Skip to content

Commit

Permalink
Merge branch 'master' into feat/tracked-entity-input
Browse files Browse the repository at this point in the history
  • Loading branch information
martinkrulltott authored Mar 8, 2024
2 parents 927c211 + c463f66 commit 93b4705
Show file tree
Hide file tree
Showing 22 changed files with 325 additions and 119 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
## [26.4.1](https://github.com/dhis2/analytics/compare/v26.4.0...v26.4.1) (2024-03-05)


### Bug Fixes

* interpretations panel renders with flashing when liking or unliking an interpretation ([#1600](https://github.com/dhis2/analytics/issues/1600)) ([bb32565](https://github.com/dhis2/analytics/commit/bb32565960a5f813aaac594b61edc2f9e53d6a4d))
* use translated title and subtitle when available (DHIS2-16216) ([#1597](https://github.com/dhis2/analytics/issues/1597)) ([5a91391](https://github.com/dhis2/analytics/commit/5a91391272022aab14081ba65e0b103693e01daa))

# [26.4.0](https://github.com/dhis2/analytics/compare/v26.3.1...v26.4.0) (2024-03-04)


### Features

* update interpretations component so it can be used in dashboard items ([#1510](https://github.com/dhis2/analytics/issues/1510)) ([163abf6](https://github.com/dhis2/analytics/commit/163abf60326a97248daa019c65b4658c78701780))

## [26.3.1](https://github.com/dhis2/analytics/compare/v26.3.0...v26.3.1) (2024-02-28)


### Bug Fixes

* **translations:** sync translations from transifex (master) ([1f30bb2](https://github.com/dhis2/analytics/commit/1f30bb2db5d16c1cff95437006db64e6060ae3d2))

# [26.3.0](https://github.com/dhis2/analytics/compare/v26.2.4...v26.3.0) (2024-01-25)


Expand Down
11 changes: 8 additions & 3 deletions i18n/cs.po
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
#
# Translators:
# Jiří Podhorecký, 2023
# Philip Larsen Donnelly, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2023-07-06T08:30:33.216Z\n"
"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n"
"PO-Revision-Date: 2020-04-28 22:05+0000\n"
"Last-Translator: Jiří Podhorecký, 2023\n"
"Last-Translator: Philip Larsen Donnelly, 2024\n"
"Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -385,6 +386,10 @@ msgstr "Skrýt interpretaci"
msgid "Write an interpretation"
msgstr "Napsat interpretaci"

msgid ""
"Other people viewing this interpretation in the future may see more data."
msgstr ""

msgid "Post interpretation"
msgstr "Vložit interpretaci"

Expand Down Expand Up @@ -638,7 +643,7 @@ msgstr[2] "{{count}} skupin"
msgstr[3] "{{count}} skupin"

msgid "Selected: {{commaSeparatedListOfOrganisationUnits}}"
msgstr "Vybráno: {{commaSeparatedListOfOfOrganisationUnits}}"
msgstr "Vybráno: {{commaSeparatedListOfOrganisationUnits}}"

msgid "Nothing selected"
msgstr "Není vybráno nic"
Expand Down
9 changes: 6 additions & 3 deletions i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -400,12 +400,15 @@ msgstr "Unlike"
msgid "Like"
msgstr "Like"

msgid "Share"
msgstr "Share"

msgid "See interpretation"
msgstr "See interpretation"

msgid "Open in app"
msgstr "Open in app"

msgid "Share"
msgstr "Share"

msgid "Manage sharing"
msgstr "Manage sharing"

Expand Down
38 changes: 22 additions & 16 deletions i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
# Gabriela Rodriguez <[email protected]>, 2022
# Viktor Varland <[email protected]>, 2022
# Marta Vila <[email protected]>, 2023
# Philip Larsen Donnelly, 2023
# Janeth Cruz, 2023
# Sergio Valenzuela <[email protected]>, 2023
# Enzo Nicolas Rossi <[email protected]>, 2023
# Enzo Nicolas Rossi <[email protected]>, 2024
# Philip Larsen Donnelly, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2023-07-06T08:30:33.216Z\n"
"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n"
"PO-Revision-Date: 2020-04-28 22:05+0000\n"
"Last-Translator: Enzo Nicolas Rossi <[email protected]>, 2023\n"
"Last-Translator: Philip Larsen Donnelly, 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 @@ -227,10 +227,10 @@ msgid "All metrics"
msgstr "Todas las métricas"

msgid "Move to {{axisName}}"
msgstr "Mover a {{Nombredeleje}}"
msgstr "Mover a {{axisName}}"

msgid "Add to {{axisName}}"
msgstr "Añadir a {{Nombredeleje}}"
msgstr "Añadir a {{axisName}}"

msgid "Not available for {{visualizationType}}"
msgstr "No disponible para {{visualizationType}}"
Expand Down Expand Up @@ -399,6 +399,12 @@ msgstr "Ocultar interpretación"
msgid "Write an interpretation"
msgstr "Escribir una interpretación"

msgid ""
"Other people viewing this interpretation in the future may see more data."
msgstr ""
"Otras personas que vean esta interpretación en el futuro podrían ver más "
"datos."

msgid "Post interpretation"
msgstr "Interpretación posterior"

Expand Down Expand Up @@ -636,15 +642,15 @@ msgstr[2] "{{count}} unidades organizativas"

msgid "{{count}} levels"
msgid_plural "{{count}} levels"
msgstr[0] "{{contar}} nivel"
msgstr[1] "{{contar}} niveles"
msgstr[2] "{{contar}} niveles"
msgstr[0] "{{count}} nivel"
msgstr[1] "{{count}} niveles"
msgstr[2] "{{count}} niveles"

msgid "{{count}} groups"
msgid_plural "{{count}} groups"
msgstr[0] "{{contar}} grupo"
msgstr[1] "{{contar}} grupos"
msgstr[2] "{{contar}} grupos"
msgstr[0] "{{count}} grupo"
msgstr[1] "{{count}} grupos"
msgstr[2] "{{count}} grupos"

msgid "Selected: {{commaSeparatedListOfOrganisationUnits}}"
msgstr "Seleccionado: {{commaSeparatedListOfOrganisationUnits}}"
Expand All @@ -653,7 +659,7 @@ msgid "Nothing selected"
msgstr "Nada seleccionado"

msgid "User organisation unit"
msgstr "Usuario de unidad organizativa"
msgstr "Unidad organizativa del usuario"

msgid "User sub-units"
msgstr "Subunidades de usuario"
Expand Down Expand Up @@ -1223,9 +1229,9 @@ msgstr "Eje {{axisId}}"

msgid "{{count}} items"
msgid_plural "{{count}} items"
msgstr[0] "{{contar}} elemento"
msgstr[1] "{{contar}} artículos"
msgstr[2] "{{contar}} artículos"
msgstr[0] "{{count}} elemento"
msgstr[1] "{{count}} artículos"
msgstr[2] "{{count}} artículos"

msgid "Reset zoom"
msgstr "Restablecer zoom"
41 changes: 30 additions & 11 deletions i18n/es_419.po
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# Translators:
# Jaime Bosque <[email protected]>, 2022
# Enzo Nicolas Rossi <[email protected]>, 2023
# Enzo Nicolas Rossi <[email protected]>, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2023-04-18T08:41:27.838Z\n"
"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n"
"PO-Revision-Date: 2020-04-28 22:05+0000\n"
"Last-Translator: Enzo Nicolas Rossi <[email protected]>, 2023\n"
"Last-Translator: Enzo Nicolas Rossi <[email protected]>, 2024\n"
"Language-Team: Spanish (Latin America) (https://app.transifex.com/hisp-uio/teams/100509/es_419/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -168,7 +168,7 @@ msgid "Search by data item name"
msgstr ""

msgid "No items selected"
msgstr ""
msgstr "No hay elementos seleccionados"

msgid "Selected Items"
msgstr ""
Expand Down Expand Up @@ -213,7 +213,7 @@ msgid "Move to {{axisName}}"
msgstr ""

msgid "Add to {{axisName}}"
msgstr ""
msgstr "Añadir a {{axisName}}"

msgid "Not available for {{visualizationType}}"
msgstr ""
Expand All @@ -225,7 +225,7 @@ msgid "Add Assigned Categories"
msgstr ""

msgid "Remove"
msgstr ""
msgstr "Eliminar"

msgid "Filter dimensions"
msgstr ""
Expand Down Expand Up @@ -347,6 +347,9 @@ msgstr ""
msgid "Post reply"
msgstr ""

msgid "Delete failed"
msgstr ""

msgid "Could not update comment"
msgstr ""

Expand All @@ -373,19 +376,32 @@ msgstr ""
msgid "Write an interpretation"
msgstr ""

msgid ""
"Other people viewing this interpretation in the future may see more data."
msgstr ""

msgid "Post interpretation"
msgstr ""

msgid "Interpretations"
msgstr ""

msgid "Unlike"
msgid "Reply"
msgstr ""

msgid "Like"
msgid "{{count}} replies"
msgid_plural "{{count}} replies"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""

msgid "View replies"
msgstr ""

msgid "Reply"
msgid "Unlike"
msgstr ""

msgid "Like"
msgstr ""

msgid "Share"
Expand Down Expand Up @@ -434,7 +450,7 @@ msgid "Searching for \"{{- searchText}}\""
msgstr ""

msgid "No results found"
msgstr ""
msgstr "No se han encontrado resultados"

msgid "Not available offline"
msgstr ""
Expand Down Expand Up @@ -845,6 +861,9 @@ msgstr ""
msgid "Years"
msgstr "Años"

msgid "Interpretations and details"
msgstr ""

msgid "Translating to"
msgstr ""

Expand Down Expand Up @@ -906,7 +925,7 @@ msgid "Expected reports"
msgstr ""

msgid "Program"
msgstr ""
msgstr "Programa"

msgid "Select a program"
msgstr ""
Expand Down
28 changes: 16 additions & 12 deletions i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
# tx_e2f_fr r25 <[email protected]>, 2021
# Karoline Tufte Lien <[email protected]>, 2022
# Edem Kossi <[email protected]>, 2022
# phil_dhis2, 2023
# Yao Selom SAKA (HISP WCA) <[email protected]>, 2023
# Yayra Gomado <[email protected]>, 2023
# Philip Larsen Donnelly, 2024
#
msgid ""
msgstr ""
"Project-Id-Version: i18next-conv\n"
"POT-Creation-Date: 2023-07-06T08:30:33.216Z\n"
"POT-Creation-Date: 2023-09-27T14:15:13.876Z\n"
"PO-Revision-Date: 2020-04-28 22:05+0000\n"
"Last-Translator: Yayra Gomado <[email protected]>, 2023\n"
"Last-Translator: Philip Larsen Donnelly, 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 @@ -217,13 +217,13 @@ msgid "All metrics"
msgstr "Tous les éléments"

msgid "Move to {{axisName}}"
msgstr "Déménager à {{nomdel'axe}}"
msgstr "Déménager à {{axisName}}"

msgid "Add to {{axisName}}"
msgstr "Ajouter à {{nomdel'axe}} "
msgstr "Ajouter à {{axisName}} "

msgid "Not available for {{visualizationType}}"
msgstr "Non disponible pour {{Typedevisualisation}}"
msgstr "Non disponible pour {{visualizationType}}"

msgid "Remove Assigned Categories"
msgstr "Supprimer les Catégories Attribuées"
Expand Down Expand Up @@ -383,6 +383,10 @@ msgstr ""
msgid "Write an interpretation"
msgstr "Ecrire une interprétation"

msgid ""
"Other people viewing this interpretation in the future may see more data."
msgstr ""

msgid "Post interpretation"
msgstr ""

Expand Down Expand Up @@ -1063,19 +1067,19 @@ msgid "Bottom"
msgstr "Bas"

msgid "{{dynamicOuNames}} and {{lastOuName}}"
msgstr "{{NomsOudynamiques}} et {{dernièreOuNom}}"
msgstr "{{dynamicOuNames}} et {{lastOuName}}"

msgid "{{allDynamicOuNames}} levels"
msgstr "{{touslesnomsOudynamiques}} niveaux"
msgstr "{{allDynamicOuNames}} niveaux"

msgid "{{allDynamicOuNames}} groups"
msgstr "{{touslesnomsOudynamiques}} groupes"
msgstr "{{allDynamicOuNames}} groupes"

msgid "{{allDynamicOuNames}} levels in {{staticOuNames}}"
msgstr "{{touslesnomsOudynamiques}} niveaux dans {{NomsOustatiques}} "
msgstr "{{allDynamicOuNames}} niveaux dans {{staticOuNames}} "

msgid "{{allDynamicOuNames}} groups in {{staticOuNames}}"
msgstr "{{touslesnomsOudynamiques}} groupes dans {{NomsOustatiques}}"
msgstr "{{allDynamicOuNames}} groupes dans {{staticOuNames}}"

msgid "{{percentage}}% of total x values"
msgstr "{{percentage}}% de nombre total de X valeurs"
Expand Down Expand Up @@ -1183,7 +1187,7 @@ msgid "Base"
msgstr "Base"

msgid "Axis {{axisId}}"
msgstr "Axe {{{axisId}}"
msgstr "Axe {{axisId}}"

msgid "{{count}} items"
msgid_plural "{{count}} items"
Expand Down
Loading

0 comments on commit 93b4705

Please sign in to comment.