From 62a654d526a58f115033869f61c4aadfdf87b9c5 Mon Sep 17 00:00:00 2001 From: Eduardo Peredo Rivero Date: Wed, 11 Mar 2026 13:19:42 -0500 Subject: [PATCH 1/2] add spanish and french translations --- i18n/es.po | 6 +----- i18n/fr.po | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/i18n/es.po b/i18n/es.po index 2d105d8f..7569963a 100644 --- a/i18n/es.po +++ b/i18n/es.po @@ -211,10 +211,6 @@ msgstr "" msgid "Default" msgstr "" -#, fuzzy -msgid "Delete and import" -msgstr "Importación de datos" - #, fuzzy msgid "Import despite duplicates" msgstr "Importar datos" @@ -1385,7 +1381,7 @@ msgstr "" "continuar?" msgid "Delete and Import" -msgstr "" +msgstr "Borrar e Importar" msgid "" "All data values in the spreadsheet will be imported to the system, but any " diff --git a/i18n/fr.po b/i18n/fr.po index 7b362091..0b4860db 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -205,10 +205,6 @@ msgstr "" msgid "Default" msgstr "" -#, fuzzy -msgid "Delete and import" -msgstr "Importation de données en masse" - #, fuzzy msgid "Import despite duplicates" msgstr "Importer des données" @@ -1407,7 +1403,7 @@ msgstr "" "calcul seront enregistrées. Êtes-vous sur de vouloir continuer?" msgid "Delete and Import" -msgstr "" +msgstr "SUPPRIMER ET IMPORTER" msgid "" "All data values in the spreadsheet will be imported to the system, but any " From 1ee25c3face9b3754e1fbecea7570d7a224740c8 Mon Sep 17 00:00:00 2001 From: Eduardo Peredo Rivero Date: Wed, 11 Mar 2026 14:23:30 -0500 Subject: [PATCH 2/2] fix duplicate entries in po files --- i18n/en.pot | 9 +++------ i18n/es.po | 18 +++++++----------- i18n/fr.po | 14 +++++++------- i18n/pt.po | 16 ++++++---------- i18n/ru.po | 16 ++++++---------- .../history/HistoryImportSummary.tsx | 2 +- 6 files changed, 30 insertions(+), 45 deletions(-) diff --git a/i18n/en.pot b/i18n/en.pot index 2d0dd273..56b0abcf 100644 --- a/i18n/en.pot +++ b/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: 2025-11-12T16:45:33.366Z\n" -"PO-Revision-Date: 2025-11-12T16:45:33.366Z\n" +"POT-Creation-Date: 2026-03-11T19:21:15.859Z\n" +"PO-Revision-Date: 2026-03-11T19:21:15.859Z\n" msgid "Events - Create/update" msgstr "" @@ -188,7 +188,7 @@ msgstr "" msgid "Default" msgstr "" -msgid "Delete and import" +msgid "Delete and Import" msgstr "" msgid "Import despite duplicates" @@ -1310,9 +1310,6 @@ msgid "" "existing values before importing the data?" msgstr "" -msgid "Delete and Import" -msgstr "" - msgid "" "All data values in the spreadsheet will be imported to the system, but any " "data that was existing for such organisation unit and periods in the system " diff --git a/i18n/es.po b/i18n/es.po index 7569963a..be274f85 100644 --- a/i18n/es.po +++ b/i18n/es.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Bulk Load\n" -"POT-Creation-Date: 2025-11-12T16:45:33.366Z\n" +"POT-Creation-Date: 2026-03-11T19:21:15.859Z\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -211,6 +211,9 @@ msgstr "" msgid "Default" msgstr "" +msgid "Delete and Import" +msgstr "Borrar e Importar" + #, fuzzy msgid "Import despite duplicates" msgstr "Importar datos" @@ -1287,9 +1290,9 @@ msgid "" "Samaritan’s Purse, Medecins Sans Frontières (MSF), the the Norwegian Refugee " "Council (NRC) and the Clinton Health Access Initiative (CHAI) to support " "countries in strengthening the collection and use of health data by using " -"DHIS2. The application has been developed by [EyeSeeTea SL](http://" -"eyeseetea.com). Source code, documentation and release notes can be found at " -"the [EyeSeetea GitHub Project Page](https://eyeseetea.github.io/Bulk-Load-" +"DHIS2. The application has been developed by [EyeSeeTea SL](http://eyeseetea." +"com). Source code, documentation and release notes can be found at the " +"[EyeSeetea GitHub Project Page](https://eyeseetea.github.io/Bulk-Load-" "blessed/)." msgstr "" @@ -1380,9 +1383,6 @@ msgstr "" "remplazarán por aquellos presentes en el archivo. ¿Está seguro que desea " "continuar?" -msgid "Delete and Import" -msgstr "Borrar e Importar" - msgid "" "All data values in the spreadsheet will be imported to the system, but any " "data that was existing for such organisation unit and periods in the system " @@ -1465,7 +1465,3 @@ msgstr "" msgid "Settings saved" msgstr "Configuración guardada" - -#, fuzzy -#~ msgid "Pending" -#~ msgstr "Encabezamientos" diff --git a/i18n/fr.po b/i18n/fr.po index 0b4860db..38648ff4 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Bulk Load App\n" -"POT-Creation-Date: 2025-11-12T16:45:33.366Z\n" +"POT-Creation-Date: 2026-03-11T19:21:15.859Z\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -205,6 +205,9 @@ msgstr "" msgid "Default" msgstr "" +msgid "Delete and Import" +msgstr "SUPPRIMER ET IMPORTER" + #, fuzzy msgid "Import despite duplicates" msgstr "Importer des données" @@ -1306,9 +1309,9 @@ msgid "" "Samaritan’s Purse, Medecins Sans Frontières (MSF), the the Norwegian Refugee " "Council (NRC) and the Clinton Health Access Initiative (CHAI) to support " "countries in strengthening the collection and use of health data by using " -"DHIS2. The application has been developed by [EyeSeeTea SL](http://" -"eyeseetea.com). Source code, documentation and release notes can be found at " -"the [EyeSeetea GitHub Project Page](https://eyeseetea.github.io/Bulk-Load-" +"DHIS2. The application has been developed by [EyeSeeTea SL](http://eyeseetea." +"com). Source code, documentation and release notes can be found at the " +"[EyeSeetea GitHub Project Page](https://eyeseetea.github.io/Bulk-Load-" "blessed/)." msgstr "" @@ -1402,9 +1405,6 @@ msgstr "" "valeurs de données seront supprimées et seules celles de la feuille de " "calcul seront enregistrées. Êtes-vous sur de vouloir continuer?" -msgid "Delete and Import" -msgstr "SUPPRIMER ET IMPORTER" - msgid "" "All data values in the spreadsheet will be imported to the system, but any " "data that was existing for such organisation unit and periods in the system " diff --git a/i18n/pt.po b/i18n/pt.po index b3848033..926b8a67 100644 --- a/i18n/pt.po +++ b/i18n/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Bulk Load\n" -"POT-Creation-Date: 2025-11-12T16:45:33.366Z\n" +"POT-Creation-Date: 2026-03-11T19:21:15.859Z\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -213,9 +213,8 @@ msgstr "" msgid "Default" msgstr "" -#, fuzzy -msgid "Delete and import" -msgstr "Importação de dados em massa" +msgid "Delete and Import" +msgstr "" #, fuzzy msgid "Import despite duplicates" @@ -1346,9 +1345,9 @@ msgid "" "Samaritan’s Purse, Medecins Sans Frontières (MSF), the the Norwegian Refugee " "Council (NRC) and the Clinton Health Access Initiative (CHAI) to support " "countries in strengthening the collection and use of health data by using " -"DHIS2. The application has been developed by [EyeSeeTea SL](http://" -"eyeseetea.com). Source code, documentation and release notes can be found at " -"the [EyeSeetea GitHub Project Page](https://eyeseetea.github.io/Bulk-Load-" +"DHIS2. The application has been developed by [EyeSeeTea SL](http://eyeseetea." +"com). Source code, documentation and release notes can be found at the " +"[EyeSeetea GitHub Project Page](https://eyeseetea.github.io/Bulk-Load-" "blessed/)." msgstr "" @@ -1441,9 +1440,6 @@ msgstr "" "dados serão excluídos e remplazados pelos dados da planilha. Tem certeza que " "deseja continuar?" -msgid "Delete and Import" -msgstr "" - msgid "" "All data values in the spreadsheet will be imported to the system, but any " "data that was existing for such organisation unit and periods in the system " diff --git a/i18n/ru.po b/i18n/ru.po index eb4bfe74..4aa1643f 100644 --- a/i18n/ru.po +++ b/i18n/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Bulk Load\n" -"POT-Creation-Date: 2025-11-12T16:45:33.366Z\n" +"POT-Creation-Date: 2026-03-11T19:21:15.859Z\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -214,9 +214,8 @@ msgstr "" msgid "Default" msgstr "" -#, fuzzy -msgid "Delete and import" -msgstr "Массовый импорт данных" +msgid "Delete and Import" +msgstr "" #, fuzzy msgid "Import despite duplicates" @@ -1350,9 +1349,9 @@ msgid "" "Samaritan’s Purse, Medecins Sans Frontières (MSF), the the Norwegian Refugee " "Council (NRC) and the Clinton Health Access Initiative (CHAI) to support " "countries in strengthening the collection and use of health data by using " -"DHIS2. The application has been developed by [EyeSeeTea SL](http://" -"eyeseetea.com). Source code, documentation and release notes can be found at " -"the [EyeSeetea GitHub Project Page](https://eyeseetea.github.io/Bulk-Load-" +"DHIS2. The application has been developed by [EyeSeeTea SL](http://eyeseetea." +"com). Source code, documentation and release notes can be found at the " +"[EyeSeetea GitHub Project Page](https://eyeseetea.github.io/Bulk-Load-" "blessed/)." msgstr "" @@ -1445,9 +1444,6 @@ msgstr "" "данных будут удалены, и будут сохранены только те, которые находятся в " "электронной таблице. Вы уверены?" -msgid "Delete and Import" -msgstr "" - msgid "" "All data values in the spreadsheet will be imported to the system, but any " "data that was existing for such organisation unit and periods in the system " diff --git a/src/webapp/components/history/HistoryImportSummary.tsx b/src/webapp/components/history/HistoryImportSummary.tsx index c960826e..046cae75 100644 --- a/src/webapp/components/history/HistoryImportSummary.tsx +++ b/src/webapp/components/history/HistoryImportSummary.tsx @@ -88,7 +88,7 @@ function getImportStrategyLabel(entry: HistoryEntryDetails, dataFormType: Maybe< } switch (strategy) { case "IMPORT": - return dataFormType === "dataSets" ? i18n.t("Delete and import") : i18n.t("Import despite duplicates"); + return dataFormType === "dataSets" ? i18n.t("Delete and Import") : i18n.t("Import despite duplicates"); case "IGNORE": return dataFormType === "dataSets" ? i18n.t("Import only new data values")