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 8c249fbd7b8..4aa5f0b521d 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--------------------------------------------#