From 35440822be1d305e7c38982992680be20ffeee04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Sat, 18 Aug 2018 06:00:52 +0200 Subject: [PATCH 1/5] CHANGED: The COMMIT_COUNT placeholder in the UPDATE_INFO message of the UpdateNotification module does not contain the word "commit" or "commits" any more, so language files can independently localize them. --- modules/default/updatenotification/updatenotification.js | 2 +- tests/configs/data/TranslationTest.json | 2 +- tests/configs/data/en.json | 2 +- translations/af.json | 2 +- translations/bg.json | 2 +- translations/ca.json | 2 +- translations/cs.json | 2 +- translations/da.json | 2 +- translations/de.json | 2 +- translations/en.json | 2 +- translations/es.json | 2 +- translations/et.json | 2 +- translations/fr.json | 2 +- translations/hu.json | 2 +- translations/id.json | 2 +- translations/is.json | 2 +- translations/it.json | 2 +- translations/kr.json | 2 +- translations/nb.json | 2 +- translations/nl.json | 2 +- translations/nn.json | 2 +- translations/pl.json | 3 ++- translations/pt-br.json | 2 +- translations/pt.json | 2 +- translations/ru.json | 2 +- translations/sv.json | 2 +- translations/zh-cn.json | 2 +- 27 files changed, 28 insertions(+), 27 deletions(-) diff --git a/modules/default/updatenotification/updatenotification.js b/modules/default/updatenotification/updatenotification.js index b26517e5..d69f6288 100644 --- a/modules/default/updatenotification/updatenotification.js +++ b/modules/default/updatenotification/updatenotification.js @@ -59,7 +59,7 @@ Module.register("updatenotification", { message.appendChild(icon); var subtextHtml = this.translate("UPDATE_INFO", { - COMMIT_COUNT: this.status.behind + " " + ((this.status.behind == 1) ? "commit" : "commits"), + COMMIT_COUNT: this.status.behind, BRANCH_NAME: this.status.current }); diff --git a/tests/configs/data/TranslationTest.json b/tests/configs/data/TranslationTest.json index 5614b23c..53ffa825 100644 --- a/tests/configs/data/TranslationTest.json +++ b/tests/configs/data/TranslationTest.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.", - "UPDATE_INFO": "The current installation is COMMIT_COUNT behind on the BRANCH_NAME branch." + "UPDATE_INFO": "The current installation is COMMIT_COUNT commit(s) behind on the BRANCH_NAME branch." } diff --git a/tests/configs/data/en.json b/tests/configs/data/en.json index 5614b23c..53ffa825 100644 --- a/tests/configs/data/en.json +++ b/tests/configs/data/en.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.", - "UPDATE_INFO": "The current installation is COMMIT_COUNT behind on the BRANCH_NAME branch." + "UPDATE_INFO": "The current installation is COMMIT_COUNT commit(s) behind on the BRANCH_NAME branch." } diff --git a/translations/af.json b/translations/af.json index 68bebc8d..bef7b546 100644 --- a/translations/af.json +++ b/translations/af.json @@ -26,5 +26,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² update beskikbaar.", "UPDATE_NOTIFICATION_MODULE": "Update beskikbaar vir {MODULE_NAME} module.", - "UPDATE_INFO": "Die huidige installasie is {COMMIT_COUNT} agter op die {BRANCH_NAME} branch." + "UPDATE_INFO": "Die huidige installasie is {COMMIT_COUNT} commit(s) agter op die {BRANCH_NAME} branch." } diff --git a/translations/bg.json b/translations/bg.json index 705c1396..322dc8b2 100644 --- a/translations/bg.json +++ b/translations/bg.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "Налична актуализация за MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Налична актуализация за {MODULE_NAME} модул.", - "UPDATE_INFO": "Текущата инсталация е изостанала с {COMMIT_COUNT} къмита на клон {BRANCH_NAME}." + "UPDATE_INFO": "Текущата инсталация е изостанала с {COMMIT_COUNT} commit(s) къмита на клон {BRANCH_NAME}." } diff --git a/translations/ca.json b/translations/ca.json index 76e4ad2c..674de8bf 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² actualizació disponible.", "UPDATE_NOTIFICATION_MODULE": "Disponible una actualizació per al mòdul {MODULE_NAME}.", - "UPDATE_INFO": "La teva instal·lació actual està {COMMIT_COUNT} canvis darrere de la branca {BRANCH_NAME}." + "UPDATE_INFO": "La teva instal·lació actual està {COMMIT_COUNT} commit(s) canvis darrere de la branca {BRANCH_NAME}." } diff --git a/translations/cs.json b/translations/cs.json index bec2e82c..39348e7e 100644 --- a/translations/cs.json +++ b/translations/cs.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "Dostupná aktualizace pro MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Dostupná aktualizace pro modul {MODULE_NAME}.", - "UPDATE_INFO": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT}." + "UPDATE_INFO": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT} commit(s)." } diff --git a/translations/da.json b/translations/da.json index fe31cba4..79877334 100644 --- a/translations/da.json +++ b/translations/da.json @@ -27,5 +27,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² opdatering tilgængelig.", "UPDATE_NOTIFICATION_MODULE": "Opdatering tilgængelig for {MODULE_NAME} modulet.", - "UPDATE_INFO": "Den nuværende installation er {COMMIT_COUNT} bagud på {BRANCH_NAME} branch'en." + "UPDATE_INFO": "Den nuværende installation er {COMMIT_COUNT} commit(s) bagud på {BRANCH_NAME} branch'en." } diff --git a/translations/de.json b/translations/de.json index 050060cf..f6604bc5 100644 --- a/translations/de.json +++ b/translations/de.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "Aktualisierung für MagicMirror² verfügbar.", "UPDATE_NOTIFICATION_MODULE": "Aktualisierung für das {MODULE_NAME} Modul verfügbar.", - "UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} hinter dem {BRANCH_NAME} Branch.", + "UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} Commit(s) hinter dem {BRANCH_NAME} Branch.", "FEELS": "Gefühlt" } diff --git a/translations/en.json b/translations/en.json index 1cba9a89..563c5d30 100644 --- a/translations/en.json +++ b/translations/en.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for {MODULE_NAME} module.", - "UPDATE_INFO": "The current installation is {COMMIT_COUNT} behind on the {BRANCH_NAME} branch.", + "UPDATE_INFO": "The current installation is {COMMIT_COUNT} commit(s) behind on the {BRANCH_NAME} branch.", "FEELS": "Feels" } diff --git a/translations/es.json b/translations/es.json index c2420494..9086ae79 100644 --- a/translations/es.json +++ b/translations/es.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² actualización disponible.", "UPDATE_NOTIFICATION_MODULE": "Disponible una actualización para el módulo {MODULE_NAME}.", - "UPDATE_INFO": "Tu actual instalación está {COMMIT_COUNT} cambios detrás de la rama {BRANCH_NAME}.", + "UPDATE_INFO": "Tu actual instalación está {COMMIT_COUNT} commit(s) cambios detrás de la rama {BRANCH_NAME}.", "FEELS": "Sensación térmica de" } diff --git a/translations/et.json b/translations/et.json index f7ad1f0e..4283a048 100644 --- a/translations/et.json +++ b/translations/et.json @@ -26,5 +26,5 @@ "UPDATE_NOTIFICATION": "MagicMirror²´le uuendus saadaval.", "UPDATE_NOTIFICATION_MODULE": "Uuendus saadaval {MODULE_NAME} moodulile.", - "UPDATE_INFO": "Praegune paigaldus on {COMMIT_COUNT} tagapool {BRANCH_NAME} harul." + "UPDATE_INFO": "Praegune paigaldus on {COMMIT_COUNT} commit(s) tagapool {BRANCH_NAME} harul." } diff --git a/translations/fr.json b/translations/fr.json index 65195b8e..cdb70028 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "Une mise à jour de MagicMirror² est disponible", "UPDATE_NOTIFICATION_MODULE": "Une mise à jour est disponible pour le module {MODULE_NAME} .", - "UPDATE_INFO": "L'installation actuelle est {COMMIT_COUNT} en retard sur la branche {BRANCH_NAME} .", + "UPDATE_INFO": "L'installation actuelle est {COMMIT_COUNT} commit(s) en retard sur la branche {BRANCH_NAME} .", "FEELS": "Ressenti" } diff --git a/translations/hu.json b/translations/hu.json index b483ecd9..3926f60c 100644 --- a/translations/hu.json +++ b/translations/hu.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror²-hoz frissítés érhető el.", "UPDATE_NOTIFICATION_MODULE": "A {MODULE_NAME} modulhoz frissítés érhető el.", - "UPDATE_INFO": "A jelenlegi telepítés óta {COMMIT_COUNT} commit jelent meg a {BRANCH_NAME} ágon.", + "UPDATE_INFO": "A jelenlegi telepítés óta {COMMIT_COUNT} új commit jelent meg a {BRANCH_NAME} ágon.", "FEELS": "Érzet" } diff --git a/translations/id.json b/translations/id.json index 9a4ed5d4..3aff52d9 100644 --- a/translations/id.json +++ b/translations/id.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "Memperbarui MagicMirror² tersedia.", "UPDATE_NOTIFICATION_MODULE": "Memperbarui tersedia untuk modul {MODULE_NAME}.", - "UPDATE_INFO": "Instalasi saat ini tertinggal {COMMIT_COUNT} pada cabang {BRANCH_NAME}." + "UPDATE_INFO": "Instalasi saat ini tertinggal {COMMIT_COUNT} commit(s) pada cabang {BRANCH_NAME}." } diff --git a/translations/is.json b/translations/is.json index b60c0ae4..69427ea8 100644 --- a/translations/is.json +++ b/translations/is.json @@ -26,5 +26,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² uppfærsla í boði.", "UPDATE_NOTIFICATION_MODULE": "Uppfærsla í boði fyrir {MODULE_NAME} module.", - "UPDATE_INFO": "Núverandi kerfi er {COMMIT_COUNT} á eftir {BRANCH_NAME} branchinu." + "UPDATE_INFO": "Núverandi kerfi er {COMMIT_COUNT} commit(s) á eftir {BRANCH_NAME} branchinu." } diff --git a/translations/it.json b/translations/it.json index f903eb2e..b9146178 100644 --- a/translations/it.json +++ b/translations/it.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "E' disponibile un aggiornamento di MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "E' disponibile un aggiornamento del modulo {MODULE_NAME}.", - "UPDATE_INFO": "L'installazione è {COMMIT_COUNT} indietro rispetto all'attuale branch {BRANCH_NAME}." + "UPDATE_INFO": "L'installazione è {COMMIT_COUNT} commit(s) indietro rispetto all'attuale branch {BRANCH_NAME}." } diff --git a/translations/kr.json b/translations/kr.json index 70df42f8..d3f0b37d 100644 --- a/translations/kr.json +++ b/translations/kr.json @@ -26,5 +26,5 @@ "UPDATE_NOTIFICATION": "새로운 MagicMirror² 업데이트가 있습니다.", "UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME} 모듈에서 사용 가능한 업데이트 입니다.", - "UPDATE_INFO": "설치할 {COMMIT_COUNT} 는 {BRANCH_NAME} 분기에 해당됩니다." + "UPDATE_INFO": "설치할 {COMMIT_COUNT} commit(s) 는 {BRANCH_NAME} 분기에 해당됩니다." } diff --git a/translations/nb.json b/translations/nb.json index 30f271c6..25491468 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -28,7 +28,7 @@ "UPDATE_NOTIFICATION": "MagicMirror²-oppdatering er tilgjengelig.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen {MODULE_NAME}.", - "UPDATE_INFO": "Nåværende installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} grenen.", + "UPDATE_INFO": "Nåværende installasjon er {COMMIT_COUNT} commit(s) bak {BRANCH_NAME} grenen.", "FEELS": "Føles som" } diff --git a/translations/nl.json b/translations/nl.json index e1497d39..d94ca100 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -26,7 +26,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² update beschikbaar.", "UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.", - "UPDATE_INFO": "De huidige installatie loopt {COMMIT_COUNT} achter op de {BRANCH_NAME} branch.", + "UPDATE_INFO": "De huidige installatie loopt {COMMIT_COUNT} commit(s) achter op de {BRANCH_NAME} branch.", "FEELS": "Gevoelstemperatuur" } diff --git a/translations/nn.json b/translations/nn.json index 5e321fea..8ce32ad1 100644 --- a/translations/nn.json +++ b/translations/nn.json @@ -26,7 +26,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengeleg.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengeleg for modulen {MODULE_NAME}.", - "UPDATE_INFO": "noverande installasjon er {COMMIT_COUNT} bak {BRANCH_NAME} greinen.", + "UPDATE_INFO": "noverande installasjon er {COMMIT_COUNT} commit(s) bak {BRANCH_NAME} greinen.", "FEELS": "Kjenst som" } diff --git a/translations/pl.json b/translations/pl.json index c07cd093..e09ce081 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "Dostępna jest aktualizacja MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Dostępna jest aktualizacja modułu {MODULE_NAME}.", - "UPDATE_INFO": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.", + "UPDATE_INFO_SINGLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitw od gazi {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitw od gazi {BRANCH_NAME}.", "FEELS": "Odczuwalna" } diff --git a/translations/pt-br.json b/translations/pt-br.json index 47af03c8..28784ae2 100644 --- a/translations/pt-br.json +++ b/translations/pt-br.json @@ -25,5 +25,5 @@ "UPDATE_NOTIFICATION": "Nova atualização para MagicMirror disponível.", "UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.", - "UPDATE_INFO": "Sua versão atual é a {COMMIT_COUNT} dentro do seguinte branch {BRANCH_NAME}." + "UPDATE_INFO": "Sua versão atual é a {COMMIT_COUNT} commit(s) dentro do seguinte branch {BRANCH_NAME}." } diff --git a/translations/pt.json b/translations/pt.json index daceb4b2..59bc045f 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -27,5 +27,5 @@ "UPDATE_NOTIFICATION": "Atualização do MagicMirror² disponível.", "UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.", - "UPDATE_INFO": "A instalação atual está {COMMIT_COUNT} atrasada no branch {BRANCH_NAME}." + "UPDATE_INFO": "A instalação atual está {COMMIT_COUNT} commit(s) atrasada no branch {BRANCH_NAME}." } diff --git a/translations/ru.json b/translations/ru.json index e4fce93e..d40d1c2f 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -28,5 +28,5 @@ "UPDATE_NOTIFICATION": "Есть обновление для MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Есть обновление для {MODULE_NAME} модуля.", - "UPDATE_INFO": "Данная инсталляция позади {BRANCH_NAME} ветки на {COMMIT_COUNT} коммитов." + "UPDATE_INFO": "Данная инсталляция позади {BRANCH_NAME} commit(s) ветки на {COMMIT_COUNT} коммитов." } diff --git a/translations/sv.json b/translations/sv.json index 0bdb24e4..ed957755 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -29,7 +29,7 @@ "UPDATE_NOTIFICATION": "MagicMirror² uppdatering finns tillgänglig.", "UPDATE_NOTIFICATION_MODULE": "Uppdatering finns tillgänglig av {MODULE_NAME} modulen.", - "UPDATE_INFO": "Denna installation ligger {COMMIT_COUNT} steg bakom {BRANCH_NAME} grenen.", + "UPDATE_INFO": "Denna installation ligger {COMMIT_COUNT} commit(s) steg bakom {BRANCH_NAME} grenen.", "FEELS": "Känns som" } diff --git a/translations/zh-cn.json b/translations/zh-cn.json index 42ac8e65..920c3649 100644 --- a/translations/zh-cn.json +++ b/translations/zh-cn.json @@ -26,5 +26,5 @@ "UPDATE_NOTIFICATION": "MagicMirror² 有新的更新", "UPDATE_NOTIFICATION_MODULE": "模块 {MODULE_NAME} 可更新", - "UPDATE_INFO": "当前已安装版本为 {COMMIT_COUNT} 落后于分支 {BRANCH_NAME} " + "UPDATE_INFO": "当前已安装版本为 {COMMIT_COUNT} commit(s) 落后于分支 {BRANCH_NAME} " } From ddebc63488a8eafa3cea0e0e5948b65af8fc811b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Sat, 18 Aug 2018 06:10:31 +0200 Subject: [PATCH 2/5] ADDED: CHANGELOG entry. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e121423..8a7df8f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Mixup between german and spanish translation for newsfeed. - Fixed close dates to be absolute, if no configured in the config.js - module Calendar +- The word "commit" in the message of the UpdateNotification module can be localized. - Fix for weatherforecast rainfall rounding [#1374](https://github.com/MichMich/MagicMirror/issues/1374) - Fix calendar parsing issue for Midori on RasperryPi Zero w, related to issue #694. - Fix weather city ID link in sample config From b601f6a138e1f4ec101272bb90f108f0858f239d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Thu, 30 Aug 2018 00:21:43 +0200 Subject: [PATCH 3/5] CHANGED: The UPDATE_INFO key in the localization file is changed to UPDATE_INFO_SINGLE and UPDATE_INFO_MULTIPLE to allow different localization for single and multiple commits. --- modules/default/updatenotification/updatenotification.js | 3 ++- tests/configs/data/TranslationTest.json | 3 ++- tests/configs/data/en.json | 3 ++- translations/af.json | 3 ++- translations/bg.json | 3 ++- translations/ca.json | 3 ++- translations/cs.json | 3 ++- translations/cy.json | 3 ++- translations/da.json | 3 ++- translations/de.json | 3 ++- translations/en.json | 3 ++- translations/es.json | 3 ++- translations/et.json | 3 ++- translations/fr.json | 3 ++- translations/hu.json | 3 ++- translations/id.json | 3 ++- translations/is.json | 3 ++- translations/it.json | 3 ++- translations/kr.json | 3 ++- translations/nb.json | 3 ++- translations/nl.json | 3 ++- translations/nn.json | 3 ++- translations/pt-br.json | 3 ++- translations/pt.json | 3 ++- translations/ro.json | 3 ++- translations/ru.json | 3 ++- translations/sv.json | 3 ++- translations/zh-cn.json | 3 ++- 28 files changed, 56 insertions(+), 28 deletions(-) diff --git a/modules/default/updatenotification/updatenotification.js b/modules/default/updatenotification/updatenotification.js index d69f6288..e3e55fc5 100644 --- a/modules/default/updatenotification/updatenotification.js +++ b/modules/default/updatenotification/updatenotification.js @@ -58,7 +58,8 @@ Module.register("updatenotification", { icon.innerHTML = " "; message.appendChild(icon); - var subtextHtml = this.translate("UPDATE_INFO", { + var updateInfoKeyName = this.status.behind == 1 ? "UPDATE_INFO_SINGLE" : "UPDATE_INFO_MULTIPLE"; + var subtextHtml = this.translate(updateInfoKeyName, { COMMIT_COUNT: this.status.behind, BRANCH_NAME: this.status.current }); diff --git a/tests/configs/data/TranslationTest.json b/tests/configs/data/TranslationTest.json index 53ffa825..bbb13845 100644 --- a/tests/configs/data/TranslationTest.json +++ b/tests/configs/data/TranslationTest.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.", - "UPDATE_INFO": "The current installation is COMMIT_COUNT commit(s) behind on the BRANCH_NAME branch." + "UPDATE_INFO_SINGLE": "The current installation is COMMIT_COUNT commit behind on the BRANCH_NAME branch.", + "UPDATE_INFO_MULTIPLE": "The current installation is COMMIT_COUNT commits behind on the BRANCH_NAME branch." } diff --git a/tests/configs/data/en.json b/tests/configs/data/en.json index 53ffa825..bbb13845 100644 --- a/tests/configs/data/en.json +++ b/tests/configs/data/en.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.", - "UPDATE_INFO": "The current installation is COMMIT_COUNT commit(s) behind on the BRANCH_NAME branch." + "UPDATE_INFO_SINGLE": "The current installation is COMMIT_COUNT commit behind on the BRANCH_NAME branch.", + "UPDATE_INFO_MULTIPLE": "The current installation is COMMIT_COUNT commits behind on the BRANCH_NAME branch." } diff --git a/translations/af.json b/translations/af.json index bef7b546..c0845649 100644 --- a/translations/af.json +++ b/translations/af.json @@ -26,5 +26,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² update beskikbaar.", "UPDATE_NOTIFICATION_MODULE": "Update beskikbaar vir {MODULE_NAME} module.", - "UPDATE_INFO": "Die huidige installasie is {COMMIT_COUNT} commit(s) agter op die {BRANCH_NAME} branch." + "UPDATE_INFO_SINGLE": "Die huidige installasie is {COMMIT_COUNT} commit agter op die {BRANCH_NAME} branch.", + "UPDATE_INFO_MULTIPLE": "Die huidige installasie is {COMMIT_COUNT} commits agter op die {BRANCH_NAME} branch." } diff --git a/translations/bg.json b/translations/bg.json index 322dc8b2..786f8643 100644 --- a/translations/bg.json +++ b/translations/bg.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "Налична актуализация за MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Налична актуализация за {MODULE_NAME} модул.", - "UPDATE_INFO": "Текущата инсталация е изостанала с {COMMIT_COUNT} commit(s) къмита на клон {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "Текущата инсталация е изостанала с {COMMIT_COUNT} commit къмита на клон {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Текущата инсталация е изостанала с {COMMIT_COUNT} commits къмита на клон {BRANCH_NAME}." } diff --git a/translations/ca.json b/translations/ca.json index 674de8bf..91f871ca 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² actualizació disponible.", "UPDATE_NOTIFICATION_MODULE": "Disponible una actualizació per al mòdul {MODULE_NAME}.", - "UPDATE_INFO": "La teva instal·lació actual està {COMMIT_COUNT} commit(s) canvis darrere de la branca {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "La teva instal·lació actual està {COMMIT_COUNT} commit canvis darrere de la branca {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "La teva instal·lació actual està {COMMIT_COUNT} commits canvis darrere de la branca {BRANCH_NAME}." } diff --git a/translations/cs.json b/translations/cs.json index 39348e7e..6ea3ddc1 100644 --- a/translations/cs.json +++ b/translations/cs.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "Dostupná aktualizace pro MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Dostupná aktualizace pro modul {MODULE_NAME}.", - "UPDATE_INFO": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT} commit(s)." + "UPDATE_INFO_SINGLE": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT} commit.", + "UPDATE_INFO_MULTIPLE": "Současná instalace je na větvi {BRANCH_NAME} pozadu o {COMMIT_COUNT} commits." } diff --git a/translations/cy.json b/translations/cy.json index 7ae28abb..ba5d62ea 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² mwy diweddar yn barod.", "UPDATE_NOTIFICATION_MODULE": "Mae diweddaraiad ar gyfer y modiwl {MODULE_NAME}.", - "UPDATE_INFO": "Mae'r fersiwn bresenol {COMMIT_COUNT} commit tu ôl i'r gangen {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "Mae'r fersiwn bresenol {COMMIT_COUNT} commit tu ôl i'r gangen {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Mae'r fersiwn bresenol {COMMIT_COUNT} commit tu ôl i'r gangen {BRANCH_NAME}." } diff --git a/translations/da.json b/translations/da.json index 79877334..4f4f50e7 100644 --- a/translations/da.json +++ b/translations/da.json @@ -27,5 +27,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² opdatering tilgængelig.", "UPDATE_NOTIFICATION_MODULE": "Opdatering tilgængelig for {MODULE_NAME} modulet.", - "UPDATE_INFO": "Den nuværende installation er {COMMIT_COUNT} commit(s) bagud på {BRANCH_NAME} branch'en." + "UPDATE_INFO_SINGLE": "Den nuværende installation er {COMMIT_COUNT} commit bagud på {BRANCH_NAME} branch'en.", + "UPDATE_INFO_MULTIPLE": "Den nuværende installation er {COMMIT_COUNT} commits bagud på {BRANCH_NAME} branch'en." } diff --git a/translations/de.json b/translations/de.json index f6604bc5..57f06cde 100644 --- a/translations/de.json +++ b/translations/de.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "Aktualisierung für MagicMirror² verfügbar.", "UPDATE_NOTIFICATION_MODULE": "Aktualisierung für das {MODULE_NAME} Modul verfügbar.", - "UPDATE_INFO": "Die aktuelle Installation ist {COMMIT_COUNT} Commit(s) hinter dem {BRANCH_NAME} Branch.", + "UPDATE_INFO_SINGLE": "Die aktuelle Installation ist {COMMIT_COUNT} Commit hinter dem {BRANCH_NAME} Branch.", + "UPDATE_INFO_MULTIPLE": "Die aktuelle Installation ist {COMMIT_COUNT} Commits hinter dem {BRANCH_NAME} Branch.", "FEELS": "Gefühlt" } diff --git a/translations/en.json b/translations/en.json index 563c5d30..900bf630 100644 --- a/translations/en.json +++ b/translations/en.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for {MODULE_NAME} module.", - "UPDATE_INFO": "The current installation is {COMMIT_COUNT} commit(s) behind on the {BRANCH_NAME} branch.", + "UPDATE_INFO_SINGLE": "The current installation is {COMMIT_COUNT} commit behind on the {BRANCH_NAME} branch.", + "UPDATE_INFO_MULTIPLE": "The current installation is {COMMIT_COUNT} commits behind on the {BRANCH_NAME} branch.", "FEELS": "Feels" } diff --git a/translations/es.json b/translations/es.json index 9086ae79..5e5fe96d 100644 --- a/translations/es.json +++ b/translations/es.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "MagicMirror² actualización disponible.", "UPDATE_NOTIFICATION_MODULE": "Disponible una actualización para el módulo {MODULE_NAME}.", - "UPDATE_INFO": "Tu actual instalación está {COMMIT_COUNT} commit(s) cambios detrás de la rama {BRANCH_NAME}.", + "UPDATE_INFO_SINGLE": "Tu actual instalación está {COMMIT_COUNT} commit cambios detrás de la rama {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Tu actual instalación está {COMMIT_COUNT} commits cambios detrás de la rama {BRANCH_NAME}.", "FEELS": "Sensación térmica de" } diff --git a/translations/et.json b/translations/et.json index 4283a048..bddd56ae 100644 --- a/translations/et.json +++ b/translations/et.json @@ -26,5 +26,6 @@ "UPDATE_NOTIFICATION": "MagicMirror²´le uuendus saadaval.", "UPDATE_NOTIFICATION_MODULE": "Uuendus saadaval {MODULE_NAME} moodulile.", - "UPDATE_INFO": "Praegune paigaldus on {COMMIT_COUNT} commit(s) tagapool {BRANCH_NAME} harul." + "UPDATE_INFO_SINGLE": "Praegune paigaldus on {COMMIT_COUNT} commit tagapool {BRANCH_NAME} harul.", + "UPDATE_INFO_MULTIPLE": "Praegune paigaldus on {COMMIT_COUNT} commits tagapool {BRANCH_NAME} harul." } diff --git a/translations/fr.json b/translations/fr.json index cdb70028..e2dd22e2 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "Une mise à jour de MagicMirror² est disponible", "UPDATE_NOTIFICATION_MODULE": "Une mise à jour est disponible pour le module {MODULE_NAME} .", - "UPDATE_INFO": "L'installation actuelle est {COMMIT_COUNT} commit(s) en retard sur la branche {BRANCH_NAME} .", + "UPDATE_INFO_SINGLE": "L'installation actuelle est {COMMIT_COUNT} commit en retard sur la branche {BRANCH_NAME} .", + "UPDATE_INFO_MULTIPLE": "L'installation actuelle est {COMMIT_COUNT} commits en retard sur la branche {BRANCH_NAME} .", "FEELS": "Ressenti" } diff --git a/translations/hu.json b/translations/hu.json index 3926f60c..e0d8b7ae 100644 --- a/translations/hu.json +++ b/translations/hu.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "MagicMirror²-hoz frissítés érhető el.", "UPDATE_NOTIFICATION_MODULE": "A {MODULE_NAME} modulhoz frissítés érhető el.", - "UPDATE_INFO": "A jelenlegi telepítés óta {COMMIT_COUNT} új commit jelent meg a {BRANCH_NAME} ágon.", + "UPDATE_INFO_SINGLE": "A jelenlegi telepítés óta {COMMIT_COUNT} új commit jelent meg a {BRANCH_NAME} ágon.", + "UPDATE_INFO_MULTIPLE": "A jelenlegi telepítés óta {COMMIT_COUNT} új commit jelent meg a {BRANCH_NAME} ágon.", "FEELS": "Érzet" } diff --git a/translations/id.json b/translations/id.json index 3aff52d9..d6c91e5b 100644 --- a/translations/id.json +++ b/translations/id.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "Memperbarui MagicMirror² tersedia.", "UPDATE_NOTIFICATION_MODULE": "Memperbarui tersedia untuk modul {MODULE_NAME}.", - "UPDATE_INFO": "Instalasi saat ini tertinggal {COMMIT_COUNT} commit(s) pada cabang {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "Instalasi saat ini tertinggal {COMMIT_COUNT} commit pada cabang {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Instalasi saat ini tertinggal {COMMIT_COUNT} commits pada cabang {BRANCH_NAME}." } diff --git a/translations/is.json b/translations/is.json index 69427ea8..01a3406d 100644 --- a/translations/is.json +++ b/translations/is.json @@ -26,5 +26,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² uppfærsla í boði.", "UPDATE_NOTIFICATION_MODULE": "Uppfærsla í boði fyrir {MODULE_NAME} module.", - "UPDATE_INFO": "Núverandi kerfi er {COMMIT_COUNT} commit(s) á eftir {BRANCH_NAME} branchinu." + "UPDATE_INFO_SINGLE": "Núverandi kerfi er {COMMIT_COUNT} commit á eftir {BRANCH_NAME} branchinu.", + "UPDATE_INFO_MULTIPLE": "Núverandi kerfi er {COMMIT_COUNT} commits á eftir {BRANCH_NAME} branchinu." } diff --git a/translations/it.json b/translations/it.json index b9146178..a5eaf2f2 100644 --- a/translations/it.json +++ b/translations/it.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "E' disponibile un aggiornamento di MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "E' disponibile un aggiornamento del modulo {MODULE_NAME}.", - "UPDATE_INFO": "L'installazione è {COMMIT_COUNT} commit(s) indietro rispetto all'attuale branch {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "L'installazione è {COMMIT_COUNT} commit indietro rispetto all'attuale branch {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "L'installazione è {COMMIT_COUNT} commits indietro rispetto all'attuale branch {BRANCH_NAME}." } diff --git a/translations/kr.json b/translations/kr.json index d3f0b37d..54ee8d20 100644 --- a/translations/kr.json +++ b/translations/kr.json @@ -26,5 +26,6 @@ "UPDATE_NOTIFICATION": "새로운 MagicMirror² 업데이트가 있습니다.", "UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME} 모듈에서 사용 가능한 업데이트 입니다.", - "UPDATE_INFO": "설치할 {COMMIT_COUNT} commit(s) 는 {BRANCH_NAME} 분기에 해당됩니다." + "UPDATE_INFO_SINGLE": "설치할 {COMMIT_COUNT} commit 는 {BRANCH_NAME} 분기에 해당됩니다.", + "UPDATE_INFO_MULTIPLE": "설치할 {COMMIT_COUNT} commits 는 {BRANCH_NAME} 분기에 해당됩니다." } diff --git a/translations/nb.json b/translations/nb.json index 25491468..88027d89 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -28,7 +28,8 @@ "UPDATE_NOTIFICATION": "MagicMirror²-oppdatering er tilgjengelig.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen {MODULE_NAME}.", - "UPDATE_INFO": "Nåværende installasjon er {COMMIT_COUNT} commit(s) bak {BRANCH_NAME} grenen.", + "UPDATE_INFO_SINGLE": "Nåværende installasjon er {COMMIT_COUNT} commit bak {BRANCH_NAME} grenen.", + "UPDATE_INFO_MULTIPLE": "Nåværende installasjon er {COMMIT_COUNT} commits bak {BRANCH_NAME} grenen.", "FEELS": "Føles som" } diff --git a/translations/nl.json b/translations/nl.json index d94ca100..9a344eb3 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -26,7 +26,8 @@ "UPDATE_NOTIFICATION": "MagicMirror² update beschikbaar.", "UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.", - "UPDATE_INFO": "De huidige installatie loopt {COMMIT_COUNT} commit(s) achter op de {BRANCH_NAME} branch.", + "UPDATE_INFO_SINGLE": "De huidige installatie loopt {COMMIT_COUNT} commit achter op de {BRANCH_NAME} branch.", + "UPDATE_INFO_MULTIPLE": "De huidige installatie loopt {COMMIT_COUNT} commits achter op de {BRANCH_NAME} branch.", "FEELS": "Gevoelstemperatuur" } diff --git a/translations/nn.json b/translations/nn.json index 8ce32ad1..1fd14548 100644 --- a/translations/nn.json +++ b/translations/nn.json @@ -26,7 +26,8 @@ "UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengeleg.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengeleg for modulen {MODULE_NAME}.", - "UPDATE_INFO": "noverande installasjon er {COMMIT_COUNT} commit(s) bak {BRANCH_NAME} greinen.", + "UPDATE_INFO_SINGLE": "noverande installasjon er {COMMIT_COUNT} commit bak {BRANCH_NAME} greinen.", + "UPDATE_INFO_MULTIPLE": "noverande installasjon er {COMMIT_COUNT} commits bak {BRANCH_NAME} greinen.", "FEELS": "Kjenst som" } diff --git a/translations/pt-br.json b/translations/pt-br.json index 28784ae2..898e4f1f 100644 --- a/translations/pt-br.json +++ b/translations/pt-br.json @@ -25,5 +25,6 @@ "UPDATE_NOTIFICATION": "Nova atualização para MagicMirror disponível.", "UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.", - "UPDATE_INFO": "Sua versão atual é a {COMMIT_COUNT} commit(s) dentro do seguinte branch {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "Sua versão atual é a {COMMIT_COUNT} commit dentro do seguinte branch {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Sua versão atual é a {COMMIT_COUNT} commits dentro do seguinte branch {BRANCH_NAME}." } diff --git a/translations/pt.json b/translations/pt.json index 59bc045f..e01d028c 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -27,5 +27,6 @@ "UPDATE_NOTIFICATION": "Atualização do MagicMirror² disponível.", "UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.", - "UPDATE_INFO": "A instalação atual está {COMMIT_COUNT} commit(s) atrasada no branch {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "A instalação atual está {COMMIT_COUNT} commit atrasada no branch {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "A instalação atual está {COMMIT_COUNT} commits atrasada no branch {BRANCH_NAME}." } diff --git a/translations/ro.json b/translations/ro.json index acc7db8c..3584d69f 100644 --- a/translations/ro.json +++ b/translations/ro.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "Un update este disponibil pentru MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Un update este disponibil pentru modulul {MODULE_NAME}.", - "UPDATE_INFO": "Există {COMMIT_COUNT} commit-uri noi pe branch-ul {BRANCH_NAME}." + "UPDATE_INFO_SINGLE": "Există {COMMIT_COUNT} commit-uri noi pe branch-ul {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Există {COMMIT_COUNT} commit-uri noi pe branch-ul {BRANCH_NAME}." } diff --git a/translations/ru.json b/translations/ru.json index d40d1c2f..cf2e5c5f 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -28,5 +28,6 @@ "UPDATE_NOTIFICATION": "Есть обновление для MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Есть обновление для {MODULE_NAME} модуля.", - "UPDATE_INFO": "Данная инсталляция позади {BRANCH_NAME} commit(s) ветки на {COMMIT_COUNT} коммитов." + "UPDATE_INFO_SINGLE": "Данная инсталляция позади {BRANCH_NAME} commit ветки на {COMMIT_COUNT} коммитов.", + "UPDATE_INFO_MULTIPLE": "Данная инсталляция позади {BRANCH_NAME} commits ветки на {COMMIT_COUNT} коммитов." } diff --git a/translations/sv.json b/translations/sv.json index ed957755..e8f5d018 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -29,7 +29,8 @@ "UPDATE_NOTIFICATION": "MagicMirror² uppdatering finns tillgänglig.", "UPDATE_NOTIFICATION_MODULE": "Uppdatering finns tillgänglig av {MODULE_NAME} modulen.", - "UPDATE_INFO": "Denna installation ligger {COMMIT_COUNT} commit(s) steg bakom {BRANCH_NAME} grenen.", + "UPDATE_INFO_SINGLE": "Denna installation ligger {COMMIT_COUNT} commit steg bakom {BRANCH_NAME} grenen.", + "UPDATE_INFO_MULTIPLE": "Denna installation ligger {COMMIT_COUNT} commits steg bakom {BRANCH_NAME} grenen.", "FEELS": "Känns som" } diff --git a/translations/zh-cn.json b/translations/zh-cn.json index 920c3649..b879edb4 100644 --- a/translations/zh-cn.json +++ b/translations/zh-cn.json @@ -26,5 +26,6 @@ "UPDATE_NOTIFICATION": "MagicMirror² 有新的更新", "UPDATE_NOTIFICATION_MODULE": "模块 {MODULE_NAME} 可更新", - "UPDATE_INFO": "当前已安装版本为 {COMMIT_COUNT} commit(s) 落后于分支 {BRANCH_NAME} " + "UPDATE_INFO_SINGLE": "当前已安装版本为 {COMMIT_COUNT} commit 落后于分支 {BRANCH_NAME} ", + "UPDATE_INFO_MULTIPLE": "当前已安装版本为 {COMMIT_COUNT} commits 落后于分支 {BRANCH_NAME} " } From b06cf55c0bb595d5f93386c33e7e3a5a150a94de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Wed, 5 Sep 2018 04:33:42 +0200 Subject: [PATCH 4/5] FIXED: Character encoding issue in pl.json occurred during rebase. --- translations/pl.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/pl.json b/translations/pl.json index e09ce081..617288e9 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -28,8 +28,8 @@ "UPDATE_NOTIFICATION": "Dostępna jest aktualizacja MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Dostępna jest aktualizacja modułu {MODULE_NAME}.", - "UPDATE_INFO_SINGLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitw od gazi {BRANCH_NAME}.", - "UPDATE_INFO_MULTIPLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitw od gazi {BRANCH_NAME}.", - + "UPDATE_INFO_SINGLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.", + "UPDATE_INFO_MULTIPLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.", + "FEELS": "Odczuwalna" } From ec44cb27619aa35dada2dfe546f389fbcc2a3241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Bal=C3=A1ssy?= Date: Wed, 5 Sep 2018 04:39:39 +0200 Subject: [PATCH 5/5] CHANGED: The wording in CHANGELOG is modified to be more descriptive. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a7df8f5..571b97d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Mixup between german and spanish translation for newsfeed. - Fixed close dates to be absolute, if no configured in the config.js - module Calendar -- The word "commit" in the message of the UpdateNotification module can be localized. +- Fixed the UpdateNotification module message about new commits in the repository, so they can be correctly localized in singular and plural form. - Fix for weatherforecast rainfall rounding [#1374](https://github.com/MichMich/MagicMirror/issues/1374) - Fix calendar parsing issue for Midori on RasperryPi Zero w, related to issue #694. - Fix weather city ID link in sample config