diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar.properties index 5955f0feee1a..885fd415ada7 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar.properties @@ -216,7 +216,6 @@ F_USERGROUP_LIST=\u0633\u0631\u062f \u0642\u0627\u0626\u0645\u0629 \u0645\u062c\ F_USER_GROUPS_READ_ONLY_ADD_MEMBERS=\u0625\u0636\u0627\u0641\u0629/\u0625\u0632\u0627\u0644\u0629 \u0623\u0639\u0636\u0627\u0621 \u0641\u064a \u0645\u062c\u0645\u0648\u0639\u0627\u062a \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646 \u0627\u0644\u062a\u064a \u0644\u0644\u0642\u0631\u0627\u0621\u0629 \u0641\u0642\u0637 F_USER_ADD=\u0625\u0636\u0627\u0641\u0629/\u062a\u062d\u062f\u064a\u062b \u0645\u0633\u062a\u062e\u062f\u0645 F_USER_DELETE=\u062d\u0630\u0641 \u0645\u0633\u062a\u062e\u062f\u0645 -F_USER_VIEW=View user F_USER_ADD_WITHIN_MANAGED_GROUP=\u0625\u0636\u0627\u0641\u0629/\u062a\u062d\u062f\u064a\u062b \u0645\u0633\u062a\u062e\u062f\u0645 \u0636\u0645\u0646 \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u064f\u062f\u0627\u0631\u0629 F_USER_DELETE_WITHIN_MANAGED_GROUP=\u062d\u0630\u0641 \u0645\u0633\u062a\u062e\u062f\u0645 \u0636\u0645\u0646 \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u064f\u062f\u0627\u0631\u0629 F_USER_VIEW_WITHIN_MANAGED_GROUP=\u0627\u0633\u062a\u0639\u0631\u0627\u0636 \u0645\u0633\u062a\u062e\u062f\u0645 \u0636\u0645\u0646 \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u0645\u064f\u062f\u0627\u0631\u0629 @@ -233,9 +232,7 @@ F_REPORT_DELETE=\u062d\u0630\u0641 \u062a\u0642\u0631\u064a\u0631 F_REPORT_VIEW=\u0627\u0633\u062a\u0639\u0631\u0627\u0636 \u062a\u0642\u0631\u064a\u0631 F_DASHBOARD_PUBLIC_ADD=\u0625\u0636\u0627\u0641\u0629/\u062a\u062d\u062f\u064a\u062b \u0644\u0648\u062d\u0629 \u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0639\u0627\u0645 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=\u0625\u0636\u0627\u0641\u0629/\u062a\u062d\u062f\u064a\u062b \u0645\u0633\u062a\u0646\u062f \u0639\u0627\u0645 F_DOCUMENT_PRIVATE_ADD=\u0625\u0636\u0627\u0641\u0629/\u062a\u062d\u062f\u064a\u062b \u0645\u0633\u062a\u0646\u062f \u062e\u0627\u0635 F_DOCUMENT_DELETE=\u062d\u0630\u0641 \u0645\u0633\u062a\u0646\u062f @@ -437,7 +434,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -542,7 +538,6 @@ item=\u0627\u0644\u0639\u0646\u0635\u0631 action=\u0625\u062c\u0631\u0627\u0621 sub_total=\u0627\u0644\u0625\u062c\u0645\u0627\u0644\u064a \u0627\u0644\u0641\u0631\u0639\u064a total=\u0627\u0644\u0625\u062c\u0645\u0627\u0644\u064a -impersonate_user=Impersonate user username_in_password=\u0644\u0627 \u064a\u0645\u0643\u0646 \u0623\u0646 \u064a\u0643\u0648\u0646 \u0627\u0633\u0645 \u0627\u0644\u0645\u062a\u0633\u062e\u062f\u0645 \u062c\u0632\u0621\u0627\u064b \u0645\u0646 \u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u0631\u0648\u0631 email_in_password=\u0644\u0627 \u064a\u0645\u0643\u0646 \u0623\u0646 \u064a\u0643\u0648\u0646 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u062c\u0632\u0621\u0627\u064b \u0645\u0646 \u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u0631\u0648\u0631 username_email_in_password=\u0644\u0627 \u064a\u0645\u0643\u0646 \u0623\u0646 \u064a\u0643\u0648\u0646 \u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645/\u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0625\u0644\u0643\u062a\u0631\u0648\u0646\u064a \u062c\u0632\u0621\u0627\u064b \u0645\u0646 \u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u0631\u0648\u0631 @@ -1692,12 +1687,10 @@ authentication.message.account.locked=\u062d\u0633\u0627\u0628\u0643 \u0645\u064 powered_by=\u0645\u0634\u063a\u0644 \u0628\u0648\u0627\u0633\u0637\u0629 sign_in=\u062a\u0633\u062c\u064a\u0644 \u062f\u062e\u0648\u0644 login_using_two_factor_authentication=\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644 \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 two factor authentication -two_factor_authentication_code=Two factor authentication code sign_in_with_openID=\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644 \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 OpenID change_language=\u062a\u063a\u064a\u064a\u0631 \u0627\u0644\u0644\u063a\u0629 login_with_google=\u062a\u0633\u062d\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644 \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 Google login_with_azure=\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644 \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 Microsoft -oidc_login_failed=Failed to login with OIDC two_factor_code=\u0627\u0644\u0643\u0648\u062f #-- New User Account page -----------------------------------------------------# @@ -1780,11 +1773,6 @@ respond_to_this_message=\u0627\u0644\u0631\u062f \u0639\u0644\u0649 \u0647\u0630 #-- 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 #-- Cache strategy display strings --------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar_IQ.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar_IQ.properties index 23cf799d73df..4cc03645180c 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar_IQ.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar_IQ.properties @@ -215,10 +215,8 @@ 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 @@ -232,9 +230,7 @@ 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 @@ -503,7 +499,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=The short name is already in use. Please choose a different short name unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -1626,12 +1621,7 @@ 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 #-- New User Account page -----------------------------------------------------# new_user_account_name=\u0627\u0644\u0627\u0633\u0645 diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_bn.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_bn.properties index 6cecf753c2b8..fea5290937c8 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_bn.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_bn.properties @@ -215,10 +215,8 @@ 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 @@ -232,9 +230,7 @@ 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 @@ -503,7 +499,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=The short name is already in use. Please choose a different short name unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -1626,12 +1621,7 @@ 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 #-- New User Account page -----------------------------------------------------# new_user_account_name=Name diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ckb.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ckb.properties index cde48c4aebac..a7b9f54ce4d0 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ckb.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ckb.properties @@ -216,10 +216,8 @@ 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 @@ -233,9 +231,7 @@ 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 @@ -436,7 +432,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -518,7 +513,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=The short name is already in use. Please choose a different short name unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -541,7 +535,6 @@ item=Item action=Action sub_total=Sub total total=\u0643\u0624\u064a \u0637\u0634\u062a\u064a -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 @@ -1688,13 +1681,7 @@ 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=Code #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_cs.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_cs.properties index bb92e502dbdd..60fdcad8daaf 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_cs.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_cs.properties @@ -1778,11 +1778,6 @@ respond_to_this_message=Odpov\u011b\u010f na tuto zpr\u00e1vu #-- 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 #-- Cache strategy display strings --------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_da.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_da.properties index 9869668ab62a..962472d3297a 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_da.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_da.properties @@ -213,10 +213,8 @@ 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 @@ -230,9 +228,7 @@ 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 @@ -433,7 +429,6 @@ 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 #-- Common ---------------------------------------------------------------------# @@ -515,7 +510,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=The short name is already in use. Please choose a different short name unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -538,7 +532,6 @@ 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 @@ -1685,13 +1678,7 @@ 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=Code #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es.properties index 8e5d830f2b61..81a23b59c776 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es.properties @@ -1688,13 +1688,7 @@ authentication.message.account.invalid=Nombre de usuario o contrase\u00f1a incor authentication.message.account.locked=Your account is locked powered_by=Desarrollado por sign_in=Iniciar sesi\u00f3n -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=C\u00f3digo #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es_419.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es_419.properties index 8c413fb17e08..6b4b79a8ed99 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es_419.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es_419.properties @@ -215,10 +215,8 @@ 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 @@ -232,9 +230,7 @@ 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 @@ -435,7 +431,6 @@ 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 #-- Common ---------------------------------------------------------------------# offline=Offline @@ -516,7 +511,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=The short name is already in use. Please choose a different short name unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -539,7 +533,6 @@ 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 @@ -1686,13 +1679,7 @@ 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=Code #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_fr.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_fr.properties index 0cdd924afa72..2ef6faae8f3a 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_fr.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_fr.properties @@ -437,7 +437,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -542,7 +541,6 @@ item=\u00c9l\u00e9ment action=Action sub_total=Sous-total total=Total -impersonate_user=Impersonate user username_in_password=Le nom d'utilisateur ne doit pas appara\u00eetre dans le mot de passe email_in_password=Le courriel ne doit pas appara\u00eetre dans le mot de passe username_email_in_password=Le nom d'utilisateur/email ne doit pas appara\u00eetre dans le mot de passe @@ -1790,11 +1788,6 @@ email_invite_1_3rd_paragraph=Vous devez r\u00e9pondre \u00e0 cette invitation da #-- 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 #-- Cache strategy display strings --------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_id.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_id.properties index c06e63465db1..a44a918c7e17 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_id.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_id.properties @@ -215,10 +215,8 @@ 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 @@ -232,9 +230,7 @@ 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 @@ -435,7 +431,6 @@ 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 #-- Common ---------------------------------------------------------------------# offline=Offline @@ -516,7 +511,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=Nama singkat sudah digunakan. Silakan memilih nama singkat yang baru unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -539,7 +533,6 @@ 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 @@ -1686,13 +1679,7 @@ 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=Kode #-- New User Account page -----------------------------------------------------# 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 2621cf5add9c..9613e03361d0 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 @@ -216,10 +216,8 @@ 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 @@ -233,9 +231,7 @@ 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 @@ -436,7 +432,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -518,7 +513,6 @@ password_uppercase_validation=Password must have at least one upper 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 @@ -541,7 +535,6 @@ 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 @@ -1688,13 +1681,7 @@ 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=Code #-- New User Account page -----------------------------------------------------# 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 045c58e26f79..f0dd28a72ffc 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 @@ -216,10 +216,8 @@ 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 @@ -233,9 +231,7 @@ 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 @@ -437,7 +433,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -519,7 +514,6 @@ password_uppercase_validation=Password must have at least one upper 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=\u0ea5\u0eb0\u0eab\u0eb1\u0e94\u0e99\u0eb5\u0ec9\u0ea1\u0eb5\u0ec1\u0ea5\u0ec9\u0ea7. \u0e81\u0eb0\u0ea5\u0eb8\u0e99\u0eb2\u0ec0\u0ea5\u0eb7\u0ead\u0e81\u0ea5\u0eb0\u0eab\u0eb1\u0e94\u0ead\u0eb7\u0ec8\u0e99 short_name_in_use=\u0e8a\u0eb7\u0ec8\u0eaa\u0eb1\u0ec9\u0e99\u0e99\u0eb5\u0ec9\u0ea1\u0eb5\u0ec1\u0ea5\u0ec9\u0ea7. \u0e81\u0eb0\u0ea5\u0eb8\u0e99\u0eb2\u0ec0\u0ea5\u0eb7\u0ead\u0e81\u0e8a\u0eb7\u0ec8\u0ead\u0eb7\u0ec8\u0e99 unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -542,7 +536,6 @@ item=Item action=Action sub_total=Sub total total=\u0ea5\u0ea7\u0ea1 -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 @@ -1691,13 +1684,7 @@ authentication.message.account.invalid=\u0e8a\u0eb7\u0ec8 \u0ea5\u0eb0\u0eab\u0e authentication.message.account.locked=Your account is locked powered_by=Powered by 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 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=\u0ea5\u0eb0\u0eab\u0eb1\u0e94 #-- New User Account page -----------------------------------------------------# @@ -1790,11 +1777,6 @@ 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 #-- Cache strategy display strings --------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_my.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_my.properties index 1d42dbd85106..aa04aee1214d 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_my.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_my.properties @@ -213,10 +213,8 @@ F_USERGROUP_LIST=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030\u1 F_USER_GROUPS_READ_ONLY_ADD_MEMBERS=Add/Remove Members In Read-Only User Groups F_USER_ADD=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030 \u1015\u1031\u102b\u1004\u103a\u1038\u101e\u100a\u103a\u104b F_USER_DELETE=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030 \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b -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=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b @@ -230,9 +228,7 @@ F_REPORT_DELETE=\u1021\u1005\u102e\u101b\u1004\u103a\u1001\u1036\u1005\u102c\u10 F_REPORT_VIEW=\u1021\u1005\u102e\u101b\u1004\u103a\u1001\u1036\u1005\u102c\u1000\u102d\u102f \u1000\u103c\u100a\u1037\u103a\u101e\u100a\u103a\u104b 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=Document \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b F_DOCUMENT_PRIVATE_ADD=Document \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b F_DOCUMENT_DELETE=Document \u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b @@ -433,7 +429,6 @@ 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 #-- Common ---------------------------------------------------------------------# @@ -515,7 +510,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=\u1021\u1019\u100a\u103a\u1021\u1010\u102d\u102f\u1019\u103e\u102c \u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u1015\u103c\u102e\u1038\u101e\u102c\u1038\u1016\u103c\u1005\u103a\u1014\u1031\u1015\u102b\u101e\u100a\u103a\u104b \u1021\u1001\u103c\u102c\u1038\u1021\u1019\u100a\u103a\u1021\u1010\u102d\u102f\u1000\u102d\u102f \u101b\u103d\u1031\u1038\u1001\u103b\u101a\u103a\u1015\u102b\u104b unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -538,7 +532,6 @@ 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 @@ -1685,13 +1678,7 @@ authentication.message.account.invalid=\u1021\u101e\u102f\u1036\u1038\u1015\u103 authentication.message.account.locked=Your account is locked powered_by=\u1021\u1006\u1004\u103a\u1037\u1019\u103c\u103e\u1004\u103a\u1037\u1001\u103c\u1004\u103a\u1038\u1000\u102d\u102f\u1021\u1031\u102c\u1000\u103a\u1015\u102b\u1010\u102d\u102f\u1037\u1016\u103c\u1004\u103a\u1037\u1006\u1031\u102c\u1004\u103a\u101b\u103d\u1000\u103a\u1011\u102c\u1038\u101e\u100a\u103a 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=\u1000\u102f\u1012\u103a #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_nb.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_nb.properties index a3fe6275832f..eb81d460009e 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_nb.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_nb.properties @@ -216,7 +216,6 @@ F_USERGROUP_LIST=Liste opp brukergrupper F_USER_GROUPS_READ_ONLY_ADD_MEMBERS=Legg til/fjern medlemmer i skrivebeskyttede brukergrupper F_USER_ADD=Legg til/oppdater bruker F_USER_DELETE=Slett bruker -F_USER_VIEW=View user F_USER_ADD_WITHIN_MANAGED_GROUP=Legg til/oppdater bruker innen administrert gruppe F_USER_DELETE_WITHIN_MANAGED_GROUP=Slett bruker innen administrert gruppe bruker innen administrert gruppe F_USER_VIEW_WITHIN_MANAGED_GROUP=Vis bruker innen administrert gruppe @@ -233,9 +232,7 @@ F_REPORT_DELETE=Slett rapport F_REPORT_VIEW=Vis rapport F_DASHBOARD_PUBLIC_ADD=Legg til/oppdater offentlig dashbord 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=Legg til/oppdater offentlig dokument F_DOCUMENT_PRIVATE_ADD=Legg til/oppdater privat dokument F_DOCUMENT_DELETE=Slett dokument @@ -437,7 +434,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -542,7 +538,6 @@ item=Element action=Handling sub_total=Delsum total=Totalt -impersonate_user=Impersonate user username_in_password=Brukernavn kan ikke v\u00e6re en del av passordet email_in_password=E-post kan ikke v\u00e6re en del av passordet username_email_in_password=Brukernavn/e-post kan ikke v\u00e6re en del av passordet @@ -1697,7 +1692,6 @@ sign_in_with_openID=Logg inn med OpenID change_language=Bytt spr\u00e5k login_with_google=Logg inn med Google login_with_azure=Logg inn med Microsoft -oidc_login_failed=Failed to login with OIDC two_factor_code=Kode #-- New User Account page -----------------------------------------------------# @@ -1780,11 +1774,6 @@ respond_to_this_message=Svar p\u00e5 denne meldingen #-- 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 #-- Cache strategy display strings --------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ne.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ne.properties index 110222d7d99f..06a8b5a7bd0f 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ne.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ne.properties @@ -216,10 +216,8 @@ 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 @@ -233,9 +231,7 @@ 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 @@ -436,7 +432,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -518,7 +513,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=The short name is already in use. Please choose a different short name unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -541,7 +535,6 @@ 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 @@ -1688,13 +1681,7 @@ 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=Code #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_nl.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_nl.properties index 13afeec7a23a..55412fea6e31 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_nl.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_nl.properties @@ -216,10 +216,8 @@ 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 @@ -233,9 +231,7 @@ 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 @@ -437,7 +433,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -519,7 +514,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=The short name is already in use. Please choose a different short name unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -542,7 +536,6 @@ item=Item action=Action sub_total=Sub total total=Totaal -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 @@ -1691,13 +1684,7 @@ 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=Code #-- New User Account page -----------------------------------------------------# @@ -1790,11 +1777,6 @@ 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 #-- Cache strategy display strings --------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_or.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_or.properties index 4650c05874ca..b3e2b3a0f09e 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_or.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_or.properties @@ -215,10 +215,8 @@ 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 @@ -232,9 +230,7 @@ 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 @@ -503,7 +499,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=The short name is already in use. Please choose a different short name unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -1626,13 +1621,7 @@ 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 #-- New User Account page -----------------------------------------------------# new_user_account_name=Name diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_prs.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_prs.properties index 8b85f7433707..7ef7c6e84c7d 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_prs.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_prs.properties @@ -216,7 +216,6 @@ F_USERGROUP_LIST=\u0644\u0633\u062a \u06af\u0631\u0648\u067e \u0647\u0627\u06cc F_USER_GROUPS_READ_ONLY_ADD_MEMBERS=\u0627\u0641\u0632\u0627\u06cc\u0634/ \u062d\u0630\u0641 \u0639\u0636\u0648 \u062f\u0631 \u06af\u0631\u0648\u067e \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u0646\u062f\u0647 \u06af\u0627\u0646 \u0628\u0627 \u0635\u0644\u0627\u062d\u06cc\u062a \u062a\u0646\u0647\u0627 \u0645\u0637\u0627\u0644\u0639\u0647 F_USER_ADD=\u0627\u0641\u0632\u0627\u06cc\u0634/ \u062a\u062c\u062f\u06cc\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u0646\u062f\u0647 F_USER_DELETE=\u062d\u0630\u0641 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u0646\u062f\u0647 -F_USER_VIEW=View user F_USER_ADD_WITHIN_MANAGED_GROUP=\u0627\u0641\u0632\u0627\u06cc\u0634/ \u062a\u062c\u062f\u06cc\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u0646\u062f\u0647 \u062f\u0631 \u06af\u0631\u0648\u067e \u062a\u0646\u0638\u06cc\u0645 \u0634\u062f\u0647 F_USER_DELETE_WITHIN_MANAGED_GROUP=\u062d\u0630\u0641 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u0646\u062f\u0647 \u062f\u0631 \u06af\u0631\u0648\u067e \u062a\u0646\u0638\u06cc\u0645 \u0634\u062f\u0647 F_USER_VIEW_WITHIN_MANAGED_GROUP=\u0646\u0645\u0627\u06cc\u0634 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u0646\u062f\u0647 \u062f\u0631 \u06af\u0631\u0648\u067e \u062a\u0646\u0638\u06cc\u0645 \u0634\u062f\u0647 @@ -233,9 +232,7 @@ F_REPORT_DELETE=\u062d\u0630\u0641 \u06af\u0632\u0627\u0631\u0634 F_REPORT_VIEW=\u0646\u0645\u0627\u06cc\u0634 \u06af\u0632\u0627\u0631\u0634 F_DASHBOARD_PUBLIC_ADD=\u0627\u0641\u0632\u0627\u06cc\u0634/ \u062a\u062c\u062f\u06cc\u062f \u062f\u0627\u0634\u0628\u0648\u0631\u062f \u0639\u0627\u0645\u0647 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=\u0627\u0641\u0632\u0627\u06cc\u0634/ \u062a\u062c\u062f\u06cc\u062f \u0627\u0633\u0646\u0627\u062f \u0639\u0627\u0645\u0647 F_DOCUMENT_PRIVATE_ADD=\u0627\u0641\u0632\u0627\u06cc\u0634/ \u062a\u062c\u062f\u06cc\u062f \u0627\u0633\u0646\u0627\u062f \u062e\u0635\u0648\u0635\u06cc F_DOCUMENT_DELETE=\u062d\u0630\u0641 \u0627\u0633\u0646\u0627\u062f @@ -437,7 +434,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -519,7 +515,6 @@ password_uppercase_validation=\u0631\u0645\u0632 \u0628\u0627\u06cc\u062f \u062d password_dictionary_validation=\u0631\u0645\u0632 \u0646\u0647 \u0628\u0627\u06cc\u062f \u06a9\u0644\u0645\u0647 \u0639\u0645\u0648\u0645\u06cc \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u062f password_specialcharacter_validation=\u0631\u0645\u0632 \u0628\u0627\u06cc\u062f \u062d\u062f \u0627\u0642\u0644 \u06cc\u06a9 \u06a9\u0644\u0645\u0647 \u062e\u0627\u0635 \u062f\u0627\u0634\u062a\u0647 \u0628\u0627\u0634\u062f password_username_validation=\u0646\u0627\u0645 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u0646\u062f\u0647/\u0627\u06cc\u0645\u0644 \u0622\u062f\u0631\u0633 \u0646\u0647 \u0628\u0627\u06cc\u062f \u0628\u062e\u0634 \u0627\u0632 \u0631\u0645\u0632 \u0634\u0648\u062f -mandatory_parameter_missing=Username or Password is missing code_in_use=\u06a9\u0648\u062f \u0627\u0632 \u0642\u0628\u0644 \u0645\u0648\u0631\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0642\u0631\u0627\u0631 \u062f\u0627\u0631\u062f. \u0644\u0637\u0641\u0627\u064b \u06cc\u06a9 \u06a9\u0648\u062f \u062f\u06cc\u06af\u0631 \u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0645\u0627\u0626\u06cc\u062f short_name_in_use=\u0627\u0633\u0645 \u06a9\u0648\u062a\u0627\u0647 \u0627\u0632 \u0642\u0628\u0644 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06af\u0631\u062f\u06cc\u062f\u0647 \u0627\u0633\u062a. \u0644\u0637\u0641\u0627\u064b \u06cc\u06a9 \u0627\u0633\u0645 \u06a9\u0648\u062a\u0627\u0647 \u0645\u062a\u0641\u0627\u0648\u062a \u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0645\u0627\u0626\u06cc\u062f unsupported_browser=\u0644\u0637\u0641\u0627\u064b \u0635\u0641\u062d\u0647 \u062c\u0633\u062a\u062c\u0648 \u062e\u0648\u06cc\u0634 \u0631\u0627 \u062a\u062c\u062f\u06cc\u062f \u0646\u0645\u0627\u0626\u06cc\u062f. \u0646\u0633\u062e\u0647 \u0634\u0645\u0627\u0631\u0647 8 \u0648\u06cc\u0627 \u0646\u0633\u062e\u0647 \u0647\u0627\u06cc \u0642\u0628\u0644\u06cc \u062c\u0633\u062a\u062c\u0648 \u06af\u0631 \u0627\u0646\u062a\u0631\u0646\u062a \u0642\u0627\u0628\u0644 \u062d\u0645\u0627\u06cc\u062a \u0646\u0647 \u0645\u06cc \u0628\u0627\u0634\u062f @@ -542,7 +537,6 @@ item=\u0645\u0648\u0631\u062f action=\u0627\u0633\u062a\u062b\u0646\u0627\u064b sub_total=\u0645\u062c\u0645\u0648\u0639\u0647 \u062c\u0632 total=\u0645\u062c\u0645\u0648\u0639 -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 @@ -1691,13 +1685,7 @@ authentication.message.account.invalid=\u0646\u0627\u0645 \u0627\u0633\u062a\u06 authentication.message.account.locked=Your account is locked powered_by=\u062d\u0645\u0627\u06cc\u062a \u062a\u0648\u0633\u0637 sign_in=\u0648\u0631\u0648\u062f \u0628\u0647 \u0633\u06cc\u0633\u062a\u0645 -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=\u06a9\u0648\u0689 \u06cc\u0627 \u0634\u0641\u0631 #-- New User Account page -----------------------------------------------------# @@ -1780,11 +1768,6 @@ respond_to_this_message=\u067e\u0627\u0633\u062e \u0628\u0647 \u0627\u06cc\u0646 #-- 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 #-- Cache strategy display strings --------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ps.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ps.properties index cf90f24b71bb..e2dceda7cd86 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ps.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ps.properties @@ -216,7 +216,6 @@ F_USERGROUP_LIST=\u062f \u06a9\u0627\u0631\u0648\u0648\u0646\u06a9\u064a \u06ab\ F_USER_GROUPS_READ_ONLY_ADD_MEMBERS=\u062f \u062a\u06cc\u0627\u0631 \u06a9\u0627\u0631\u0648\u0648\u0646\u06a9\u064a \u067e\u0647 \u06ab\u0631\u0648\u067e\u0648\u0646\u0648 \u06a9\u06d0 \u063a\u0693\u064a \u0627\u0636\u0627\u0641\u0647/\u0644\u0631\u06d0 /\u06a9\u0693\u0626 F_USER_ADD=\u062f \u06a9\u0627\u0631\u0648\u0648\u0646\u06a9\u064a \u062a\u062c\u062f\u06cc\u062f\u0648\u0644/\u0627\u0636\u0627\u0641\u0647 \u06a9\u0648\u0644 F_USER_DELETE=\u06a9\u0627\u0631\u0648\u0648\u0646\u06a9\u06cc \u062d\u0630\u0641 \u06a9\u0693\u0626 -F_USER_VIEW=View user F_USER_ADD_WITHIN_MANAGED_GROUP=\u067e\u0647 \u062a\u0646\u0638\u06cc\u0645 \u0634\u0648\u064a \u06ab\u0631\u0648\u067e \u06a9\u06d0 \u062f \u06a9\u0627\u0631\u0648\u0648\u0646\u06a9\u064a \u062a\u062c\u062f\u06cc\u062f\u0648\u0644/\u0627\u0636\u0627\u0641\u0647 \u06a9\u0648\u0644 F_USER_DELETE_WITHIN_MANAGED_GROUP=\u067e\u0647 \u062a\u0646\u0638\u06cc\u0645 \u0634\u0648\u064a \u06ab\u0631\u0648\u067e \u06a9\u06d0 \u06a9\u0627\u0631\u0648\u0648\u0646\u06a9\u06cc \u062d\u0630\u0641 \u06a9\u0693\u0626 F_USER_VIEW_WITHIN_MANAGED_GROUP=\u067e\u0647 \u062a\u0646\u0638\u06cc\u0645 \u0634\u0648\u064a \u06ab\u0631\u0648\u067e \u06a9\u06d0 \u06a9\u0627\u0631\u0648\u0648\u0646\u06a9\u06cc \u0648\u06ab\u0648\u0631\u0626 @@ -233,9 +232,7 @@ F_REPORT_DELETE=\u0631\u0627\u067e\u0648\u0631 \u062d\u0630\u0641 \u06a9\u0693\u F_REPORT_VIEW=\u0631\u0627\u067e\u0648\u0631 \u0648\u06ab\u0648\u0631\u0626 F_DASHBOARD_PUBLIC_ADD=\u062f \u0639\u0627\u0645\u0647 \u0689\u06d0\u0634\u0628\u0648\u0631\u0689 \u062a\u062c\u062f\u06cc\u062f\u0648\u0644 / \u0627\u0636\u0627\u0641\u0647 \u06a9\u0648\u0644 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=\u062f \u0639\u0627\u0645\u0647 \u0633\u0646\u062f\u0648\u0646\u0648 \u062a\u062c\u062f\u06cc\u062f\u0648\u0644 / \u0627\u0636\u0627\u0641\u0647 \u06a9\u0648\u0644 F_DOCUMENT_PRIVATE_ADD=\u062f \u062e\u0635\u0648\u0635\u064a \u0633\u0646\u062f\u0648\u0646\u0648 \u062a\u062c\u062f\u06cc\u062f\u0648\u0644 / \u0627\u0636\u0627\u0641\u0647 \u06a9\u0648\u0644 F_DOCUMENT_DELETE=\u0633\u0646\u062f\u0648\u0646\u0647 \u062d\u0630\u0641 \u06a9\u0693\u0626 @@ -436,7 +433,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -518,7 +514,6 @@ password_uppercase_validation=\u067e\u067c \u0646\u0648\u0645 \u0628\u0627\u06cc password_dictionary_validation=\u067e\u067c \u0646\u0648\u0645 \u0628\u0627\u06cc\u062f \u0647\u06d0\u0685 \u0689\u0648\u0644 \u062c\u0646\u0633\u064a \u06a9\u0644\u0645\u0647 \u0648\u0646\u0647 \u0644\u0631\u064a password_specialcharacter_validation=\u067e\u067c \u0646\u0648\u0645 \u0628\u0627\u06cc\u062f \u0644\u0696 \u062a\u0631 \u0644\u0696\u0647 \u06cc\u0648\u0647 \u0681\u0627\u0646\u06ab\u0693\u06d0 \u0646\u069a\u0647 \u06cc\u0627 \u062a\u0648\u0631\u06cc \u0648\u0644\u0631\u064a. password_username_validation=\u06a9\u0627\u0631\u06d0\u062f\u0648\u0646\u06a9\u06cc \u0646\u0648\u0645 / \u0628\u0631\u06d0\u069a\u0646\u0627\u0644\u06cc\u06a9 \u0628\u0627\u06cc\u062f \u062f \u067e\u067c \u0646\u0648\u0645 \u0628\u0631\u062e\u0647 \u0646\u0647 \u0648\u064a -mandatory_parameter_missing=Username or Password is missing code_in_use=\u062f \u062f\u06d0 \u06a9\u0648\u0689 \u0685\u062e\u0647 \u0644\u0647 \u0648\u0693\u0627\u0646\u062f\u06d0 \u06a9\u0627\u0631 \u0627\u062e\u06cc\u0633\u062a\u0644 \u06a9\u06cc\u0696\u064a. \u0644\u0637\u0641\u0627\u064b \u0628\u0644 \u06a9\u0648\u0689 \u063a\u0648\u0631\u0647 \u06a9\u0693\u0626. short_name_in_use=\u062f \u062f\u06d0 \u0644\u0646\u0689 \u0646\u0648\u0645 \u0685\u062e\u0647 \u0644\u0647 \u0648\u0693\u0627\u0646\u062f\u06d0 \u06a9\u0627\u0631 \u0627\u062e\u06cc\u0633\u062a\u0644 \u06a9\u06cc\u0696\u064a. \u0644\u0637\u0641\u0627\u064b \u0628\u0644 \u0644\u0646\u0689 \u0646\u0648\u0645 \u063a\u0648\u0631\u0647 \u06a9\u0693\u0626. unsupported_browser=\u0645\u0647\u0631\u0628\u0627\u0646\u064a \u0648\u06a9\u0693\u0626 \u062e\u067e\u0644 \u067e\u0644\u067c\u0646\u06d0 \u067e\u0627\u06bc\u0647 \u062a\u062c\u062f\u06cc\u062f \u06cc\u0627 \u0646\u0648\u06cc \u06a9\u0693\u0626. \u0681\u06a9\u0647 \u0686\u06d0 \u062f \u0627\u0646\u067c\u0631\u0646\u06d0\u067c \u067e\u0644\u067c\u0648\u0646\u06a9\u064a \u062f \u062f\u06d0 \u0627\u062a\u0645\u06d0 (\u06f8) \u06cc\u0627 \u0645\u062e\u06a9\u06cc\u0646\u06cd \u0646\u0633\u062e\u06d0 \u0633\u0631\u0647 \u0645\u0631\u0633\u062a\u0647 \u0646\u0647 \u06a9\u0648\u064a. @@ -541,7 +536,6 @@ item=\u0645\u0648\u0631\u062f action=\u0639\u0645\u0644 sub_total=\u0644\u0648\u0645\u0693\u0646\u06cd \u06cc\u0627 \u0641\u0631\u0639\u064a \u0645\u062c\u0645\u0648\u0639\u0647 total=\u067c\u0648\u0644\u067c\u0627\u0644 -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 @@ -1688,13 +1682,7 @@ authentication.message.account.invalid=\u063a\u0644\u0637 \u06a9\u0627\u0631\u06 authentication.message.account.locked=Your account is locked powered_by=\u062f \u0641\u0639\u0627\u0644\u0648\u0644\u0648 \u0648\u0633\u06cc\u0644\u0647 sign_in=\u0633\u06cc\u0633\u067c\u0645 \u062a\u0647 \u062f\u0627\u062e\u0644\u06d0\u062f\u0644 -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=\u06a9\u0648\u0689 \u06cc\u0627 \u0634\u0641\u0631 #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt.properties index 9500ca8f9591..1a76b4a67fc9 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt.properties @@ -216,7 +216,6 @@ F_USERGROUP_LIST=Listar grupos de utilizadores F_USER_GROUPS_READ_ONLY_ADD_MEMBERS=Adicionar / remover membros em grupos de usu\u00e1rios somente leitura F_USER_ADD=Adicionar utilizador F_USER_DELETE=Eliminar utilizador -F_USER_VIEW=View user F_USER_ADD_WITHIN_MANAGED_GROUP=Adicionar / actualizar usu\u00e1rio dentro do grupo gerenciado F_USER_DELETE_WITHIN_MANAGED_GROUP=Excluir usu\u00e1rio dentro do grupo gerenciado F_USER_VIEW_WITHIN_MANAGED_GROUP=Exibir usu\u00e1rio no grupo gerenciado @@ -233,9 +232,7 @@ F_REPORT_DELETE=Apagar Relat\u00f3rio F_REPORT_VIEW=Ver Relat\u00f3rio F_DASHBOARD_PUBLIC_ADD=Adicionar / Alterar pain\u00e9l p\u00fablico 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=Adicionar Documento F_DOCUMENT_PRIVATE_ADD=Adicionar documento particular F_DOCUMENT_DELETE=Eliminar Documento @@ -437,7 +434,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -519,7 +515,6 @@ password_uppercase_validation=A senha deve ter pelo menos uma letra mai\u00fascu password_dictionary_validation=A senha n\u00e3o deve ter nenhuma palavra gen\u00e9rica password_specialcharacter_validation=A senha deve conter pelo menos um caractere especial password_username_validation=Nome de usu\u00e1rio / email n\u00e3o deve fazer parte da senha -mandatory_parameter_missing=Username or Password is missing code_in_use=O c\u00f3digo j\u00e1 est\u00e1 em uso. Por favor, escolha um c\u00f3digo diferente short_name_in_use=O nome curto j\u00e1 est\u00e1 em uso. Por favor, escolha um nome diferente de curto unsupported_browser=Actualize seu navegador. Internet Explorer vers\u00e3o 8 e vers\u00f5es anteriores n\u00e3o s\u00e3o suportadas. @@ -542,7 +537,6 @@ item=Item action=Ac\u00e7\u00e3o sub_total=Subtotal total=Total -impersonate_user=Impersonate user username_in_password=O nome de usu\u00e1rio n\u00e3o pode fazer parte da senha email_in_password=O email n\u00e3o pode fazer parte da senha username_email_in_password=Nome de usu\u00e1rio / e-mail n\u00e3o pode fazer parte da senha @@ -1691,13 +1685,7 @@ authentication.message.account.invalid=Utilizador ou password errado(s) authentication.message.account.locked=Sua conta est\u00e1 bloqueada powered_by=Fornecido por sign_in=Entrar -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=C\u00f3digo #-- New User Account page -----------------------------------------------------# @@ -1790,11 +1778,6 @@ 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 #-- Cache strategy display strings --------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt_BR.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt_BR.properties index fab1e75fcf68..62ee22e7b318 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt_BR.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt_BR.properties @@ -216,10 +216,8 @@ F_USERGROUP_LIST=Listar grupos de utilizadores F_USER_GROUPS_READ_ONLY_ADD_MEMBERS=Add/Remove Members In Read-Only User Groups F_USER_ADD=Adiccionar utilizador F_USER_DELETE=Eliminar utilizador -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=Eliminar Regra de Valida\u00e7\u00e3o @@ -233,9 +231,7 @@ F_REPORT_DELETE=Apagar Relat\u00f3rio F_REPORT_VIEW=Ver Relat\u00f3rio 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=Adiccionar Documento F_DOCUMENT_PRIVATE_ADD=Adicionar documento particular F_DOCUMENT_DELETE=Eliminar Documento @@ -518,7 +514,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=O nome curto j\u00e1 est\u00e1 em uso. Por favor, escolha um nome diferente de curto unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -1688,13 +1683,7 @@ 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=C\u00f3digo #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ro.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ro.properties index 5cd1afb50765..2db194ca2b73 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ro.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ro.properties @@ -215,10 +215,8 @@ 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 @@ -232,9 +230,7 @@ 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 @@ -503,7 +499,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=The short name is already in use. Please choose a different short name unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -1626,12 +1621,7 @@ 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 #-- New User Account page -----------------------------------------------------# new_user_account_name=Name diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ru.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ru.properties index 5980db08a5f1..8bb3f2397aa4 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ru.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ru.properties @@ -216,7 +216,6 @@ F_USERGROUP_LIST=\u0421\u043e\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043f\u F_USER_GROUPS_READ_ONLY_ADD_MEMBERS=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0443\u0447\u0430\u0441\u0442\u043d\u0438\u043a\u043e\u0432 \u0432 \u0433\u0440\u0443\u043f\u043f\u0430\u0445 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0442\u043e\u043b\u044c\u043a\u043e \u0434\u043b\u044f \u0447\u0442\u0435\u043d\u0438\u044f F_USER_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f F_USER_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f -F_USER_VIEW=View user F_USER_ADD_WITHIN_MANAGED_GROUP=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0432 \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0435\u043c\u043e\u0439 \u0433\u0440\u0443\u043f\u043f\u0435 F_USER_DELETE_WITHIN_MANAGED_GROUP=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0432 \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0435\u043c\u043e\u0439 \u0433\u0440\u0443\u043f\u043f\u0435 F_USER_VIEW_WITHIN_MANAGED_GROUP=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0432 \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0435\u043c\u043e\u0439 \u0433\u0440\u0443\u043f\u043f\u0435 @@ -233,9 +232,7 @@ F_REPORT_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043e\u0442\u0447\u0 F_REPORT_VIEW=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u043e\u0442\u0447\u0435\u0442 F_DASHBOARD_PUBLIC_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u043e-\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0443\u044e \u0438\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u044c 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=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442 F_DOCUMENT_PRIVATE_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043b\u0438\u0447\u043d\u044b\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442 F_DOCUMENT_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442 @@ -436,7 +433,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -518,7 +514,6 @@ password_uppercase_validation=\u041f\u0430\u0440\u043e\u043b\u044c \u0434\u043e\ password_dictionary_validation=\u041f\u0430\u0440\u043e\u043b\u044c \u043d\u0435 \u0434\u043e\u043b\u0436\u0435\u043d \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u043e\u0431\u0449\u0435\u0443\u043f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0445 \u0441\u043b\u043e\u0432 password_specialcharacter_validation=\u041f\u0430\u0440\u043e\u043b\u044c \u0434\u043e\u043b\u0436\u0435\u043d \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u0445\u043e\u0442\u044f \u0431\u044b \u043e\u0434\u0438\u043d \u0441\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0439 \u0441\u0438\u043c\u0432\u043e\u043b password_username_validation=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f / \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u0430\u044f \u043f\u043e\u0447\u0442\u0430 \u043d\u0435 \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c \u0447\u0430\u0441\u0442\u044c\u044e \u043f\u0430\u0440\u043e\u043b\u044f -mandatory_parameter_missing=Username or Password is missing code_in_use=\u042d\u0442\u043e\u0442 \u043a\u043e\u0434 \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0434\u0440\u0443\u0433\u043e\u0439 \u043a\u043e\u0434 short_name_in_use=\u041a\u043e\u0440\u043e\u0442\u043a\u043e\u0435 \u0438\u043c\u044f \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430 \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0434\u0440\u0443\u0433\u043e\u0435 \u043a\u043e\u0440\u043e\u0442\u043a\u043e\u0435 \u0438\u043c\u044f. unsupported_browser=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u0435 \u0432\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440. Internet Explorer 8 \u0438 \u0431\u043e\u043b\u0435\u0435 \u0440\u0430\u043d\u043d\u0438\u0445 \u0432\u0435\u0440\u0441\u0438\u0439 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f. @@ -541,7 +536,6 @@ item=\u041f\u0443\u043d\u043a\u0442 action=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435 sub_total=\u041f\u0440\u043e\u043c\u0435\u0436\u0443\u0442\u043e\u0447\u043d\u044b\u0439 \u0438\u0442\u043e\u0433 total=\u0412\u0441\u0435\u0433\u043e -impersonate_user=Impersonate user username_in_password=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0447\u0430\u0441\u0442\u044c\u044e \u043f\u0430\u0440\u043e\u043b\u044f email_in_password=Email \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0447\u0430\u0441\u0442\u044c\u044e \u043f\u0430\u0440\u043e\u043b\u044f username_email_in_password=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f/Email \u043d\u0435 \u043c\u043e\u0433\u0443\u0442 \u0431\u044b\u0442\u044c \u0447\u0430\u0441\u0442\u044c\u044e \u043f\u0430\u0440\u043e\u043b\u044f @@ -1688,13 +1682,7 @@ authentication.message.account.invalid=\u041d\u0435\u0432\u0435\u0440\u043d\u043 authentication.message.account.locked=\u0412\u0430\u0448\u0430 \u0443\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0430 powered_by=\u041d\u0430 \u043f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0435 sign_in=\u0412\u043e\u0439\u0442\u0438 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0443 -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=\u041a\u043e\u0434 #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_si.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_si.properties index a72a887aad46..f3c7702b04b3 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_si.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_si.properties @@ -213,10 +213,8 @@ 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 @@ -230,9 +228,7 @@ 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 @@ -433,7 +429,6 @@ 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 #-- Common ---------------------------------------------------------------------# @@ -515,7 +510,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=The short name is already in use. Please choose a different short name unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -538,7 +532,6 @@ item=Item action=Action sub_total=Sub total total=\u0d91\u0d9a\u0dad\u0dd4\u0dc0 -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 @@ -1685,13 +1678,7 @@ 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=\u0d9a\u0dda\u0dad \u0d9a\u0dbb\u0db1\u0dca\u0db1 #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_sv.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_sv.properties index 1b61e7a57656..e5fde9a47abe 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_sv.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_sv.properties @@ -216,10 +216,8 @@ 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 @@ -233,9 +231,7 @@ 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 @@ -436,7 +432,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -518,7 +513,6 @@ password_uppercase_validation=Password must have at least one upper 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=Koden anv\u00e4nds redan. V\u00e4lj en annan kod short_name_in_use=Kortnamnet anv\u00e4nds redan. V\u00e4lj ett annat kortnamn unsupported_browser=Uppgradera din webbl\u00e4sare. Internet Explorer version 8 eller tidigare st\u00f6ds inte. @@ -541,7 +535,6 @@ item=Item action=Action sub_total=Sub total total=Totalt -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 @@ -1688,13 +1681,7 @@ authentication.message.account.invalid=fel anv\u00e4ndarnamn eller l\u00f6senord authentication.message.account.locked=Your account is locked powered_by=powered by sign_in=Logga 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=Koda #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tet.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tet.properties index dac9b0fb1a73..7ef08b400638 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tet.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tet.properties @@ -216,10 +216,8 @@ 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 @@ -233,9 +231,7 @@ 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 @@ -436,7 +432,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -518,7 +513,6 @@ password_uppercase_validation=Password must have at least one upper 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=K\u00f3digu ne'e uza ona. Favor hili k\u00f3digu seluk short_name_in_use=Naran badak ne'e uza ona. Favor hili naran badak seluk unsupported_browser=Favor atualiza itabo'ot nia navagador. La suporta Internet Explorer versaun 8 no anteriores. @@ -541,7 +535,6 @@ 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 @@ -1688,13 +1681,7 @@ authentication.message.account.invalid=Utilizador nia Naran ou se\u00f1a sala authentication.message.account.locked=Your account is locked powered_by=Distribuidu husi sign_in=Tama -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=K\u00f3digu #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tg.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tg.properties index e4a3d3a44e03..7f73852bb77b 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tg.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tg.properties @@ -213,10 +213,8 @@ F_USERGROUP_LIST=\u041d\u043e\u043c\u0431\u0430\u0440\u043a\u0443\u043d\u0438\u0 F_USER_GROUPS_READ_ONLY_ADD_MEMBERS=Add/Remove Members In Read-Only User Groups F_USER_ADD=\u0418\u043b\u043e\u0432\u0430\u0438 \u041a\u043e\u0440\u0431\u0430\u0440 F_USER_DELETE=\u041d\u0435\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u041a\u043e\u0440\u0431\u0430\u0440 -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=\u041d\u0435\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u049a\u043e\u0438\u0434\u0430\u0438 \u0441\u0430\u043d\u04b7\u0438\u0448\u0438 \u044d\u044a\u0442\u0438\u0431\u043e\u0440 @@ -230,9 +228,7 @@ F_REPORT_DELETE=\u041d\u0435\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d\u0 F_REPORT_VIEW=\u041d\u0430\u043c\u043e\u0438\u0448\u0438 \u04b3\u0438\u0441\u043e\u0431\u043e\u0442 F_DASHBOARD_PUBLIC_ADD=\u0418\u043b\u043e\u0432\u0430/\u043d\u0430\u0432\u0441\u043e\u0437\u0438\u0438 \u043b\u0430\u0432\u04b3\u0430\u0438 \u043c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u0438 \u043e\u043c\u043c\u0430\u0432\u04e3 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=\u0418\u043b\u043e\u0432\u0430\u0438 \u04b2\u0443\u04b7\u04b7\u0430\u0442\u0438 \u043e\u043c\u043c\u0430\u0432\u04e3 F_DOCUMENT_PRIVATE_ADD=\u0418\u043b\u043e\u0432\u0430\u0438 \u04b2\u0443\u04b7\u04b7\u0430\u0442\u0438 \u043e\u043c\u043c\u0430\u0432\u04e3 F_DOCUMENT_DELETE=\u041d\u0435\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u04b2\u0443\u04b7\u04b7\u0430\u0442 @@ -433,7 +429,6 @@ 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 #-- Common ---------------------------------------------------------------------# @@ -515,7 +510,6 @@ password_uppercase_validation=Password must have at least one upper 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=The code is already in use. Please choose a different code short_name_in_use=\u041d\u043e\u043c\u0438 \u043c\u0443\u0445\u0442\u0430\u0441\u0430\u0440 \u0430\u043b\u043b\u0430\u043a\u0430\u0439 \u0438\u0441\u0442\u0438\u0444\u043e\u0434\u0430 \u043c\u0435\u0448\u0430\u0432\u0430\u0434. \u041b\u0443\u0442\u0444\u0430\u043d \u043d\u043e\u043c\u0438 \u043c\u0443\u0445\u0442\u0430\u0441\u0430\u0440\u0438 \u0434\u0438\u0433\u0430\u0440\u0435\u0440\u043e \u0438\u043d\u0442\u0438\u0445\u043e\u0431 \u043a\u0443\u043d\u0435\u0434 unsupported_browser=Please upgrade your browser. Internet Explorer version 8 and earlier is not supported. @@ -538,7 +532,6 @@ item=Item action=\u0410\u043c\u0430\u043b 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 @@ -1685,13 +1678,7 @@ authentication.message.account.invalid=\u041f\u0430\u0440\u043e\u043b \u0451 \u0 authentication.message.account.locked=Your account is locked powered_by=\u041f\u0435\u0448\u043d\u0438\u04b3\u043e\u0434 \u0430\u0437 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=\u0420\u0430\u043c\u0437 #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_uk.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_uk.properties index 7e42d33de494..f320b93609a5 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_uk.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_uk.properties @@ -216,10 +216,8 @@ 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 @@ -233,9 +231,7 @@ 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 @@ -437,7 +433,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -519,7 +514,6 @@ password_uppercase_validation=\u041f\u0430\u0440\u043e\u043b\u044c \u043f\u043e\ password_dictionary_validation=\u041f\u0430\u0440\u043e\u043b\u044c \u043d\u0435 \u043f\u043e\u0432\u0438\u043d\u0435\u043d \u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u0436\u043e\u0434\u043d\u043e\u0433\u043e \u0437\u0430\u0433\u0430\u043b\u044c\u043d\u043e\u0432\u0436\u0438\u0432\u0430\u043d\u043e\u0433\u043e \u0441\u043b\u043e\u0432\u0430 password_specialcharacter_validation=\u041f\u0430\u0440\u043e\u043b\u044c \u043f\u043e\u0432\u0438\u043d\u0435\u043d \u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u0449\u043e\u043d\u0430\u0439\u043c\u0435\u043d\u0448\u0435 \u043e\u0434\u0438\u043d \u0441\u043f\u0435\u0446\u0456\u0430\u043b\u044c\u043d\u0438\u0439 \u0441\u0438\u043c\u0432\u043e\u043b password_username_validation=\u0406\u043c'\u044f \u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0430/\u0415\u043c\u0435\u0439\u043b \u043d\u0435 \u043f\u043e\u0432\u0438\u043d\u043d\u0456 \u0431\u0443\u0442\u0438 \u0447\u0430\u0441\u0442\u0438\u043d\u043e\u044e \u043f\u0430\u0440\u043e\u043b\u044f -mandatory_parameter_missing=Username or Password is missing code_in_use=\u041a\u043e\u0434 \u0432\u0436\u0435 \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u044e\u0442\u044c. \u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u043e\u0431\u0435\u0440\u0456\u0442\u044c \u0456\u043d\u0448\u0438\u0439 \u043a\u043e\u0434 short_name_in_use=\u041a\u043e\u0440\u043e\u0442\u043a\u0435 \u0456\u043c'\u044f \u0432\u0436\u0435 \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u044e\u0442\u044c. \u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u043e\u0431\u0435\u0440\u0456\u0442\u044c \u0456\u043d\u0448\u0435 \u043a\u043e\u0440\u043e\u0442\u043a\u0435 \u0456\u043c'\u044f unsupported_browser=\u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u043e\u043d\u043e\u0432\u0456\u0442\u044c \u0432\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440. Internet Explorer 8 \u0442\u0430 \u0431\u0456\u043b\u044c\u0448 \u0440\u0430\u043d\u043d\u0456\u0445 \u0432\u0435\u0440\u0441\u0456\u0439 \u043d\u0435 \u043f\u0456\u0434\u0442\u0440\u0438\u043c\u0443\u0454\u0442\u044c\u0441\u044f. @@ -542,7 +536,6 @@ item=\u0415\u043b\u0435\u043c\u0435\u043d\u0442 action=\u0414\u0456\u044f sub_total=\u041f\u0440\u043e\u043c\u0456\u0436\u043d\u0438\u0439 \u043f\u0456\u0434\u0441\u0443\u043c\u043e\u043a total=\u041f\u0456\u0434\u0441\u0443\u043c\u043e\u043a -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 @@ -1691,13 +1684,7 @@ authentication.message.account.invalid=\u041d\u0435\u043f\u0440\u0430\u0432\u043 authentication.message.account.locked=Your account is locked powered_by=\u041d\u0430 \u043f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0456 sign_in=\u0423\u0432\u0456\u0439\u0442\u0438 -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=\u041a\u043e\u0434 #-- New User Account page -----------------------------------------------------# @@ -1780,11 +1767,6 @@ respond_to_this_message=\u0412\u0456\u0434\u043f\u043e\u0432\u0456\u0441\u0442\u #-- 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 #-- Cache strategy display strings --------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ur.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ur.properties index d48822ee7ff1..3e5cd61f1668 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ur.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ur.properties @@ -216,10 +216,8 @@ 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 @@ -233,9 +231,7 @@ 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 @@ -436,7 +432,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -518,7 +513,6 @@ password_uppercase_validation=\u067e\u0627\u0633\u0648\u0631\u0688 \u0645\u06cc\ password_dictionary_validation=\u067e\u0627\u0633\u0648\u0631\u0688 \u0639\u0645\u0648\u0645\u0645\u06cc \u0644\u0641\u0638 \u0646\u06c1 \u06c1\u0648 password_specialcharacter_validation=\u067e\u0627\u0633\u0648\u0631\u0688 \u0645\u06cc\u06ba \u0627\u06cc\u06a9 \u0645\u062e\u0635\u0648\u0635 \u062d\u0631\u0641 \u0644\u0627\u0632\u0645\u06cc \u06c1\u0648\u0646\u0627 \u0686\u0627\u06c1\u06cc\u06d2 password_username_validation=\u067e\u0627\u0633\u0648\u0631\u0688 \u0645\u06cc\u06ba \u0627\u06cc \u0645\u06cc\u0644 - \u06cc\u0648\u0632\u0646\u0627\u0645 \u0646\u06c1\u06cc\u06ba \u06c1\u0648\u0646\u0627 \u0686\u0627\u06c1\u06cc\u06d2 -mandatory_parameter_missing=Username or Password is missing code_in_use=\u06a9\u0648\u0688 \u0627\u0633\u062a\u0645\u0627\u0644 \u0645\u06cc\u06ba \u06c1\u06d2\u060c \u062f\u0648\u0633\u0631\u0627 \u06a9\u0648\u0688 \u062f\u06cc\u06ba short_name_in_use=\u0645\u062e\u062a\u0635\u0631 \u0646\u0627\u0645 \u0627\u0633\u062a\u0645\u0627\u0644 \u0645\u06cc\u06ba \u06c1\u06d2\u060c \u06a9\u0648\u0626\u06cc \u062f\u0648\u0633\u0631\u0627 \u0646\u0627\u0645 \u062f\u06cc\u06ba unsupported_browser=\u0628\u0631\u0627\u0624\u0632\u0631 \u0627\u067e\u0688\u06cc\u0679 \u06a9\u0631\u06cc\u06ba\u06d4 \u0627\u0646\u0679\u0631\u0646\u06cc\u0679 \u06f8 \u0627\u0648\u0631 \u0627\u0633 \u0633\u06d2 \u0642\u0628\u0644 \u0628\u0631\u0627\u0624\u0632\u0631 \u06a9\u06cc \u0633\u067e\u0648\u0631\u0679 \u0646\u06c1\u06cc\u06ba \u06c1\u06d2\u06d4 @@ -541,7 +535,6 @@ item=\u0634\u06d2 action=\u0639\u0645\u0644 sub_total=\u0632\u06cc\u0644\u06cc \u0645\u062c\u0645\u0648\u0639\u06cc total=\u06a9\u064f\u0644 -impersonate_user=Impersonate user username_in_password=\u06cc\u0648\u0632\u0631\u0646\u0627\u0645 \u067e\u0633\u0648\u0631\u0688 \u0645\u06cc\u06ba \u0646\u06c1\u06cc\u06ba \u06c1\u0648 \u0633\u06a9\u062a\u0627 email_in_password=\u0627\u06cc \u0645\u06cc\u0644 \u067e\u0627\u0633\u0648\u0631\u0688 \u0645\u06cc\u06ba \u0646\u06c1\u06cc\u06ba \u06c1\u0648 \u0633\u06a9\u062a\u0627 username_email_in_password=\u06cc\u0648\u0632\u0631 - \u0627\u06cc \u0645\u06cc\u0644 \u067e\u0627\u0633\u0648\u0631\u0688 \u06a9\u0627 \u062d\u0635\u06c1 \u0646\u06c1\u06cc\u06ba \u06c1\u0648 \u0633\u06a9\u062a\u0627 @@ -1688,13 +1681,7 @@ authentication.message.account.invalid=\u063a\u0644\u0637 \u0627\u0633\u062a\u06 authentication.message.account.locked=\u0627\u0653\u067e \u06a9\u0627 \u0627\u06a9\u0627\u0624\u0646\u0679 \u0628\u0646\u062f \u06c1\u06d2 powered_by=\u06a9\u06cc \u0637\u0627\u0642\u062a \u0633\u06d2 sign_in=\u062f\u0627\u062e\u0644\u06c1 -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=\u06a9\u0648\u0688 #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_uz_UZ_Cyrl.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_uz_UZ_Cyrl.properties index 2b239bebacc3..998793758453 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_uz_UZ_Cyrl.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_uz_UZ_Cyrl.properties @@ -1780,11 +1780,6 @@ respond_to_this_message=\u0423\u0448\u0431\u0443 \u0445\u0430\u0431\u0430\u0440\ #-- 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 #-- Cache strategy display strings --------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_uz_UZ_Latn.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_uz_UZ_Latn.properties index e32bf37bdcd0..2e0dfe78b485 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_uz_UZ_Latn.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_uz_UZ_Latn.properties @@ -216,7 +216,6 @@ F_USERGROUP_LIST=Foydalanuvchi Guruhlari Ro\u02bcyxati F_USER_GROUPS_READ_ONLY_ADD_MEMBERS=Faqat O\u02bcqish uchun Foydalanuvchi Guruhlariga \u0410\u02bczolarni Qo\u02bcshish/Olib tashlash F_USER_ADD=Foydalanuvchi Qo\u02bcshish/Yangilash F_USER_DELETE=Foydalanuvchini O\u02bcchirish -F_USER_VIEW=View user F_USER_ADD_WITHIN_MANAGED_GROUP=Boshqariladigan Guruh ichida Foydalanuvchi Qo\u02bcshish/Yangilash F_USER_DELETE_WITHIN_MANAGED_GROUP=Boshqariladigan Guruh ichida Foydalanuvchi O\u02bcchirish F_USER_VIEW_WITHIN_MANAGED_GROUP=Boshqariladigan Guruh ichida Foydalanuvchi Ko\u02bcrib chiqish @@ -233,9 +232,7 @@ F_REPORT_DELETE=Hisobotni O\u02bcchirish F_REPORT_VIEW=Hisobotni Ko\u02bcrib chiqish F_DASHBOARD_PUBLIC_ADD=Ochiq Boshqaruv panelini Qo\u02bcshish/Yangilash 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=Ochiq Hujjat Qo\u02bcshish/Yangilash F_DOCUMENT_PRIVATE_ADD=Yopiq Hujjat Qo\u02bcshish/Yangilash F_DOCUMENT_DELETE=Hujjatni O\u02bcchirish @@ -436,7 +433,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -541,7 +537,6 @@ item=Element action=\u0410mal sub_total=Oraliq yig\u02bcindi total=Jami -impersonate_user=Impersonate user username_in_password=FoydalanuvchiIsmi parolning qismi bo\u02bclishi mumkin emas email_in_password=Ye-pochta parolning qismi bo\u02bclishi mumkin emas username_email_in_password=FoydalanuvchiIsmi/U-pochta parolning qismi bo\u02bclishi mumkin emas @@ -1694,7 +1689,6 @@ sign_in_with_openID=OpenID orqali tizimga kiring change_language=tilni tanlang login_with_google=Google orqali tizimga kiring login_with_azure=Mikrosoft orqali tizimga kiring -oidc_login_failed=Failed to login with OIDC two_factor_code=Kod #-- New User Account page -----------------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_vi.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_vi.properties index 578a91af9e6c..6a9224b06443 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_vi.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_vi.properties @@ -216,7 +216,6 @@ F_USERGROUP_LIST=Li\u1ec7t k\u00ea nh\u00f3m ng\u01b0\u1eddi d\u00f9ng F_USER_GROUPS_READ_ONLY_ADD_MEMBERS=Th\u00eam th\u00e0nh vi\u00ean v\u00e0o nh\u00f3m ch\u1ec9 \u0111\u01b0\u1ee3c xem F_USER_ADD=Th\u00eam ng\u01b0\u1eddi d\u00f9ng F_USER_DELETE=X\u00f3a ng\u01b0\u1eddi d\u00f9ng -F_USER_VIEW=View user F_USER_ADD_WITHIN_MANAGED_GROUP=Th\u00eam ng\u01b0\u1eddi d\u00f9ng trong nh\u00f3m qu\u1ea3n l\u00fd F_USER_DELETE_WITHIN_MANAGED_GROUP=X\u00f3a ng\u01b0\u1eddi d\u00f9ng trong nh\u00f3m qu\u1ea3n l\u00fd F_USER_VIEW_WITHIN_MANAGED_GROUP=Xem ng\u01b0\u1eddi d\u00f9ng trong nh\u00f3m qu\u1ea3n l\u00fd @@ -233,9 +232,7 @@ F_REPORT_DELETE=X\u00f3a b\u00e1o c\u00e1o F_REPORT_VIEW=Xem/In b\u00e1o c\u00e1o F_DASHBOARD_PUBLIC_ADD=Th\u00eam b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n m\u1edf 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=Th\u00eam t\u00e0i li\u1ec7u m\u1edf F_DOCUMENT_PRIVATE_ADD=Th\u00eam t\u00e0i li\u1ec7u \u0111\u00f3ng F_DOCUMENT_DELETE=X\u00f3a t\u00e0i li\u1ec7u @@ -437,7 +434,6 @@ 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_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -542,7 +538,6 @@ item=M\u1ee5c action=H\u00e0nh \u0111\u1ed9ng sub_total=T\u1ed5ng ph\u1ee5 total=T\u1ed5ng s\u1ed1 -impersonate_user=Impersonate user username_in_password=M\u1eadt kh\u1ea9u kh\u00f4ng \u0111\u01b0\u1ee3c bao g\u1ed3m t\u00ean ng\u01b0\u1eddi d\u00f9ng email_in_password=M\u1eadt kh\u1ea9u kh\u00f4ng \u0111\u01b0\u1ee3c bao g\u1ed3m email username_email_in_password=M\u1eadt kh\u1ea9u kh\u00f4ng bao g\u1ed3m t\u00ean ng\u01b0\u1eddi d\u00f9ng / Email @@ -1691,13 +1686,7 @@ authentication.message.account.invalid=Sai t\u00ean truy c\u1eadp ho\u1eb7c m\u1 authentication.message.account.locked=Your account is locked powered_by=\u0110\u01b0\u1ee3c cung c\u1ea5p b\u1edfi sign_in=\u0110\u0103ng nh\u1eadp -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=M\u00e3 #-- New User Account page -----------------------------------------------------# @@ -1780,11 +1769,6 @@ respond_to_this_message=Tr\u1ea3 l\u1eddi tin nh\u1eafn n\u00e0y #-- 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 #-- Cache strategy display strings --------------------------------------------# diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh_CN.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh_CN.properties index 3e42529c60e2..5c5f03a91bc7 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh_CN.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh_CN.properties @@ -437,7 +437,6 @@ F_EVENT_HOOK_DELETE=\u5220\u9664\u4e8b\u4ef6\u6302\u94a9 F_ROUTE_PUBLIC_ADD=\u6dfb\u52a0/\u66f4\u65b0\u516c\u5171\u8def\u7531 F_ROUTE_PRIVATE_ADD=\u6dfb\u52a0/\u66f4\u65b0\u4e13\u7528\u8def\u7531 F_ROUTE_PUBLIC_DELETE=\u5220\u9664\u8def\u7ebf -F_IMPERSONATE_USER=Impersonate user F_MAP_EXTERNAL_LAYER_ADD=Add external map layer #-- Common ---------------------------------------------------------------------# @@ -1780,11 +1779,6 @@ respond_to_this_message=\u54cd\u5e94\u8be5\u4fe1\u606f #-- 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 #-- Cache strategy display strings --------------------------------------------#