Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 72362815fc0eef44e67e0b00cbbf99513bb09d00 https://github.com/galaxyproject/galaxy/commit/72362815fc0eef44e67e0b00cbbf9... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M client/galaxy/scripts/nls/locale.js M static/maps/layout/scratchbook.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/nls/locale.js.map M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js.map M static/scripts/layout/scratchbook.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/nls/locale.js Log Message: ----------- Add localization defaults to base locale.js, rebuild client to incorporate latest changes from @manabuishii Commit: ff04384659f80ff5aa156436388012fbd6313efd https://github.com/galaxyproject/galaxy/commit/ff04384659f80ff5aa15643638801... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M client/galaxy/scripts/nls/ja/locale.js M config/galaxy.ini.sample M lib/galaxy/model/__init__.py M lib/galaxy/tools/imp_exp/__init__.py Log Message: ----------- Merge branch 'dev' into new_localization_manabuishii Commit: 636c30704bad85d1f37a7b3333dc70df2cdafb76 https://github.com/galaxyproject/galaxy/commit/636c30704bad85d1f37a7b3333dc7... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M static/maps/nls/ja/locale.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/nls/ja/locale.js Log Message: ----------- Rebuild with new bundled Japanese translations. Commit: 69c4823f581657660efe649d224de45cb484c4c7 https://github.com/galaxyproject/galaxy/commit/69c4823f581657660efe649d224de... Author: John Chilton <jmchilton@gmail.com> Date: 2017-07-12 (Wed, 12 Jul 2017) Changed paths: M client/galaxy/scripts/nls/locale.js M static/maps/layout/scratchbook.js.map M static/maps/mvc/dataset/dataset-li-edit.js.map M static/maps/nls/ja/locale.js.map M static/maps/nls/locale.js.map M static/scripts/bundled/admin.bundled.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js M static/scripts/bundled/libs.bundled.js.map M static/scripts/bundled/login.bundled.js.map M static/scripts/layout/scratchbook.js M static/scripts/mvc/dataset/dataset-li-edit.js M static/scripts/nls/ja/locale.js M static/scripts/nls/locale.js Log Message: ----------- Merge pull request #4309 from dannon/new_localization_manabuishii Add localization defaults to base locale.js, rebuild client Compare: https://github.com/galaxyproject/galaxy/compare/68e6cdbe81cd...69c4823f5816