------------------------------------------------------------ revno: 15981 committer: Lars Helge Overland <[email protected]> branch nick: dhis2 timestamp: Sun 2014-07-06 19:12:17 +0200 message: Merged dhis-service-i18n into dhis-service-core. Please remove from IDEs. removed: dhis-2/dhis-services/dhis-service-i18n/ dhis-2/dhis-services/dhis-service-i18n/pom.xml dhis-2/dhis-services/dhis-service-i18n/src/ dhis-2/dhis-services/dhis-service-i18n/src/main/ dhis-2/dhis-services/dhis-service-i18n/src/main/java/ dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/ dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/ dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/ dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/ dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/DefaultI18nManager.java dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/I18nManager.java dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/locale/ dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/locale/UserSettingLocaleManager.java dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/resourcebundle/ dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/resourcebundle/DefaultResourceBundleManager.java dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/resourcebundle/ResourceBundleManager.java dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/resourcebundle/ResourceBundleManagerException.java dhis-2/dhis-services/dhis-service-i18n/src/main/resources/ dhis-2/dhis-services/dhis-service-i18n/src/main/resources/META-INF/ dhis-2/dhis-services/dhis-service-i18n/src/main/resources/META-INF/dhis/ dhis-2/dhis-services/dhis-service-i18n/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_ar.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_ar_IQ.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_bi.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_bn.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_dz.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_en.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_es.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_fr.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_id.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_km.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_lo.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_my.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_ne.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_pt.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_pt_BR.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_ru.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_rw.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_tg.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_vi.properties dhis-2/dhis-services/dhis-service-i18n/src/main/resources/i18n_global_zh.properties added: dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nManager.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/DefaultI18nManager.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/locale/ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/locale/UserSettingLocaleManager.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/resourcebundle/ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/resourcebundle/DefaultResourceBundleManager.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/resourcebundle/ResourceBundleManager.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/resourcebundle/ResourceBundleManagerException.java dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar_IQ.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_bi.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_bn.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_dz.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_en.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_fr.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_id.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_km.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_lo.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_my.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ne.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt_BR.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ru.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_rw.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tg.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_vi.properties dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties modified: dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-dxf2/pom.xml dhis-2/dhis-services/dhis-service-tracker/pom.xml dhis-2/dhis-services/pom.xml dhis-2/dhis-web/dhis-web-api/pom.xml dhis-2/dhis-web/dhis-web-commons/pom.xml dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java dhis-2/dhis-web/dhis-web-ohie/pom.xml dhis-2/pom.xml The size of the diff (17142 lines) is larger than your specified limit of 5000 lines
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription _______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
