fix(translations): sync translations from transifex (master)

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--------------------------------------------#