From c9d2af37021d8ee30a3acad359a20666bcb6bc18 Mon Sep 17 00:00:00 2001 From: dhis2-bot Date: Sat, 14 Dec 2024 22:56:17 +0000 Subject: [PATCH 1/4] fix(translations): sync translations from transifex (master) --- .../main/resources/i18n_global_ru.properties | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) 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 626ff0ad5126..679f51335019 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 @@ -153,12 +153,14 @@ F_DATAADMIN_UNLOCK=\u0420\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\ F_DATAELEMENT_PUBLIC_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0439 \u044d\u043b\u0435\u043c\u0435\u043d\u0442 \u0434\u0430\u043d\u043d\u044b\u0445 F_DATAELEMENT_PRIVATE_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043b\u0438\u0447\u043d\u044b\u0439 \u044d\u043b\u0435\u043c\u0435\u043d\u0442 \u0434\u0430\u043d\u043d\u044b\u0445 F_DATAELEMENT_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u043b\u0435\u043c\u0435\u043d\u0442 \u0434\u0430\u043d\u043d\u044b\u0445 +F_DATA_ELEMENT_MERGE=Merge Data Elements F_CATEGORY_PUBLIC_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u043e\u0431\u0449\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0443\u044e \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044e F_CATEGORY_PRIVATE_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u0443\u044e \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044e F_CATEGORY_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044e F_CATEGORY_OPTION_PUBLIC_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u043e\u043f\u0446\u0438\u044e \u043e\u0431\u0449\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e\u0439 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438 F_CATEGORY_OPTION_PRIVATE_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u043e\u043f\u0446\u0438\u044e \u043f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u043e\u0439 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438 F_CATEGORY_OPTION_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043e\u043f\u0446\u0438\u044e \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438 +F_CATEGORY_OPTION_MERGE=Merge Category Options F_CATEGORY_COMBO_PUBLIC_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u044e \u043e\u0431\u0449\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e\u0439 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438 F_CATEGORY_COMBO_PRIVATE_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u044e \u043f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u043e\u0439 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438 F_CATEGORY_COMBO_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u044e \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438 @@ -189,7 +191,7 @@ F_INDICATOR_PRIVATE_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043b\ F_INDICATOR_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0438\u043d\u0434\u0438\u043a\u0430\u0442\u043e\u0440 F_INDICATORTYPE_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u0438\u043f \u0438\u043d\u0434\u0438\u043a\u0430\u0442\u043e\u0440\u0430 F_INDICATORTYPE_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0438\u043d\u0434\u0438\u043a\u0430\u0442\u043e\u0440\u0430 -F_INDICATOR_TYPE_MERGE=Merge Indicator Type +F_INDICATOR_TYPE_MERGE=\u041e\u0431\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c \u0442\u0438\u043f \u0438\u043d\u0434\u0438\u043a\u0430\u0442\u043e\u0440\u0430 F_INDICATOR_MERGE=Merge Indicators F_INDICATORGROUP_PUBLIC_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u0443\u044e \u0433\u0440\u0443\u043f\u043f\u0443 \u0438\u043d\u0434\u0438\u043a\u0430\u0442\u043e\u0440\u043e\u0432 F_INDICATORGROUP_PRIVATE_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043b\u0438\u0447\u043d\u0443\u044e \u0433\u0440\u0443\u043f\u043f\u0443 \u0438\u043d\u0434\u0438\u043a\u0430\u0442\u043e\u0440\u043e\u0432 @@ -408,6 +410,7 @@ F_EXTERNAL_MAP_LAYER_PUBLIC_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c F_EXTERNAL_MAP_LAYER_PRIVATE_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0439 \u0432\u043d\u0435\u0448\u043d\u0438\u0439 \u0441\u043b\u043e\u0439 \u043a\u0430\u0440\u0442\u044b F_EXTERNAL_MAP_LAYER_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u043d\u0435\u0448\u043d\u0438\u0439 \u0441\u043b\u043e\u0439 \u043a\u0430\u0440\u0442\u044b F_VIEW_EVENT_ANALYTICS=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0430\u043d\u0430\u043b\u0438\u0442\u0438\u043a\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 +F_CAPTURE_DATASTORE_UPDATE=Create and edit Capture datastore configuration F_ADD_COLOR_SET=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u043d\u0430\u0431\u043e\u0440 \u0446\u0432\u0435\u0442\u043e\u0432 F_PROGRAM_RULE_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u043e \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b F_PROGRAMDATAELEMENT_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u043b\u0435\u043c\u0435\u043d\u0442 \u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u044b @@ -687,6 +690,8 @@ format.FinancialApril.startDate.ext=MMMM yyyy '- ' format.FinancialApril.endDate.ext=MMMM yyyy format.FinancialJuly.startDate.ext=MMMM yyyy '- ' format.FinancialJuly.endDate.ext=MMMM yyyy +format.FinancialSep.startDate.ext=MMMM yyyy '- ' +format.FinancialSep.endDate.ext=MMMM yyyy format.FinancialOct.startDate.ext=MMMM yyyy '- ' format.FinancialOct.endDate.ext=MMMM yyyy format.FinancialNov.startDate.ext=MMMM yyyy '- ' @@ -1787,6 +1792,24 @@ email_invite_1_1st_paragraph_after_application_title=\u0443\u0447\u0435\u0442\u0 email_invite_1_2nd_paragraph=You have been sent two emails, where this is the first one. Please follow the link below. In the next step you will be asked to enter a code which has been sent to you in the other email. email_invite_1_3rd_paragraph=You must respond to this invitation within one week. If you take no action, the invitation will expire at that time. +#-- Verify email -------------------------------------------------------------# + +email_verify_1_1st_paragraph_before_application_title=This is a message to verify a +email_verify_1_1st_paragraph_after_application_title=, user account email. +email_verify_1_2nd_paragraph=Please click the link below to verify the email address of your account. +email_verify_1_3rd_paragraph=You must respond to this email within one hour. If you take no action, the email address will not be verified. +verify_email_subject=Verify email address + +#-- 2FA code email -------------------------------------------------------------# + +email_2fa_subject=Your Two-Factor Authentication Code for +email_2fa_1_greeting=Dear +email_2fa_1_1st_paragraph_application_title=You have requested a two-factor authentication code to log into your account. +email_2fa_1_2nd_paragraph=Your two-factor authentication code: +email_2fa_1_3rd_paragraph=Please use this code within 15 minutes to log into your account. +email_2fa_1_4th_paragraph=If you did not request this code, please contact your system administrator immediately to secure your account. +email_2fa_1_ending=Thank you, + #-- Cache strategy display strings --------------------------------------------# cache_strategy=\u0421\u0442\u0440\u0430\u0442\u0435\u0433\u0438\u044f \u043a\u0435\u0448\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f @@ -1951,6 +1974,7 @@ data_integrity.periods_duplicates.section=\u041f\u0435\u0440\u0438\u043e\u0434\u data_integrity.periods_duplicates.name=Duplicate Periods data_integrity.periods_duplicates.description=Lists all periods duplicates which have identical type and start date data_integrity.periods_duplicates.recommendation=Make sure all database references are moved to one of the duplicates before deleting the unused duplicates +data_integrity.option_groups_empty.name=Option groups with no options data_integrity.org_units_with_cyclic_references.section=\u041e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u0438 data_integrity.org_units_with_cyclic_references.name=\u041e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0435 \u043e\u0442\u0434\u0435\u043b\u044b \u0441 \u0446\u0438\u043a\u043b\u0438\u0447\u0435\u0441\u043a\u0438\u043c\u0438 \u0441\u0441\u044b\u043b\u043a\u0430\u043c\u0438 data_integrity.org_units_with_cyclic_references.description=Lists all organisation units that have a conflicting parent hierarchy definition so that two organisation units become parent of each other or in other words they form a circular reference @@ -2022,6 +2046,7 @@ data_integrity.program_rule_actions_without_stage_id.name=Program rules with act data_integrity.program_rule_actions_without_stage_id.description=Lists program rules connected to an action of a type that requires a program stage but is not yet connected to one #YAML based data integrity checks data_integrity.categories_no_options.name=Categories with no category options +data_integrity.categories_dimensions_no_visualizations.name = Categories which are dimensions but which do not have any associated visualizations. data_integrity.categories_one_default_category.name=Only one default category should exist data_integrity.categories_one_default_category_combo.name=Only one default category combo should exist data_integrity.categories_one_default_category_option.name=Only one default category option should exist @@ -2031,6 +2056,8 @@ data_integrity.categories_unique_category_combo.name=Different category combinat data_integrity.invalid_category_combos.name=\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u0438 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0439 data_integrity.category_combos_unused.name=Category combinations not used by other metadata objects data_integrity.category_option_combos_disjoint.name=Category option combinations with disjoint associations. +data_integrity.category_option_combos_no_names.name=Category option combinations with no names +data_integrity.category_option_combos_have_duplicates.name=Category option combination duplicates (same category options and same category combo) data_integrity.category_option_group_sets_incomplete.name=Category option group sets which do not contain all category options. data_integrity.category_options_excess_groupset_membership.name=Category options which belong to multiple groups in a category option group set. data_integrity.category_options_no_categories.name=Category options with no categories. @@ -2039,13 +2066,15 @@ data_integrity.catoptioncombos_no_catcombo.name=Category options combinations wi data_integrity.cocs_wrong_cardinality.name=Category option combinations with incorrect cardinality. data_integrity.dashboards_no_items.name=\u0418\u043d\u0444\u043e\u043f\u0430\u043d\u0435\u043b\u0438 \u0431\u0435\u0437 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432 data_integrity.data_elements_aggregate_abandoned.name=Aggregate data elements that have not been changed in last 100 days and do not have any data values. -data_integrity.data_elements_aggregate_aggregation_operator.name=Non-numeric data elements which have an aggregation operator other than NONE. +data_integrity.data_elements_can_aggregate_with_none_operator.name=Aggregate data elements which can be aggregated but have an aggregation operator set to NONE. +data_integrity.data_elements_cannot_aggregate_operator_not_none.name=Data elements which cannot be aggregated but have an aggregation operator set to something other than NONE. data_integrity.data_elements_aggregate_no_analysis.name=Aggregate data elements not used in any favourites (directly or through indicators) data_integrity.data_elements_aggregate_no_data.name=Aggregate data elements with NO data values. data_integrity.data_elements_aggregate_no_groups.name=Aggregate data elements not in any data element groups. data_integrity.data_elements_aggregate_with_different_period_types.name=Aggregate data elements which belong to data sets with different period types. data_integrity.data_elements_without_datasets.name=Aggregate data elements not assigned to any data sets data_integrity.datasets_empty.name=Data sets with no data elements +data_integrity.datasets_custom_data_entry_forms_empty.name=Datasets which have custom data entry forms which are empty. data_integrity.datasets_not_assigned_to_org_units.name=Data sets not assigned to any organisation units data_integrity.data_elements_excess_groupset_membership.name=Data elements which belong to multiple groups in a group set. data_integrity.category_option_group_sets_scarce.name=Category option groups should have at least two members. @@ -2084,6 +2113,7 @@ data_integrity.periods_3y_future.name=Periods which are more than three years in data_integrity.periods_distant_past.name=Periods which are in the distant past. data_integrity.periods_same_start_end_date.name=Periods with the same start and end dates data_integrity.periods_same_start_date_period_type.name=Periods with the same start date and period type +data_integrity.programs_custom_data_entry_forms_empty.name=Programs which have custom data entry forms which are empty. data_integrity.program_rules_message_no_template.name=Program rules actions which should send or schedule a message without a message template. data_integrity.program_rules_no_action.name=Program rules with no action. data_integrity.program_rules_no_expression.name=Program rules with no expression. @@ -2100,6 +2130,8 @@ data_integrity.user_roles_no_authorities.name=User roles with no authorities data_integrity.user_roles_with_no_users.name=User roles with no users data_integrity.option_groups_empty.users=Option groups with no options data_integrity.push_analysis_no_recipients.name=Push analyses without recipients +data_integrity.file_resources_no_icon.name=File resources that are missing an icon + # -- End Data Integrity Checks--------------------------------------------# From 231e394fea02394f1c8abf93f6bb1002cc982d07 Mon Sep 17 00:00:00 2001 From: dhis2-bot Date: Sat, 21 Dec 2024 22:55:40 +0000 Subject: [PATCH 2/4] fix(translations): sync translations from transifex (master) --- .../main/resources/i18n_global_zh.properties | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties index 8c249fbd7b82..4aa5f0b521da 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties @@ -153,12 +153,14 @@ F_DATAADMIN_UNLOCK=\u6570\u636e\u7ba1\u7406\u89e3\u9501 F_DATAELEMENT_PUBLIC_ADD=\u6dfb\u52a0\u6570\u636e\u5143 F_DATAELEMENT_PRIVATE_ADD=\u6dfb\u52a0\u79c1\u4eba\u6570\u636e\u5143 F_DATAELEMENT_DELETE=\u5220\u9664\u6570\u636e\u5143 +F_DATA_ELEMENT_MERGE=\u5408\u5e76\u6570\u636e\u5143\u7d20 F_CATEGORY_PUBLIC_ADD=\u6dfb\u52a0/\u66f4\u65b0\u516c\u5171\u5206\u7c7b F_CATEGORY_PRIVATE_ADD=\u6dfb\u52a0/\u66f4\u65b0\u79c1\u6709\u6570\u636e\u5143\u5206\u7c7b F_CATEGORY_DELETE=\u5220\u9664\u6570\u636e\u5143\u5206\u7c7b F_CATEGORY_OPTION_PUBLIC_ADD=\u6dfb\u52a0/\u66f4\u65b0\u516c\u5171\u5206\u7c7b\u9009\u9879 F_CATEGORY_OPTION_PRIVATE_ADD=\u6dfb\u52a0/\u66f4\u65b0\u79c1\u6709\u6570\u636e\u5143\u5206\u7c7b\u9009\u9879 F_CATEGORY_OPTION_DELETE=\u6dfb\u52a0/\u66f4\u65b0\u516c\u5171\u6570\u636e\u5143\u5206\u7c7b\u9009\u9879 +F_CATEGORY_OPTION_MERGE=\u5408\u5e76\u7c7b\u522b\u9009\u9879 F_CATEGORY_COMBO_PUBLIC_ADD=\u6dfb\u52a0/\u66f4\u65b0\u516c\u5171\u6570\u636e\u5143\u5206\u7c7b\u7ec4\u5408 F_CATEGORY_COMBO_PRIVATE_ADD=\u6dfb\u52a0/\u66f4\u65b0\u6570\u636e\u5143\u5206\u7c7b\u7ec4\u5408 F_CATEGORY_COMBO_DELETE=\u5220\u9664\u6570\u636e\u5143\u5206\u7c7b\u7ec4\u5408 @@ -689,7 +691,7 @@ format.FinancialApril.endDate.ext=yyyy MMMM format.FinancialJuly.startDate.ext=MMMM yyyy '- ' format.FinancialJuly.endDate.ext=yyyy MMMM format.FinancialSep.startDate.ext=MMMM yyyy '- ' -format.FinancialSep.endDate.ext=yyyy MMMM +format.FinancialSep.endDate.ext=MMMM yyyy format.FinancialOct.startDate.ext=MMMM yyyy '- ' format.FinancialOct.endDate.ext=yyyy MMMM format.FinancialNov.startDate.ext=MMMM yyyy '- ' @@ -1798,6 +1800,16 @@ email_verify_1_2nd_paragraph=\u8bf7\u70b9\u51fb\u4e0b\u9762\u7684\u94fe\u63a5\u9 email_verify_1_3rd_paragraph=\u60a8\u5fc5\u987b\u5728\u4e00\u5c0f\u65f6\u5185\u56de\u590d\u6b64\u7535\u5b50\u90ae\u4ef6\u3002\u5982\u679c\u60a8\u6ca1\u6709\u91c7\u53d6\u4efb\u4f55\u884c\u52a8\uff0c\u8be5\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u5c06\u65e0\u6cd5\u901a\u8fc7\u9a8c\u8bc1\u3002 verify_email_subject=\u9a8c\u8bc1\u7535\u5b50\u90ae\u4ef6\u5730\u5740 +#-- 2FA code email -------------------------------------------------------------# + +email_2fa_subject=\u60a8\u7684\u53cc\u56e0\u7d20\u8eab\u4efd\u9a8c\u8bc1\u4ee3\u7801\u7528\u4e8e +email_2fa_1_greeting=\u4eb2\u7231\u7684 +email_2fa_1_1st_paragraph_application_title=\u60a8\u8981\u6c42\u4f7f\u7528\u53cc\u56e0\u7d20\u8eab\u4efd\u9a8c\u8bc1\u4ee3\u7801\u767b\u5f55\u60a8\u7684\u8d26\u6237\u3002 +email_2fa_1_2nd_paragraph=\u60a8\u7684\u53cc\u56e0\u7d20\u9a8c\u8bc1\u7801 +email_2fa_1_3rd_paragraph=\u8bf7\u5728 15 \u5206\u949f\u5185\u4f7f\u7528\u6b64\u4ee3\u7801\u767b\u5f55\u60a8\u7684\u8d26\u6237\u3002 +email_2fa_1_4th_paragraph=\u5982\u679c\u60a8\u6ca1\u6709\u7533\u8bf7\u6b64\u4ee3\u7801\uff0c\u8bf7\u7acb\u5373\u8054\u7cfb\u60a8\u7684\u7cfb\u7edf\u7ba1\u7406\u5458\uff0c\u4ee5\u786e\u4fdd\u60a8\u7684\u8d26\u6237\u5b89\u5168\u3002 +email_2fa_1_ending=\u8c22\u8c22\u3001 + #-- Cache strategy display strings --------------------------------------------# cache_strategy=\u7f13\u51b2\u7b56\u7565 @@ -2034,7 +2046,7 @@ data_integrity.program_rule_actions_without_stage_id.name=\u5177\u6709\u7f3a\u5c data_integrity.program_rule_actions_without_stage_id.description=\u5217\u51fa\u4e0e\u9700\u8981\u9879\u76ee\u9636\u6bb5\u4f46\u5c1a\u672a\u8fde\u63a5\u5230\u67d0\u4e2a\u7c7b\u578b\u7684\u64cd\u4f5c\u76f8\u5173\u7684\u9879\u76ee\u89c4\u5219 #YAML based data integrity checks data_integrity.categories_no_options.name=\u6ca1\u6709\u7c7b\u522b\u9009\u9879\u7684\u7c7b\u522b -data_integrity.categories_dimensions_no_visualizations.name = Categories which are dimensions but which do not have any associated visualizations. +data_integrity.categories_dimensions_no_visualizations.name = \u5c5e\u4e8e\u7ef4\u5ea6\u4f46\u6ca1\u6709\u76f8\u5173\u53ef\u89c6\u5316\u5185\u5bb9\u7684\u7c7b\u522b\u3002 data_integrity.categories_one_default_category.name=\u53ea\u5e94\u5b58\u5728\u4e00\u4e2a\u9ed8\u8ba4\u7c7b\u522b data_integrity.categories_one_default_category_combo.name=\u53ea\u80fd\u5b58\u5728\u4e00\u4e2a\u9ed8\u8ba4\u7c7b\u522b\u7ec4\u5408 data_integrity.categories_one_default_category_option.name=\u5e94\u8be5\u53ea\u5b58\u5728\u4e00\u4e2a\u9ed8\u8ba4\u7c7b\u522b\u9009\u9879 @@ -2044,8 +2056,8 @@ data_integrity.categories_unique_category_combo.name=\u4e0d\u540c\u7684\u7c7b\u5 data_integrity.invalid_category_combos.name=\u65e0\u6548\u7684\u7c7b\u522b\u7ec4\u5408 data_integrity.category_combos_unused.name=\u5176\u4ed6\u5143\u6570\u636e\u5bf9\u8c61\u672a\u4f7f\u7528\u7684\u7c7b\u522b\u7ec4\u5408 data_integrity.category_option_combos_disjoint.name=\u5177\u6709\u4e0d\u76f8\u4ea4\u5173\u8054\u7684\u7c7b\u522b\u9009\u9879\u7ec4\u5408\u3002 -data_integrity.category_option_combos_no_names.name=Category option combinations with no names -data_integrity.category_option_combos_have_duplicates.name=Category option combination duplicates (same category options and same category combo) +data_integrity.category_option_combos_no_names.name=\u65e0\u540d\u79f0\u7684\u7c7b\u522b\u9009\u9879\u7ec4\u5408 +data_integrity.category_option_combos_have_duplicates.name=\u7c7b\u522b\u9009\u9879\u7ec4\u5408\u91cd\u590d\uff08\u76f8\u540c\u7c7b\u522b\u9009\u9879\u548c\u76f8\u540c\u7c7b\u522b\u7ec4\u5408\uff09 data_integrity.category_option_group_sets_incomplete.name=\u4e0d\u5305\u542b\u6240\u6709\u7c7b\u522b\u9009\u9879\u7684\u7c7b\u522b\u9009\u9879\u7ec4\u96c6\u3002 data_integrity.category_options_excess_groupset_membership.name=\u5c5e\u4e8e\u7c7b\u522b\u9009\u9879\u7ec4\u96c6\u4e2d\u591a\u4e2a\u7ec4\u7684\u7c7b\u522b\u9009\u9879\u3002 data_integrity.category_options_no_categories.name=\u6ca1\u6709\u7c7b\u522b\u7684\u7c7b\u522b\u9009\u9879\u3002 @@ -2054,15 +2066,15 @@ data_integrity.catoptioncombos_no_catcombo.name=\u6ca1\u6709\u7c7b\u522b\u7ec4\u data_integrity.cocs_wrong_cardinality.name=\u57fa\u6570\u4e0d\u6b63\u786e\u7684\u7c7b\u522b\u9009\u9879\u7ec4\u5408\u3002 data_integrity.dashboards_no_items.name=\u6ca1\u6709\u9879\u76ee\u7684\u4eea\u8868\u677f\u3002 data_integrity.data_elements_aggregate_abandoned.name=\u805a\u5408\u8fc7\u53bb 100 \u5929\u5185\u672a\u66f4\u6539\u4e14\u6ca1\u6709\u4efb\u4f55\u6570\u636e\u503c\u7684\u6570\u636e\u5143\u7d20\u3002 -data_integrity.data_elements_can_aggregate_with_none_operator.name=Aggregate data elements which can be aggregated but have an aggregation operator set to NONE. -data_integrity.data_elements_cannot_aggregate_operator_not_none.name=Data elements which cannot be aggregated but have an aggregation operator set to something other than NONE. +data_integrity.data_elements_can_aggregate_with_none_operator.name=\u53ef\u6c47\u603b\u4f46\u6c47\u603b\u8fd0\u7b97\u7b26\u8bbe\u7f6e\u4e3a "\u65e0 "\u7684\u6c47\u603b\u6570\u636e\u5143\u7d20\u3002 +data_integrity.data_elements_cannot_aggregate_operator_not_none.name=\u4e0d\u80fd\u6c47\u603b\u4f46\u6c47\u603b\u8fd0\u7b97\u7b26\u8bbe\u7f6e\u4e3a "\u65e0( NONE)"\u4ee5\u5916\u7684\u6570\u636e\u5143\u7d20\u3002 data_integrity.data_elements_aggregate_no_analysis.name=\u805a\u5408\u672a\u5728\u4efb\u4f55\u6536\u85cf\u5939\u4e2d\u4f7f\u7528\u7684\u6570\u636e\u5143\u7d20\uff08\u76f4\u63a5\u6216\u901a\u8fc7\u6307\u6807\uff09 data_integrity.data_elements_aggregate_no_data.name=\u805a\u5408\u6ca1\u6709\u6570\u636e\u503c\u7684\u6570\u636e\u5143\u7d20\u3002 data_integrity.data_elements_aggregate_no_groups.name=\u805a\u5408\u4e0d\u5728\u4efb\u4f55\u6570\u636e\u5143\u7d20\u7ec4\u4e2d\u7684\u6570\u636e\u5143\u7d20\u3002 data_integrity.data_elements_aggregate_with_different_period_types.name=\u805a\u5408\u5c5e\u4e8e\u4e0d\u540c\u5468\u671f\u7c7b\u578b\u7684\u6570\u636e\u96c6\u7684\u6570\u636e\u5143\u7d20\u3002 data_integrity.data_elements_without_datasets.name=\u805a\u5408\u672a\u5206\u914d\u7ed9\u4efb\u4f55\u6570\u636e\u96c6\u7684\u6570\u636e\u5143\u7d20 data_integrity.datasets_empty.name=\u6ca1\u6709\u6570\u636e\u5143\u7d20\u7684\u6570\u636e\u96c6 -data_integrity.datasets_custom_data_entry_forms_empty.name=Datasets which have custom data entry forms which are empty. +data_integrity.datasets_custom_data_entry_forms_empty.name=\u5177\u6709\u7a7a\u7684\u81ea\u5b9a\u4e49\u6570\u636e\u8f93\u5165\u8868\u5355\u7684\u6570\u636e\u96c6\u3002 data_integrity.datasets_not_assigned_to_org_units.name=\u672a\u5206\u914d\u7ed9\u4efb\u4f55\u7ec4\u7ec7\u5355\u4f4d\u7684\u6570\u636e\u96c6 data_integrity.data_elements_excess_groupset_membership.name=\u5c5e\u4e8e\u7ec4\u96c6\u4e2d\u591a\u4e2a\u7ec4\u7684\u6570\u636e\u5143\u7d20\u3002 data_integrity.category_option_group_sets_scarce.name=\u7c7b\u522b\u9009\u9879\u7ec4\u5e94\u8be5\u81f3\u5c11\u6709\u4e24\u4e2a\u6210\u5458\u3002 @@ -2101,7 +2113,7 @@ data_integrity.periods_3y_future.name=\u672a\u6765\u4e09\u5e74\u4ee5\u4e0a\u7684 data_integrity.periods_distant_past.name=\u5728\u9065\u8fdc\u7684\u8fc7\u53bb\u7684\u65f6\u671f\u3002 data_integrity.periods_same_start_end_date.name=\u5177\u6709\u76f8\u540c\u5f00\u59cb\u65e5\u671f\u548c\u7ed3\u675f\u65e5\u671f\u7684\u671f\u95f4 data_integrity.periods_same_start_date_period_type.name=\u5177\u6709\u76f8\u540c\u5f00\u59cb\u65e5\u671f\u548c\u671f\u95f4\u7c7b\u578b\u7684\u671f\u95f4 -data_integrity.programs_custom_data_entry_forms_empty.name=Programs which have custom data entry forms which are empty. +data_integrity.programs_custom_data_entry_forms_empty.name=\u5177\u6709\u7a7a\u7684\u81ea\u5b9a\u4e49\u6570\u636e\u8f93\u5165\u8868\u5355\u7684\u7a0b\u5e8f\u3002 data_integrity.program_rules_message_no_template.name=\u5e94\u5728\u6ca1\u6709\u6d88\u606f\u6a21\u677f\u7684\u60c5\u51b5\u4e0b\u53d1\u9001\u6216\u5b89\u6392\u6d88\u606f\u7684\u7a0b\u5e8f\u89c4\u5219\u64cd\u4f5c\u3002 data_integrity.program_rules_no_action.name=\u65e0\u64cd\u4f5c\u7684\u7a0b\u5e8f\u89c4\u5219\u3002 data_integrity.program_rules_no_expression.name=\u6ca1\u6709\u8868\u8fbe\u5f0f\u7684\u7a0b\u5e8f\u89c4\u5219\u3002 @@ -2118,6 +2130,7 @@ data_integrity.user_roles_no_authorities.name=\u6ca1\u6709\u6743\u9650\u7684\u75 data_integrity.user_roles_with_no_users.name=\u6ca1\u6709\u7528\u6237\u7684\u7528\u6237\u89d2\u8272 data_integrity.option_groups_empty.users=\u65e0\u9009\u9879\u7684\u9009\u9879\u7ec4 data_integrity.push_analysis_no_recipients.name=\u65e0\u6536\u4ef6\u4eba\u7684\u63a8\u9001\u5206\u6790 +data_integrity.file_resources_no_icon.name=\u7f3a\u5c11\u56fe\u6807\u7684\u6587\u4ef6\u8d44\u6e90 # -- End Data Integrity Checks--------------------------------------------# From 56e48aa824f9383ef9509ea7c6e95a88649c2250 Mon Sep 17 00:00:00 2001 From: dhis2-bot Date: Sat, 28 Dec 2024 22:55:28 +0000 Subject: [PATCH 3/4] fix(translations): sync translations from transifex (master) --- .../main/resources/i18n_global_es.properties | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) 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 795f303240a4..b66fe8926632 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 @@ -153,12 +153,14 @@ F_DATAADMIN_UNLOCK=Desbloqueo de Datos de Administrador F_DATAELEMENT_PUBLIC_ADD=A\u00f1adir Elemento de Dato F_DATAELEMENT_PRIVATE_ADD=A\u00f1adir Elementos de Datos Privados F_DATAELEMENT_DELETE=Eliminar Elemento de Dato +F_DATA_ELEMENT_MERGE=Merge Data Elements F_CATEGORY_PUBLIC_ADD=A\u00f1adir/Actualizar P\u00fablico categor\u00eda F_CATEGORY_PRIVATE_ADD=A\u00f1adir/Actualizar Privado categor\u00eda F_CATEGORY_DELETE=Borrar categor\u00eda F_CATEGORY_OPTION_PUBLIC_ADD=A\u00f1adir/Actualizar P\u00fablico opci\u00f3n de categor\u00eda F_CATEGORY_OPTION_PRIVATE_ADD=A\u00f1adir/Actualizar Privado opci\u00f3n de categor\u00eda F_CATEGORY_OPTION_DELETE=Borrar opci\u00f3n de categor\u00eda +F_CATEGORY_OPTION_MERGE=Merge Category Options F_CATEGORY_COMBO_PUBLIC_ADD=A\u00f1adir/Actualizar Combo P\u00fablico categor\u00eda F_CATEGORY_COMBO_PRIVATE_ADD=A\u00f1adir/Actualizar Privado categor\u00eda Combo F_CATEGORY_COMBO_DELETE=Borrar categor\u00eda Combo @@ -408,6 +410,7 @@ F_EXTERNAL_MAP_LAYER_PUBLIC_ADD=A\u00f1adir/actualizar capa de mapa externa p\u0 F_EXTERNAL_MAP_LAYER_PRIVATE_ADD=A\u00f1adir/actualizar capa de mapa externa privada F_EXTERNAL_MAP_LAYER_DELETE=Eliminar capa de mapa externa F_VIEW_EVENT_ANALYTICS=Ver an\u00e1lisis de eventos +F_CAPTURE_DATASTORE_UPDATE=Create and edit Capture datastore configuration F_ADD_COLOR_SET=A\u00f1adir/actualizar juego de colores F_PROGRAM_RULE_DELETE=Borrar regla de programa F_PROGRAMDATAELEMENT_DELETE=Borrar elemento de datos del programa @@ -439,7 +442,6 @@ F_ROUTE_PUBLIC_ADD=A\u00f1adir/actualizar ruta p\u00fablica F_ROUTE_PRIVATE_ADD=A\u00f1adir/actualizar ruta privada F_ROUTE_PUBLIC_DELETE=Borrar ruta F_IMPERSONATE_USER=Suplantar la identidad de un usuario -F_MAP_EXTERNAL_LAYER_ADD=A\u00f1adir capa de mapa externa #-- Common ---------------------------------------------------------------------# offline=Desconectado @@ -687,6 +689,8 @@ format.FinancialApril.startDate.ext=MMMM yyyy '- ' format.FinancialApril.endDate.ext=MMMM yyyy format.FinancialJuly.startDate.ext=MMMM yyyy '- ' format.FinancialJuly.endDate.ext=MMMM yyyy +format.FinancialSep.startDate.ext=MMMM yyyy '- ' +format.FinancialSep.endDate.ext=MMMM yyyy format.FinancialOct.startDate.ext=MMMM yyyy '- ' format.FinancialOct.endDate.ext=MMMM yyyy format.FinancialNov.startDate.ext=MMMM yyyy '- ' @@ -1787,6 +1791,24 @@ email_invite_1_1st_paragraph_after_application_title=Cuenta de usuario email_invite_1_2nd_paragraph=Te han enviado dos correos-e, donde este es el primero. Por favor, siga el siguiente enlace. En el paso siguiente, se le pedir\u00e1 que ingrese un c\u00f3digo que le ha sido enviado en el otro correo-e. email_invite_1_3rd_paragraph=Debe responder a esta invitaci\u00f3n en un plazo de una semana. Si no realiza ninguna acci\u00f3n, la invitaci\u00f3n expirar\u00e1 en ese momento. +#-- Verify email -------------------------------------------------------------# + +email_verify_1_1st_paragraph_before_application_title=This is a message to verify a +email_verify_1_1st_paragraph_after_application_title=, user account email. +email_verify_1_2nd_paragraph=Please click the link below to verify the email address of your account. +email_verify_1_3rd_paragraph=You must respond to this email within one hour. If you take no action, the email address will not be verified. +verify_email_subject=Verify email address + +#-- 2FA code email -------------------------------------------------------------# + +email_2fa_subject=Your Two-Factor Authentication Code for +email_2fa_1_greeting=Dear +email_2fa_1_1st_paragraph_application_title=You have requested a two-factor authentication code to log into your account. +email_2fa_1_2nd_paragraph=Your two-factor authentication code: +email_2fa_1_3rd_paragraph=Please use this code within 15 minutes to log into your account. +email_2fa_1_4th_paragraph=If you did not request this code, please contact your system administrator immediately to secure your account. +email_2fa_1_ending=Thank you, + #-- Cache strategy display strings --------------------------------------------# cache_strategy=Estrategia de cach\u00e9 @@ -1951,6 +1973,7 @@ data_integrity.periods_duplicates.section=Periodos data_integrity.periods_duplicates.name=Duplicate Periods data_integrity.periods_duplicates.description=Lists all periods duplicates which have identical type and start date data_integrity.periods_duplicates.recommendation=Make sure all database references are moved to one of the duplicates before deleting the unused duplicates +data_integrity.option_groups_empty.name=Option groups with no options data_integrity.org_units_with_cyclic_references.section=Unidades Organizativas data_integrity.org_units_with_cyclic_references.name=Unidades organizativas con referencias ciclicas data_integrity.org_units_with_cyclic_references.description=Lists all organisation units that have a conflicting parent hierarchy definition so that two organisation units become parent of each other or in other words they form a circular reference @@ -2022,6 +2045,7 @@ data_integrity.program_rule_actions_without_stage_id.name=Program rules with act data_integrity.program_rule_actions_without_stage_id.description=Lists program rules connected to an action of a type that requires a program stage but is not yet connected to one #YAML based data integrity checks data_integrity.categories_no_options.name=Categories with no category options +data_integrity.categories_dimensions_no_visualizations.name = Categories which are dimensions but which do not have any associated visualizations. data_integrity.categories_one_default_category.name=Only one default category should exist data_integrity.categories_one_default_category_combo.name=Only one default category combo should exist data_integrity.categories_one_default_category_option.name=Only one default category option should exist @@ -2031,6 +2055,8 @@ data_integrity.categories_unique_category_combo.name=Different category combinat data_integrity.invalid_category_combos.name=Invalid category combinations data_integrity.category_combos_unused.name=Category combinations not used by other metadata objects data_integrity.category_option_combos_disjoint.name=Category option combinations with disjoint associations. +data_integrity.category_option_combos_no_names.name=Category option combinations with no names +data_integrity.category_option_combos_have_duplicates.name=Category option combination duplicates (same category options and same category combo) data_integrity.category_option_group_sets_incomplete.name=Category option group sets which do not contain all category options. data_integrity.category_options_excess_groupset_membership.name=Category options which belong to multiple groups in a category option group set. data_integrity.category_options_no_categories.name=Category options with no categories. @@ -2039,13 +2065,15 @@ data_integrity.catoptioncombos_no_catcombo.name=Category options combinations wi data_integrity.cocs_wrong_cardinality.name=Category option combinations with incorrect cardinality. data_integrity.dashboards_no_items.name=Dashboards with no items. data_integrity.data_elements_aggregate_abandoned.name=Aggregate data elements that have not been changed in last 100 days and do not have any data values. -data_integrity.data_elements_aggregate_aggregation_operator.name=Non-numeric data elements which have an aggregation operator other than NONE. +data_integrity.data_elements_can_aggregate_with_none_operator.name=Aggregate data elements which can be aggregated but have an aggregation operator set to NONE. +data_integrity.data_elements_cannot_aggregate_operator_not_none.name=Data elements which cannot be aggregated but have an aggregation operator set to something other than NONE. data_integrity.data_elements_aggregate_no_analysis.name=Aggregate data elements not used in any favourites (directly or through indicators) data_integrity.data_elements_aggregate_no_data.name=Aggregate data elements with NO data values. data_integrity.data_elements_aggregate_no_groups.name=Aggregate data elements not in any data element groups. data_integrity.data_elements_aggregate_with_different_period_types.name=Aggregate data elements which belong to data sets with different period types. data_integrity.data_elements_without_datasets.name=Aggregate data elements not assigned to any data sets data_integrity.datasets_empty.name=Data sets with no data elements +data_integrity.datasets_custom_data_entry_forms_empty.name=Datasets which have custom data entry forms which are empty. data_integrity.datasets_not_assigned_to_org_units.name=Data sets not assigned to any organisation units data_integrity.data_elements_excess_groupset_membership.name=Data elements which belong to multiple groups in a group set. data_integrity.category_option_group_sets_scarce.name=Category option groups should have at least two members. @@ -2084,6 +2112,7 @@ data_integrity.periods_3y_future.name=Periods which are more than three years in data_integrity.periods_distant_past.name=Periods which are in the distant past. data_integrity.periods_same_start_end_date.name=Periods with the same start and end dates data_integrity.periods_same_start_date_period_type.name=Periods with the same start date and period type +data_integrity.programs_custom_data_entry_forms_empty.name=Programs which have custom data entry forms which are empty. data_integrity.program_rules_message_no_template.name=Program rules actions which should send or schedule a message without a message template. data_integrity.program_rules_no_action.name=Program rules with no action. data_integrity.program_rules_no_expression.name=Program rules with no expression. @@ -2100,6 +2129,8 @@ data_integrity.user_roles_no_authorities.name=User roles with no authorities data_integrity.user_roles_with_no_users.name=User roles with no users data_integrity.option_groups_empty.users=Option groups with no options data_integrity.push_analysis_no_recipients.name=Push analyses without recipients +data_integrity.file_resources_no_icon.name=File resources that are missing an icon + # -- End Data Integrity Checks--------------------------------------------# From e522f8ffdb27fef0980063d24f6ed048690f7028 Mon Sep 17 00:00:00 2001 From: dhis2-bot Date: Sat, 4 Jan 2025 22:57:05 +0000 Subject: [PATCH 4/4] fix(translations): sync translations from transifex (master) --- .../src/main/resources/i18n_global_zh.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties index 4aa5f0b521da..952263d2b857 100644 --- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties +++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties @@ -442,7 +442,6 @@ 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=\u5192\u5145\u7528\u6237 -F_MAP_EXTERNAL_LAYER_ADD=\u6dfb\u52a0\u5916\u90e8\u5730\u56fe\u56fe\u5c42 #-- Common ---------------------------------------------------------------------# offline=\u79bb\u7ebf