diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_lo.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_lo.properties index 60f6f17dfd8e..40c53598c719 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_lo.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_lo.properties @@ -192,6 +192,7 @@ F_INDICATOR_PRIVATE_ADD=Add/Update Private Indicator F_INDICATOR_DELETE=Delete Indicator F_INDICATORTYPE_ADD=Add/Update Indicator Type F_INDICATORTYPE_DELETE=Delete Indicator Type +F_INDICATOR_TYPE_MERGE=Merge Indicator Type F_INDICATORGROUP_PUBLIC_ADD=Add/Update Public Indicator Group F_INDICATORGROUP_PRIVATE_ADD=Add/Update Private Indicator Group F_INDICATORGROUP_DELETE=Delete Indicator Group @@ -1690,7 +1691,7 @@ wrong_username_or_password=\u0e8a\u0eb7\u0ec8 \u0ea5\u0eb0\u0eab\u0eb1\u0e94\u0e authentication.message.account.invalid=\u0e8a\u0eb7\u0ec8 \u0ea5\u0eb0\u0eab\u0eb1\u0e94\u0e9c\u0ec8\u0eb2\u0e99 \u0e9a\u0ecd\u0ec8\u0e96\u0eb7\u0e81 authentication.message.account.locked=Your account is locked powered_by=Powered by -sign_in=Sign in +sign_in=\u0ec0\u0e82\u0ebb\u0ec9\u0eb2\u0eaa\u0eb9\u0ec8\u0ea5\u0eb0\u0e9a\u0ebb\u0e9a login_using_two_factor_authentication=Login using two factor authentication two_factor_authentication_code=Two factor authentication code sign_in_with_openID=Sign in with OpenID @@ -1790,7 +1791,7 @@ email_invite_1_3rd_paragraph=You must respond to this invitation within 4 days. #-- Cache strategy display strings --------------------------------------------# cache_strategy=Cache strategy -respect_system_setting=Respect system setting +respect_system_setting=\u0e9b\u0eb0\u0e95\u0eb4\u0e9a\u0eb1\u0e94\u0e95\u0eb2\u0ea1\u0e81\u0eb2\u0e99\u0e95\u0eb1\u0ec9\u0e87\u0e84\u0ec8\u0eb2\u0e82\u0ead\u0e87\u0ea5\u0eb0\u0e9a\u0ebb\u0e9a no_cache=No cache cache_until_6am_tomorrow=Cache until 6 AM tomorrow cache_for_two_weeks=Cache for two weeks