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 dd952babecb7..0e53b994710e 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
@@ -23,7 +23,7 @@ update_access_denied_message=You do not have update access to object
 delete_access_denied_message=You do not have delete access to object
 go_back=Go back
 main_menu=Main menu
-maintenance=Maintenance
+maintenance=\u062a\u0637\u0628\u064a\u0642 \u0627\u0644\u0635\u064a\u0627\u0646\u0629
 services=Services
 
 #-- dhis-ouwt ------------------------------------------------------------------#
@@ -37,7 +37,7 @@ select_organisationunit=You must select an OrganisationUnit from the tree.
 
 #-- Modules --------------------------------------------------------------------#
 
-dhis-web-maintenance=Maintenance
+dhis-web-maintenance=\u062a\u0637\u0628\u064a\u0642 \u0627\u0644\u0635\u064a\u0627\u0646\u0629
 dhis-web-data-administration=Data Administration
 dhis-web-maintenance-settings=Settings
 dhis-web-maintenance-appmanager=App Management
@@ -107,7 +107,7 @@ intro_log_out=Go here to log out of the system and deny others to access your us
 
 #-- See module privilegies ----------------------------------------------------#
 
-M_dhis-web-maintenance=Maintenance app
+M_dhis-web-maintenance=\u062a\u0637\u0628\u064a\u0642 \u0627\u0644\u0635\u064a\u0627\u0646\u0629
 M_dhis-web-data-administration=Data Administration app
 M_dhis-web-settings=Settings app
 M_dhis-web-dataentry=Data Entry app
@@ -414,6 +414,7 @@ F_EXTERNAL_MAP_LAYER_PUBLIC_ADD=Add/Update Public External Map Layer
 F_EXTERNAL_MAP_LAYER_PRIVATE_ADD=Add/Update Private External Map Layer
 F_EXTERNAL_MAP_LAYER_DELETE=Delete External Map Layer
 F_VIEW_EVENT_ANALYTICS=View event analytics
+F_CAPTURE_DATASTORE_UPDATE=Create and edit Capture datastore configuration
 F_ADD_COLOR_SET=Add/Update Color Set
 F_PROGRAM_RULE_DELETE=Delete Program Rule
 F_PROGRAMDATAELEMENT_DELETE=Delete Program Data Element
@@ -606,6 +607,7 @@ BiWeekly=\u0643\u0644 \u0627\u0633\u0628\u0648\u0639\u064a\u0646
 Monthly=\u0634\u0647\u0631\u064a
 BiMonthly=\u0623\u0634\u0647\u0631 \u0645\u0632\u062f\u0648\u062c\u0629
 Quarterly=\u0631\u0628\u0639 \u0633\u0646\u0648\u064a
+QuarterlyNov=Quarterly November
 SixMonthly=\u0633\u062a\u0629 \u0623\u0634\u0647\u0631
 SixMonthlyApril=\u0633\u062a\u0629 \u0623\u0634\u0647\u0631 \u0646\u064a\u0633\u0627\u0646
 SixMonthlyNov=Six-monthly November
@@ -642,6 +644,8 @@ format.BiMonthly.startDate=MMM 'to '
 format.BiMonthly.endDate=MMM yyyy
 format.Quarterly.startDate=MMM 'to '
 format.Quarterly.endDate=MMM yyyy
+format.QuarterlyNov.startDate=MMM 'to '
+format.QuarterlyNov.endDate=MMM yyyy
 format.SixMonthly.startDate=MMM 'to '
 format.SixMonthly.endDate=MMM yyyy
 format.SixMonthlyApril.startDate=MMM 'to '
@@ -732,9 +736,53 @@ weekday.short.friday=Fri
 weekday.short.saturday=Sat
 weekday.short.sunday=Sun
 
-#-- Nepali Calendar Month/Day names -------------------------------------------#
-
+# Various Calendar months.
 # The keys for months are still based on ISO 8601, the ordering is correct, but the key names are not. Jan-Dec -> 1-12. #
+
+#-- Ethiopian Calendar Months and days -----------------------------------------------------------#
+ethiopian.month.january=Meskerem
+ethiopian.month.february=Tikemet
+ethiopian.month.march=Hidar
+ethiopian.month.april=Tahesas
+ethiopian.month.may=Tir
+ethiopian.month.june=Yekatit
+ethiopian.month.july=Megabit
+ethiopian.month.august=Miazia
+ethiopian.month.september=Ginbot
+ethiopian.month.october=Sene
+ethiopian.month.november=Hamle
+ethiopian.month.december=Nehase.
+
+ethiopian.month.short.january=Mes
+ethiopian.month.short.february=Tik
+ethiopian.month.short.march=Hid
+ethiopian.month.short.april=Tah
+ethiopian.month.short.may=Tir
+ethiopian.month.short.june=Yek
+ethiopian.month.short.july=Meg
+ethiopian.month.short.august=Mia
+ethiopian.month.short.september=Gin
+ethiopian.month.short.october=Sen
+ethiopian.month.short.november=Ham
+ethiopian.month.short.december=Neh
+
+ethiopian.weekday.monday=Segno
+ethiopian.weekday.tuesday=Maksegno
+ethiopian.weekday.wednesday=Irob
+ethiopian.weekday.thursday=Hamus
+ethiopian.weekday.friday=Arb
+ethiopian.weekday.saturday=Kidame
+ethiopian.weekday.sunday=Ehud
+
+ethiopian.weekday.short.monday=Seg
+ethiopian.weekday.short.tuesday=Mak
+ethiopian.weekday.short.wednesday=Iro
+ethiopian.weekday.short.thursday=Ham
+ethiopian.weekday.short.friday=Arb
+ethiopian.weekday.short.saturday=Kid
+ethiopian.weekday.short.sunday=Ehu
+
+#-- Nepali Calendar Month/Day names -------------------------------------------#
 nepali.month.january=Baishak
 nepali.month.february=Jestha
 nepali.month.march=Asar
@@ -1224,13 +1272,13 @@ data_dictionary=Data Dictionary
 data_elements=\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a
 data_sets=\u062d\u0632\u0645 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a
 indicators=\u0627\u0644\u0645\u0624\u0634\u0631\u0627\u062a
-indicator_groups=Indicator groups
-data_element_groups=Data element groups
+indicator_groups=\u0645\u062c\u0645\u0648\u0639\u0627\u062a \u0627\u0644\u0645\u0624\u0634\u0631\u0627\u062a
+data_element_groups=\u0645\u062c\u0645\u0648\u0639\u0627\u062a \u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0628\u064a\u0627\u0646\u0627\u062a
 data_element_concepts=Data element concepts
 organisation_units=\u0627\u0644\u0648\u062d\u062f\u0627\u062a \u0627\u0644\u062a\u0646\u0638\u064a\u0645\u064a\u0629
 organisation_unit_groups=Organisation unit groups
 organisation_unit_hierarchy=Organisation unit hierarchy
-validation_rules=Validation rules
+validation_rules=\u0642\u0648\u0627\u0639\u062f \u0627\u0644\u062a\u062d\u0642\u0642
 period_type=Period Type
 users=\u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u0648\u0646
 user_groups=User groups
@@ -1238,7 +1286,7 @@ pivot_tables=\u0627\u0644\u062c\u062f\u0627\u0648\u0644 \u0627\u0644\u0645\u062d
 charts=\u0627\u0644\u0645\u062e\u0637\u0637\u0627\u062a \u0627\u0644\u0628\u064a\u0627\u0646\u064a\u0629
 maps=\u0627\u0644\u062e\u0631\u0627\u0626\u0637
 dashboards=Dashboards
-programs=Programs
+programs=\u0627\u0644\u0628\u0631\u0627\u0645\u062c
 events=Events
 
 #-- Indicator -----------------------------------------------------------------#
@@ -1304,7 +1352,7 @@ greater_than_or_equal_to_title=Greater than or equal to
 #-- Constant ------------------------------------------------------------------#
 
 constant=Constant
-constants=Constants
+constants=\u0627\u0644\u062b\u0648\u0627\u0628\u062a
 no_constant_to_select=No constants to select
 
 #-- Dynamic Attributes --------------------------------------------------------#
@@ -1755,8 +1803,8 @@ enrollment_date=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062a\u0633\u062c\u0
 current_date=Current date
 value_count=Value count
 zero_pos_value_count=Zero or positive value count
-event_count=Event count (only for event status ACTIVE and/or COMPLETED, it can interfere with event status filter)
-scheduled_event_count=Scheduled event count (only for event status SCHEDULE, it can interfere with event status filter)
+event_count=Event count (ACTIVE or COMPLETED status only)
+scheduled_event_count=Event count (SCHEDULE status only)
 org_unit_count=Organisation unit count
 enrollment_count=Enrollment count
 tei_count=Tracked entity instance count
@@ -1969,6 +2017,100 @@ data_integrity.program_rule_actions_without_section.description=Lists program ru
 data_integrity.program_rule_actions_without_stage.section=Program Rules
 data_integrity.program_rule_actions_without_stage.name=Program rules with actions lacking a program stage
 data_integrity.program_rule_actions_without_stage.description=Lists program rules connected to an action of a type that requires a program stage but is not yet connected to one
+data_integrity.program_rule_actions_without_stage_id.section=Program Rules
+data_integrity.program_rule_actions_without_stage_id.name=Program rules with actions lacking a program stage
+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
+data_integrity.categories_one_default_category_option_combo.name=Only one default category option combo should exist
+data_integrity.categories_same_category_options.name=Categories with the same category options
+data_integrity.categories_unique_category_combo.name=Different category combinations should not have the exact same combination of categories.
+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.
+data_integrity.category_options_shared_within_category_combo.name=Category combinations with categories which share the same category options.
+data_integrity.catoptioncombos_no_catcombo.name=Category options combinations with no category combination.
+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_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_same_name.name=Data sets with the same name or short name
+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 sets should have at least two members.
+data_integrity.category_option_groups_scarce.name=Category option groups should have at least two members.
+data_integrity.data_element_groups_scarce.name=Data element groups should have at least two members.
+data_integrity.indicator_group_sets_scarce.name=Indicator groups sets should have at least two members.
+data_integrity.indicator_groups_scarce.name=Indicator groups should have at least two members.
+data_integrity.orgunit_groups_scarce.name=Organisation unit groups should have at least two members.
+data_integrity.program_indicator_groups_scarce.name=Program indicator groups should have at least two members.
+data_integrity.user_groups_scarce.name=User groups should have at least two members.
+data_integrity.validation_rule_groups_scarce.name=Validation rule should have at least two members.
+data_integrity.indicator_no_analysis.name=Indicators not used in analytical objects.
+data_integrity.indicator_types_duplicated.name=Indicator types with the same factor.
+data_integrity.indicators_duplicated_terms.name=Indicators with the same terms.
+data_integrity.indicators_exact_duplicates.name=Indicators with the same formula.
+data_integrity.indicators_not_grouped.name=Indicators not in any groups.
+data_integrity.option_sets_wrong_sort_order.name=Option sets with possibly wrong sort order.
+data_integrity.options_sets_empty.name=Empty option sets
+data_integrity.options_sets_unused.name=Option sets which are not used
+data_integrity.orgunit_group_sets_excess_groups.name=Organisation units which belong to multiple groups in a group set.
+data_integrity.orgunits_compulsory_group_count.name=Organisation units that are not in all compulsory orgunit group sets
+data_integrity.orgunits_invalid_geometry.name=Organisation units with invalid geometry.
+data_integrity.orgunits_multiple_roots.name=The organisation unit hierarchy should have a single root.
+data_integrity.orgunits_multiple_spaces.name=Organisation units should not have multiple spaces in their names or shortnames.
+data_integrity.orgunits_no_coordinates.name=Organisation units with no coordinates.
+data_integrity.orgunits_not_contained_by_parent.name=Organisation units with point coordinates should be contained by their parent.
+data_integrity.orgunits_null_island.name=Organisation units located within 100 km of Null Island (0,0).
+data_integrity.orgunits_openingdate_gt_closeddate.name=Organisation units which have an opening date later than the closed date.
+data_integrity.orgunits_orphaned.name=Orphaned organisation units.
+data_integrity.orgunits_same_name_and_parent.name=Organisation units should not have the same name and parent.
+data_integrity.orgunits_trailing_spaces.name=Organisation units should not have trailing spaces.
+data_integrity.org_units_not_in_compulsory_group_sets.name=Organisation units not in all compulsory organisation unit group sets
+data_integrity.organisation_units_violating_exclusive_group_sets.name=Organisation units which belong to multiple groups in a group set
+data_integrity.organisation_units_without_groups.name=Organisation units not in any groups
+data_integrity.periods_3y_future.name=Periods which are more than three years in the future.
+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.
+data_integrity.program_rules_no_priority.name=Program rules with no priority
+data_integrity.validation_rules_missing_value_strategy_null.name=All validation rule expressions should have a missing value strategy.
+data_integrity.dashboards_not_viewed_one_year.name=Dashboards which have not been actively viewed in the past 12 months
+data_integrity.maps_not_viewed_one_year.name=Maps which have not been viewed in the past 12 months
+data_integrity.visualizations_not_viewed_one_year.name=Visualizations which have not been viewed in the past 12 months
+data_integrity.users_with_invalid_usernames.name = Users with invalid usernames
+data_integrity.users_capture_ou_not_in_data_view_ou.name=Users with capture org unit not in data view org unit
+data_integrity.users_capture_ou_not_in_tei_search_ou.name=Users with capture org unit not in TEI search org unit
+data_integrity.users_with_no_user_role.name=Users with no user role
+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
+data_integrity.users_with_all_authority.name=Users with the ALL authority
+
+# -- End Data Integrity Checks--------------------------------------------#
 
 # disable inactive users job notification texts
 notification.user_inactive.subject=Your DHIS2 account will be disabled soon.
diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_hi_IN.properties b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_hi_IN.properties
index 119456c71269..9a24cf3a0772 100644
--- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_hi_IN.properties
+++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_hi_IN.properties
@@ -597,21 +597,21 @@ LAST_4_BIWEEKS=Last 4 bi-weeks
 
 #-- PeriodTypes ----------------------------------------------------------------#
 
-Daily=Daily
-Weekly=Weekly
+Daily=\u0930\u094b\u091c\u093c\u093e\u0928\u093e
+Weekly=\u0938\u093e\u092a\u094d\u0924\u093e\u0939\u093f\u0915
 WeeklyWednesday=Weekly Wednesday
 WeeklyThursday=Weekly Thursday
 WeeklySaturday=Weekly Saturday
 WeeklySunday=Weekly Sunday
 BiWeekly=Bi-weekly
-Monthly=Monthly
+Monthly=\u092e\u093e\u0938\u093f\u0915
 BiMonthly=Bi-monthly
 Quarterly=Quarterly
 QuarterlyNov=Quarterly November
 SixMonthly=Six-monthly
 SixMonthlyApril=Six-monthly April
 SixMonthlyNov=Six-monthly November
-Yearly=Yearly
+Yearly=\u0935\u093e\u0930\u094d\u0937\u093f\u0915
 TwoYearly=Two-yearly
 OnChange=On-change
 Survey=Survey
@@ -1207,7 +1207,7 @@ delete_confirm=Do you want to delete?
 
 available=Available
 selected=Selected
-error=Error
+error=\u0924\u094d\u0930\u0941\u091f\u093f
 warning=Warning
 success=Success
 waiting=Please wait
@@ -1865,7 +1865,7 @@ program=Program
 #--Various --------------------------------------------------------------------#
 
 manage_my_apps=Manage my apps
-no_results_found=No results found
+no_results_found=\u0915\u094b\u0908 \u092a\u0930\u093f\u0923\u093e\u092e \u0928\u0939\u0940\u0902 \u092e\u093f\u0932\u093e
 
 #-- Settings categories -------------------------------------------------------#
 
@@ -2017,6 +2017,100 @@ data_integrity.program_rule_actions_without_section.description=Lists program ru
 data_integrity.program_rule_actions_without_stage.section=Program Rules
 data_integrity.program_rule_actions_without_stage.name=Program rules with actions lacking a program stage
 data_integrity.program_rule_actions_without_stage.description=Lists program rules connected to an action of a type that requires a program stage but is not yet connected to one
+data_integrity.program_rule_actions_without_stage_id.section=Program Rules
+data_integrity.program_rule_actions_without_stage_id.name=Program rules with actions lacking a program stage
+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
+data_integrity.categories_one_default_category_option_combo.name=Only one default category option combo should exist
+data_integrity.categories_same_category_options.name=Categories with the same category options
+data_integrity.categories_unique_category_combo.name=Different category combinations should not have the exact same combination of categories.
+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.
+data_integrity.category_options_shared_within_category_combo.name=Category combinations with categories which share the same category options.
+data_integrity.catoptioncombos_no_catcombo.name=Category options combinations with no category combination.
+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_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_same_name.name=Data sets with the same name or short name
+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 sets should have at least two members.
+data_integrity.category_option_groups_scarce.name=Category option groups should have at least two members.
+data_integrity.data_element_groups_scarce.name=Data element groups should have at least two members.
+data_integrity.indicator_group_sets_scarce.name=Indicator groups sets should have at least two members.
+data_integrity.indicator_groups_scarce.name=Indicator groups should have at least two members.
+data_integrity.orgunit_groups_scarce.name=Organisation unit groups should have at least two members.
+data_integrity.program_indicator_groups_scarce.name=Program indicator groups should have at least two members.
+data_integrity.user_groups_scarce.name=User groups should have at least two members.
+data_integrity.validation_rule_groups_scarce.name=Validation rule should have at least two members.
+data_integrity.indicator_no_analysis.name=Indicators not used in analytical objects.
+data_integrity.indicator_types_duplicated.name=Indicator types with the same factor.
+data_integrity.indicators_duplicated_terms.name=Indicators with the same terms.
+data_integrity.indicators_exact_duplicates.name=Indicators with the same formula.
+data_integrity.indicators_not_grouped.name=Indicators not in any groups.
+data_integrity.option_sets_wrong_sort_order.name=Option sets with possibly wrong sort order.
+data_integrity.options_sets_empty.name=Empty option sets
+data_integrity.options_sets_unused.name=Option sets which are not used
+data_integrity.orgunit_group_sets_excess_groups.name=Organisation units which belong to multiple groups in a group set.
+data_integrity.orgunits_compulsory_group_count.name=Organisation units that are not in all compulsory orgunit group sets
+data_integrity.orgunits_invalid_geometry.name=Organisation units with invalid geometry.
+data_integrity.orgunits_multiple_roots.name=The organisation unit hierarchy should have a single root.
+data_integrity.orgunits_multiple_spaces.name=Organisation units should not have multiple spaces in their names or shortnames.
+data_integrity.orgunits_no_coordinates.name=Organisation units with no coordinates.
+data_integrity.orgunits_not_contained_by_parent.name=Organisation units with point coordinates should be contained by their parent.
+data_integrity.orgunits_null_island.name=Organisation units located within 100 km of Null Island (0,0).
+data_integrity.orgunits_openingdate_gt_closeddate.name=Organisation units which have an opening date later than the closed date.
+data_integrity.orgunits_orphaned.name=Orphaned organisation units.
+data_integrity.orgunits_same_name_and_parent.name=Organisation units should not have the same name and parent.
+data_integrity.orgunits_trailing_spaces.name=Organisation units should not have trailing spaces.
+data_integrity.org_units_not_in_compulsory_group_sets.name=Organisation units not in all compulsory organisation unit group sets
+data_integrity.organisation_units_violating_exclusive_group_sets.name=Organisation units which belong to multiple groups in a group set
+data_integrity.organisation_units_without_groups.name=Organisation units not in any groups
+data_integrity.periods_3y_future.name=Periods which are more than three years in the future.
+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.
+data_integrity.program_rules_no_priority.name=Program rules with no priority
+data_integrity.validation_rules_missing_value_strategy_null.name=All validation rule expressions should have a missing value strategy.
+data_integrity.dashboards_not_viewed_one_year.name=Dashboards which have not been actively viewed in the past 12 months
+data_integrity.maps_not_viewed_one_year.name=Maps which have not been viewed in the past 12 months
+data_integrity.visualizations_not_viewed_one_year.name=Visualizations which have not been viewed in the past 12 months
+data_integrity.users_with_invalid_usernames.name = Users with invalid usernames
+data_integrity.users_capture_ou_not_in_data_view_ou.name=Users with capture org unit not in data view org unit
+data_integrity.users_capture_ou_not_in_tei_search_ou.name=Users with capture org unit not in TEI search org unit
+data_integrity.users_with_no_user_role.name=Users with no user role
+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
+data_integrity.users_with_all_authority.name=Users with the ALL authority
+
+# -- End Data Integrity Checks--------------------------------------------#
 
 # disable inactive users job notification texts
 notification.user_inactive.subject=Your DHIS2 account will be disabled soon.
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 31636c6ed207..849bf7d8bc77 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
@@ -538,7 +538,7 @@ minus=Minus
 no_of_days=Number of days
 variables=Variables
 open=\u1794\u17be\u1780
-normal=Normal
+normal=\u1792\u1798\u17d2\u1798\u178f\u17b6
 item=Item
 action=Action
 sub_total=Sub total
@@ -550,47 +550,47 @@ username_email_in_password=Username/Email cannot be part of password
 
 #-- Relative periods -----------------------------------------------------------#
 
-TODAY=Today
+TODAY=\u1790\u17d2\u1784\u17c3\u1793\u17c1\u17c7
 YESTERDAY=\u1780\u17b6\u179b\u1796\u17b8\u1798\u17d2\u179f\u17b7\u179b\u1798\u17b7\u1789
-LAST_3_DAYS=Last 3 days
-LAST_7_DAYS=Last 7 days
-LAST_14_DAYS=Last 14 days
+LAST_3_DAYS=\u17e3\u1790\u17d2\u1784\u17c3\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
+LAST_7_DAYS=\u17e7\u1790\u17d2\u1784\u17c3\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
+LAST_14_DAYS=\u17e1\u17e4\u1790\u17d2\u1784\u17c3\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
 LAST_30_DAYS=Last 30 days
 LAST_60_DAYS=Last 60 days
 LAST_90_DAYS=Last 90 days
 LAST_180_DAYS=Last 180 days
-THIS_MONTH=This month
+THIS_MONTH=\u1781\u17c2\u1793\u17c1\u17c7
 THIS_BIMONTH=This bi-month
-THIS_QUARTER=This quarter
-THIS_SIX_MONTH=This six-month
-LAST_MONTH=Last month
+THIS_QUARTER=\u178f\u17d2\u179a\u17b8\u1798\u17b6\u179f\u1793\u17c1\u17c7
+THIS_SIX_MONTH=\u1786\u1798\u17b6\u179f\u1793\u17c1\u17c7
+LAST_MONTH=\u1781\u17c2\u1798\u17bb\u1793
 LAST_BIMONTH=Last bi-month
-LAST_QUARTER=Last quarter
-LAST_SIX_MONTH=Last six-month
-MONTHS_THIS_YEAR=Months this year
-QUARTERS_THIS_YEAR=Quarters this year
-THIS_YEAR=This year
+LAST_QUARTER=\u178f\u17d2\u179a\u17b8\u1798\u17b6\u179f\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
+LAST_SIX_MONTH=\u1786\u1798\u17b6\u179f\u1798\u17bb\u1793
+MONTHS_THIS_YEAR=\u1787\u17b6\u1781\u17c2\u1780\u17d2\u1793\u17bb\u1784\u1786\u17d2\u1793\u17b6\u17c6\u1793\u17c1\u17c7
+QUARTERS_THIS_YEAR=\u1787\u17b6\u178f\u17d2\u179a\u17b8\u1798\u17b6\u179f\u1780\u17d2\u1793\u17bb\u1784\u1786\u17d2\u1793\u17b6\u17c6\u1793\u17c1\u17c7
+THIS_YEAR=\u1786\u17d2\u1793\u17b6\u17c6\u1793\u17c1\u17c7
 MONTHS_LAST_YEAR=Months last year
 QUARTERS_LAST_YEAR=Quarters last year
-LAST_YEAR=Last year
+LAST_YEAR=\u1786\u17d2\u1793\u17b6\u17c6\u1798\u17bb\u1793
 BIMONTHS_THIS_YEAR=Bi-months this year
 LAST_10_YEARS=Last 10 years
-LAST_5_YEARS=Last 5 years
-LAST_12_MONTHS=Last 12 months
-LAST_6_MONTHS=Last 6 months
-LAST_3_MONTHS=Last 3 months
+LAST_5_YEARS=\u17e5\u1786\u17d2\u1793\u17b6\u17c6\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
+LAST_12_MONTHS=\u17e1\u17e2\u1781\u17c2\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
+LAST_6_MONTHS=\u17e6\u1781\u17c2\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
+LAST_3_MONTHS=\u17e3\u1781\u17c2\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
 LAST_6_BIMONTHS=Last 6 bi-months
-LAST_4_QUARTERS=Last 4 quarters
-LAST_2_SIXMONTHS=Last 2 six-months
-THIS_FINANCIAL_YEAR=This financial year
-LAST_FINANCIAL_YEAR=Last financial year
-LAST_5_FINANCIAL_YEARS=Last 5 financial years
-LAST_WEEK=Last week
-WEEKS_THIS_YEAR=Weeks this year
-LAST_4_WEEKS=Last 4 weeks
-LAST_12_WEEKS=Last 12 weeks
-LAST_52_WEEKS=Last 52 weeks
-THIS_WEEK=This week
+LAST_4_QUARTERS=\u17e4\u178f\u17d2\u179a\u17b8\u1798\u17b6\u179f\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
+LAST_2_SIXMONTHS=\u17e2\u1786\u1798\u17b6\u179f\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
+THIS_FINANCIAL_YEAR=\u1786\u17d2\u1793\u17b6\u17c6\u17a0\u17b7\u179a\u1789\u17d2\u1789\u179c\u178f\u17d2\u1790\u17bb\u1793\u17c1\u17c7
+LAST_FINANCIAL_YEAR=\u1786\u17d2\u1793\u17b6\u17c6\u17a0\u17b7\u179a\u1789\u17d2\u1789\u179c\u178f\u17d2\u1790\u17bb\u1798\u17bb\u1793
+LAST_5_FINANCIAL_YEARS=\u17e5\u1786\u17d2\u1793\u17b6\u17c6\u17a0\u17b7\u179a\u1789\u17d2\u1789\u179c\u178f\u17d2\u1790\u17bb\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
+LAST_WEEK=\u179f\u1794\u17d2\u178f\u17b6\u17a0\u17cd\u1798\u17bb\u1793
+WEEKS_THIS_YEAR=\u1787\u17b6\u179f\u1794\u17d2\u178a\u17b6\u17a0\u17cd\u1780\u17d2\u1793\u17bb\u1784\u1786\u17d2\u1793\u17b6\u17c6\u1793\u17c1\u17c7
+LAST_4_WEEKS=\u17e4\u179f\u1794\u17d2\u178f\u17b6\u17a0\u17cd\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
+LAST_12_WEEKS=\u17e1\u17e2\u179f\u1794\u17d2\u178f\u17b6\u17a0\u17cd\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
+LAST_52_WEEKS=\u17e5\u17e2\u179f\u1794\u17d2\u178f\u17b6\u17a0\u17cd\u1785\u17bb\u1784\u1780\u17d2\u179a\u17c4\u1799
+THIS_WEEK=\u179f\u1794\u17d2\u178f\u17b6\u17a0\u17cd\u1793\u17c1\u17c7
 THIS_BIWEEK=This bi-week
 LAST_BIWEEK=Last bi-week
 LAST_4_BIWEEKS=Last 4 bi-weeks
@@ -1076,8 +1076,8 @@ false=\u1791\u17c1
 sum=\u1795\u179b\u200b\u1794\u17bc\u1780
 count=\u1795\u179b\u179a\u17b6\u1794\u17cb
 average=\u1795\u179b\u1798\u1792\u17d2\u1799\u1798
-stddev=Standard deviation
-variance=Variance
+stddev=\u1782\u17c6\u179b\u17b6\u178f\u1782\u17c6\u179a\u17bc
+variance=\u1797\u17b6\u1796\u1794\u17d2\u179a\u17c2\u1794\u17d2\u179a\u17bd\u179b
 min=\u17a2\u1794\u17d2\u1794\u1794\u179a\u1798\u17b6
 max=\u17a2\u178f\u17b7\u1794\u179a\u1798\u17b6
 text=\u17a2\u178f\u17d2\u1790\u1794\u1791\u200b
@@ -1099,7 +1099,7 @@ yes_no=\u1794\u17b6\u1791/\u1791\u17c1
 bool=\u1794\u17b6\u1791/\u1791\u17c1
 none=\u1782\u17d2\u1798\u17b6\u1793
 yes_only = \u1785\u1798\u17d2\u179b\u17be\u1799 \u1794\u17b6\u1791/\u1785\u17b6\u179f
-custom=Custom
+custom=\u1780\u17c2\u179f\u1798\u17d2\u179a\u17bd\u179b\u1795\u17d2\u1791\u17b6\u179b\u17cb\u1781\u17d2\u179b\u17bd\u1793
 file=File
 no_value=\u1798\u17b7\u1793\u1798\u17b6\u1793\u178f\u1798\u17d2\u179b\u17c3
 
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 02ffa904f52d..253218963fc3 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
@@ -107,7 +107,7 @@ intro_log_out=Clique aqui para sair do sistema e negar que outras pessoas acesse
 
 #-- See module privilegies ----------------------------------------------------#
 
-M_dhis-web-maintenance=Maintenance app
+M_dhis-web-maintenance=Aplicativo de manuten\u00e7\u00e3o
 M_dhis-web-data-administration=Data Administration app
 M_dhis-web-settings=Settings app
 M_dhis-web-dataentry=Ver m\u00f3dulo de Entrada de Dados
@@ -414,6 +414,7 @@ F_EXTERNAL_MAP_LAYER_PUBLIC_ADD=Add/Update Public External Map Layer
 F_EXTERNAL_MAP_LAYER_PRIVATE_ADD=Add/Update Private External Map Layer
 F_EXTERNAL_MAP_LAYER_DELETE=Delete External Map Layer
 F_VIEW_EVENT_ANALYTICS=View event analytics
+F_CAPTURE_DATASTORE_UPDATE=Create and edit Capture datastore configuration
 F_ADD_COLOR_SET=Add/Update Color Set
 F_PROGRAM_RULE_DELETE=Delete Program Rule
 F_PROGRAMDATAELEMENT_DELETE=Delete Program Data Element
@@ -1842,7 +1843,7 @@ option=Op\u00e7\u00e3o
 category_option_group=Grupo de op\u00e7\u00f5es de categoria
 external_map_layer=External map layer
 legend_set=Conjunto da legenda
-push_analysis=Push analysis
+push_analysis=An\u00e1lise push
 relationship_type=Tipo de Rela\u00e7\u00e3o
 tracked_entity=Entidade rastreada
 tracked_entity_attribute=Atributo de entidade rastreada
@@ -2016,6 +2017,100 @@ data_integrity.program_rule_actions_without_section.description=Lists program ru
 data_integrity.program_rule_actions_without_stage.section=Program Rules
 data_integrity.program_rule_actions_without_stage.name=Program rules with actions lacking a program stage
 data_integrity.program_rule_actions_without_stage.description=Lists program rules connected to an action of a type that requires a program stage but is not yet connected to one
+data_integrity.program_rule_actions_without_stage_id.section=Program Rules
+data_integrity.program_rule_actions_without_stage_id.name=Program rules with actions lacking a program stage
+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
+data_integrity.categories_one_default_category_option_combo.name=Only one default category option combo should exist
+data_integrity.categories_same_category_options.name=Categories with the same category options
+data_integrity.categories_unique_category_combo.name=Different category combinations should not have the exact same combination of categories.
+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.
+data_integrity.category_options_shared_within_category_combo.name=Category combinations with categories which share the same category options.
+data_integrity.catoptioncombos_no_catcombo.name=Category options combinations with no category combination.
+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_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_same_name.name=Data sets with the same name or short name
+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 sets should have at least two members.
+data_integrity.category_option_groups_scarce.name=Category option groups should have at least two members.
+data_integrity.data_element_groups_scarce.name=Data element groups should have at least two members.
+data_integrity.indicator_group_sets_scarce.name=Indicator groups sets should have at least two members.
+data_integrity.indicator_groups_scarce.name=Indicator groups should have at least two members.
+data_integrity.orgunit_groups_scarce.name=Organisation unit groups should have at least two members.
+data_integrity.program_indicator_groups_scarce.name=Program indicator groups should have at least two members.
+data_integrity.user_groups_scarce.name=User groups should have at least two members.
+data_integrity.validation_rule_groups_scarce.name=Validation rule should have at least two members.
+data_integrity.indicator_no_analysis.name=Indicators not used in analytical objects.
+data_integrity.indicator_types_duplicated.name=Indicator types with the same factor.
+data_integrity.indicators_duplicated_terms.name=Indicators with the same terms.
+data_integrity.indicators_exact_duplicates.name=Indicators with the same formula.
+data_integrity.indicators_not_grouped.name=Indicators not in any groups.
+data_integrity.option_sets_wrong_sort_order.name=Option sets with possibly wrong sort order.
+data_integrity.options_sets_empty.name=Empty option sets
+data_integrity.options_sets_unused.name=Option sets which are not used
+data_integrity.orgunit_group_sets_excess_groups.name=Organisation units which belong to multiple groups in a group set.
+data_integrity.orgunits_compulsory_group_count.name=Organisation units that are not in all compulsory orgunit group sets
+data_integrity.orgunits_invalid_geometry.name=Organisation units with invalid geometry.
+data_integrity.orgunits_multiple_roots.name=The organisation unit hierarchy should have a single root.
+data_integrity.orgunits_multiple_spaces.name=Organisation units should not have multiple spaces in their names or shortnames.
+data_integrity.orgunits_no_coordinates.name=Organisation units with no coordinates.
+data_integrity.orgunits_not_contained_by_parent.name=Organisation units with point coordinates should be contained by their parent.
+data_integrity.orgunits_null_island.name=Organisation units located within 100 km of Null Island (0,0).
+data_integrity.orgunits_openingdate_gt_closeddate.name=Organisation units which have an opening date later than the closed date.
+data_integrity.orgunits_orphaned.name=Orphaned organisation units.
+data_integrity.orgunits_same_name_and_parent.name=Organisation units should not have the same name and parent.
+data_integrity.orgunits_trailing_spaces.name=Organisation units should not have trailing spaces.
+data_integrity.org_units_not_in_compulsory_group_sets.name=Organisation units not in all compulsory organisation unit group sets
+data_integrity.organisation_units_violating_exclusive_group_sets.name=Organisation units which belong to multiple groups in a group set
+data_integrity.organisation_units_without_groups.name=Organisation units not in any groups
+data_integrity.periods_3y_future.name=Periods which are more than three years in the future.
+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.
+data_integrity.program_rules_no_priority.name=Program rules with no priority
+data_integrity.validation_rules_missing_value_strategy_null.name=All validation rule expressions should have a missing value strategy.
+data_integrity.dashboards_not_viewed_one_year.name=Dashboards which have not been actively viewed in the past 12 months
+data_integrity.maps_not_viewed_one_year.name=Maps which have not been viewed in the past 12 months
+data_integrity.visualizations_not_viewed_one_year.name=Visualizations which have not been viewed in the past 12 months
+data_integrity.users_with_invalid_usernames.name = Users with invalid usernames
+data_integrity.users_capture_ou_not_in_data_view_ou.name=Users with capture org unit not in data view org unit
+data_integrity.users_capture_ou_not_in_tei_search_ou.name=Users with capture org unit not in TEI search org unit
+data_integrity.users_with_no_user_role.name=Users with no user role
+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
+data_integrity.users_with_all_authority.name=Users with the ALL authority
+
+# -- End Data Integrity Checks--------------------------------------------#
 
 # disable inactive users job notification texts
 notification.user_inactive.subject=Your DHIS2 account will be disabled soon.
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 a03b225c4b6f..71ceb69ce148 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
@@ -373,11 +373,11 @@ F_MOBILE_DELETE_SMS=X\u00f3a SMS
 F_SEND_EMAIL=G\u1eedi email
 F_VIEW_SETTINGS=Xem c\u00e0i \u0111\u1eb7t
 F_PERFORM_MAINTENANCE=Th\u1ef1c hi\u1ec7n ch\u1ee9c n\u0103ng b\u1ea3o tr\u00ec
-F_PERFORM_ANALYTICS_EXPLAIN=Perform analytics explain query
+F_PERFORM_ANALYTICS_EXPLAIN=Th\u1ef1c hi\u1ec7n ph\u00e2n t\u00edch gi\u1ea3i th\u00edch truy v\u1ea5n
 F_PRUNE_ORGANISATION_UNITS=Tinh ch\u1ec9nh c\u00e1c \u0111\u01a1n v\u1ecb
-F_ORGANISATION_UNIT_SPLIT=Split organisation unit
+F_ORGANISATION_UNIT_SPLIT=Chia t\u00e1ch \u0111\u01a1n v\u1ecb
 F_ORGANISATION_UNIT_MERGE=H\u1ee3p nh\u1ea5t c\u00e1c \u0111\u01a1n v\u1ecb
-F_ORG_UNIT_PROFILE_ADD=Add organisation unit profile
+F_ORG_UNIT_PROFILE_ADD=Th\u00eam h\u1ed3 s\u01a1 \u0111\u01a1n v\u1ecb
 F_ELIMINATE_DUPLICATE_DATA_ELEMENTS=Lo\u1ea1i b\u1ecf c\u00e1c \u0111\u01a1n v\u1ecb tr\u00f9ng l\u1eb7p
 F_GENERATE_MIN_MAX_VALUES=T\u1ea1o c\u00e1c gi\u00e1 tr\u1ecb nh\u1ecf-l\u1edbn nh\u1ea5t
 F_IMPORT_DATA=Nh\u1eadp d\u1eef li\u1ec7u
@@ -396,15 +396,15 @@ F_REPLICATE_USER=T\u00e1i t\u1ea1o t\u00e0i kho\u1ea3n
 F_LOCALE_ADD=Th\u00eam v\u00f9ng/qu\u1ed1c gia
 F_LOCALE_DELETE=X\u00f3a v\u00f9ng/qu\u1ed1c gia
 F_PREDICTOR_RUN=Ch\u1ea1y b\u1ed9 d\u1ef1 \u0111o\u00e1n
-F_TRACKED_ENTITY_MANAGEMENT=Manage tracked entities
-F_TRACKED_ENTITY_UPDATE=Update tracked entities
+F_TRACKED_ENTITY_MANAGEMENT=Qu\u1ea3n l\u00fd c\u00e1 th\u1ec3
+F_TRACKED_ENTITY_UPDATE=C\u1eadp nh\u1eadt c\u00e1 th\u1ec3 theo d\u00f5i
 F_VALIDATIONRULEGROUP_ADD=X\u00f3a nh\u00f3m quy t\u1eafc
 F_SQLVIEW_ADD=Th\u00eam xem SQL
 F_ORGUNITGROUPSET_ADD=X\u00f3a t\u1eadp h\u1ee3p nh\u00f3m \u0111\u01a1n v\u1ecb
 F_OPTIONSET_ADD=Th\u00eam t\u1eadp t\u00f9y ch\u1ecdn
 F_INSERT_CUSTOM_JS_CSS=Ch\u00e8n Javascript v\u00e0 CSS
 F_VIEW_UNAPPROVED_DATA=Xem d\u1eef li\u1ec7u ch\u01b0a duy\u1ec7t
-F_PROGRAM_RULE_MANAGEMENT=Manage program rule
+F_PROGRAM_RULE_MANAGEMENT=Qu\u1ea3n l\u00fd lu\u1eadt ch\u01b0\u01a1ng tr\u00ecnh
 F_PROGRAM_RULE_ADD=Th\u00eam lu\u1eadt ch\u01b0\u01a1ng tr\u00ecnh
 F_PROGRAM_RULE_UPDATE=C\u1eadp nh\u1eadt lu\u1eadt ch\u01b0\u01a1ng tr\u00ecnh
 F_PROGRAM_DASHBOARD_CONFIG_ADMIN=C\u1ea5u h\u00ecnh b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n ch\u01b0\u01a1ng tr\u00ecnh
@@ -414,7 +414,7 @@ F_EXTERNAL_MAP_LAYER_PUBLIC_ADD=Th\u00eam / C\u1eadp nh\u1eadt l\u1edbp b\u1ea3n
 F_EXTERNAL_MAP_LAYER_PRIVATE_ADD=Th\u00eam / C\u1eadp nh\u1eadt L\u1edbp b\u1ea3n \u0111\u1ed3 b\u00ean ngo\u00e0i ri\u00eang t\u01b0
 F_EXTERNAL_MAP_LAYER_DELETE=X\u00f3a l\u1edbp b\u1ea3n \u0111\u1ed3 b\u00ean ngo\u00e0i
 F_VIEW_EVENT_ANALYTICS=Xem ph\u00e2n t\u00edch s\u1ef1 ki\u1ec7n
-F_CAPTURE_DATASTORE_UPDATE=Create and edit Capture datastore configuration
+F_CAPTURE_DATASTORE_UPDATE=T\u1ea1o v\u00e0 ch\u1ec9nh s\u1eeda Ghi l\u1ea1i c\u1ea5u h\u00ecnh kho d\u1eef li\u1ec7u
 F_ADD_COLOR_SET=Th\u00eam / c\u1eadp nh\u1eadt b\u1ed9 m\u00e0u
 F_PROGRAM_RULE_DELETE=X\u00f3a quy t\u1eafc ch\u01b0\u01a1ng tr\u00ecnh
 F_PROGRAMDATAELEMENT_DELETE=X\u00f3a ph\u1ea7n t\u1eed d\u1eef li\u1ec7u ch\u01b0\u01a1ng tr\u00ecnh
@@ -433,13 +433,13 @@ F_REPORT_EXTERNAL=Quy\u1ec1n truy c\u1eadp b\u00ean ngo\u00e0i B\u00e1o c\u00e1o
 F_UNCOMPLETE_EVENT=S\u1ef1 ki\u1ec7n ch\u01b0a ho\u00e0n th\u00e0nh
 F_SKIP_DATA_IMPORT_AUDIT=B\u1ecf qua ki\u1ec3m tra nh\u1eadn d\u1eef li\u1ec7u
 F_TRACKER_IMPORTER_EXPERIMENTAL=Tracker importer experimental
-F_VIEW_SERVER_INFO=View server information
-F_DATA_APPROVAL_WORKFLOW=Add/Update Data Approval Workflow
-F_DATA_APPROVAL_LEVEL=Add/Update Data Approval Level
-F_AGGREGATE_DATA_EXCHANGE_PUBLIC_ADD=Add/Update Public Aggregate Data Exchange
-F_AGGREGATE_DATA_EXCHANGE_PRIVATE_ADD=Add/Update Private Aggregate Data Exchange
-F_AGGREGATE_DATA_EXCHANGE_DELETE=Delete Aggregate Data Exchange
-F_AGGREGATE_DATA_EXCHANGE=Aggregate Data Exchange
+F_VIEW_SERVER_INFO=Xem c\u1ea5u h\u00ecnh m\u00e1y ch\u1ee7
+F_DATA_APPROVAL_WORKFLOW=Th\u00eam/C\u1eadp nh\u1eadt Quy tr\u00ecnh ph\u00ea duy\u1ec7t d\u1eef li\u1ec7u
+F_DATA_APPROVAL_LEVEL=Th\u00eam/C\u1eadp nh\u1eadt C\u1ea5p \u0111\u1ed9 ph\u00ea duy\u1ec7t d\u1eef li\u1ec7u
+F_AGGREGATE_DATA_EXCHANGE_PUBLIC_ADD=Th\u00eam/C\u1eadp nh\u1eadt Trao \u0111\u1ed5i d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p c\u00f4ng khai
+F_AGGREGATE_DATA_EXCHANGE_PRIVATE_ADD=Th\u00eam/C\u1eadp nh\u1eadt Trao \u0111\u1ed5i d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p n\u1ed9i b\u1ed9
+F_AGGREGATE_DATA_EXCHANGE_DELETE=X\u00f3a trao \u0111\u1ed5i d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p
+F_AGGREGATE_DATA_EXCHANGE=Trao \u0111\u1ed5i d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p
 #-- Common ---------------------------------------------------------------------#
 
 offline=Offline
@@ -969,7 +969,7 @@ database_name=T\u00ean c\u01a1 s\u1edf d\u1eef li\u1ec7u
 database_user=Ng\u01b0\u1eddi d\u00f9ng c\u01a1 s\u1edf d\u1eef li\u1ec7u
 database_version=Phi\u00ean b\u1ea3n CSDL
 system_id=M\u00e3 h\u1ec7 th\u1ed1ng
-last_monitoring_request=Last monitoring request
+last_monitoring_request=Y\u00eau c\u1ea7u gi\u00e1m s\u00e1t cu\u1ed1i c\u00f9ng
 read_replica_count=\u0110\u1ecdc s\u1ed1 l\u01b0\u1ee3ng b\u1ea3n sao
 not_set=Kh\u00f4ng c\u00e0i
 current_user=Ng\u01b0\u1eddi d\u00f9ng hi\u1ec7n t\u1ea1i
@@ -1908,17 +1908,17 @@ data_integrity.data_elements_without_data_sets.name=Ph\u1ea7n t\u1eed d\u1eef li
 data_integrity.data_elements_without_data_sets.description=Danh s\u00e1ch ph\u1ea7n t\u1eed d\u1eef li\u1ec7u kh\u00f4ng n\u1eb1m trong bi\u1ec3u nh\u1eadp
 data_integrity.data_elements_without_groups.section=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 data_integrity.data_elements_without_groups.name=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u kh\u00f4ng n\u1eb1m trong nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
-data_integrity.data_elements_without_groups.description=Lists all data elements that have no data element groups
+data_integrity.data_elements_without_groups.description=Li\u1ec7t k\u00ea t\u1ea5t c\u1ea3 c\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u kh\u00f4ng c\u00f3 nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
 data_integrity.data_elements_assigned_to_data_sets_with_different_period_types.section=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
-data_integrity.data_elements_assigned_to_data_sets_with_different_period_types.name=Data elements assigned to data sets with different period type
-data_integrity.data_elements_assigned_to_data_sets_with_different_period_types.description=Lists all data elements that are assigned to at least one data set that has a different period type
+data_integrity.data_elements_assigned_to_data_sets_with_different_period_types.name=C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c g\u00e1n cho c\u00e1c t\u1eadp d\u1eef li\u1ec7u c\u00f3 lo\u1ea1i th\u1eddi k\u1ef3 kh\u00e1c nhau
+data_integrity.data_elements_assigned_to_data_sets_with_different_period_types.description=Li\u1ec7t k\u00ea t\u1ea5t c\u1ea3 c\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u01b0\u1ee3c g\u00e1n cho \u00edt nh\u1ea5t m\u1ed9t t\u1eadp d\u1eef li\u1ec7u c\u00f3 lo\u1ea1i chu k\u1ef3 kh\u00e1c nhau
 data_integrity.data_elements_violating_exclusive_group_sets.section=Ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
-data_integrity.data_elements_violating_exclusive_group_sets.name=Data elements with conflicting exclusive group sets
-data_integrity.data_elements_violating_exclusive_group_sets.description=Lists all data elements that are a members of more than one exclusive data element set belonging to the same data element group set
-data_integrity.data_elements_violating_exclusive_group_sets.recommendation=Either remove the data element from all but one exclusive group set or consider if the set really should be an exclusive group set
+data_integrity.data_elements_violating_exclusive_group_sets.name=C\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u c\u00f3 t\u1eadp h\u1ee3p nh\u00f3m \u0111\u1ed9c quy\u1ec1n xung \u0111\u1ed9t
+data_integrity.data_elements_violating_exclusive_group_sets.description=Li\u1ec7t k\u00ea t\u1ea5t c\u1ea3 c\u00e1c ph\u1ea7n t\u1eed d\u1eef li\u1ec7u l\u00e0 th\u00e0nh vi\u00ean c\u1ee7a nhi\u1ec1u h\u01a1n m\u1ed9t t\u1eadp h\u1ee3p ph\u1ea7n t\u1eed d\u1eef li\u1ec7u \u0111\u1ed9c quy\u1ec1n thu\u1ed9c c\u00f9ng m\u1ed9t t\u1eadp h\u1ee3p nh\u00f3m ph\u1ea7n t\u1eed d\u1eef li\u1ec7u
+data_integrity.data_elements_violating_exclusive_group_sets.recommendation=Ho\u1eb7c lo\u1ea1i b\u1ecf ph\u1ea7n t\u1eed d\u1eef li\u1ec7u kh\u1ecfi t\u1ea5t c\u1ea3 tr\u1eeb m\u1ed9t t\u1eadp h\u1ee3p nh\u00f3m \u0111\u1ed9c quy\u1ec1n ho\u1eb7c xem x\u00e9t li\u1ec7u t\u1eadp h\u1ee3p \u0111\u00f3 c\u00f3 th\u1ef1c s\u1ef1 l\u00e0 m\u1ed9t t\u1eadp h\u1ee3p nh\u00f3m \u0111\u1ed9c quy\u1ec1n hay kh\u00f4ng
 data_integrity.data_elements_in_data_set_not_in_form.section=Qu\u1ea3n tr\u1ecb m\u1eabu nh\u1eadp li\u1ec7u
-data_integrity.data_elements_in_data_set_not_in_form.name=Data sets with data elements not in data entry form
-data_integrity.data_elements_in_data_set_not_in_form.description=Lists all data sets that have data elements which are neither a member of the set's data entry form nor a member of the sets section
+data_integrity.data_elements_in_data_set_not_in_form.name=B\u1ed9 d\u1eef li\u1ec7u c\u00f3 c\u00e1c th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u kh\u00f4ng c\u00f3 trong bi\u1ec3u m\u1eabu nh\u1eadp d\u1eef li\u1ec7u
+data_integrity.data_elements_in_data_set_not_in_form.description=Li\u1ec7t k\u00ea t\u1ea5t c\u1ea3 c\u00e1c t\u1eadp d\u1eef li\u1ec7u c\u00f3 c\u00e1c th\u00e0nh ph\u1ea7n d\u1eef li\u1ec7u kh\u00f4ng ph\u1ea3i l\u00e0 th\u00e0nh vi\u00ean c\u1ee7a bi\u1ec3u m\u1eabu nh\u1eadp d\u1eef li\u1ec7u c\u1ee7a t\u1eadp d\u1eef li\u1ec7u ho\u1eb7c kh\u00f4ng ph\u1ea3i l\u00e0 th\u00e0nh vi\u00ean c\u1ee7a ph\u1ea7n t\u1eadp d\u1eef li\u1ec7u
 data_integrity.data_elements_in_data_set_not_in_form.recommendation=Either remove the data elements in question or make them a member of the set's form or section
 data_integrity.data_sets_not_assigned_to_org_units.section=Qu\u1ea3n tr\u1ecb m\u1eabu nh\u1eadp li\u1ec7u
 data_integrity.data_sets_not_assigned_to_org_units.name=T\u1eadp D\u1eef Li\u1ec7u kh\u00f4ng \u0111\u01b0\u1ee3c g\u00e1n cho \u0110\u01a1n V\u1ecb n\u00e0o
@@ -2017,6 +2017,100 @@ data_integrity.program_rule_actions_without_section.description=Lists program ru
 data_integrity.program_rule_actions_without_stage.section=Program Rules
 data_integrity.program_rule_actions_without_stage.name=Program rules with actions lacking a program stage
 data_integrity.program_rule_actions_without_stage.description=Lists program rules connected to an action of a type that requires a program stage but is not yet connected to one
+data_integrity.program_rule_actions_without_stage_id.section=Program Rules
+data_integrity.program_rule_actions_without_stage_id.name=Program rules with actions lacking a program stage
+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
+data_integrity.categories_one_default_category_option_combo.name=Only one default category option combo should exist
+data_integrity.categories_same_category_options.name=Categories with the same category options
+data_integrity.categories_unique_category_combo.name=Different category combinations should not have the exact same combination of categories.
+data_integrity.invalid_category_combos.name=T\u1ed5 h\u1ee3p ph\u00e2n lo\u1ea1i kh\u00f4ng h\u1ee3p l\u1ec7
+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.
+data_integrity.category_options_shared_within_category_combo.name=Category combinations with categories which share the same category options.
+data_integrity.catoptioncombos_no_catcombo.name=Category options combinations with no category combination.
+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_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_same_name.name=Data sets with the same name or short name
+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 sets should have at least two members.
+data_integrity.category_option_groups_scarce.name=Category option groups should have at least two members.
+data_integrity.data_element_groups_scarce.name=Data element groups should have at least two members.
+data_integrity.indicator_group_sets_scarce.name=Indicator groups sets should have at least two members.
+data_integrity.indicator_groups_scarce.name=Indicator groups should have at least two members.
+data_integrity.orgunit_groups_scarce.name=Organisation unit groups should have at least two members.
+data_integrity.program_indicator_groups_scarce.name=Program indicator groups should have at least two members.
+data_integrity.user_groups_scarce.name=User groups should have at least two members.
+data_integrity.validation_rule_groups_scarce.name=Validation rule should have at least two members.
+data_integrity.indicator_no_analysis.name=Indicators not used in analytical objects.
+data_integrity.indicator_types_duplicated.name=Indicator types with the same factor.
+data_integrity.indicators_duplicated_terms.name=Indicators with the same terms.
+data_integrity.indicators_exact_duplicates.name=Indicators with the same formula.
+data_integrity.indicators_not_grouped.name=Indicators not in any groups.
+data_integrity.option_sets_wrong_sort_order.name=Option sets with possibly wrong sort order.
+data_integrity.options_sets_empty.name=Empty option sets
+data_integrity.options_sets_unused.name=Option sets which are not used
+data_integrity.orgunit_group_sets_excess_groups.name=Organisation units which belong to multiple groups in a group set.
+data_integrity.orgunits_compulsory_group_count.name=Organisation units that are not in all compulsory orgunit group sets
+data_integrity.orgunits_invalid_geometry.name=Organisation units with invalid geometry.
+data_integrity.orgunits_multiple_roots.name=The organisation unit hierarchy should have a single root.
+data_integrity.orgunits_multiple_spaces.name=Organisation units should not have multiple spaces in their names or shortnames.
+data_integrity.orgunits_no_coordinates.name=Organisation units with no coordinates.
+data_integrity.orgunits_not_contained_by_parent.name=Organisation units with point coordinates should be contained by their parent.
+data_integrity.orgunits_null_island.name=Organisation units located within 100 km of Null Island (0,0).
+data_integrity.orgunits_openingdate_gt_closeddate.name=Organisation units which have an opening date later than the closed date.
+data_integrity.orgunits_orphaned.name=Orphaned organisation units.
+data_integrity.orgunits_same_name_and_parent.name=Organisation units should not have the same name and parent.
+data_integrity.orgunits_trailing_spaces.name=Organisation units should not have trailing spaces.
+data_integrity.org_units_not_in_compulsory_group_sets.name=Organisation units not in all compulsory organisation unit group sets
+data_integrity.organisation_units_violating_exclusive_group_sets.name=Organisation units which belong to multiple groups in a group set
+data_integrity.organisation_units_without_groups.name=Organisation units not in any groups
+data_integrity.periods_3y_future.name=Periods which are more than three years in the future.
+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.
+data_integrity.program_rules_no_priority.name=Program rules with no priority
+data_integrity.validation_rules_missing_value_strategy_null.name=All validation rule expressions should have a missing value strategy.
+data_integrity.dashboards_not_viewed_one_year.name=Dashboards which have not been actively viewed in the past 12 months
+data_integrity.maps_not_viewed_one_year.name=Maps which have not been viewed in the past 12 months
+data_integrity.visualizations_not_viewed_one_year.name=Visualizations which have not been viewed in the past 12 months
+data_integrity.users_with_invalid_usernames.name = Users with invalid usernames
+data_integrity.users_capture_ou_not_in_data_view_ou.name=Users with capture org unit not in data view org unit
+data_integrity.users_capture_ou_not_in_tei_search_ou.name=Users with capture org unit not in TEI search org unit
+data_integrity.users_with_no_user_role.name=Users with no user role
+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
+data_integrity.users_with_all_authority.name=Users with the ALL authority
+
+# -- End Data Integrity Checks--------------------------------------------#
 
 # disable inactive users job notification texts
 notification.user_inactive.subject=T\u00e0i kho\u1ea3n DHIS2 c\u1ee7a b\u1ea1n s\u1ebd s\u1edbm b\u1ecb kh\u00f3a.
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 97fb0fb4753a..34c983669ed2 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
@@ -393,8 +393,8 @@ F_ACCEPT_DATA_LOWER_LEVELS=\u63a5\u53d7\u8f83\u4f4e\u7b49\u7ea7\u7684\u6570\u636
 F_RUN_VALIDATION=\u8fdb\u884c\u9a8c\u8bc1
 F_PROGRAM_TRACKING_LIST=\u67e5\u770b\u9879\u76ee\u8ddf\u8e2a
 F_REPLICATE_USER=\u590d\u5236\u7528\u6237
-F_LOCALE_ADD=\u6dfb\u52a0\u8bed\u8a00
-F_LOCALE_DELETE=\u5220\u9664\u8bed\u8a00
+F_LOCALE_ADD=\u6dfb\u52a0\u65b9\u8a00
+F_LOCALE_DELETE=\u5220\u9664\u65b9\u8a00
 F_PREDICTOR_RUN=\u8fd0\u884c\u9884\u62a5
 F_TRACKED_ENTITY_MANAGEMENT=\u7ba1\u7406\u8ddf\u8e2a\u7684\u5b9e\u4f53
 F_TRACKED_ENTITY_UPDATE=\u66f4\u65b0\u8ddf\u8e2a\u7684\u5b9e\u4f53
@@ -918,9 +918,9 @@ persian.weekday.short.sunday=Yek
 #-- Translation page ------------------------------------------------------#
 
 translation_translate=\u7ffb\u8bd1
-translation_addlocale=\u4fdd\u5b58locale
+translation_addlocale=\u4fdd\u5b58\u65b9\u8a00
 translation_details=\u8be6\u60c5
-translation_select_locale=[ \u9009\u62e9 \u5730\u533a ]
+translation_select_locale=[ \u9009\u62e9\u65b9\u8a00 ]
 translation_select_ref=[ \u9009\u62e9\u53c2\u8003 ]
 translation_save=\u4fdd\u5b58
 translation_label_id=Id
@@ -935,15 +935,15 @@ translation_countrycode=\u56fd\u5bb6\u4ee3\u7801
 translation_languagecode=\u8bed\u8a00\u4ee3\u7801
 translation_label_numerator_description=\u63cf\u8ff0
 translation_label_denominator_description=\u5206\u6bcd\u63cf\u8ff0
-translation_locale_added=\u6dfb\u52a0\u5730\u533a
+translation_locale_added=\u6dfb\u52a0\u65b9\u8a00
 translation_cancel=\u53d6\u6d88
 translation_add=\u6dfb\u52a0
-translation_locale=\u5730\u533a
+translation_locale=\u65b9\u8a00
 translation_reference=\u5f15\u7528
 translation_language_must_be_two_chars=\u8bed\u8a00\u9700\u4e3a\u4e24\u4e2a\u5b57\u7b26
 translation_country_must_be_two_chars=\u56fd\u5bb6\u5fc5\u987b\u4e24\u4e2a\u5b57\u7b26
 translation_variant_must_be_specified=\u9700\u5b9a\u4e49\u53d8\u4f53
-translation_locale_already_exists=\u5730\u533a\u5df2\u7ecf\u5b58\u5728
+translation_locale_already_exists=\u5730\u533a\u65b9\u8a00\u5df2\u7ecf\u5b58\u5728
 translation_shortname_wellformed=\u8bf7\u786e\u8ba4\u7f29\u5199\u4ec5\u9650\u4e8e\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u4e0b\u5212\u7ebf\u548c\u7a7a\u683c
 translation_shortname_length=\u7f29\u5199\u9700\u5c0f\u4e8e25\u4e2a\u5b57\u7b26
 translation_duplicated_name_with=\u62b1\u6b49\uff0c\u4f60\u8f93\u5165\u91cd\u590d\u7684\u540d\u79f0
diff --git a/dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_hi_IN.properties b/dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_hi_IN.properties
index b9c0b90716b3..433f662dc881 100644
--- a/dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_hi_IN.properties
+++ b/dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_hi_IN.properties
@@ -56,7 +56,7 @@ dataset_is_approved=Data has been approved and cannot be modified
 dataset_is_closed=Data input period is closed
 dataset_is_concluded=Data entry has concluded
 dataset_is_locked=Data set is locked
-complete=Complete
+complete=\u092a\u0942\u0930\u093e \u0939\u0941\u0906
 incomplete=Incomplete
 confirm_complete=Are you sure this data set is complete?
 confirm_undo=Are you sure you to want to remove this data set's completion status?