Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dhis2/capture-app into hv…
Browse files Browse the repository at this point in the history
…/feat/DHIS2-17771_OrgUnitContextualizationInSelfContainedWidgets
  • Loading branch information
henrikmv committed Sep 23, 2024
2 parents efe949d + c256a12 commit 8477c66
Show file tree
Hide file tree
Showing 25 changed files with 483 additions and 93 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/verify-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ jobs:
- name: Build
run: yarn build

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: app-build
path: |
Expand All @@ -214,7 +214,7 @@ jobs:
with:
node-version: 18.x

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: app-build

Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [101.4.1](https://github.com/dhis2/capture-app/compare/v101.4.0...v101.4.1) (2024-09-19)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([#3805](https://github.com/dhis2/capture-app/issues/3805)) ([a4464f4](https://github.com/dhis2/capture-app/commit/a4464f431618200853772cc2546ea9adff515840))

# [101.4.0](https://github.com/dhis2/capture-app/compare/v101.3.3...v101.4.0) (2024-09-09)


Expand Down
23 changes: 20 additions & 3 deletions i18n/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -1316,6 +1316,9 @@ msgstr ""
msgid "Event completed"
msgstr "الحدث مكتمل"

msgid "The event cannot be edited after it has been completed"
msgstr ""

msgid "Back to all stages and events"
msgstr ""

Expand Down Expand Up @@ -1484,13 +1487,27 @@ msgstr ""
msgid "New {{ eventName }} event"
msgstr ""

msgid "To open this event, please wait until saving is complete"
msgid "An error occurred while deleting the event"
msgstr ""

msgid "Show {{ rest }} more"
msgid ""
"Deleting an event is permanent and cannot be undone. Are you sure you want "
"to delete this event?"
msgstr ""

msgid "An error occurred when updating event status"
msgstr ""

msgid "Reset list"
msgid "Unskip"
msgstr ""

msgid "Skip"
msgstr "تخطى"

msgid "To open this event, please wait until saving is complete"
msgstr ""

msgid "Show {{ rest }} more"
msgstr ""

msgid "Go to full {{ eventName }}"
Expand Down
17 changes: 17 additions & 0 deletions i18n/cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -1535,6 +1535,23 @@ msgstr "Tato fáze může mít pouze jednu událost"
msgid "New {{ eventName }} event"
msgstr "Nová událost {{ eventName }}"

msgid "An error occurred while deleting the event"
msgstr ""

msgid ""
"Deleting an event is permanent and cannot be undone. Are you sure you want "
"to delete this event?"
msgstr ""

msgid "An error occurred when updating event status"
msgstr ""

msgid "Unskip"
msgstr ""

msgid "Skip"
msgstr "Přeskočit"

msgid "To open this event, please wait until saving is complete"
msgstr "Chcete-li otevřít tuto událost, počkejte na dokončení ukládání"

Expand Down
38 changes: 30 additions & 8 deletions i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Sergio Valenzuela <[email protected]>, 2020
# ericbp <[email protected]>, 2021
# Jaime Bosque <[email protected]>, 2021
# Marta Vila <[email protected]>, 2022
# Pablo Pajuelo Cabezas <[email protected]>, 2022
# Prabhjot Singh, 2023
# Christian Atavillos, 2023
Expand All @@ -13,13 +12,15 @@
# Janeth Cruz, 2024
# Enzo Nicolas Rossi <[email protected]>, 2024
# Viktor Varland <[email protected]>, 2024
# Marta Vila <[email protected]>, 2024
# Juan M Alcantara Acosta <[email protected]>, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n"
"PO-Revision-Date: 2019-06-27 07:31+0000\n"
"Last-Translator: Viktor Varland <[email protected]>, 2024\n"
"Last-Translator: Juan M Alcantara Acosta <[email protected]>, 2024\n"
"Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -848,6 +849,8 @@ msgid ""
"The category option is not valid for the selected organisation unit. Please "
"select a valid combination."
msgstr ""
"La opción de categoría no es válida para la unidad organizativa "
"seleccionada. Seleccione una combinación válida."

msgid "Please select {{category}}."
msgstr "Seleccione {{category}}."
Expand Down Expand Up @@ -1027,7 +1030,7 @@ msgid "Loading"
msgstr "Cargando"

msgid "An error occurred while loading the form"
msgstr ""
msgstr "Ocurrió un error al cargar el formulario"

msgid "Possible duplicates found"
msgstr "Posibles duplicados encontrados"
Expand Down Expand Up @@ -1394,7 +1397,7 @@ msgid "Event completed"
msgstr "Evento completado"

msgid "The event cannot be edited after it has been completed"
msgstr ""
msgstr "El evento no admite cambios después de haber sido completado"

msgid "Back to all stages and events"
msgstr "Volver a todas las etapas y eventos"
Expand Down Expand Up @@ -1560,7 +1563,7 @@ msgid "Enter details now"
msgstr "Introducir datos ahora"

msgid "Link to an existing"
msgstr ""
msgstr "Relacionar con ..."

msgid "Scheduled date"
msgstr "Fecha planificada"
Expand All @@ -1572,14 +1575,33 @@ msgid "Please select a valid event"
msgstr "Seleccione un evento válido"

msgid "You do not have access to create events in this stage"
msgstr ""
msgstr "No cuenta con acceso para crear eventos en esta etapa"

msgid "This stage can only have one event"
msgstr "Esta etapa solo puede tener un evento"

msgid "New {{ eventName }} event"
msgstr "Nuevo evento {{ eventName }}"

msgid "An error occurred while deleting the event"
msgstr "Se produjo un error eliminando el evento"

msgid ""
"Deleting an event is permanent and cannot be undone. Are you sure you want "
"to delete this event?"
msgstr ""
"La eliminación de un evento es permanente y no se puede deshacer. ¿Está "
"seguro de que desea eliminar este evento?"

msgid "An error occurred when updating event status"
msgstr "Ocurrió un error al actualizar el estado del evento"

msgid "Unskip"
msgstr "des omitir"

msgid "Skip"
msgstr "Omitir"

msgid "To open this event, please wait until saving is complete"
msgstr "Para abrir este evento, espere hasta que se complete el guardado."

Expand Down Expand Up @@ -1610,10 +1632,10 @@ msgid "Stages and Events"
msgstr "Etapas y eventos"

msgid "An error occurred while loading the widget."
msgstr ""
msgstr "Ha ocurrido un error al cargar el componente"

msgid "View linked event"
msgstr ""
msgstr "Ver eventos relacionados"

msgid "Scheduled"
msgstr "Planificado"
Expand Down
17 changes: 17 additions & 0 deletions i18n/es_419.po
Original file line number Diff line number Diff line change
Expand Up @@ -1518,6 +1518,23 @@ msgstr ""
msgid "New {{ eventName }} event"
msgstr "Nuevo evento {{ eventName }}"

msgid "An error occurred while deleting the event"
msgstr ""

msgid ""
"Deleting an event is permanent and cannot be undone. Are you sure you want "
"to delete this event?"
msgstr ""

msgid "An error occurred when updating event status"
msgstr ""

msgid "Unskip"
msgstr ""

msgid "Skip"
msgstr "Omitir"

msgid "To open this event, please wait until saving is complete"
msgstr ""

Expand Down
21 changes: 19 additions & 2 deletions i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
# Gabriela Rodriguez <[email protected]>, 2024
# Yao Selom SAKA (HISP WCA) <[email protected]>, 2024
# Elise Desailly, 2024
# Bram Piot <[email protected]>, 2024
# Viktor Varland <[email protected]>, 2024
# Yayra Gomado <[email protected]>, 2024
# Bram Piot <[email protected]>, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n"
"PO-Revision-Date: 2019-06-27 07:31+0000\n"
"Last-Translator: Yayra Gomado <[email protected]>, 2024\n"
"Last-Translator: Bram Piot <[email protected]>, 2024\n"
"Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -1548,6 +1548,23 @@ msgstr "Ce stade ne peut avoir qu'un seul événement"
msgid "New {{ eventName }} event"
msgstr "Nouvel événement {{ eventName }}"

msgid "An error occurred while deleting the event"
msgstr ""

msgid ""
"Deleting an event is permanent and cannot be undone. Are you sure you want "
"to delete this event?"
msgstr ""

msgid "An error occurred when updating event status"
msgstr ""

msgid "Unskip"
msgstr ""

msgid "Skip"
msgstr "Ignorer"

msgid "To open this event, please wait until saving is complete"
msgstr ""

Expand Down
21 changes: 19 additions & 2 deletions i18n/id.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
# ratih syabrina, 2024
# Yusuf Setiawan <[email protected]>, 2024
# Guardian Sanjaya <[email protected]>, 2024
# Aprisa Chrysantina <[email protected]>, 2024
# Viktor Varland <[email protected]>, 2024
# Aprisa Chrysantina <[email protected]>, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n"
"PO-Revision-Date: 2019-06-27 07:31+0000\n"
"Last-Translator: Viktor Varland <[email protected]>, 2024\n"
"Last-Translator: Aprisa Chrysantina <[email protected]>, 2024\n"
"Language-Team: Indonesian (https://app.transifex.com/hisp-uio/teams/100509/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -1493,6 +1493,23 @@ msgstr ""
msgid "New {{ eventName }} event"
msgstr ""

msgid "An error occurred while deleting the event"
msgstr ""

msgid ""
"Deleting an event is permanent and cannot be undone. Are you sure you want "
"to delete this event?"
msgstr ""

msgid "An error occurred when updating event status"
msgstr ""

msgid "Unskip"
msgstr ""

msgid "Skip"
msgstr "Lewati"

msgid "To open this event, please wait until saving is complete"
msgstr ""

Expand Down
25 changes: 21 additions & 4 deletions i18n/lo.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
# Saysamone Sibounma, 2023
# Somkhit Bouavong <[email protected]>, 2024
# Thuy Nguyen <[email protected]>, 2024
# Viktor Varland <[email protected]>, 2024
# Namwan Chanthavisouk, 2024
# Viktor Varland <[email protected]>, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2024-08-10T10:42:21.141Z\n"
"PO-Revision-Date: 2019-06-27 07:31+0000\n"
"Last-Translator: Namwan Chanthavisouk, 2024\n"
"Last-Translator: Viktor Varland <[email protected]>, 2024\n"
"Language-Team: Lao (https://app.transifex.com/hisp-uio/teams/100509/lo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -1336,7 +1336,7 @@ msgid "Event completed"
msgstr "ກິດຈະກຳສຳເລັດແລ້ວ"

msgid "The event cannot be edited after it has been completed"
msgstr ""
msgstr "ເຫດການດັ່ງກ່າວບໍ່ສາມາດແກ້ໄຂໄດ້ຫຼັງຈາກສໍາເລັດແລ້ວ"

msgid "Back to all stages and events"
msgstr "ກັບໄປທຸກຂັ້ນຕອນ ແລະ ເຫດການ"
Expand Down Expand Up @@ -1497,14 +1497,31 @@ msgid "Please select a valid event"
msgstr "ກະລຸນາເລືອກເຫດການທີ່ຖືກຕ້ອງ"

msgid "You do not have access to create events in this stage"
msgstr ""
msgstr "ທ່ານບໍ່ມີສິດເຂົ້າເຖິງເພື່ອສ້າງເຫດການໃນຂັ້ນຕອນນີ້"

msgid "This stage can only have one event"
msgstr "ຂັ້ນຕອນນີ້ສາມາດມີເຫດການດຽວເທົ່ານັ້ນ"

msgid "New {{ eventName }} event"
msgstr "ເຫດການໃໝ່ {{ eventName }}"

msgid "An error occurred while deleting the event"
msgstr ""

msgid ""
"Deleting an event is permanent and cannot be undone. Are you sure you want "
"to delete this event?"
msgstr ""

msgid "An error occurred when updating event status"
msgstr ""

msgid "Unskip"
msgstr ""

msgid "Skip"
msgstr "ຂ້າມ"

msgid "To open this event, please wait until saving is complete"
msgstr "ເພື່ອເປີດເຫດການນີ້, ກະລຸນາລໍຖ້າຈົນກວ່າການບັນທຶກຈະສຳເລັດ"

Expand Down
Loading

0 comments on commit 8477c66

Please sign in to comment.