diff --git a/src/i18n/i18n_module_ar.properties b/src/i18n/i18n_module_ar.properties
index 79d406127..999e86d3e 100644
--- a/src/i18n/i18n_module_ar.properties
+++ b/src/i18n/i18n_module_ar.properties
@@ -1316,8 +1316,8 @@ must_select_one_dataelement=\u0627\u0644\u0631\u062c\u0627\u0621 \u062a\u062d\u0
 single_event=\u062d\u062f\u062b \u0645\u0641\u0631\u062f
 tracked_entity_instances=\u0646\u0645\u0627\u0630\u062c \u0627\u0644\u0643\u064a\u0627\u0646 \u0627\u0644\u0645\u062a\u062a\u0628\u0639
 dob_type=\u0646\u0648\u0639 \u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0645\u064a\u0644\u0627\u062f
-date_of_enrollment_description=\u0648\u0635\u0641 \u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062a\u0633\u062c\u064a\u0644
-date_of_incident_description=\u0648\u0635\u0641 \u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0648\u0627\u0642\u0639\u0629
+date_of_enrollment_description=Custom label for enrollment date
+date_of_incident_description=Custom label for incident date
 date_of_enrollment=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062a\u0633\u062c\u064a\u0644
 date_of_incident=\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0648\u0627\u0642\u0639\u0629
 male=\u0630\u0643\u0631
@@ -2066,6 +2066,10 @@ first=\u0627\u0644\u0642\u064a\u0645\u0629 \u0627\u0644\u0623\u0648\u0644\u0649
 first_average_org_unit=\u0627\u0644\u0642\u064a\u0645\u0629 \u0627\u0644\u0623\u0648\u0644\u0649 (\u0627\u0644\u0645\u062a\u0648\u0633\u0637 \u0641\u064a \u0627\u0644\u062a\u0633\u0644\u0633\u0644 \u0627\u0644\u0647\u0631\u0645\u064a \u0644\u0644\u0648\u062d\u062f\u0629 \u0627\u0644\u062a\u0646\u0638\u064a\u0645\u064a\u0629)
 last_in_period=\u0622\u062e\u0631 \u0642\u064a\u0645\u0629 \u0641\u064a \u0627\u0644\u0641\u062a\u0631\u0629 (\u0627\u0644\u0645\u062c\u0645\u0648\u0639 \u0641\u064a \u0627\u0644\u062a\u062f\u0631\u062c \u0627\u0644\u0647\u0631\u0645\u064a \u0644\u0644\u0648\u062d\u062f\u0629 \u0627\u0644\u062a\u0646\u0638\u064a\u0645\u064a\u0629)
 last_in_period_average_org_unit=\u0622\u062e\u0631 \u0642\u064a\u0645\u0629 \u0641\u064a \u0627\u0644\u0641\u062a\u0631\u0629 (\u0627\u0644\u0645\u062a\u0648\u0633\u0637 \u0641\u064a \u0627\u0644\u062a\u0633\u0644\u0633\u0644 \u0627\u0644\u0647\u0631\u0645\u064a \u0644\u0644\u0648\u062d\u062f\u0629 \u0627\u0644\u062a\u0646\u0638\u064a\u0645\u064a\u0629)
+last_last_org_unit=Last value in period (last value in org unit hierarchy)
+first_first_org_unit=First value in period  (first value in org unit hierarchy)
+min_sum_org_unit=Min value (sum in org unit hierarchy)
+max_sum_org_unit=Max value (sum in org unit hierarchy)
 program_notification_template=\u0642\u0627\u0644\u0628 \u0627\u0644\u0631\u0633\u0627\u0644\u0629
 no_notification_template_specified=\u0644\u0645 \u064a\u062a\u0645 \u062a\u062d\u062f\u064a\u062f \u0642\u0627\u0644\u0628 \u0627\u0644\u0625\u0634\u0639\u0627\u0631
 intro_tracked_entity_type=\u062a\u062d\u062f\u064a\u062f \u0623\u0646\u0648\u0627\u0639 \u0627\u0644\u0643\u064a\u0627\u0646\u0627\u062a \u0627\u0644\u062a\u064a \u064a\u0645\u0643\u0646 \u062a\u062a\u0628\u0639\u0647\u0627 \u0636\u0645\u0646 \u0627\u0644\u0646\u0638\u0627\u0645\u060c \u0648\u0627\u0644\u062a\u064a \u064a\u0645\u0643\u0646 \u0623\u0646 \u062a\u0643\u0648\u0646 \u0623\u064a \u0634\u064a\u0621 \u0645\u0646 \u0623\u0634\u062e\u0627\u0635 \u0625\u0644\u0649 \u0633\u0644\u0639.
@@ -2076,8 +2080,8 @@ select_incident_dates_in_future=\u0627\u0644\u0633\u0645\u0627\u062d \u0628\u062
 display_enrollment_date_label=Display enrollment date label
 display_incident_date_label=Display incident date label
 display_incident_date=\u0625\u0638\u0647\u0627\u0631 \u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0648\u0627\u0642\u0639\u0629
-incident_date_label=\u0648\u0635\u0641 \u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0648\u0627\u0642\u0639\u0629
-enrollment_date_label=\u0648\u0635\u0641 \u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062a\u0633\u062c\u064a\u0644
+incident_date_label=Custom label for incident date
+enrollment_date_label=Custom label for enrollment date
 ignore_overdue_events=\u062a\u062c\u0627\u0647\u0644 \u0627\u0644\u0623\u062d\u062f\u0627\u062b \u0627\u0644\u0645\u062a\u0623\u062e\u0631\u0629
 related_program=\u0628\u0631\u0646\u0627\u0645\u062c \u0630\u0648 \u0635\u0644\u0629
 assign_attributes=\u062a\u0639\u064a\u064a\u0646 \u0627\u0644\u0633\u0645\u0627\u062a
@@ -2098,8 +2102,8 @@ block_entry_form=\u062d\u0638\u0631 \u0646\u0645\u0648\u0630\u062c \u0627\u0644\
 remind_completed=\u0627\u0637\u0644\u0628 \u0645\u0646 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0625\u0643\u0645\u0627\u0644 \u0627\u0644\u0628\u0631\u0646\u0627\u0645\u062c \u0639\u0646\u062f \u0627\u0643\u062a\u0645\u0627\u0644 \u0627\u0644\u0645\u0631\u062d\u0644\u0629
 allow_generate_next_visit=\u0627\u0637\u0644\u0628 \u0645\u0646 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0625\u0646\u0634\u0627\u0621 \u062d\u062f\u062b \u062c\u062f\u064a\u062f \u0639\u0646\u062f \u0627\u0643\u062a\u0645\u0627\u0644 \u0627\u0644\u0645\u0631\u062d\u0644\u0629
 generated_by_enrollment_date=\u062a\u0648\u0644\u064a\u062f \u0627\u0644\u0623\u062d\u062f\u0627\u062b \u0627\u0639\u062a\u0645\u0627\u062f\u0627\u064b \u0639\u0644\u0649 \u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062a\u0633\u062c\u064a\u0644
-execution_date_label=\u0648\u0635\u0641 \u062a\u0627\u0631\u064a\u062e \u0627\u0644\u062a\u0642\u0631\u064a\u0631
-due_date_label=\u0648\u0635\u0641 \u062a\u0627\u0631\u064a\u062e \u0645\u0648\u0639\u062f \u0627\u0644\u0627\u0633\u062a\u062d\u0642\u0627\u0642
+execution_date_label=Custom label for report date
+due_date_label=Custom label for due date
 min_days_from_start=\u0627\u0644\u0623\u064a\u0627\u0645 \u0627\u0644\u0645\u062c\u062f\u0648\u0644\u0629 \u0645\u0646 \u0627\u0644\u0628\u062f\u0627\u064a\u0629
 pre_generate_uid=\u062a\u0648\u0644\u064a\u062f \u0645\u0633\u0628\u0642 \u0644\u0645\u0639\u0631\u0641 UID \u0644\u0644\u062d\u062f\u062b
 standard_interval=\u0623\u064a\u0627\u0645 \u0627\u0644\u0641\u0627\u0635\u0644 \u0627\u0644\u0632\u0645\u0646\u064a \u0627\u0644\u0642\u064a\u0627\u0633\u064a\u0629
@@ -2331,3 +2335,11 @@ registration_organisation_unit=Registration organisation unit
 organisation_unit_field=Organisation unit field
 prevent_adding_new_events_to_stage=Prevent adding new events to stage
 predict_according_to_input_category_option_combo=Predict according to input category option combo
+program_stage_label=Custom label for program stage
+event_label=Custom label for event
+enrollment_label=Custom label for enrollment
+follow_up_label=Custom label for follow-up
+org_unit_label=Custom label for registering unit
+relationship_label=Custom label for relationship
+note_label=Custom label for note
+tracked_entity_attribute_label=Custom label for tracked entity attribute
diff --git a/src/i18n/i18n_module_cs.properties b/src/i18n/i18n_module_cs.properties
index ae18173f9..49c970ba0 100644
--- a/src/i18n/i18n_module_cs.properties
+++ b/src/i18n/i18n_module_cs.properties
@@ -1316,8 +1316,8 @@ must_select_one_dataelement=Vyberte pros\u00edm jeden datov\u00fd prvek
 single_event=Jedna ud\u00e1lost
 tracked_entity_instances=Sledovan\u00e9 instance entit
 dob_type=Typ DOB
-date_of_enrollment_description=Popis data z\u00e1pisu
-date_of_incident_description=Popis data incidentu
+date_of_enrollment_description=Custom label for enrollment date
+date_of_incident_description=Custom label for incident date
 date_of_enrollment=Datum z\u00e1pisu
 date_of_incident=Datum incidentu
 male=Male
@@ -2066,6 +2066,10 @@ first=Prvn\u00ed hodnota (sou\u010det v hierarchii organiza\u010dn\u00edch jedno
 first_average_org_unit=Prvn\u00ed hodnota (pr\u016fm\u011br v hierarchii org. jednotek)
 last_in_period=Posledn\u00ed hodnota v obdob\u00ed (sou\u010det v hierarchii org. jednotek)
 last_in_period_average_org_unit=Posledn\u00ed hodnota v obdob\u00ed (pr\u016fm\u011br v hierarchii organiza\u010dn\u00edch jednotek)
+last_last_org_unit=Last value in period (last value in org unit hierarchy)
+first_first_org_unit=First value in period  (first value in org unit hierarchy)
+min_sum_org_unit=Min value (sum in org unit hierarchy)
+max_sum_org_unit=Max value (sum in org unit hierarchy)
 program_notification_template=\u0160ablona zpr\u00e1vy
 no_notification_template_specified=Nen\u00ed zad\u00e1na \u017e\u00e1dn\u00e1 \u0161ablona ozn\u00e1men\u00ed
 intro_tracked_entity_type=Definujte typy entit, kter\u00e9 lze v syst\u00e9mu sledovat, co\u017e m\u016f\u017ee b\u00fdt cokoli, od osob po komodity.
@@ -2076,8 +2080,8 @@ select_incident_dates_in_future=Povolit budouc\u00ed data incidentu
 display_enrollment_date_label=Display enrollment date label
 display_incident_date_label=Display incident date label
 display_incident_date=Zobrazit datum incidentu
-incident_date_label=Popis data incidentu
-enrollment_date_label=Popis data z\u00e1pisu
+incident_date_label=Custom label for incident date
+enrollment_date_label=Custom label for enrollment date
 ignore_overdue_events=Ignorovat ud\u00e1losti po vypr\u0161en\u00ed
 related_program=Souvisej\u00edc\u00ed program
 assign_attributes=P\u0159i\u0159adit atributy
@@ -2098,8 +2102,8 @@ block_entry_form=Po vypln\u011bn\u00ed zablokovat p\u0159ihla\u0161ovac\u00ed fo
 remind_completed=Po dokon\u010den\u00ed f\u00e1ze po\u017e\u00e1dejte u\u017eivatele o dokon\u010den\u00ed programu
 allow_generate_next_visit=A\u017e bude f\u00e1ze dokon\u010dena, po\u017e\u00e1dejte u\u017eivatele o vytvo\u0159en\u00ed nov\u00e9 ud\u00e1losti
 generated_by_enrollment_date=Generovat ud\u00e1losti na z\u00e1klad\u011b data registrace
-execution_date_label=Popis data zpr\u00e1vy
-due_date_label=Popis data platnosti
+execution_date_label=Custom label for report date
+due_date_label=Custom label for due date
 min_days_from_start=Napl\u00e1novan\u00e9 dny od za\u010d\u00e1tku
 pre_generate_uid=P\u0159edgenerovat UID ud\u00e1losti
 standard_interval=Standardn\u00ed intervalov\u00e9 dny
@@ -2331,3 +2335,11 @@ registration_organisation_unit=Registration organisation unit
 organisation_unit_field=Organisation unit field
 prevent_adding_new_events_to_stage=Prevent adding new events to stage
 predict_according_to_input_category_option_combo=Predict according to input category option combo
+program_stage_label=Custom label for program stage
+event_label=Custom label for event
+enrollment_label=Custom label for enrollment
+follow_up_label=Custom label for follow-up
+org_unit_label=Custom label for registering unit
+relationship_label=Custom label for relationship
+note_label=Custom label for note
+tracked_entity_attribute_label=Custom label for tracked entity attribute
diff --git a/src/i18n/i18n_module_es.properties b/src/i18n/i18n_module_es.properties
index 2318bd4f7..d2563076a 100644
--- a/src/i18n/i18n_module_es.properties
+++ b/src/i18n/i18n_module_es.properties
@@ -279,8 +279,8 @@ value_should_be_list_of_urls=Este campo debe contener una lista de URLs
 value_should_be_an_email=Este campo deber\u00eda contener una direcci\u00f3n de correo electr\u00f3nico
 value_should_be_a_number=Este campo deber\u00eda contener un n\u00famero
 number_should_not_have_decimals=The number should not have decimals
-value_not_max=The value is to long/large
-value_not_min=The value is to short/small
+value_not_max=The value is too long/large
+value_not_min=The value is too short/small
 could_not_run_async_validation=No se puede ejecutar el validador as\u00edncrono
 list=Mostrar
 add=A\u00f1adir
@@ -639,6 +639,9 @@ sql_view_refreshed_successfully=SQL view refreshed successfully
 sql_view_refresh_error=Could not refresh SQL query
 cache_strategy=Estrategia de cach\u00e9
 no_cache=Sin cach\u00e9
+cache_1_minute=Cache for 1 minute
+cache_5_minutes=Cache for 5 minutes
+cache_10_minutes=Cache for 10 minutes
 cache_15_minutes=Cach\u00e9 de 15 minutos
 cache_30_minutes=Cache for 30 minutes
 cache_1_hour=Cach\u00e9 por una hora
@@ -1313,8 +1316,8 @@ must_select_one_dataelement=Por favor, seleccione un elemento de dato
 single_event=Evento \u00fanico
 tracked_entity_instances=Instancias de entidad
 dob_type=Tipo de Fecha de Nacimiento
-date_of_enrollment_description=Descripci\u00f3n de la fecha de inscripci\u00f3n
-date_of_incident_description=Descripci\u00f3n de la fecha del incidente
+date_of_enrollment_description=Custom label for enrollment date
+date_of_incident_description=Custom label for incident date
 date_of_enrollment=Fecha de inscripci\u00f3n
 date_of_incident=Fecha del incidente
 male=Masculino
@@ -1389,7 +1392,7 @@ reminder_message_template=Plantillas de mensajes recordatorios
 message=Mensaje
 params=Para\u0301metros
 program_name=Nombre del programa
-program_stage_name=Program stage name
+program_stage_name=Nombre de la etapa del programa
 orgunit_name=Organisation unit name
 days_since_due_date=Days since due date
 schedule_automated_message_reminder=Automated Message Reminder
@@ -2063,6 +2066,10 @@ first=First value (sum in org unit hierarchy)
 first_average_org_unit=First value (averge in org unit hierarchy)
 last_in_period=Last value in period (sum in org unit hierarchy)
 last_in_period_average_org_unit=Last value in period (average in org unit hierarchy)
+last_last_org_unit=Last value in period (last value in org unit hierarchy)
+first_first_org_unit=First value in period  (first value in org unit hierarchy)
+min_sum_org_unit=Min value (sum in org unit hierarchy)
+max_sum_org_unit=Max value (sum in org unit hierarchy)
 program_notification_template=Plantilla de mensaje
 no_notification_template_specified=No notification template specified
 intro_tracked_entity_type=Definir los tipos de entidades que pueden rastrearse a trav\u00e9s del sistema, que pueden ser desde personas hasta mercanc\u00edas.
@@ -2073,8 +2080,8 @@ select_incident_dates_in_future=Allow future incident dates
 display_enrollment_date_label=Display enrollment date label
 display_incident_date_label=Display incident date label
 display_incident_date=Mostrar la fecha del incidente
-incident_date_label=Descripci\u00f3n de la fecha del incidente
-enrollment_date_label=Descripci\u00f3n de la fecha de inscripci\u00f3n
+incident_date_label=Custom label for incident date
+enrollment_date_label=Custom label for enrollment date
 ignore_overdue_events=Ignorar eventos atrasados
 related_program=Related program
 assign_attributes=Assign attributes
@@ -2095,8 +2102,8 @@ block_entry_form=Block entry form after completed
 remind_completed=Pedir al usuario que finalice el programa cuando se haya completado la etapa
 allow_generate_next_visit=Pedir al usuario que cree un nuevo evento cuando se complete la etapa
 generated_by_enrollment_date=Generar eventos en funci\u00f3n de la fecha de inscripci\u00f3n
-execution_date_label=Description of report date
-due_date_label=Descripci\u00f3n de la fecha l\u00edmite
+execution_date_label=Custom label for report date
+due_date_label=Custom label for due date
 min_days_from_start=D\u00edas programados desde el inicio
 pre_generate_uid=Pre-generate event UID
 standard_interval=Intervalo estandar en d\u00edas
@@ -2328,3 +2335,11 @@ registration_organisation_unit=Registration organisation unit
 organisation_unit_field=Organisation unit field
 prevent_adding_new_events_to_stage=Prevent adding new events to stage
 predict_according_to_input_category_option_combo=Predict according to input category option combo
+program_stage_label=Custom label for program stage
+event_label=Custom label for event
+enrollment_label=Custom label for enrollment
+follow_up_label=Custom label for follow-up
+org_unit_label=Custom label for registering unit
+relationship_label=Custom label for relationship
+note_label=Custom label for note
+tracked_entity_attribute_label=Custom label for tracked entity attribute
diff --git a/src/i18n/i18n_module_es_419.properties b/src/i18n/i18n_module_es_419.properties
index c907efc2b..e50bea2ed 100644
--- a/src/i18n/i18n_module_es_419.properties
+++ b/src/i18n/i18n_module_es_419.properties
@@ -542,7 +542,7 @@ frequency=Frequency
 define_associations=Assign to organisation units
 number_of_data_elements=Number of data elements
 define_dataset_associations=Assign data set to organisation units
-assign=Assign
+assign=Asignar
 edit_dataset=Edit data set
 confirm_delete=Are you sure you want to delete this data set?
 duplicate_names=This name is already registered
@@ -1033,7 +1033,7 @@ last_30_days=Last 30 days
 dynamic_attributes=Dynamic Attributes
 user=User
 user_group=User Group
-program=Program
+program=Programa
 program_stage=Program Stage
 tracked_entity=Tracked entity
 positive_integer=Positive Integer
@@ -1124,7 +1124,7 @@ option_management=Option management
 add_option=Add option
 edit_option=Edit option
 sort_options=Sort options
-available_options=Available options
+available_options=Opciones Disponibles
 please_select_a_dataset=Please select a data set
 please_select_an_organisation_unit=Please select an organisation unit
 prev_year=Prev year
@@ -1316,8 +1316,8 @@ must_select_one_dataelement=Please select one data element
 single_event=Single event
 tracked_entity_instances=Tracked entity instances
 dob_type=DOB type
-date_of_enrollment_description=Description of enrollment date
-date_of_incident_description=Description of incident date
+date_of_enrollment_description=Custom label for enrollment date
+date_of_incident_description=Custom label for incident date
 date_of_enrollment=Fecha de inscripci\u00f3n
 date_of_incident=Date of incident
 male=Male
@@ -1674,7 +1674,7 @@ use_optionset_code=Use code for option sets
 entire_system=Entire system
 aggregate_export_category_option_combo=Category option combination for aggregate data export
 aggregate_export_attribute_option_combo=Attribute option combination for aggregate data export
-program_section=Program
+program_section=Programa
 intro_tracked_entity_attribute=Create, modify and view tracked entity attributes. An attribute can be used to register extra information for a tracked entity.
 confidentiality_option_not_available_since_encryption_is_not_configured=Confidentiality option not available since encryption is not configured
 predictor=Predictor
@@ -1844,7 +1844,7 @@ no_manage_access=You do not have manage access to this object.
 the_custom_attribute_will_be_applied_to_the_selected_objects=The custom attribute will be applied to selected objects.
 section=Section
 program_indicator=Program indicator
-no_results_found=No results found
+no_results_found=No se han encontrado resultados
 
 add_program_details=Add program details
 assign_data_elements=Assign data elements
@@ -2066,6 +2066,10 @@ first=First value (sum in org unit hierarchy)
 first_average_org_unit=First value (averge in org unit hierarchy)
 last_in_period=Last value in period (sum in org unit hierarchy)
 last_in_period_average_org_unit=Last value in period (average in org unit hierarchy)
+last_last_org_unit=Last value in period (last value in org unit hierarchy)
+first_first_org_unit=First value in period  (first value in org unit hierarchy)
+min_sum_org_unit=Min value (sum in org unit hierarchy)
+max_sum_org_unit=Max value (sum in org unit hierarchy)
 program_notification_template=Message template
 no_notification_template_specified=No notification template specified
 intro_tracked_entity_type=Define types of entities which can be tracked through the system, which can be anything from persons to commodities.
@@ -2076,8 +2080,8 @@ select_incident_dates_in_future=Allow future incident dates
 display_enrollment_date_label=Display enrollment date label
 display_incident_date_label=Display incident date label
 display_incident_date=Show incident date
-incident_date_label=Description of incident date
-enrollment_date_label=Description of enrollment date
+incident_date_label=Custom label for incident date
+enrollment_date_label=Custom label for enrollment date
 ignore_overdue_events=Ignore overdue events
 related_program=Related program
 assign_attributes=Assign attributes
@@ -2098,8 +2102,8 @@ block_entry_form=Block entry form after completed
 remind_completed=Ask user to complete program when stage is complete
 allow_generate_next_visit=Ask user to create new event when stage is complete
 generated_by_enrollment_date=Generate events based on enrollment date
-execution_date_label=Description of report date
-due_date_label=Description of due date
+execution_date_label=Custom label for report date
+due_date_label=Custom label for due date
 min_days_from_start=Scheduled days from start
 pre_generate_uid=Pre-generate event UID
 standard_interval=Standard interval days
@@ -2107,7 +2111,7 @@ standard_interval=Standard interval days
 analytics_period_boundaries=Analytics period boundaries
 analytics_period_boundary_type=Analytics period boundary type
 analytics_boundary_target=Boundary target
-remove_singular=Remove
+remove_singular=Eliminar
 add_period_boundary=Add new boundary
 period_number_offset=Offset period by amount
 period_offset=Period type
@@ -2331,3 +2335,11 @@ registration_organisation_unit=Registration organisation unit
 organisation_unit_field=Organisation unit field
 prevent_adding_new_events_to_stage=Prevent adding new events to stage
 predict_according_to_input_category_option_combo=Predict according to input category option combo
+program_stage_label=Custom label for program stage
+event_label=Custom label for event
+enrollment_label=Custom label for enrollment
+follow_up_label=Custom label for follow-up
+org_unit_label=Custom label for registering unit
+relationship_label=Custom label for relationship
+note_label=Custom label for note
+tracked_entity_attribute_label=Custom label for tracked entity attribute
diff --git a/src/i18n/i18n_module_fr.properties b/src/i18n/i18n_module_fr.properties
index 17b6b2401..7f7c3f335 100644
--- a/src/i18n/i18n_module_fr.properties
+++ b/src/i18n/i18n_module_fr.properties
@@ -1316,8 +1316,8 @@ must_select_one_dataelement=Veuillez s\u00e9lectionner un \u00e9l\u00e9ment de d
 single_event=Ev\u00e8nement unique
 tracked_entity_instances=Instances d'entit\u00e9s suivies
 dob_type=Type DDN (Date De Naissance)
-date_of_enrollment_description=Description de la date d'inscription
-date_of_incident_description=Description de la date de l'incident
+date_of_enrollment_description=Custom label for enrollment date
+date_of_incident_description=Custom label for incident date
 date_of_enrollment=Date d'inscription
 date_of_incident=Date de l'incident
 male=Masculin
@@ -2066,6 +2066,10 @@ first=Premi\u00e8re valeur (somme dans la hi\u00e9rarchie d'org unit)
 first_average_org_unit=Premi\u00e8re valeur (moyenne dans la hi\u00e9rarchie d'org unit)
 last_in_period=Derni\u00e8re valeur en p\u00e9riode (somme dans la hi\u00e9rarchie d'org unit)
 last_in_period_average_org_unit=Derni\u00e8re valeur en p\u00e9riode (moyenne dans la hi\u00e9rarchie d'org unit)
+last_last_org_unit=Last value in period (last value in org unit hierarchy)
+first_first_org_unit=First value in period  (first value in org unit hierarchy)
+min_sum_org_unit=Min value (sum in org unit hierarchy)
+max_sum_org_unit=Max value (sum in org unit hierarchy)
 program_notification_template=Mod\u00e8le de message
 no_notification_template_specified=Aucun mod\u00e8le de notification sp\u00e9cifi\u00e9
 intro_tracked_entity_type=D\u00e9finir les types d'entit\u00e9s qui peuvent \u00eatre suivies \u00e0 travers le syst\u00e8me, soit n'importe quel type (personnes, produits, etc.)
@@ -2076,8 +2080,8 @@ select_incident_dates_in_future=Permettre dates d'\u00e9v\u00e8nement futures
 display_enrollment_date_label=Display enrollment date label
 display_incident_date_label=Display incident date label
 display_incident_date=Montrer date d'incident
-incident_date_label=Description de la date de l'incident
-enrollment_date_label=Description de la date d'inscription
+incident_date_label=Custom label for incident date
+enrollment_date_label=Custom label for enrollment date
 ignore_overdue_events=Ignorer les \u00e9v\u00e8nements en retard
 related_program=Programme connexe
 assign_attributes=Assigner les attributs
@@ -2098,8 +2102,8 @@ block_entry_form=Bloquer la saisie apr\u00e8s compl\u00e9tion
 remind_completed=Demander l'utilisateur de compl\u00e9ter le programme lorsque le stade est compl\u00e9t\u00e9
 allow_generate_next_visit=Demander \u00e0 l'utilisateur de cr\u00e9er un nouvel \u00e9v\u00e8nement lorsque le stade est compl\u00e9t\u00e9
 generated_by_enrollment_date=G\u00e9n\u00e9rer les \u00e9v\u00e8nements sur la base de la date d'enr\u00f4lement
-execution_date_label=Description de la date de rapport
-due_date_label=Description de la date d'\u00e9ch\u00e9ance
+execution_date_label=Custom label for report date
+due_date_label=Custom label for due date
 min_days_from_start=Jours pr\u00e9vus \u00e0 partir du d\u00e9but
 pre_generate_uid=Pr\u00e9-g\u00e9n\u00e9rer un UID d'\u00e9v\u00e9nement
 standard_interval=Jours d'intervalle standard
@@ -2331,3 +2335,11 @@ registration_organisation_unit=Registration organisation unit
 organisation_unit_field=Organisation unit field
 prevent_adding_new_events_to_stage=Prevent adding new events to stage
 predict_according_to_input_category_option_combo=Predict according to input category option combo
+program_stage_label=Custom label for program stage
+event_label=Custom label for event
+enrollment_label=Custom label for enrollment
+follow_up_label=Custom label for follow-up
+org_unit_label=Custom label for registering unit
+relationship_label=Custom label for relationship
+note_label=Custom label for note
+tracked_entity_attribute_label=Custom label for tracked entity attribute
diff --git a/src/i18n/i18n_module_id.properties b/src/i18n/i18n_module_id.properties
index f5eb52b4c..8f5e27cee 100644
--- a/src/i18n/i18n_module_id.properties
+++ b/src/i18n/i18n_module_id.properties
@@ -276,11 +276,11 @@ value_should_be_empty_string_or_undefined=Value should be empty
 value_should_be_a_url=This field requires a valid url
 value_should_be_a_relative_url=This field requires a relative URL
 value_should_be_list_of_urls=This field requires a list of URLs
-value_should_be_an_email=This field contains an e-mail address
+value_should_be_an_email=This field should contain an e-mail address
 value_should_be_a_number=This field should contain a number
 number_should_not_have_decimals=The number should not have decimals
-value_not_max=The value is to long/large
-value_not_min=The value is to short/small
+value_not_max=The value is too long/large
+value_not_min=The value is too short/small
 could_not_run_async_validation=Unable to run async validator
 list=Daftar
 add=Tambah
@@ -639,6 +639,9 @@ sql_view_refreshed_successfully=SQL view refreshed successfully
 sql_view_refresh_error=Could not refresh SQL query
 cache_strategy=Cache strategy
 no_cache=No cache
+cache_1_minute=Cache for 1 minute
+cache_5_minutes=Cache for 5 minutes
+cache_10_minutes=Cache for 10 minutes
 cache_15_minutes=Cache for 15 minutes
 cache_30_minutes=Cache for 30 minutes
 cache_1_hour=Cache for one hour
@@ -1313,8 +1316,8 @@ must_select_one_dataelement=Silahkan pilih satu elemen data
 single_event=Single event
 tracked_entity_instances=Tracked entity instances
 dob_type=DOB type
-date_of_enrollment_description=Deskripsi tanggal pendaftaran
-date_of_incident_description=Deskripsi tanggal insidensi
+date_of_enrollment_description=Custom label for enrollment date
+date_of_incident_description=Custom label for incident date
 date_of_enrollment=Tanggal pendaftaran
 date_of_incident=Tanggal insidensi
 male=Pria
@@ -2063,6 +2066,10 @@ first=First value (sum in org unit hierarchy)
 first_average_org_unit=First value (averge in org unit hierarchy)
 last_in_period=Last value in period (sum in org unit hierarchy)
 last_in_period_average_org_unit=Last value in period (average in org unit hierarchy)
+last_last_org_unit=Last value in period (last value in org unit hierarchy)
+first_first_org_unit=First value in period  (first value in org unit hierarchy)
+min_sum_org_unit=Min value (sum in org unit hierarchy)
+max_sum_org_unit=Max value (sum in org unit hierarchy)
 program_notification_template=Message template
 no_notification_template_specified=No notification template specified
 intro_tracked_entity_type=Definisikan tipe-tipe entity yang dapat diketahui melalui sistem, yang bisa apa saja dari orang sampai komoditas
@@ -2073,8 +2080,8 @@ select_incident_dates_in_future=Memperbolehkan tanggal insidensi di masa depan
 display_enrollment_date_label=Display enrollment date label
 display_incident_date_label=Display incident date label
 display_incident_date=Tampilkan tanggal insidensi
-incident_date_label=Deskripsi tanggal insidensi
-enrollment_date_label=Deskripsi tanggal pendaftaran
+incident_date_label=Custom label for incident date
+enrollment_date_label=Custom label for enrollment date
 ignore_overdue_events=Ignore overdue events
 related_program=Related program
 assign_attributes=Assign attributes
@@ -2095,8 +2102,8 @@ block_entry_form=Blok formulir entri setelah lengkap
 remind_completed=Tanyakan user untuk menyelesaikan program ketika stage sudah lengkap
 allow_generate_next_visit=Meminta user untuk membuat event baru ketika stage lengkap
 generated_by_enrollment_date=Generate events based on enrollment date
-execution_date_label=Deskripsi tanggal pelaporan
-due_date_label=Description of due date
+execution_date_label=Custom label for report date
+due_date_label=Custom label for due date
 min_days_from_start=Jadwalkan per hari dari awal
 pre_generate_uid=Pre-generate event UID
 standard_interval=Interval hari-hari yang standar
@@ -2327,3 +2334,12 @@ owner_at_end_organisation_unit=Owner at end organisation unit
 registration_organisation_unit=Registration organisation unit
 organisation_unit_field=Organisation unit field
 prevent_adding_new_events_to_stage=Prevent adding new events to stage
+predict_according_to_input_category_option_combo=Predict according to input category option combo
+program_stage_label=Custom label for program stage
+event_label=Custom label for event
+enrollment_label=Custom label for enrollment
+follow_up_label=Custom label for follow-up
+org_unit_label=Custom label for registering unit
+relationship_label=Custom label for relationship
+note_label=Custom label for note
+tracked_entity_attribute_label=Custom label for tracked entity attribute
diff --git a/src/i18n/i18n_module_lo.properties b/src/i18n/i18n_module_lo.properties
index 67092b4ce..8a0831275 100644
--- a/src/i18n/i18n_module_lo.properties
+++ b/src/i18n/i18n_module_lo.properties
@@ -1316,8 +1316,8 @@ must_select_one_dataelement=Please select one data element
 single_event=Single event
 tracked_entity_instances=\u0e95\u0eb4\u0e94\u0e95\u0eb2\u0ea1\u0e82\u0ecd\u0ec9\u0ea1\u0eb9\u0e99
 dob_type=DOB type
-date_of_enrollment_description=Description of enrollment date
-date_of_incident_description=Description of incident date
+date_of_enrollment_description=Custom label for enrollment date
+date_of_incident_description=Custom label for incident date
 date_of_enrollment=Date of enrollment
 date_of_incident=Date of incident
 male=~\u0ec0\u0e9e\u0e94\u0e8a\u0eb2\u0e8d
@@ -2066,6 +2066,10 @@ first=First value (sum in org unit hierarchy)
 first_average_org_unit=First value (averge in org unit hierarchy)
 last_in_period=Last value in period (sum in org unit hierarchy)
 last_in_period_average_org_unit=Last value in period (average in org unit hierarchy)
+last_last_org_unit=Last value in period (last value in org unit hierarchy)
+first_first_org_unit=First value in period  (first value in org unit hierarchy)
+min_sum_org_unit=Min value (sum in org unit hierarchy)
+max_sum_org_unit=Max value (sum in org unit hierarchy)
 program_notification_template=Message template
 no_notification_template_specified=No notification template specified
 intro_tracked_entity_type=Define types of entities which can be tracked through the system, which can be anything from persons to commodities.
@@ -2076,8 +2080,8 @@ select_incident_dates_in_future=Allow future incidence dates
 display_enrollment_date_label=Display enrollment date label
 display_incident_date_label=Display incident date label
 display_incident_date=Show incidence date
-incident_date_label=Description of incident date
-enrollment_date_label=Description of enrollment date
+incident_date_label=Custom label for incident date
+enrollment_date_label=Custom label for enrollment date
 ignore_overdue_events=Ignore overdue events
 related_program=Related program
 assign_attributes=Assign attributes
@@ -2098,8 +2102,8 @@ block_entry_form=Block entry form after completed
 remind_completed=Ask user to complete program when stage is complete
 allow_generate_next_visit=Ask user to create new event when stage is complete
 generated_by_enrollment_date=Generate events based on enrollment date
-execution_date_label=Description of report date
-due_date_label=Description of due date
+execution_date_label=Custom label for report date
+due_date_label=Custom label for due date
 min_days_from_start=Scheduled days from start
 pre_generate_uid=Pre-generate event UID
 standard_interval=Standard interval days
@@ -2331,3 +2335,11 @@ registration_organisation_unit=Registration organisation unit
 organisation_unit_field=Organisation unit field
 prevent_adding_new_events_to_stage=Prevent adding new events to stage
 predict_according_to_input_category_option_combo=Predict according to input category option combo
+program_stage_label=Custom label for program stage
+event_label=Custom label for event
+enrollment_label=Custom label for enrollment
+follow_up_label=Custom label for follow-up
+org_unit_label=Custom label for registering unit
+relationship_label=Custom label for relationship
+note_label=Custom label for note
+tracked_entity_attribute_label=Custom label for tracked entity attribute
diff --git a/src/i18n/i18n_module_nb.properties b/src/i18n/i18n_module_nb.properties
index bcbadabaa..ba4990383 100644
--- a/src/i18n/i18n_module_nb.properties
+++ b/src/i18n/i18n_module_nb.properties
@@ -1316,8 +1316,8 @@ must_select_one_dataelement=Vennligst velg ett dataelement
 single_event=Enkelt hendelse
 tracked_entity_instances=Sporet enhetforekomst
 dob_type=DOB type
-date_of_enrollment_description=Beskrivelse av registreringsdato
-date_of_incident_description=Beskrivelse av forekomstdato
+date_of_enrollment_description=Custom label for enrollment date
+date_of_incident_description=Custom label for incident date
 date_of_enrollment=Dato for registrering
 date_of_incident=Dato for forekomst
 male=Mann
@@ -2066,6 +2066,10 @@ first=F\u00f8rste verdi  (sum i org enhetshierarki)
 first_average_org_unit=F\u00f8rste verdi (sum i org enhetshierarki)
 last_in_period=Siste verdi i periode (sum i org enhetshierarki)
 last_in_period_average_org_unit=Siste verdi i periode (gjennomsnitt i org enhetshierarki)
+last_last_org_unit=Last value in period (last value in org unit hierarchy)
+first_first_org_unit=First value in period  (first value in org unit hierarchy)
+min_sum_org_unit=Min value (sum in org unit hierarchy)
+max_sum_org_unit=Max value (sum in org unit hierarchy)
 program_notification_template=Meldingsmal
 no_notification_template_specified=Ingen varselmal er spesifisert
 intro_tracked_entity_type=Definer typer enheter som kan spores gjennom systemet, som kan v\u00e6re alt fra personer til varer.
@@ -2076,8 +2080,8 @@ select_incident_dates_in_future=Tillat fremtidige forekomstdatoer
 display_enrollment_date_label=Display enrollment date label
 display_incident_date_label=Display incident date label
 display_incident_date=Vis forekomstdato
-incident_date_label=Beskrivelse av forekomstdato
-enrollment_date_label=Beskrivelse av registreringsdato
+incident_date_label=Custom label for incident date
+enrollment_date_label=Custom label for enrollment date
 ignore_overdue_events=Ignorer forfalte hendelser
 related_program=Relatert program
 assign_attributes=Tildel attributter
@@ -2098,8 +2102,8 @@ block_entry_form=Blokk registreringsskjema etter fullf\u00f8ring
 remind_completed=Sp\u00f8r brukeren \u00e5 fullf\u00f8re programmet n\u00e5r fasen er fullf\u00f8rt
 allow_generate_next_visit=Sp\u00f8r brukeren om \u00e5 opprette en ny hendelse n\u00e5r fasen er fullf\u00f8rt
 generated_by_enrollment_date=Generer hendelser basert p\u00e5 registreringsdato
-execution_date_label=Beskrivelse av rapportdato
-due_date_label=Beskrivelse av forfallsdato
+execution_date_label=Custom label for report date
+due_date_label=Custom label for due date
 min_days_from_start=Planlagte dager fra start
 pre_generate_uid=For generer UID for hendelser
 standard_interval=Standard intervalldager
@@ -2331,3 +2335,11 @@ registration_organisation_unit=Registration organisation unit
 organisation_unit_field=Organisation unit field
 prevent_adding_new_events_to_stage=Forhindre \u00e5 legge til nye hendelser i fase
 predict_according_to_input_category_option_combo=Predict according to input category option combo
+program_stage_label=Custom label for program stage
+event_label=Custom label for event
+enrollment_label=Custom label for enrollment
+follow_up_label=Custom label for follow-up
+org_unit_label=Custom label for registering unit
+relationship_label=Custom label for relationship
+note_label=Custom label for note
+tracked_entity_attribute_label=Custom label for tracked entity attribute
diff --git a/src/i18n/i18n_module_pt_BR.properties b/src/i18n/i18n_module_pt_BR.properties
index a4e187e2f..8ecec3868 100644
--- a/src/i18n/i18n_module_pt_BR.properties
+++ b/src/i18n/i18n_module_pt_BR.properties
@@ -1,6 +1,6 @@
 
 aggregate=Agregar
-tracker=Tracker
+tracker=Rastreador
 no_option_assigned=Uso da categoria com uma op\u00e7\u00e3o vazia n\u00e3o \u00e9 permitido\!
 number_of_category_options=N\u00famero de op\u00e7\u00f5es de categorias
 number_of_categories=N\u00famero de categorias
@@ -11,9 +11,9 @@ available_categories=Categorias dispon\u00edveis
 category_management=Gest\u00e3o de categoria de elemento de dado
 category_combo_management=Gest\u00e3o de combina\u00e7\u00e3o de categoria de elemento de dado
 create_new_data_element_category_combo=Criar nova combina\u00e7\u00e3o de categoria de elemento de dado
-confirm_delete_category_option=Are you sure you want to delete this category option?
-confirm_delete_category=Are you sure you want to delete this category?
-confirm_delete_category_combo=Are you sure you want to delete this category combination?
+confirm_delete_category_option=Tem certeza de que deseja excluir esta op\u00e7\u00e3o de categoria?
+confirm_delete_category=Tem certeza de que deseja excluir esta categoria?
+confirm_delete_category_combo=Tem certeza de que deseja excluir esta combina\u00e7\u00e3o de categorias?
 edit_data_element_category=Editar categoria de elemento de dado
 edit_data_element_category_combo=Criar nova combina\u00e7\u00e3o de categoria de elemento de dado
 category_combination=Combina\u00e7\u00e3o de categorias
@@ -54,11 +54,11 @@ edit_numerator=Editar numerador
 edit_denominator=Editar denominador
 confirm_delete_data_element=Tem certeza de que deseja excluir este elemento de dados?
 confirm_delete_data_element_group=Tem certeza de que deseja excluir este grupo de elemento de dados?
-confirm_delete_data_element_group_set=Are you sure you want to delete this data element group set?
+confirm_delete_data_element_group_set=Tem certeza de que deseja excluir este conjunto de grupos de elementos de dados?
 confirm_delete_indicator_group=Tem certeza de que deseja excluir este grupo indicador?
 confirm_delete_indicator_type=Tem certeza de que deseja excluir este tipo de indicador?
 confirm_delete_data_dictionary=Tem certeza de que deseja excluir este dicion\u00e1rio de dados?
-confirm_delete_indicator_group_set=Are you sure you want to delete this indicator group set?
+confirm_delete_indicator_group_set=Tem certeza de que deseja excluir este conjunto de grupos de indicadores?
 everything_is_ok=Tudo est\u00e1 OK
 adding_data_element_group_failed=Adi\u00e7\u00e3o do grupo de elemento de dados falhou com a seguinte mensagem
 saving_data_element_group_failed=Salvar o grupo de elemento de dados falhou com a seguinte mensagem
@@ -71,10 +71,10 @@ available_dataelements=Elementos de dados dispon\u00edveis
 selected_dataelements=Elementos de dados selecionados
 add_selected=Adicionar seleccionado
 remove_all=Remover todos trancados
-assign_all=Assign all
+assign_all=Atribuir tudo
 create_new_data_dictionary=Criar novo dicion\u00e1rio de dado
 region=Regi\u00e3o
-select_domain_type=Select domain type
+select_domain_type=Selecione o tipo de dom\u00ednio
 current=Corrente
 date=Data
 selected_data_elements=Elementos de dados selecionados
@@ -113,7 +113,7 @@ must_include_category_option=Por favor, inclua uma ou mais op\u00e7\u00f5es cate
 specify_category_option_name=Por favor, especifique um nome de op\u00e7\u00e3o da categoria
 category_option_name_already_exists=Nome da op\u00e7\u00e3o de categoria j\u00e1 existente
 data_element_group_set=Conjunto de grupo elemento de dado
-data_element_group_set_management=Data element group set management
+data_element_group_set_management=Gerenciamento de conjunto de grupos de elementos de dados
 indicator_group_set=Conjunto de grupo de indicador
 name_aldready_exists=Nome j\u00e1 existe\!
 available_dataelementgroup=Grupos Elemento de dados dispon\u00edveis
@@ -134,11 +134,11 @@ intro_data_element=Criar, modificar, exibir e excluir elementos de dados. Elemen
 intro_data_element_group=Criar, modificar, exibir e excluir grupos de elementos de dados. Grupos s\u00e3o usados \u200b\u200bpara melhor an\u00e1lise.
 intro_data_element_group_editor=Facilmente adicionar ou remover elementos de dados de e para grupos de elementos de dados, bem como elementos de dados apagados.
 intro_data_element_group_set=Criar, modificar, visualizar e excluir conjuntos de dados do grupo do elemento. Conjuntos de grupo s\u00e3o utilizadas para uma melhor an\u00e1lise.
-intro_category_option=Create, modify, view and delete category options. Category options are options with in category.
-intro_category=Create, modify, view and delete data element categories. Categories are used for disaggregation of data elements.
-intro_category_combo=Create, modify, view and delete category combinations.
-intro_category_option_group=Create, modify, view and delete category option groups, which can be used to classify category options.
-intro_category_option_group_set=Create, modify, view and delete category option group sets, which can be used for improved data analysis.
+intro_category_option=Crie, modifique, visualize e exclua op\u00e7\u00f5es de categoria. As op\u00e7\u00f5es de categoria s\u00e3o op\u00e7\u00f5es dentro da categoria.
+intro_category=Criar, modificar, visualizar e excluir categorias de elementos de dados. As categorias s\u00e3o usadas para desagrega\u00e7\u00e3o de elementos de dados.
+intro_category_combo=Crie, modifique, visualize e exclua combina\u00e7\u00f5es de categorias.
+intro_category_option_group=Crie, modifique, exiba e exclua grupos de op\u00e7\u00f5es de categoria, que podem ser usados \u200b\u200bpara classificar op\u00e7\u00f5es de categoria.
+intro_category_option_group_set=Crie, modifique, visualize e exclua conjuntos de grupos de op\u00e7\u00f5es de categoria, que podem ser usados \u200b\u200bpara melhorar a an\u00e1lise de dados.
 intro_indicator=Criar, modificar, exibir e excluir indicadores. Um indicador \u00e9 uma f\u00f3rmula composta de elementos de dados e n\u00fameros.
 intro_indicator_type=Criar, modificar, exibir e excluir tipos de indicadores. Um tipo de indicador \u00e9 um fator de um indicador, como percentuais.
 intro_indicator_group=Criar, modificar, visualizar e excluir grupos de indicadores. Grupos s\u00e3o usados \u200b\u200bpara melhor an\u00e1lise.
@@ -173,8 +173,8 @@ view_2=Vista 2
 zero_is_significant=Armazenar valor de dado com zero
 form_name=Nome do formul\u00e1rio
 compulsory=Obrigat\u00f3rio
-data_dimension=Data dimension
-include_subhierarchy_in_analytics=Include subhierarchy in analytics
+data_dimension=Dimens\u00e3o dos dados
+include_subhierarchy_in_analytics=Incluir sub-hierarquia nas an\u00e1lises
 select_group=Seleccione o grupo
 option_set=Conjunto de op\u00e7\u00f5es
 please_select=Por favor seleccione
@@ -184,105 +184,105 @@ legend_sets=Legendas
 skip_total=Saltar categorias totais em relat\u00f3rios
 data_element_category_option=Elemento de dados Op\u00e7\u00e3o da categoria de Elementos de Dados
 category_option_management=Gest\u00e3o da Categoria de Elementos de Dados
-category_option_combo_management=Category option combination management
+category_option_combo_management=Gerenciamento de combina\u00e7\u00e3o de op\u00e7\u00f5es de categoria
 create_new_data_element_category_option=Criar nova op\u00e7\u00e3o de categoria de elemento de dados
 edit_data_element_category_option=Editar op\u00e7\u00e3o da categoria de elemento de dados
 available_category_options=Op\u00e7\u00f5es de categoria dispon\u00edveis
 selected_category_options=Op\u00e7\u00f5es categoria selecionada
-use_as_data_dimension=Use as data dimension
-tip=Tip
-use=use
-dimension_type=Dimension type
-disaggregation=Disaggregation
+use_as_data_dimension=Utilizar como dimens\u00e3o de dados
+tip=Dica
+use=Utilizar
+dimension_type=Tipo de dimens\u00e3o
+disaggregation=Desagrega\u00e7\u00e3o
 attribute=Atributo
-confirm_delete_attribute=Do you want to delete this attribute?
-option_set_for_data_values=Option set for data values
-comment_option_set=Option set for comments
-organisation_unit_counts=Org unit counts
+confirm_delete_attribute=Deseja excluir este atributo?
+option_set_for_data_values=Conjunto de op\u00e7\u00f5es para valores de dados
+comment_option_set=Conjunto de op\u00e7\u00f5es para coment\u00e1rios
+organisation_unit_counts=Contagens de unidades organizacionais
 reporting_rates=Taxas de relat\u00f3rio
 category_option=Opc\u00e7\u00f5es de categorias
 category=Categoria
 category_combo=Combina\u00e7\u00f5es de categoria
-category_option_group=Category option group
-category_option_group_management=Category option group management
-create_new_category_option_group=Create new category option group
-edit_category_option_group=Edit category option group
-confirm_delete_category_option_group=Are you sure you want to delete this category option group?
-category_option_group_set=Category option group set
-category_option_group_set_management=Category option group set management
-create_new_category_option_group_set=Create new category option group set
-edit_category_option_group_set=Edit category option group set
-available_category_option_groups=Available category option groups
-selected_category_option_groups=Selected category option groups
-confirm_delete_category_option_group_set=Are you sure you want to delete this category option group set?
-show_more_options=Show more options
-show_fewer_options=Show fewer options
+category_option_group=Grupo de op\u00e7\u00f5es de categoria
+category_option_group_management=Gerenciamento de grupo de op\u00e7\u00f5es de categoria
+create_new_category_option_group=Criar novo grupo de op\u00e7\u00f5es de categoria
+edit_category_option_group=Editar grupo de op\u00e7\u00f5es de categoria
+confirm_delete_category_option_group=Tem certeza de que deseja excluir este grupo de op\u00e7\u00f5es de categoria?
+category_option_group_set=Conjunto de grupos de op\u00e7\u00f5es de categoria
+category_option_group_set_management=Gerenciamento de conjunto de grupos de op\u00e7\u00f5es de categoria
+create_new_category_option_group_set=Criar novo conjunto de grupos de op\u00e7\u00f5es de categoria
+edit_category_option_group_set=Editar conjunto de grupos de op\u00e7\u00f5es de categoria
+available_category_option_groups=Grupos de op\u00e7\u00f5es de categoria dispon\u00edveis
+selected_category_option_groups=Grupos de op\u00e7\u00f5es de categoria selecionados
+confirm_delete_category_option_group_set=Tem certeza de que deseja excluir este conjunto de grupos de op\u00e7\u00f5es de categoria?
+show_more_options=Mostrar mais op\u00e7\u00f5es
+show_fewer_options=Mostrar poucas op\u00e7\u00f5es
 id=Id
 min=Min
 max=M\u00e1x
-category_option_combo=Category option combination
-intro_category_option_combo=View and edit category option combinations. Category option combinations are break-downs of category.
-edit_data_element_category_option_combo=Edit data element category option combo
-approve_data=Approve data
-decimals_in_data_output=Decimals in data output
-categories=Categories
-ignore_data_approval=Ignore data approval
-data_dimension_type=Data dimension type
+category_option_combo=Combina\u00e7\u00e3o de op\u00e7\u00f5es de categoria
+intro_category_option_combo=Ver e editar combina\u00e7\u00f5es de op\u00e7\u00f5es de categoria. As combina\u00e7\u00f5es de op\u00e7\u00f5es de categoria s\u00e3o desagrega\u00e7\u00f5es de categoria.
+edit_data_element_category_option_combo=Editar combina\u00e7\u00e3o de op\u00e7\u00f5es de categoria de elemento de dados
+approve_data=Aprovar dados
+decimals_in_data_output=Decimais na sa\u00edda de dados
+categories=Categorias
+ignore_data_approval=Ignorar aprova\u00e7\u00e3o de dados
+data_dimension_type=Tipo de dimens\u00e3o de dados
 indicator_type=Tipo de Indicador
-indicator_group_set_management=Indicator group set management
-of_page=of
-management=management
-search_by_name=Search by name
-search_by_name_code_id=Search by name, code or id
-press_enter_to_search=(Press enter to search)
+indicator_group_set_management=Gerenciamento de conjunto de grupos de indicadores
+of_page=de
+management=gest\u00e3o
+search_by_name=Pesquisar por nome
+search_by_name_code_id=Pesquise por nome, c\u00f3digo ou ID
+press_enter_to_search=(Pressione enter para pesquisar)
 filter_menu_items_by_name=Filtrar por nome
-press_enter_to_go_to_first=(Press enter to go to first item)
-search_available=Search available
-search_selected=Search selected
-required=(required)
-aggregation_type=Aggregation type
-ok=Ok
-dismiss=Dismiss
+press_enter_to_go_to_first=(Pressione enter para ir para o primeiro item)
+search_available=Pesquisa dispon\u00edvel
+search_selected=Pesquisa selecionada
+required=(requeridas)
+aggregation_type=Tipo de agregac\u00e3o
+ok=Esta bem
+dismiss=Dispensar
 description=Descri\u00e7\u00e3o
-search_available_selected_items=Search available/selected items
-tracked_entity_type_attributes=Tracked entity type attributes
-program_tracked_entity_attributes=Program tracked entity attributes
-search_available_program_tracked_entity_attributes=Search available/selected program tracked entity attributes
-search_available_tracked_entity_type_attributes=Search available/selected tracked entity type attributes
-selected=selected
+search_available_selected_items=Pesquisar itens dispon\u00edveis / selecionados
+tracked_entity_type_attributes=Atributos de tipo de entidade rastreados
+program_tracked_entity_attributes=Atributos de entidade rastreada pelo programa
+search_available_program_tracked_entity_attributes=Pesquisar atributos de entidade rastreados pelo programa dispon\u00edvel / selecionado
+search_available_tracked_entity_type_attributes=Pesquisar atributos de tipo de entidade rastreada dispon\u00edveis/selecionados
+selected=selecionado
 indicators=Indicadores
-category_option_groups=Category Option Groups
+category_option_groups=Grupos de op\u00e7\u00f5es de categoria
 annualized=Anualizado
-decimals=Decimals in data output
+decimals=Decimais na sa\u00edda de dados
 constants=Constantes
-sharing=Sharing
+sharing=Compartilhamento
 search=Pesquisar
-program_tracked_entity_attributes=Program tracked entity attributes
+program_tracked_entity_attributes=Atributos de entidade rastreada pelo programa
 program_indicators=Indicadores
 program_data_elements=Elementos de Dados
 please_select_a_program=Por favor, seleccione um programa
-no_tracked_entity_attributes=No tracked entity attributes for this program
-no_program_indicators=No program indicators for this program
-no_program_data_elements=No program data elements for this program
-members=Members
-can_edit=Can Edit
-hidden_by_filters=hidden by filters
+no_tracked_entity_attributes=Nenhum atributo de entidade rastreado para este programa
+no_program_indicators=N\u00e3o h\u00e1 indicadores de programa para este programa
+no_program_data_elements=N\u00e3o h\u00e1 elementos de dados do programa para este programa
+members=Membros
+can_edit=Pode editar
+hidden_by_filters=oculto por filtros
 value_type=Tipo de Valor
 value_required=Este campo \u00e9 obrigatorio
-value_not_unique=This field requires a unique value
-option_name_must_be_unique=Name must be unique within an option set
-option_code_must_be_unique=Code must be unique within an option set
-value_should_be_empty_string_or_undefined=Value should be empty
-value_should_be_a_url=This field requires a valid url
-value_should_be_a_relative_url=This field requires a relative URL
-value_should_be_list_of_urls=This field requires a list of URLs
-value_should_be_an_email=This field contains an e-mail address
-value_should_be_a_number=This field should contain a number
-number_should_not_have_decimals=The number should not have decimals
-value_not_max=The value is to long/large
-value_not_min=The value is to short/small
-could_not_run_async_validation=Unable to run async validator
-list=List
+value_not_unique=Este campo requer um valor \u00fanico
+option_name_must_be_unique=O nome deve ser exclusivo dentro de um conjunto de op\u00e7\u00f5es
+option_code_must_be_unique=O c\u00f3digo deve ser exclusivo dentro de um conjunto de op\u00e7\u00f5es
+value_should_be_empty_string_or_undefined=O valor deve estar vazio
+value_should_be_a_url=Este campo requer um URL v\u00e1lido
+value_should_be_a_relative_url=Este campo requer um URL relativo
+value_should_be_list_of_urls=Este campo requer uma lista de URLs
+value_should_be_an_email=Este campo deve conter um endere\u00e7o de email
+value_should_be_a_number=Este campo deve conter um n\u00famero
+number_should_not_have_decimals=O n\u00famero n\u00e3o deve ter decimais
+value_not_max=O valor \u00e9 longo / grande
+value_not_min=O valor \u00e9 curto / pequeno
+could_not_run_async_validation=N\u00e3o foi poss\u00edvel executar o validador ass\u00edncrono
+list=Lista
 add=Adicionar
 done=done
 letter=Carta
@@ -290,52 +290,52 @@ boolean=Sim/N\u00e3o
 true_only=Sim apenas
 file_resource=Arquivo
 integer_positive=Inteiro posetivo
-integer_zero_or_positive=Positive or Zero Integer
-coordinate=Coordinate
+integer_zero_or_positive=N\u00famero inteiro positivo ou zero
+coordinate=Coordenada
 integer_negative=Inteiro negativo
 integer=Inteiro
-datetime=Date & Time
-time=Time
-tracker_associate=Tracker Associate
-average_sum_org_unit=Average (sum in org unit hierarchy)
-average_sum_int=Average (sum of numbers)
-average_sum_int_disaggregation=Average (sum of numbers, disaggregation)
-average_int=Average (number)
-average_int_disaggregation=Average (number, disaggregation)
-average_bool=Average (Yes/No)
-created=Created
+datetime=Data & Hora 
+time=Tempo
+tracker_associate=Rastreio associado 
+average_sum_org_unit=M\u00e9dia (soma na hierarquia da unidade organizacional)
+average_sum_int=M\u00e9dia (soma dos n\u00fameros)
+average_sum_int_disaggregation=M\u00e9dia (soma de n\u00fameros, desagrega\u00e7\u00e3o)
+average_int=M\u00e9dia (n\u00famero)
+average_int_disaggregation=M\u00e9dia (n\u00famero, desagrega\u00e7\u00e3o)
+average_bool=M\u00e9dia (Sim / N\u00e3o)
+created=Criado
 display_description=Descri\u00e7\u00e3o
 details=Mostrar detalhes
 share=Defini\u00e7\u00f5es de partilha
-metadata_management_overview=Metadata management overview
-metadata_group_editor=Metadata group editor
-select_an_object_type=Select an object type
+metadata_management_overview=Vis\u00e3o geral do gerenciamento de metadados
+metadata_group_editor=Editor de grupo de metadados
+select_an_object_type=Selecione um tipo de objeto
 back=Voltar
 view=Vizualizar
-was_not_deleted=was not deleted
-was_deleted=was deleted
-select_locale=Select locale
+was_not_deleted=n\u00e3o foi exclu\u00eddo
+was_deleted=foi exclu\u00eddo
+select_locale=Selecionar local
 translation_dialog_title=Traduzir
-translation_saved=Translation saved
-translation_save_error=Could not save the translation.
-organisation_unit_assignment_saved=Organisation unit assignment saved
-organisation_unit_assignment_save_error=Failed to save organisation unit assignment
-deselect=Deselect
+translation_saved=Tradu\u00e7\u00e3o salva
+translation_save_error=N\u00e3o foi poss\u00edvel salvar a tradu\u00e7\u00e3o.
+organisation_unit_assignment_saved=Atribui\u00e7\u00e3o de unidade organizacional salva
+organisation_unit_assignment_save_error=Falha ao salvar a atribui\u00e7\u00e3o da unidade organizacional
+deselect=Desmarcar
 select_all=Seleccione todos
-deselect_all=Deselect all
-select_a_locale_to_enter_translations_for_that_language=Select a locale to enter translations for
+deselect_all=Desmarcar todos
+select_a_locale_to_enter_translations_for_that_language=Selecione um local para inserir tradu\u00e7\u00f5es para
 data_set_management=Gest\u00e3o de conjunto de dados
 data_set=Conjunto de dados
 intro_data_set=Criar, actualizar, visualizar e excluir conjuntos de dados e formul\u00e1rios personalizados. Um conjunto de dados \u00e9 uma colec\u00e7\u00e3o de elementos de dados para o qual os dados s\u00e3o inseridos.
-intro_data_set_notification_template=Create, update, view, and delete data set notifications.
+intro_data_set_notification_template=Crie, atualize, visualize e apague notifica\u00e7\u00f5es do conjunto de dados.
 compulsoryDataElements=Editar elementos de dados obrigat\u00f3rios
-sectionForm=Manage sections
+sectionForm=Gerenciar se\u00e7\u00f5es
 dataEntryForm=Desenho de formul\u00e1rio de entrada de dados
-pdfDataSetForm=Get PDF for data entry
-runNow=Run now
-preview=Preview
-saved_compulsory_data_elements=Saved compulsory data elements
-failed_to_save_compulsory_data_elements=Could not save compulsory data elements
+pdfDataSetForm=Obter PDF para entrada de dados
+runNow=Executar agora
+preview=Pr\u00e9-visualiza\u00e7\u00e3o
+saved_compulsory_data_elements=Elementos de dados obrigat\u00f3rios salvos
+failed_to_save_compulsory_data_elements=N\u00e3o foi poss\u00edvel salvar os elementos de dados obrigat\u00f3rios
 create_new_root=Are you sure you want to create a new root organisation unit?
 create_new_organisation_unit=Create new organisation unit
 registers_data=Dados do registo
@@ -449,7 +449,7 @@ indicator_section=Indicador
 organisation_unit_section=Unidade organizacional
 category_section=Categoria
 href=Api URL
-actions=Actions
+actions=Ac\u00e7\u00f5es
 move_$$ouCount$$_organisation_units=Move $$ouCount$$ organisation units
 successfully_moved_$$ouName$$=Successfully moved $$ouName$$
 failed_to_move_$$ouName$$_($$errorMessage$$)=Failed to move $$ouName$$ ($$errorMessage$$)
@@ -484,19 +484,19 @@ organisation_unit_attribute=Unidade organizacional
 organisation_unit_group_attribute=Grupo de Unidade de Organiza\u00e7\u00e3o
 organisation_unit_group_set_attribute=Conjunto de Grupo Unidade Organizacional
 user_attribute=Utilizador
-user_group_attribute=User group
+user_group_attribute=Grupo de usu\u00e1rios
 program_attribute=Atributo do Programa
-program_stage_attribute=Program stage
-tracked_entity_attribute=Tracked entity attribute
-tracked_entity_type=Tracked entity type
+program_stage_attribute=Est\u00e1gio do programa
+tracked_entity_attribute=Atributo de entidade rastreada
+tracked_entity_type=Tipo de entidade rastreada
 tracked_entity_type_management=Tracked entity type management
 tracked_entity_attribute_attribute=Tracked entity attribute attribute
 tracked_entity_attribute_group=Attribute group
 tracked_entity_attribute_group_management=Tracked entity attribute group management
 category_option_attribute=Opc\u00e7\u00f5es de categorias
 category_option_combo_attribute=Category option combo
-category_option_group_attribute=Category option group
-document_attribute=Document
+category_option_group_attribute=Grupo de op\u00e7\u00f5es de categoria
+document_attribute=Documento
 option_attribute=Op\u00e7\u00e3o
 option_set_attribute=Conjunto de op\u00e7\u00f5es
 constant_attribute=Constante
@@ -639,6 +639,9 @@ sql_view_refreshed_successfully=SQL view refreshed successfully
 sql_view_refresh_error=Could not refresh SQL query
 cache_strategy=Estrat\u00e9gia de cache
 no_cache=Sem cache
+cache_1_minute=Cache for 1 minute
+cache_5_minutes=Cache for 5 minutes
+cache_10_minutes=Cache for 10 minutes
 cache_15_minutes=Cache for 15 minutes
 cache_30_minutes=Cache for 30 minutes
 cache_1_hour=Cache for one hour
@@ -651,7 +654,7 @@ materialized_view=Materialized view
 query=Query
 sql_query_error=Could not execute SQL
 view_data_for=Ver dados para
-download_as=Download as
+download_as=Baixar como
 excel=Excel
 csv=CSV
 pdf=PDF
@@ -1032,7 +1035,7 @@ user=Utilizador
 user_group=Grupo de utilizadores
 program=Programa
 program_stage=Est\u00e1gio do Programa
-tracked_entity=Tracked entity
+tracked_entity=Entidade rastreada
 positive_integer=Inteiro posetivo
 negative_integer=Inteiro negativo
 create_new_attribute=Adicionar Atributo
@@ -1110,7 +1113,7 @@ data_monitoring=Data monitoring
 data_monitoring_strategy=Data monitoring strategy
 last_hour=Last hour
 last_year_daily=Last year daily
-disabled=Disabled
+disabled=Desabilitar
 data_synchronization=Data synchronization
 data_synchronization_strategy=Data synchronization strategy
 sms_scheduler_strategy= SMS scheduler strategy
@@ -1133,8 +1136,8 @@ remove_expired_invitations=Remove expired invitations
 view_name=View name
 user_account_invitations=User account invitations
 pending_invitations=Pending invitations
-expired_invitations=Expired invitations
-document=Document
+expired_invitations=Convites expirados
+document=Documento
 invalid_category_combos=Invalid category combinations
 delete=Apagar este formul\u00e1rio
 all_fields_for_data_element_required=Todos campos de elementos de dados s\u00e3o obrigat\u00f3rios
@@ -1313,8 +1316,8 @@ must_select_one_dataelement=Por favor, especifique um elemento de dados
 single_event=Evento \u00fanico
 tracked_entity_instances=Tracked entity instances
 dob_type=Tipo de Data de Nascimento
-date_of_enrollment_description=Descri\u00e7\u00e3o da data de inscri\u00e7\u00e3o
-date_of_incident_description=Descri\u00e7\u00e3o da data do incidente
+date_of_enrollment_description=Custom label for enrollment date
+date_of_incident_description=Custom label for incident date
 date_of_enrollment=Data de Inscri\u00e7\u00e3o
 date_of_incident=Data do incidente
 male=Masculino
@@ -1482,9 +1485,9 @@ create_new_program_indicator=Create new program indicator
 update_program_indicator=Edit program indicator
 program_indicator_attribute=Program indicator
 disable_registration_fields=Disable registration fields
-data_entry=Data entry
+data_entry=Entrada de dados
 combine=Combine
-completed=Completed
+completed=Conclu\u00eddo
 events=Events
 allow_enrollment_at_all_orgunits=Allow enrollment at all org units
 other_program_stages=Other program stages
@@ -1493,7 +1496,7 @@ or_operator=OR
 combine_operator=COMBINE
 filter_by_type=Filter by type
 orgunit_group=Grupo de Unidade de Organiza\u00e7\u00e3o
-enrollement_date=Enrollment date
+enrollement_date=Data de inscri\u00e7\u00e3o
 days_since_incident_date=Days since incident date
 view_all=Ver tudo
 tracked_entity_attribute_visit_schedule=Attribute Visit Schedule
@@ -1557,7 +1560,7 @@ is_hidden=Is hidden ?
 default_value=Default value
 dashboard_shortcut_to_add_relative=Shortcut link to add a relative
 shortcut_link_label_eg_add_child=Shortcut link label (e.g. Add child)
-relationship=Relationship
+relationship=Rela\u00e7\u00e3o
 select_at_least_one_scope=Select at least one scope for local id
 scheduling_of_events=Scheduling of events
 view_validation_criteria=View validation criteria
@@ -1576,7 +1579,7 @@ display_in_list_no_program=Display in list without program
 manage_attributes_with_no_program=Manage attributes with no program
 manage_attributes_for_visit_schedule=Manage attributes for visit schedule
 tracked_entity_attributes_displayed_in_list=Tracked entity attributes displayed in list
-tracked_entity_management=Tracked entity management
+tracked_entity_management=Gerenciamento de entidade rastreada
 create_new_tracked_entity=Create new tracked entity
 tracked_entity_details=Tracked entity details
 edit_tracked_entity=Edit tracked entity
@@ -1640,18 +1643,18 @@ expression_items=Expression items
 filter_items=Filter items
 filter_description=Filter description
 select_program_stage=Select program stage
-tei_attribute=Tracked entity attribute
+tei_attribute=Atributo de entidade rastreada
 design_custom_registration_form=Design custom registration form
 program_registration_form=Program registration form
 display_in_form=Display in form
-event=Event
-enrollment=Enrollment
-tracked_entity_instance=Tracked entity instance
+event=Evento
+enrollment=Inscri\u00e7\u00e3o
+tracked_entity_instance=Inst\u00e2ncia de entidade rastreada
 event_output_type=Event output type
 missing_value_replacement=Missing value replacement
 display_front_page_list=Display front page list
 access_level=Access level
-open=Open
+open=Abrir
 audited=Audited
 protected=Protected
 closed=Closed
@@ -1674,7 +1677,7 @@ aggregate_export_attribute_option_combo=Attribute option combination for aggrega
 program_section=Programa
 intro_tracked_entity_attribute=Create, modify and view tracked entity attributes. An attribute can be used to register extra information for a tracked entity.
 confidentiality_option_not_available_since_encryption_is_not_configured=Confidentiality option not available since encryption is not configured
-predictor=Predictor
+predictor=Preditor
 intro_predictor=Create predictors which can be used to predict future data values.
 predictor_management=Predictor management
 predictor_group=Predictor group
@@ -1735,9 +1738,9 @@ before_layer_id=Before layer id
 legend_set_url=Legend image URL
 confirm_delete_external_map_layer=Are you sure you want to delete this external map layer?
 sharing_settings=Defini\u00e7\u00f5es de partilha
-created_by=Created by
+created_by=Criado por
 search_for_user_groups=Pesquisar por grupos de utilizadores
-external_access=External access
+external_access=Acesso externo
 can_view=Consegue ver
 override_data_element_category_combo=Override data element category combo
 no_override=<No override>
@@ -1787,7 +1790,7 @@ description_is_required=Description is required
 expression_is_required=Expression is required
 data_input_periods=Data input periods
 day=Day
-week=Week
+week=Semana
 month=M\u00eas
 jan=Janeiro
 feb=Fevereiro
@@ -1822,26 +1825,26 @@ oct-mar=October-March
 year=Ano
 closing_date=Closing date
 
-who_has_access=Who has access
-no_author=No author
-no_access=No access
-public_access=Public access
-can_view_only=Can view only
+who_has_access=Quem tem acesso\n
+no_author=Sem autor
+no_access=Sem acesso
+public_access=Acesso p\u00fablico
+can_view_only=S\u00f3 pode ver
 can_edit_and_view=Consegue Editar e Visualizar
-can_capture_and_view=Can capture and view
-metadata=Metadata
+can_capture_and_view=Pode capturar e visualizar
+metadata=Metadados
 
-anyone_can_find_and_view=Anyone can find and view
-anyone_can_view_without_a_login=Anyone can view without a login
-anyone_can_find_view_and_edit=Anyone can find, view and edit
-add_users_and_user_groups=Add users and user groups
-enter_names=Enter names
-no_manage_access=You do not have manage access to this object.
+anyone_can_find_and_view=Qualquer pessoa pode encontrar e visualizar
+anyone_can_view_without_a_login=Qualquer pessoa pode visualizar sem fazer login
+anyone_can_find_view_and_edit=Qualquer pessoa pode encontrar, visualizar e editar
+add_users_and_user_groups=Adicionar usu\u00e1rios e grupos de usu\u00e1rios
+enter_names=Digite nomes
+no_manage_access=N\u00e3o tem acesso para gerir esse objeto.
 
 the_custom_attribute_will_be_applied_to_the_selected_objects=The custom attribute will be applied to selected objects.
-section=Section
+section=Se\u00e7\u00e3o
 program_indicator=Program indicator
-no_results_found=No results found
+no_results_found=Nenhum resultado encontrado
 
 add_program_details=Add program details
 assign_data_elements=Assign data elements
@@ -1880,11 +1883,11 @@ category_combo___display_name=Category combo
 domainType=Tipo de dom\u00ednio
 valueType=Tipo de Valor
 categoryCombo=Combina\u00e7\u00f5es de categoria
-dataDimensionType=Data dimension type
+dataDimensionType=Tipo de dimens\u00e3o de dados
 form_type=Form type
 indicator_type___display_name=Tipo de Indicador
 indicatorType=Tipo de Indicador
-aggregationType=Aggregation type
+aggregationType=Tipo de agregac\u00e3o
 formType=Form type
 section_multiorg=Section Multi-org
 dashboard___display_name=Gr\u00e1ficos
@@ -1900,10 +1903,10 @@ dataelement_current_event=Data element in current event
 dataelement_previous_event=Data element from previous event
 calculated_value=Calculated value
 program_rule_variable_source_type=Source type
-action=Action
+action=Ac\u00e7\u00e3o
 content=Content
 field=Field
-apply=Apply
+apply=Aplicar
 display_key_value_pair=Display key/value pair
 show_warning=Show warning
 assign_value=Assign value
@@ -1915,7 +1918,7 @@ hide_field=Hide field
 warning_on_complete=Warning on complete
 
 data_element___display_name=Elemento de dados
-tracked_entity_attribute___display_name=Tracked entity attribute
+tracked_entity_attribute___display_name=Atributo de entidade rastreada
 
 priority=Priority
 expression=Express\u00e3o
@@ -1926,7 +1929,7 @@ functions=Functions
 location=Localiza\u00e7\u00e3o
 programRuleVariableSourceType=Variable type
 dataElement=Elemento de dados
-trackedEntityAttribute=Tracked entity attribute
+trackedEntityAttribute=Atributo de entidade rastreada
 enter_program_rule_details=Enter program rule details
 enter_program_rule_expression=Enter program rule expression
 define_program_rule_actions=Define program rule actions
@@ -1955,7 +1958,7 @@ program_indicator_group=Program indicator group
 program_indicator_group_management=Program indicator groups
 intro_program_indicator_group=Group program indicators, even across programs.
 
-event_date=Event date
+event_date=Data do evento
 completed_date=Completed date
 value_count=Value count
 zero_pos_value_count=Zero or positive value count
@@ -2047,7 +2050,7 @@ data_approval_level=Data approval level
 intro_data_approval_level=Configure data approval levels for use in data approval workflows
 intro_data_approval_workflow=Configure data approval workflows
 data_approval_level_management=Data approval level management
-category_option_group_set___display_name=Category option group set
+category_option_group_set___display_name=Conjunto de grupos de op\u00e7\u00f5es de categoria
 data_approval_workflow_management=Data approval workflow management
 org_unit_level=N\u00edvel de Unidade Organizacional
 data_approval_levels=Data approval levels
@@ -2063,6 +2066,10 @@ first=First value (sum in org unit hierarchy)
 first_average_org_unit=First value (averge in org unit hierarchy)
 last_in_period=Last value in period (sum in org unit hierarchy)
 last_in_period_average_org_unit=Last value in period (average in org unit hierarchy)
+last_last_org_unit=Last value in period (last value in org unit hierarchy)
+first_first_org_unit=First value in period  (first value in org unit hierarchy)
+min_sum_org_unit=Min value (sum in org unit hierarchy)
+max_sum_org_unit=Max value (sum in org unit hierarchy)
 program_notification_template=Message template
 no_notification_template_specified=No notification template specified
 intro_tracked_entity_type=Define types of entities which can be tracked through the system, which can be anything from persons to commodities.
@@ -2073,8 +2080,8 @@ select_incident_dates_in_future=Allow future incident dates
 display_enrollment_date_label=Display enrollment date label
 display_incident_date_label=Display incident date label
 display_incident_date=Mostrar data do incidente
-incident_date_label=Descri\u00e7\u00e3o da data do incidente
-enrollment_date_label=Descri\u00e7\u00e3o da data de inscri\u00e7\u00e3o
+incident_date_label=Custom label for incident date
+enrollment_date_label=Custom label for enrollment date
 ignore_overdue_events=Ignore overdue events
 related_program=Related program
 assign_attributes=Assign attributes
@@ -2095,8 +2102,8 @@ block_entry_form=Bloquear formul\u00e1rio de inscri\u00e7\u00e3o, ap\u00f3s conc
 remind_completed=Ask user to complete program when stage is complete
 allow_generate_next_visit=Ask user to create new event when stage is complete
 generated_by_enrollment_date=Generate events based on enrollment date
-execution_date_label=Descri\u00e7\u00e3o do relat\u00f3tio de data
-due_date_label=Description of due date
+execution_date_label=Custom label for report date
+due_date_label=Custom label for due date
 min_days_from_start=N\u00famero m\u00ednimo de dias desde o in\u00edcio
 pre_generate_uid=Pre-generate event UID
 standard_interval=Padr\u00e3o dias de intervalo
@@ -2114,9 +2121,9 @@ report_period_before_end=Before end of reporting period
 report_period_after_start=After start of reporting period
 report_period_after_end=After end of reporting period
 
-boundary_target_incident_date=Incident date
-boundary_target_event_date=Event date
-boundary_target_enrollment_date=Enrollment date
+boundary_target_incident_date=Data do incidente
+boundary_target_event_date=Data do evento
+boundary_target_enrollment_date=Data de inscri\u00e7\u00e3o
 boundary_target_custom=Custom
 boundary_target_custom_text=Custom boundary text
 
@@ -2170,14 +2177,14 @@ icon_search=Search for icons
 differs_from_program=Differs from program
 apply_to_selected_stages=Apply to selected stages
 roles_and_access=Roles and access
-deselect_all=Deselect all
+deselect_all=Desmarcar todos
 select_similar=Select similar
 select_all=Seleccione todos
 
 from_constraint=From constraint
 to_constraint=To constraint
 
-TRACKED_ENTITY_INSTANCE=Tracked entity instance
+TRACKED_ENTITY_INSTANCE=Inst\u00e2ncia de entidade rastreada
 PROGRAM_INSTANCE=Program instance
 PROGRAM_STAGE_INSTANCE=Program stage instance
 option_group=Option group
@@ -2253,7 +2260,7 @@ stage_save_hint_text=An updated program stage is not saved until the program its
 stage_add=Add stage
 stage_update=Update stage
 invalid_coordinate=Invalid coordinate
-geometry=Geometry
+geometry=Geometria
 add_new_section=Add new section
 update_section=Update section
 no_attributes=No attributes selected
@@ -2295,10 +2302,10 @@ multi_text=Text with multiple values
 event_chart=Event chart
 event_report=Event report
 map=Mapa
-visualization=Visualization
+visualization=Visualiza\u00e7\u00e3o
 display_to_from_name=Name seen from receiving entity
 display_from_to_name=Name seen from initiating entity
-referral=Referral
+referral=Transfer\u00eancia
 display_instruction=Instruction
 display_message_template=Message template
 display_subject_template=Subject template
@@ -2327,3 +2334,12 @@ owner_at_end_organisation_unit=Owner at end organisation unit
 registration_organisation_unit=Registration organisation unit
 organisation_unit_field=Organisation unit field
 prevent_adding_new_events_to_stage=Prevent adding new events to stage
+predict_according_to_input_category_option_combo=Predict according to input category option combo
+program_stage_label=Custom label for program stage
+event_label=Custom label for event
+enrollment_label=Custom label for enrollment
+follow_up_label=Custom label for follow-up
+org_unit_label=Custom label for registering unit
+relationship_label=Custom label for relationship
+note_label=Custom label for note
+tracked_entity_attribute_label=Custom label for tracked entity attribute
diff --git a/src/i18n/i18n_module_uz_UZ_Cyrl.properties b/src/i18n/i18n_module_uz_UZ_Cyrl.properties
index 007199356..a6a6f65e2 100644
--- a/src/i18n/i18n_module_uz_UZ_Cyrl.properties
+++ b/src/i18n/i18n_module_uz_UZ_Cyrl.properties
@@ -279,8 +279,8 @@ value_should_be_list_of_urls=\u0423\u0448\u0431\u0443 \u043c\u0430\u0439\u0434\u
 value_should_be_an_email=\u0423\u0448\u0431\u0443 \u043c\u0430\u0439\u0434\u043e\u043d \u0435-\u043f\u043e\u0447\u0442\u0430 \u043c\u0430\u043d\u0437\u0438\u043b\u0438\u043d\u0438 \u045e\u0437 \u0438\u0447\u0438\u0433\u0430 \u043e\u043b\u0438\u0448\u0438 \u043a\u0435\u0440\u0430\u043a
 value_should_be_a_number=\u0423\u0448\u0431\u0443 \u043c\u0430\u0439\u0434\u043e\u043d \u0440\u0430\u049b\u0430\u043c\u043d\u0438 \u045e\u0437 \u0438\u0447\u0438\u0433\u0430 \u043e\u043b\u0438\u0448\u0438 \u043a\u0435\u0440\u0430\u043a
 number_should_not_have_decimals=\u0420\u0430\u049b\u0430\u043c\u0434\u0430 \u045e\u043d\u043b\u0438\u043a \u043a\u0430\u0441\u0440 \u0431\u045e\u043b\u043c\u0430\u0441\u043b\u0438\u0433\u0438 \u043a\u0435\u0440\u0430\u043a
-value_not_max=The value is too long/large
-value_not_min=The value is too short/small
+value_not_max=\u049a\u0438\u0439\u043c\u0430\u0442 \u0436\u0443\u0434\u0430 \u043a\u0430\u0442\u0442\u0430/\u0443\u0437\u0443\u043d
+value_not_min=\u049a\u0438\u0439\u043c\u0430\u0442 \u0436\u0443\u0434\u0430 \u043a\u0438\u0447\u0438\u043a/\u049b\u0438\u0441\u049b\u0430
 could_not_run_async_validation=\u0410\u0441\u0438\u043d\u0445\u0440\u043e\u043d \u0442\u0435\u043a\u0448\u0438\u0440\u0443\u0432 \u0438\u0448\u043b\u0430\u043c\u0430\u044f\u043f\u0442\u0438
 list=\u0420\u045e\u0439\u0445\u0430\u0442
 add=\u049a\u045e\u0448\u0438\u0448
@@ -1316,8 +1316,8 @@ must_select_one_dataelement=\u0418\u043b\u0442\u0438\u043c\u043e\u0441, \u0431\u
 single_event=\u042f\u043a\u043a\u0430 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440
 tracked_entity_instances=\u041a\u0443\u0437\u0430\u0442\u0438\u043b\u0430\u0451\u0442\u0433\u0430\u043d \u043e\u0431\u044a\u0435\u043a\u0442 \u043d\u0430\u043c\u0443\u043d\u0430\u0441\u0438
 dob_type=\u0422\u0443\u0493\u0438\u043b\u0433\u0430\u043d \u0441\u0430\u043d\u0430 \u0442\u0443\u0440\u0438
-date_of_enrollment_description=\u049a\u0430\u0439\u0434 \u049b\u0438\u043b\u0438\u0448 \u0441\u0430\u043d\u0430\u0441\u0438\u043d\u0438\u043d\u0433 \u0442\u0430\u0432\u0441\u0438\u0444\u0438
-date_of_incident_description=\u04b2\u043e\u0434\u0438\u0441\u0430 \u0441\u0430\u043d\u0430\u0441\u0438 \u0442\u0430\u0432\u0441\u0438\u0444\u0438
+date_of_enrollment_description=Custom label for enrollment date
+date_of_incident_description=Custom label for incident date
 date_of_enrollment=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043a\u0438\u0440\u0438\u0442\u0438\u043b\u0433\u0430\u043d \u0441\u0430\u043d\u0430
 date_of_incident=\u04b2\u043e\u0434\u0438\u0441\u0430 \u0441\u0430\u043d\u0430\u0441\u0438
 male=\u042d\u0440\u043a\u0430\u043a
@@ -2066,6 +2066,10 @@ first=\u0414\u0430\u0441\u0442\u043b\u0430\u0431\u043a\u0438 \u049b\u0438\u0439\
 first_average_org_unit=\u0414\u0430\u0441\u0442\u043b\u0430\u0431\u043a\u0438 \u049b\u0438\u0439\u043c\u0430\u0442 (\u0442\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c \u0438\u0435\u0440\u0430\u0440\u0445\u0438\u044f\u0441\u0438 \u045e\u0440\u0442\u0430\u0447\u0430\u0441\u0438)
 last_in_period=\u0414\u0430\u0432\u0440\u0434\u0430\u0433\u0438 \u043e\u0445\u0438\u0440\u0433\u0438 \u049b\u0438\u0439\u043c\u0430\u0442 (\u0442\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c \u0438\u0435\u0440\u0430\u0440\u0445\u0438\u044f\u0441\u0438 \u0439\u0438\u0493\u0438\u043d\u0434\u0438\u0441\u0438)
 last_in_period_average_org_unit=\u0414\u0430\u0432\u0440\u0434\u0430\u0433\u0438 \u043e\u0445\u0438\u0440\u0433\u0438 \u049b\u0438\u0439\u043c\u0430\u0442 (\u0442\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u045e\u043b\u0438\u043c \u0438\u0435\u0440\u0430\u0440\u0445\u0438\u044f\u0441\u0438 \u045e\u0440\u0442\u0430\u0447\u0430\u0441\u0438)
+last_last_org_unit=Last value in period (last value in org unit hierarchy)
+first_first_org_unit=First value in period  (first value in org unit hierarchy)
+min_sum_org_unit=Min value (sum in org unit hierarchy)
+max_sum_org_unit=Max value (sum in org unit hierarchy)
 program_notification_template=\u0425\u0430\u0431\u0430\u0440 \u0448\u0430\u0431\u043b\u043e\u043d\u0438
 no_notification_template_specified=\u0411\u0438\u043b\u0434\u0438\u0440\u0438\u0448\u043d\u043e\u043c\u0430 \u0448\u0430\u0431\u043b\u043e\u043d\u043b\u0430\u0440\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u043b\u043c\u0430\u0433\u0430\u043d
 intro_tracked_entity_type=\u0422\u0438\u0437\u0438\u043c \u043e\u0440\u049b\u0430\u043b\u0438 \u043a\u0443\u0437\u0430\u0442\u0438\u043b\u0438\u0448\u0438 \u043c\u0443\u043c\u043a\u0438\u043d \u0431\u045e\u043b\u0433\u0430\u043d \u0448\u0430\u0445\u0441\u043b\u0430\u0440\u043d\u0438\u043d\u0433 \u0442\u0443\u0440\u043b\u0430\u0440\u0438\u0433\u0430 \u049b\u0430\u0434\u0430\u0440 \u0431\u045e\u043b\u0438\u0448\u0438 \u043c\u0443\u043c\u043a\u0438\u043d \u0431\u045e\u043b\u0433\u0430\u043d \u0441\u0443\u0431\u044a\u0435\u043a\u0442\u043b\u0430\u0440\u043d\u0438\u043d\u0433 \u0442\u0443\u0440\u043b\u0430\u0440\u0438\u043d\u0438 \u0430\u043d\u0438\u049b\u043b\u0430\u043d\u0433.
@@ -2076,8 +2080,8 @@ select_incident_dates_in_future=\u041a\u0435\u043b\u0430\u0436\u0430\u043a\u0434
 display_enrollment_date_label=\u049a\u0430\u0439\u0434 \u044d\u0442\u0438\u0448 \u0441\u0430\u043d\u0430\u0441\u0438 \u0431\u0435\u043b\u0433\u0438\u0441\u0438\u043d\u0438 \u044d\u043a\u0440\u0430\u043d\u0434\u0430 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448
 display_incident_date_label=\u04b2\u043e\u043b\u0430\u0442 \u0441\u0430\u043d\u0430\u0441\u0438 \u0431\u0435\u043b\u0433\u0438\u0441\u0438\u043d\u0438 \u044d\u043a\u0440\u0430\u043d\u0434\u0430 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448
 display_incident_date=\u04b2\u043e\u0434\u0438\u0441\u0430 \u0441\u0430\u043d\u0430\u0441\u0438\u043d\u0438 \u043a\u045e\u0440\u0441\u0430\u0442\u0438\u0448
-incident_date_label=\u04b2\u043e\u0434\u0438\u0441\u0430 \u0441\u0430\u043d\u0430\u0441\u0438 \u0442\u0430\u0432\u0441\u0438\u0444\u0438
-enrollment_date_label=\u049a\u0430\u0439\u0434 \u049b\u0438\u043b\u0438\u0448 \u0441\u0430\u043d\u0430\u0441\u0438\u043d\u0438\u043d\u0433 \u0442\u0430\u0432\u0441\u0438\u0444\u0438
+incident_date_label=Custom label for incident date
+enrollment_date_label=Custom label for enrollment date
 ignore_overdue_events=\u041a\u0435\u0447\u0438\u043a\u0442\u0438\u0440\u0438\u043b\u0433\u0430\u043d \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u044d\u044a\u0442\u0438\u0431\u043e\u0440\u0441\u0438\u0437 \u049b\u043e\u043b\u0434\u0438\u0440\u0438\u0448
 related_program=\u0422\u0435\u0433\u0438\u0448\u043b\u0438 \u0434\u0430\u0441\u0442\u0443\u0440
 assign_attributes=\u0410\u0442\u0440\u0438\u0431\u0443\u0442\u043b\u0430\u0440\u043d\u0438 \u0442\u0430\u0439\u0438\u043d\u043b\u0430\u0448
@@ -2098,8 +2102,8 @@ block_entry_form=\u0422\u045e\u043b\u0434\u0438\u0440\u0438\u043b\u0433\u0430\u0
 remind_completed=\u0411\u043e\u0441\u049b\u0438\u0447 \u044f\u043a\u0443\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0444\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0432\u0447\u0438\u0434\u0430\u043d \u0434\u0430\u0441\u0442\u0443\u0440\u043d\u0438 \u0442\u045e\u043b\u0434\u0438\u0440\u0438\u0448\u043d\u0438 \u0441\u045e\u0440\u0430\u0448
 allow_generate_next_visit=\u0411\u043e\u0441\u049b\u0438\u0447 \u044f\u043a\u0443\u043d\u043b\u0430\u043d\u0433\u0430\u043d \u0444\u043e\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0432\u0447\u0438\u0434\u0430\u043d \u044f\u043d\u0433\u0438 \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440 \u044f\u0440\u0430\u0442\u0438\u0448\u043d\u0438 \u0441\u045e\u0440\u0430\u0448
 generated_by_enrollment_date=\u0420\u045e\u0439\u0445\u0430\u0442\u0433\u0430 \u043e\u043b\u0438\u043d\u0433\u0430\u043d \u0441\u0430\u043d\u0430 \u0430\u0441\u043e\u0441\u0438\u0434\u0430 \u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u044f\u0440\u0430\u0442\u0438\u0448
-execution_date_label=\u04b2\u0438\u0441\u043e\u0431\u043e\u0442 \u0441\u0430\u043d\u0430\u0441\u0438 \u0442\u0430\u0444\u0441\u0438\u043b\u043e\u0442\u0438
-due_date_label=\u041c\u0443\u0434\u0434\u0430\u0442 \u0442\u0430\u0444\u0441\u0438\u043b\u043e\u0442\u0438
+execution_date_label=Custom label for report date
+due_date_label=Custom label for due date
 min_days_from_start=\u0411\u043e\u0448\u043b\u0430\u043d\u0438\u0448\u0438\u0434\u0430\u043d \u0440\u0435\u0436\u0430\u043b\u0430\u0448\u0442\u0438\u0440\u0438\u043b\u0433\u0430\u043d \u043a\u0443\u043d\u043b\u0430\u0440
 pre_generate_uid=UID \u04b3\u043e\u0434\u0438\u0441\u0430/\u0442\u0430\u0434\u0431\u0438\u0440\u043b\u0430\u0440\u043d\u0438 \u043e\u043b\u0434\u0438\u043d\u0434\u0430\u043d \u044f\u0440\u0430\u0442\u0438\u0448
 standard_interval=\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442 \u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b \u043a\u0443\u043d\u043b\u0430\u0440
@@ -2331,3 +2335,11 @@ registration_organisation_unit=\u0422\u0430\u043d\u043b\u0430\u043d\u0433\u0430\
 organisation_unit_field=\u0422\u0430\u0448\u043a\u0438\u043b\u0438\u0439 \u0431\u0438\u0440\u043b\u0438\u043a \u049b\u0430\u0442\u043e\u0440\u0438
 prevent_adding_new_events_to_stage=\u0411\u043e\u0441\u049b\u0438\u0447\u0434\u0430 \u044f\u043d\u0433\u0438 \u04b3\u043e\u043b\u0430\u0442\u043b\u0430\u0440 \u049b\u045e\u0448\u0438\u043b\u0438\u0448\u0438 \u043e\u043b\u0434\u0438\u043d\u0438 \u043e\u043b\u0438\u0448
 predict_according_to_input_category_option_combo=\u041a\u0438\u0440\u0438\u0442\u0438\u0443\u0432\u0447\u0438 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f\u0434\u0430 \u0432\u0430\u0440\u0438\u0430\u043d\u0442 \u043a\u043e\u043c\u0431\u043e\u0441\u0438 \u0431\u0438\u043b\u0430\u043d \u043c\u0443\u0442\u0430\u043d\u043e\u0441\u0438\u0431\u043b\u0438\u043a\u043d\u0438 \u0431\u0430\u0448\u043e\u0440\u0430\u0442\u043b\u0430\u0440
+program_stage_label=Custom label for program stage
+event_label=Custom label for event
+enrollment_label=Custom label for enrollment
+follow_up_label=Custom label for follow-up
+org_unit_label=Custom label for registering unit
+relationship_label=Custom label for relationship
+note_label=Custom label for note
+tracked_entity_attribute_label=Custom label for tracked entity attribute