diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_km.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_km.properties index 0e9d5deee1b7..1c26527a70a9 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_km.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_km.properties @@ -72,6 +72,7 @@ dhis-web-sms-configuration=SMS Configuration dhis-web-login=Login dhis-web-user-profile=User Profile dhis-web-line-listing=Line Listing +dhis-web-metadata-management=Metadata Management #-- Intro modules -------------------------------------------------------------# @@ -142,6 +143,7 @@ M_dhis-web-scheduler=Scheduler app M_dhis-web-data-visualizer=Data Visualizer app M_dhis-web-sms-configuration=SMS Configuration app M_dhis-web-line-listing=Line Listing app +M_dhis-web-metadata-management=Metadata Management app #-- User action privilegies ---------------------------------------------------# @@ -220,8 +222,10 @@ F_USERGROUP_LIST=List User Groups F_USER_GROUPS_READ_ONLY_ADD_MEMBERS=Add/Remove Members In Read-Only User Groups F_USER_ADD=Add/Update User F_USER_DELETE=Delete User +F_USER_VIEW=View user F_USER_ADD_WITHIN_MANAGED_GROUP=Add/Update User Within Managed Group F_USER_DELETE_WITHIN_MANAGED_GROUP=Delete User Within Managed Group +F_USER_VIEW_WITHIN_MANAGED_GROUP=View User Within Managed Group F_VALIDATIONRULE_PUBLIC_ADD=Add/Update Public Validation Rule F_VALIDATIONRULE_PRIVATE_ADD=Add/Update Private Validation Rule F_VALIDATIONRULE_DELETE=Delete Validation Rule @@ -235,7 +239,9 @@ F_REPORT_DELETE=Delete Report F_REPORT_VIEW=View Report F_DASHBOARD_PUBLIC_ADD=Add/Update Public Dashboard F_VISUALIZATION_PUBLIC_ADD=Add/Update Public Visualization +F_VISUALIZATION_EXTERNAL=Visualization External Access F_EVENT_VISUALIZATION_PUBLIC_ADD=Add/Update Public Event Visualization +F_EVENT_VISUALIZATION_EXTERNAL=Event Visualization External Access F_DOCUMENT_PUBLIC_ADD=Add/Update Public Document F_DOCUMENT_PRIVATE_ADD=Add/Update Private Document F_DOCUMENT_DELETE=Delete Document @@ -421,7 +427,9 @@ F_EVENT_HOOK_DELETE=Delete Event Hook F_ROUTE_PUBLIC_ADD=Add/Update Public Route F_ROUTE_PRIVATE_ADD=Add/Update Private Route F_ROUTE_PUBLIC_DELETE=Delete Route +F_IMPERSONATE_USER=Impersonate user F_JOB_LOG_READ=View Job Execution Logs +F_PREVIOUS_IMPERSONATOR_AUTHORITY=User Impersonation (switch back) #-- Common ---------------------------------------------------------------------# offline=\u1780\u17d2\u179a\u17c5\u200b\u1794\u178e\u17d2\u178a\u17b6\u1789\u17a2\u17b7\u1793\u1792\u17ba\u179a\u178e\u17c2\u178f @@ -499,9 +507,11 @@ password_length_validation=Password does not meet minimum length requirement password_history_validation=Password must not be one of the previous 24 passwords password_digit_validation=Password must have at least one digit password_uppercase_validation=Password must have at least one upper case +password_lowercase_validation=Password must have at least one lower case password_dictionary_validation=Password must not have any generic word password_specialcharacter_validation=Password must contain at least one special character password_username_validation=Username/Email must not be part of password +mandatory_parameter_missing=Username or Password is missing code_in_use=\u179b\u17c1\u1781\u1780\u17bc\u178a\u1793\u17c1\u17c7\u1798\u17b6\u1793\u179a\u17bd\u1785\u17a0\u17be\u1799 \u179f\u17bc\u1798\u1787\u17d2\u179a\u17be\u179f\u179b\u17c1\u1781\u1780\u17bc\u178a\u1798\u17bd\u1799\u1795\u17d2\u179f\u17c1\u1784\u1791\u17c0\u178f short_name_in_use=\u1788\u17d2\u1798\u17c4\u17c7\u1793\u17c1\u17c7\u1798\u17b6\u1793\u179a\u17bd\u1785\u17a0\u17be\u1799 \u179f\u17bc\u1798\u1787\u17d2\u179a\u17be\u179f\u1788\u17d2\u1798\u17c4\u17c7\u1798\u17bd\u1799\u1795\u17d2\u179f\u17c1\u1784\u1791\u17c0\u178f unsupported_browser=\u179f\u17bc\u1798\u1792\u17d2\u179c\u17be\u1794\u1785\u17d2\u1785\u17bb\u1794\u17d2\u1794\u1793\u17d2\u1793\u179b\u17be\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8\u1794\u17be\u1780\u1782\u17c1\u17a0\u1791\u17c6\u1796\u17d0\u179a \u17a0\u17be\u1799\u1798\u17b7\u1793\u17a2\u17b6\u1785\u1794\u17be\u1780\u1794\u17b6\u1793\u1785\u17b6\u1794\u17cb\u1796\u17b8\u1780\u17c6\u178e\u17c2\u178a\u17c2\u179b\u1791\u17b6\u1794\u1787\u17b6\u1784 Internet Explorer V8 @@ -524,6 +534,7 @@ item=Item action=Action sub_total=Sub total total=Total +impersonate_user=Impersonate user username_in_password=Username cannot be part of password email_in_password=Email cannot be part of password username_email_in_password=Username/Email cannot be part of password @@ -1255,7 +1266,7 @@ active=Active type=Type value_type=Value Type actual=Actual -target=Target +target=\u1782\u17c4\u179b\u178a\u17c5 percent=Percent on_time=On time data_dictionary=Data Dictionary @@ -1680,7 +1691,13 @@ authentication.message.account.invalid=Wrong username or password authentication.message.account.locked=Your account is locked powered_by=Powered by sign_in=Sign in +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 change_language=Change language +login_with_google=Sign in with Google +login_with_azure=Sign in with Microsoft +oidc_login_failed=Failed to login with OIDC two_factor_code=\u179b\u17c1\u1781\u1780\u17bc\u178a #-- New User Account page -----------------------------------------------------# @@ -1773,9 +1790,21 @@ email_invite_1_3rd_paragraph=You must respond to this invitation within 4 days. #-- Verify email -------------------------------------------------------------# +email_verify_1_1st_paragraph_before_application_title=This is a message to verify a +email_verify_1_1st_paragraph_after_application_title=, user account email. +email_verify_1_2nd_paragraph=Please click the link below to verify the email address of your account. +email_verify_1_3rd_paragraph=You must respond to this email within one hour. If you take no action, the email address will not be verified. +verify_email_subject=Verify email address #-- 2FA code email -------------------------------------------------------------# +email_2fa_subject=Your Two-Factor Authentication Code for +email_2fa_1_greeting=Dear +email_2fa_1_1st_paragraph_application_title=You have requested a two-factor authentication code to log into your account. +email_2fa_1_2nd_paragraph=Your two-factor authentication code: +email_2fa_1_3rd_paragraph=Please use this code within 15 minutes to log into your account. +email_2fa_1_4th_paragraph=If you did not request this code, please contact your system administrator immediately to secure your account. +email_2fa_1_ending=Thank you, #-- Cache strategy display strings --------------------------------------------# @@ -1819,7 +1848,7 @@ indicator_group_set=Indicator group set option_set=Option set attribute=Attribute category_option=\u1787\u1798\u17d2\u179a\u17be\u179f\u1794\u17d2\u179a\u1797\u17c1\u1791 -category=Category +category=\u1785\u17c6\u178e\u17b6\u178f\u17cb\u1780\u17d2\u179a\u17bb\u1798 category_combo=Category Combination category_option_combo=Category option combination category_option_group_set=Category option group set diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties index a83e065c6c1a..225b8c88db49 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties @@ -72,6 +72,7 @@ dhis-web-sms-configuration=\u77ed\u4fe1\u914d\u7f6e dhis-web-login=\u767b\u5f55 dhis-web-user-profile=\u7528\u6237\u8d44\u6599 dhis-web-line-listing=\u884c\u5217\u8868 +dhis-web-metadata-management=\u5143\u6570\u636e\u7ba1\u7406 #-- Intro modules -------------------------------------------------------------# @@ -142,6 +143,7 @@ M_dhis-web-scheduler=\u67e5\u770b\u8c03\u5ea6\u5668App M_dhis-web-data-visualizer=\u67e5\u770b\u6570\u636e\u53ef\u89c6\u5316\u6a21\u5757 M_dhis-web-sms-configuration=\u77ed\u4fe1\u914d\u7f6e\u5e94\u7528 M_dhis-web-line-listing=\u884c\u5217\u8868\u5e94\u7528\u7a0b\u5e8f +M_dhis-web-metadata-management=\u5143\u6570\u636e\u7ba1\u7406\u5c0f\u7a0b\u5e8f #-- User action privilegies ---------------------------------------------------# @@ -607,7 +609,7 @@ Survey=\u8c03\u67e5 Relative=\u5173\u7cfb FinancialFeb=\u4e8c\u6708\u8d22\u52a1 FinancialApril=\u8d22\u52a1\u56db\u6708 -FinancialJuly=\u8d22\u653f\u4e03\u6708 +FinancialJuly=\u8d22\u52a1\u4e03\u6708 FinancialAug=\u8d22\u52a1\u516b\u6708 FinancialOct=\u8d22\u52a1\u5341\u6708 FinancialNov=\u8d22\u653f\u5341\u4e00\u6708