Merge pull request #821 from EyeSeeTea/development

Release 2.7.0

.env

@@ -1,4 +1,4 @@
 BROWSER=false
 PORT=8081
 SKIP_PREFLIGHT_CHECK=true
-REACT_APP_DHIS2_BASE_URL=http://dev2.eyeseetea.com:8083
+REACT_APP_DHIS2_BASE_URL=https://dev.eyeseetea.com/msf

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2020-12-24T10:46:07.699Z\n"
-"PO-Revision-Date: 2020-12-24T10:46:07.699Z\n"
+"POT-Creation-Date: 2021-01-22T09:15:45.194Z\n"
+"PO-Revision-Date: 2021-01-22T09:15:45.194Z\n"
 
 msgid "Field {{field}} cannot be blank"
 msgstr ""
@@ -209,6 +209,70 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
+msgid "Ready"
+msgstr ""
+
+msgid "Running"
+msgstr ""
+
+msgid "Failure"
+msgstr ""
+
+msgid "Done"
+msgstr ""
+
+msgid "Sync Rule"
+msgstr ""
+
+msgid "(package import)"
+msgstr ""
+
+msgid "(manual synchronization)"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "Timestamp"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Metadata Types"
+msgstr ""
+
+msgid "Edit {{name}}"
+msgstr ""
+
+msgid "View summary"
+msgstr ""
+
+msgid "Deleting History Notifications"
+msgstr ""
+
+msgid "Successfully deleted {{count}} history notifications"
+msgid_plural "Successfully deleted {{count}} history notifications"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Synchronization status"
+msgstr ""
+
+msgid "Delete History Notifications?"
+msgstr ""
+
+msgid "Are you sure you want to delete {{count}} history notifications?"
+msgid_plural "Are you sure you want to delete {{count}} history notifications?"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Ok"
+msgstr ""
+
 msgid "Instances"
 msgstr ""
 
@@ -348,9 +412,6 @@ msgstr ""
 msgid "Related metadata mapping"
 msgstr ""
 
-msgid "Ok"
-msgstr ""
-
 msgid "Related metadata mapping for {{name}} ({{id}})"
 msgstr ""
 
@@ -381,9 +442,15 @@ msgstr ""
 msgid "{{displayName}} Level"
 msgstr ""
 
+msgid "Program"
+msgstr ""
+
 msgid "Only selected items"
 msgstr ""
 
+msgid "Show all entries"
+msgstr ""
+
 msgid "Select with children subtree"
 msgstr ""
 
@@ -701,9 +768,6 @@ msgstr ""
 msgid "DHIS2 Version"
 msgstr ""
 
-msgid "Status"
-msgstr ""
-
 msgid "Module"
 msgstr ""
 
@@ -883,10 +947,10 @@ msgstr ""
 msgid "Dry Run"
 msgstr ""
 
-msgid "Run Analytics before sync"
+msgid "Ignore data with same value on destination (only for program indicators)"
 msgstr ""
 
-msgid "Type"
+msgid "Ignore data with same value on destination"
 msgstr ""
 
 msgid "Imported"
@@ -904,9 +968,6 @@ msgstr ""
 msgid "Data element"
 msgstr ""
 
-msgid "Program"
-msgstr ""
-
 msgid "Number of entries"
 msgstr ""
 
@@ -931,9 +992,15 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
+msgid "Generating JSON"
+msgstr ""
+
 msgid "Synchronization Results"
 msgstr ""
 
+msgid "Download JSON Payload"
+msgstr ""
+
 msgid "Origin"
 msgstr ""
 
@@ -1142,6 +1209,9 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
+msgid "Run Analytics before sync"
+msgstr ""
+
 msgid "Frequency"
 msgstr ""
 
@@ -1180,6 +1250,12 @@ msgstr ""
 msgid "Aggregation type"
 msgstr ""
 
+msgid "Save empty values as zero (only for program indicators)"
+msgstr ""
+
+msgid "Save empty values as zero (only for indicators)"
+msgstr ""
+
 msgid "Sync all attribute category options"
 msgstr ""
 
@@ -1210,12 +1286,6 @@ msgstr ""
 msgid "Use sync rules periods"
 msgstr ""
 
-msgid "Delete data values before sync"
-msgstr ""
-
-msgid "Check existing data values in previous periods"
-msgstr ""
-
 msgid "True"
 msgstr ""
 
@@ -1228,84 +1298,53 @@ msgstr ""
 msgid "MSF Settings"
 msgstr ""
 
-msgid "Run Analytics"
-msgstr ""
-
-msgid "Data Element Group *"
-msgstr ""
-
-msgid ""
-"* Data Element Group: used to check existing data values in the destination "
-"data elements"
-msgstr ""
-
-msgid "Metadata Synchronization History"
-msgstr ""
-
-msgid "Aggregated Data Synchronization History"
-msgstr ""
-
-msgid "Events Synchronization History"
+msgid "Analytics"
 msgstr ""
 
-msgid "Deleted Synchronization History"
-msgstr ""
-
-msgid "Ready"
-msgstr ""
-
-msgid "Running"
+msgid "Run Analytics"
 msgstr ""
 
-msgid "Failure"
+msgid "Number of years to include"
 msgstr ""
 
-msgid "Done"
+msgid "Data values settings"
 msgstr ""
 
-msgid "Sync Rule"
+msgid "Delete data values before sync"
 msgstr ""
 
-msgid "(package import)"
+msgid "Check existing data values in previous periods"
 msgstr ""
 
-msgid "(manual synchronization)"
+msgid "Data element filter"
 msgstr ""
 
-msgid "Timestamp"
+msgid "Data Element Group *"
 msgstr ""
 
-msgid "User"
+msgid ""
+"* Data Element Group: used to check existing data values in the destination "
+"data elements"
 msgstr ""
 
-msgid "Metadata Types"
+msgid "Project minimum dates"
 msgstr ""
 
-msgid "Edit {{name}}"
+msgid "Minimum date"
 msgstr ""
 
-msgid "View summary"
+msgid "Metadata Synchronization History"
 msgstr ""
 
-msgid "Deleting History Notifications"
+msgid "Aggregated Data Synchronization History"
 msgstr ""
 
-msgid "Successfully deleted {{count}} history notifications"
-msgid_plural "Successfully deleted {{count}} history notifications"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Synchronization status"
+msgid "Events Synchronization History"
 msgstr ""
 
-msgid "Delete History Notifications?"
+msgid "Deleted Synchronization History"
 msgstr ""
 
-msgid "Are you sure you want to delete {{count}} history notifications?"
-msgid_plural "Are you sure you want to delete {{count}} history notifications?"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "Aggregated Data Sync"
 msgstr ""
 
@@ -1786,6 +1825,9 @@ msgid_plural "Are you sure you want to delete {{count}} rules?"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "Synchronization History"
+msgstr ""
+
 msgid "Aggregate Data For HMIS"
 msgstr ""
 
@@ -1795,6 +1837,9 @@ msgstr ""
 msgid "Synchronization Progress"
 msgstr ""
 
+msgid "Download payload"
+msgstr ""
+
 msgid "Advanced Settings"
 msgstr ""
 
@@ -1810,6 +1855,9 @@ msgstr ""
 msgid "Do you want to proceed?"
 msgstr ""
 
+msgid "Retrieving information from the system..."
+msgstr ""
+
 msgid "Starting Aggregate Data..."
 msgstr ""
 
@@ -1916,6 +1964,12 @@ msgstr ""
 msgid "Last 14 days"
 msgstr ""
 
+msgid "Last 30 days"
+msgstr ""
+
+msgid "Last 90 days"
+msgstr ""
+
 msgid "This week"
 msgstr ""