Merge branch 'master' into DHIS2-16252/tracker-agg-type-labels

CHANGELOG.md

@@ -1,3 +1,24 @@
+# [32.25.0](https://github.com/dhis2/maintenance-app/compare/v32.24.14...v32.25.0) (2024-02-06)
+
+
+### Features
+
+* **program:** add custom terminology for tracker ([#2798](https://github.com/dhis2/maintenance-app/issues/2798)) ([91cf15c](https://github.com/dhis2/maintenance-app/commit/91cf15cca0198186c5cce78f72c57be9f79a6a42))
+
+## [32.24.14](https://github.com/dhis2/maintenance-app/compare/v32.24.13...v32.24.14) (2024-01-21)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([709e56c](https://github.com/dhis2/maintenance-app/commit/709e56c49385a6009e1d07e65e94a46023b8eb15))
+
+## [32.24.13](https://github.com/dhis2/maintenance-app/compare/v32.24.12...v32.24.13) (2024-01-07)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([c32b0bc](https://github.com/dhis2/maintenance-app/commit/c32b0bce9f7169a518f336f800bd8233064325a3))
+
 ## [32.24.12](https://github.com/dhis2/maintenance-app/compare/v32.24.11...v32.24.12) (2023-12-31)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "maintenance-app",
-  "version": "32.24.12",
+  "version": "32.25.0",
   "description": "DHIS2 Maintenance app",
   "repository": {
     "type": "git",

src/config/field-config/field-order.js

@@ -276,6 +276,13 @@ const fieldOrderByName = new Map([
         'displayIncidentDate',
         'incidentDateLabel',
         'enrollmentDateLabel',
+        'enrollmentLabel',
+        'followUpLabel',
+        'registeringUnitLabel',
+        'orgUnitLabel',
+        'relationshipLabel',
+        'noteLabel',
+        'trackedEntityAttributeLabel',
         'ignoreOverdueEvents',
         'featureType',
         'relatedProgram',
@@ -303,6 +310,8 @@ const fieldOrderByName = new Map([
         'preGenerateUID',
         'executionDateLabel',
         'dueDateLabel',
+        'programStageLabel',
+        'eventLabel',
     ]],
     ['trackedEntityAttribute', [
         'name',

src/i18n/i18n_module_en.properties

@@ -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=Date of enrollment
 date_of_incident=Date of incident
 male=Male
@@ -2080,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
@@ -2102,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
@@ -2335,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

src/i18n/i18n_module_es_419.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=List
 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=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
@@ -1014,7 +1017,7 @@ allow_show_zero=Display zeros
 raw_data=Raw data
 get_report_as_html=Download as HTML
 get_report_as_xml=Download as XML
-get_report_as_json=Download as JSON
+get_report_as_json=Descargar como JSON
 data_element_structure=Data element structure
 create_new_constant=Add Constant
 edit_constant=Edit Constant
@@ -2298,7 +2301,7 @@ map=Map
 visualization=Visualization
 display_to_from_name=Name seen from receiving entity
 display_from_to_name=Name seen from initiating entity
-referral=Referral
+referral=Remitir
 display_instruction=Instruction
 display_message_template=Message template
 display_subject_template=Subject template
@@ -2327,3 +2330,4 @@ 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

src/i18n/i18n_module_nb.properties

@@ -2329,5 +2329,5 @@ owner_at_start_organisation_unit=Owner at start organisation unit
 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
+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

src/i18n/i18n_module_sv.properties

@@ -279,8 +279,8 @@ value_should_be_list_of_urls=This field requires a list of URLs
 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=List
 add=L\u00e4gg till
@@ -322,7 +322,7 @@ organisation_unit_assignment_saved=Organisation unit assignment saved
 organisation_unit_assignment_save_error=Failed to save organisation unit assignment
 deselect=Deselect
 select_all=V\u00e4lj alla
-deselect_all=Deselect all
+deselect_all=Avmarkera alla
 select_a_locale_to_enter_translations_for_that_language=Select a locale to enter translations for
 data_set_management=Data set management
 data_set=datam\u00e4ngd
@@ -639,6 +639,9 @@ sql_view_refreshed_successfully=SQL view refreshed successfully
 sql_view_refresh_error=Could not refresh SQL query
 cache_strategy=cache strategi
 no_cache=ingen 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 under en timme
@@ -2170,7 +2173,7 @@ 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=Avmarkera alla
 select_similar=Select similar
 select_all=V\u00e4lj alla
 
@@ -2327,3 +2330,4 @@ 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