# \[Branch ~dhis2-devs-core/dhis2/trunk\] Rev 15278: Merge from ThoughtWorks/MSF team branch. Makes Translation.java an IdentifiableObject. Exposes tr... **URL:** \ **Category:** Support - Assistance technique\ **Created:** [15 May 2014 17:00 UTC](https://community.dhis2.org/t/branch-dhis2-devs-core-dhis2-trunk-rev-15278-merge-from-thoughtworks-msf-team-branch-makes-translation-java-an-identifiableobject-exposes-tr/24547 "2014-05-15T17:00:37Z")\ **Posts on this page:** 1\ **Page:** 1
**Author:** ![DHIS\_2\_Users](https://dhis2.b-cdn.net/letter_avatar_proxy/v4/letter/d/9fc29f/32.png) [@DHIS\_2\_Users](https://community.dhis2.org/u/DHIS_2_Users)\ **Post date:** [15 May 2014 17:00 UTC](https://community.dhis2.org/t/branch-dhis2-devs-core-dhis2-trunk-rev-15278-merge-from-thoughtworks-msf-team-branch-makes-translation-java-an-identifiableobject-exposes-tr/24547/1 "2014-05-15T17:00:37Z")
Merge authors:   Aravind M (arav-psgtech)   Kiran Prakash (kiran-f)   Mahendra Kariya (mahendrakariya-k) [revision-diff.txt](https://dhis2.b-cdn.net/uploads/default/original/3X/0/d/0daf67290c0de6caf6dd94923c63947cabb838b0.txt) (82.5 KB) > **ยทยทยท** > > ------------------------------------------------------------ > revno: 15278 [merge] > committer: Lars Helge Overland \ > branch nick: dhis2 > timestamp: Thu 2014-05-15 18:58:37 +0200 > message: >   Merge from ThoughtWorks/MSF team branch. Makes Translation.java an IdentifiableObject. Exposes translations in Web API. > added: >   dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translations.java >   dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/TranslationController.java > modified: >   .bzrignore >   dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java >   dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/TranslationService.java >   dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/TranslationStore.java >   dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java >   dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java >   dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.java >   dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nService.java >   dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java >   dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/translation/DefaultTranslationService.java >   dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/translation/hibernate/HibernateTranslationStore.java >   dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java >   dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml >   dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/translation/hibernate/Translation.hbm.xml >   dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java >   dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/translation/TranslationServiceTest.java >   dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/translation/TranslationStoreTest.java >   dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserSettingServiceTest.java >   dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java >   dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml >   dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/StatementBuilder.java >   dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/AbstractStatementBuilder.java >   dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/HsqlStatementBuilder.java >   dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/MySQLStatementBuilder.java >   dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.java >   dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/LocaleUtilsTest.java >   dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/UserSettingController.java >   dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/UserController.java >   dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm >   dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js >   dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetTranslationsAction.java >   dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/I18nAction.java >   dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/TranslateAction.java > > -- > lp:dhis2 > > > **[trunk : Code : DHIS](https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk)** > > > > The trunk is where the mainline development takes place. > > Your team DHIS 2 developers is subscribed to branch lp:dhis2. > To unsubscribe from this branch go to [OpenID transaction in progress](https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription)