From a99de1ad13e3e2f8340e87793d67a4dea0a2688b Mon Sep 17 00:00:00 2001 From: veeck Date: Wed, 13 Jan 2021 16:31:36 +0100 Subject: [PATCH 1/4] Sort translation entries consistently --- translations/bg.json | 1 - translations/ca.json | 1 - translations/cs.json | 1 - translations/cv.json | 2 +- translations/cy.json | 1 - translations/da.json | 3 ++- translations/de.json | 7 +++---- translations/en.json | 9 ++++----- translations/es.json | 9 ++++----- translations/fi.json | 9 ++++----- translations/fr.json | 7 +++---- translations/gu.json | 9 ++++----- translations/he.json | 9 ++++----- translations/hi.json | 9 ++++----- translations/hr.json | 7 +++---- translations/hu.json | 7 +++---- translations/id.json | 1 - translations/it.json | 7 +++---- translations/lt.json | 7 +++---- translations/ms-my.json | 1 - translations/nb.json | 7 +++---- translations/nl.json | 5 +++-- translations/nn.json | 6 +++--- translations/pl.json | 9 ++++----- translations/ps.json | 7 +++---- translations/pt-br.json | 8 ++++---- translations/pt.json | 10 +++++----- translations/ro.json | 7 +++---- translations/ru.json | 2 +- translations/sk.json | 1 - translations/sv.json | 7 +++---- translations/tlh.json | 7 +++---- translations/tr.json | 9 ++++----- translations/uk.json | 9 ++++----- translations/zh-cn.json | 7 +++---- 35 files changed, 91 insertions(+), 117 deletions(-) diff --git a/translations/bg.json b/translations/bg.json index b48b0a2d..145b2685 100644 --- a/translations/bg.json +++ b/translations/bg.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Вдругиден", "RUNNING": "Свършва след", "EMPTY": "Няма предстоящи събития.", - "WEEK": "Седмица {weekNumber}", "N": "С", diff --git a/translations/ca.json b/translations/ca.json index 91f871ca..e145b3ea 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Demà passat", "RUNNING": "Acaba en", "EMPTY": "No hi ha esdeveniments programats.", - "WEEK": "Setmana", "N": "N", diff --git a/translations/cs.json b/translations/cs.json index 6ea3ddc1..d1efdec4 100644 --- a/translations/cs.json +++ b/translations/cs.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Pozítří", "RUNNING": "Končí za", "EMPTY": "Žádné nadcházející události.", - "WEEK": "{weekNumber}. týden", "N": "S", diff --git a/translations/cv.json b/translations/cv.json index 9a941fc0..bed87f85 100644 --- a/translations/cv.json +++ b/translations/cv.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Виҫмине", "RUNNING": "Хальхи", "EMPTY": "Пулас ӗҫ ҫук", - "WEEK": "{weekNumber} эрне", "N": "Ҫ", @@ -25,6 +24,7 @@ "WNW": "АҪА", "NW": "ҪА", "NNW": "ҪҪА", + "FEELS": "Туйӑннӑ {DEGREE}", "UPDATE_NOTIFICATION": "MagicMirror² валли ҫӗнетӳ пур.", diff --git a/translations/cy.json b/translations/cy.json index ba5d62ea..d5dd2522 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Drennydd", "RUNNING": "Gorffen mewn", "EMPTY": "Dim digwyddiadau.", - "WEEK": "Wythnos {weekNumber}", "N": "Go", diff --git a/translations/da.json b/translations/da.json index a13a9fae..3371a2ae 100644 --- a/translations/da.json +++ b/translations/da.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "I overmorgen", "RUNNING": "Slutter om", "EMPTY": "Ingen kommende begivenheder.", - "FEELS": "Føles som {DEGREE}", "WEEK": "Uge {weekNumber}", "N": "N", @@ -26,6 +25,8 @@ "NW": "NV", "NNW": "NNV", + "FEELS": "Føles som {DEGREE}", + "UPDATE_NOTIFICATION": "MagicMirror² opdatering tilgængelig.", "UPDATE_NOTIFICATION_MODULE": "Opdatering tilgængelig for {MODULE_NAME} modulet.", "UPDATE_INFO_SINGLE": "Den nuværende installation er {COMMIT_COUNT} commit bagud på {BRANCH_NAME} branch'en.", diff --git a/translations/de.json b/translations/de.json index 85ede64e..3e3d9ade 100644 --- a/translations/de.json +++ b/translations/de.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Übermorgen", "RUNNING": "noch", "EMPTY": "Keine Termine.", - "WEEK": "{weekNumber}. Kalenderwoche", "N": "N", @@ -26,13 +25,13 @@ "NW": "NW", "NNW": "NNW", + "FEELS": "Gefühlt {DEGREE}", + "MODULE_CONFIG_CHANGED": "Die Konfigurationsoptionen für das {MODULE_NAME} Modul haben sich geändert. \nBitte überprüfen Sie die Dokumentation.", "MODULE_CONFIG_ERROR": "Fehler im {MODULE_NAME} Modul. {ERROR}", "UPDATE_NOTIFICATION": "Aktualisierung für MagicMirror² verfügbar.", "UPDATE_NOTIFICATION_MODULE": "Aktualisierung für das {MODULE_NAME} Modul verfügbar.", "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 {DEGREE}" + "UPDATE_INFO_MULTIPLE": "Die aktuelle Installation ist {COMMIT_COUNT} Commits hinter dem {BRANCH_NAME} Branch." } diff --git a/translations/en.json b/translations/en.json index f43bd4b9..9710d781 100644 --- a/translations/en.json +++ b/translations/en.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "In 2 days", "RUNNING": "Ends in", "EMPTY": "No upcoming events.", - "WEEK": "Week {weekNumber}", "N": "N", @@ -26,14 +25,14 @@ "NW": "NW", "NNW": "NNW", + "FEELS": "Feels like {DEGREE}", + "PRECIP": "PoP", + "MODULE_CONFIG_CHANGED": "The configuration options for the {MODULE_NAME} module have changed.\nPlease check the documentation.", "MODULE_CONFIG_ERROR": "Error in the {MODULE_NAME} module. {ERROR}", "UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION_MODULE": "Update available for {MODULE_NAME} module.", "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 like {DEGREE}", - "PRECIP": "PoP" + "UPDATE_INFO_MULTIPLE": "The current installation is {COMMIT_COUNT} commits behind on the {BRANCH_NAME} branch." } diff --git a/translations/es.json b/translations/es.json index a4f322f5..f98371fe 100644 --- a/translations/es.json +++ b/translations/es.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Pasado mañana", "RUNNING": "Termina en", "EMPTY": "No hay eventos programados.", - "WEEK": "Semana {weekNumber}", "N": "N", @@ -26,13 +25,13 @@ "NW": "NO", "NNW": "NNO", + "FEELS": "Sensación térmica de {DEGREE}", + "PRECIP": "Precipitación", + "MODULE_CONFIG_CHANGED": "Las opciones de configuración para el módulo {MODULE_NAME} han cambiado. \nVerifique la documentación.", "UPDATE_NOTIFICATION": "MagicMirror² actualización disponible.", "UPDATE_NOTIFICATION_MODULE": "Disponible una actualización para el módulo {MODULE_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 {DEGREE}", - "PRECIP": "Precipitación" + "UPDATE_INFO_MULTIPLE": "Tu actual instalación está {COMMIT_COUNT} commits cambios detrás de la rama {BRANCH_NAME}." } diff --git a/translations/fi.json b/translations/fi.json index a2cf0f16..97524fd5 100644 --- a/translations/fi.json +++ b/translations/fi.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Ylihuomenna", "RUNNING": "Päättyy {timeUntilEnd} päästä", "EMPTY": "Ei tulevia tapahtumia.", - "WEEK": "Viikko {weekNumber}", "N": "P", @@ -26,11 +25,11 @@ "NW": "PL", "NNW": "PPL", + "FEELS": "Tuntuu kuin {DEGREE}", + "PRECIP": "Sateen todennäköisyys", + "UPDATE_NOTIFICATION": "MagicMirror² päivitys saatavilla.", "UPDATE_NOTIFICATION_MODULE": "Päivitys saatavilla moduulille {MODULE_NAME}.", "UPDATE_INFO_SINGLE": "Nykyasennus on {COMMIT_COUNT} muutoksen jäljessä {BRANCH_NAME} haaraan nähden.", - "UPDATE_INFO_MULTIPLE": "Nykyasennus on {COMMIT_COUNT} muutosta jäljessä {BRANCH_NAME} haaraan nähden.", - - "FEELS": "Tuntuu kuin {DEGREE}", - "PRECIP": "Sateen todennäköisyys" + "UPDATE_INFO_MULTIPLE": "Nykyasennus on {COMMIT_COUNT} muutosta jäljessä {BRANCH_NAME} haaraan nähden." } diff --git a/translations/fr.json b/translations/fr.json index c3607ad4..8aafdc44 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Après-demain", "RUNNING": "Se termine dans", "EMPTY": "Aucun RDV à venir.", - "WEEK": "Semaine {weekNumber}", "N": "N", @@ -26,12 +25,12 @@ "NW": "NO", "NNW": "NNO", + "FEELS": "Ressenti {DEGREE}", + "MODULE_CONFIG_CHANGED": "Les options de configuration du module {MODULE_NAME} ont changé. \nVeuillez consulter la documentation.", "UPDATE_NOTIFICATION": "Une mise à jour de MagicMirror² est disponible", "UPDATE_NOTIFICATION_MODULE": "Une mise à jour est disponible pour le module {MODULE_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 {DEGREE}" + "UPDATE_INFO_MULTIPLE": "L'installation actuelle est {COMMIT_COUNT} commits en retard sur la branche {BRANCH_NAME} ." } diff --git a/translations/gu.json b/translations/gu.json index f3cf38be..2271a065 100644 --- a/translations/gu.json +++ b/translations/gu.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "પરમ દિવસે", "RUNNING": "માં સમાપ્ત થાય છે", "EMPTY": "કોઈ આગામી કાર્યક્રમ નથી.", - "WEEK": "સપ્તાહ {weekNumber}", "N": "ઉ", @@ -26,13 +25,13 @@ "NW": "ઉપ", "NNW": "ઉઉપ", + "FEELS": "{DEGREE} જેવું લાગશે", + "PRECIP": "PoP", + "MODULE_CONFIG_CHANGED": "{MODULE_NAME} મોડ્યુલ માટે ગોઠવણી વિકલ્પો બદલાયા છે. \nકૃપા કરીને દસ્તાવેજોને તપાસો.", "UPDATE_NOTIFICATION": "MagicMirror² અપડેટ ઉપલબ્ધ છે.", "UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME} મોડ્યુલ માટે અપડેટ ઉપલબ્ધ છે.", "UPDATE_INFO_SINGLE": "વર્તમાન ઇન્સ્ટોલેશન એ {BRANCH_NAME} શાખા ની {COMMIT_COUNT} કમીટ પાછળ છે. ", - "UPDATE_INFO_MULTIPLE": "વર્તમાન ઇન્સ્ટોલેશન એ {BRANCH_NAME} શાખા ની {COMMIT_COUNT} કમીટ પાછળ છે. ", - - "FEELS": "{DEGREE} જેવું લાગશે", - "PRECIP": "PoP" + "UPDATE_INFO_MULTIPLE": "વર્તમાન ઇન્સ્ટોલેશન એ {BRANCH_NAME} શાખા ની {COMMIT_COUNT} કમીટ પાછળ છે. " } diff --git a/translations/he.json b/translations/he.json index f956795c..038d0ed1 100644 --- a/translations/he.json +++ b/translations/he.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "בעוד יומיים", "RUNNING": "מסתיים ב", "EMPTY": "אין ארועים", - "WEEK": "{weekNumber} שבוע", "N": "צ", @@ -26,11 +25,11 @@ "NW": "ז-מע", "NNW": "צ-צ-מע", + "FEELS": "מרגיש כמו {DEGREE}", + "PRECIP": "משקעים", + "UPDATE_NOTIFICATION": "עדכון זמין ל-MagicMirror", "UPDATE_NOTIFICATION_MODULE": "עדכון זמין ב-{MODULE_NAME} מודול", "UPDATE_INFO_SINGLE": "ההתקנה הנוכחית נמצאת מאחור הענף {BRANCH_NAME} ב-{COMMIT_COUNT} מופע", - "UPDATE_INFO_MULTIPLE": "ההתקנה הנוכחית נמצאת מאחור הענף {BRANCH_NAME} ב-{COMMIT_COUNT} מופעים", - - "FEELS": "מרגיש כמו {DEGREE}", - "PRECIP": "משקעים" + "UPDATE_INFO_MULTIPLE": "ההתקנה הנוכחית נמצאת מאחור הענף {BRANCH_NAME} ב-{COMMIT_COUNT} מופעים" } diff --git a/translations/hi.json b/translations/hi.json index 393f3c87..78522ce2 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "2 दिनों में", "RUNNING": "में समाप्त", "EMPTY": "कोई आगामी कार्यक्रम नहीं।", - "WEEK": "सप्ताह {weekNumber}", "N": "उ", @@ -26,13 +25,13 @@ "NW": "उप", "NNW": "उउप", + "FEELS": "{DEGREE} की तरह लगना", + "PRECIP": "PoP", + "MODULE_CONFIG_CHANGED": "{MODULE_NAME} मॉड्यूल के लिए कॉन्फ़िगरेशन विकल्प बदल गए हैं। n कृपया दस्तावेज़ देखें।", "UPDATE_NOTIFICATION": "MagicMirror² अपडेट उपलब्ध।", "UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME} मॉड्यूल के लिए उपलब्ध अद्यतन।", "UPDATE_INFO_SINGLE": "वर्तमान स्थापना {COMMIT_COUNT} {BRANCH_NAME} शाखा के पीछे है।", - "UPDATE_INFO_MULTIPLE": "वर्तमान स्थापना {COMMIT_COUNT} पीछे {BRANCH_NAME} शाखा पर है।", - - "FEELS": "{DEGREE} की तरह लगना", - "PRECIP": "PoP" + "UPDATE_INFO_MULTIPLE": "वर्तमान स्थापना {COMMIT_COUNT} पीछे {BRANCH_NAME} शाखा पर है।" } diff --git a/translations/hr.json b/translations/hr.json index f18366cf..0e171668 100644 --- a/translations/hr.json +++ b/translations/hr.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Prekosutra", "RUNNING": "Završava za", "EMPTY": "Nema nadolazećih događaja.", - "WEEK": "Tjedan {weekNumber}", "N": "N", @@ -26,10 +25,10 @@ "NW": "NW", "NNW": "NNW", + "FEELS": "Osjećaj {DEGREE}", + "UPDATE_NOTIFICATION": "Dostupna je aktualizacija MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Dostupna je aktualizacija modula {MODULE_NAME}.", "UPDATE_INFO_SINGLE": "Instalirana verzija {COMMIT_COUNT} commit kasni za branch-om {BRANCH_NAME}.", - "UPDATE_INFO_MULTIPLE": "Instalirana verzija {COMMIT_COUNT} commit-ova kasni za branch-om {BRANCH_NAME}.", - - "FEELS": "Osjećaj {DEGREE}" + "UPDATE_INFO_MULTIPLE": "Instalirana verzija {COMMIT_COUNT} commit-ova kasni za branch-om {BRANCH_NAME}." } diff --git a/translations/hu.json b/translations/hu.json index 88ccb546..2cfd76f3 100644 --- a/translations/hu.json +++ b/translations/hu.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Holnapután", "RUNNING": "Vége lesz", "EMPTY": "Nincs közelgő esemény.", - "WEEK": "{weekNumber}. hét", "N": "É", @@ -26,10 +25,10 @@ "NW": "ÉNy", "NNW": "ÉÉNy", + "FEELS": "Érzet {DEGREE}", + "UPDATE_NOTIFICATION": "MagicMirror²-hoz frissítés érhető el.", "UPDATE_NOTIFICATION_MODULE": "A {MODULE_NAME} modulhoz frissítés érhető el.", "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 {DEGREE}" + "UPDATE_INFO_MULTIPLE": "A jelenlegi telepítés óta {COMMIT_COUNT} új commit jelent meg a {BRANCH_NAME} ágon." } diff --git a/translations/id.json b/translations/id.json index 0ad518d8..7a1a8d70 100644 --- a/translations/id.json +++ b/translations/id.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Lusa", "RUNNING": "Berakhir dalam", "EMPTY": "Tidak ada agenda", - "WEEK": "Pekan", "N": "U", diff --git a/translations/it.json b/translations/it.json index c1c00614..294fdfef 100644 --- a/translations/it.json +++ b/translations/it.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Dopodomani", "RUNNING": "Termina entro", "EMPTY": "Nessun evento imminente.", - "WEEK": "Settimana {weekNumber}", "N": "N", @@ -26,10 +25,10 @@ "NW": "NO", "NNW": "NNO", + "FEELS": "Percepiti {DEGREE}", + "UPDATE_NOTIFICATION": "E' disponibile un aggiornamento di MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "E' disponibile un aggiornamento del modulo {MODULE_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}.", - - "FEELS": "Percepiti {DEGREE}" + "UPDATE_INFO_MULTIPLE": "L'installazione è {COMMIT_COUNT} commits indietro rispetto all'attuale branch {BRANCH_NAME}." } diff --git a/translations/lt.json b/translations/lt.json index 7e44043d..cfc47179 100644 --- a/translations/lt.json +++ b/translations/lt.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Už 2 dienų", "RUNNING": "Pasibaigs už", "EMPTY": "Nėra artimų įvykių.", - "WEEK": "{weekNumber} savaitė", "N": "Š", @@ -26,11 +25,11 @@ "NW": "ŠV", "NNW": "ŠŠV", + "FEELS": "Jutiminė temp. {DEGREE}", + "PRECIP": "Krituliai", + "UPDATE_NOTIFICATION": "Galimas MagicMirror² naujinimas.", "UPDATE_NOTIFICATION_MODULE": "Galimas {MODULE_NAME} naujinimas.", "UPDATE_INFO_SINGLE": "Šis įdiegimas atsilieka {COMMIT_COUNT} įsipareigojimu {BRANCH_NAME} šakoje.", "UPDATE_INFO_MULTIPLE": "Šis įdiegimas atsilieka {COMMIT_COUNT} įsipareigojimais {BRANCH_NAME} šakoje.", - - "FEELS": "Jutiminė temp. {DEGREE}", - "PRECIP": "Krituliai" } diff --git a/translations/ms-my.json b/translations/ms-my.json index 380cf64e..22e7e09d 100644 --- a/translations/ms-my.json +++ b/translations/ms-my.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Lusa", "RUNNING": "Berakhir dalam", "EMPTY": "Tidak ada agenda", - "WEEK": "Minggu ke-{weekNumber}", "N": "U", diff --git a/translations/nb.json b/translations/nb.json index 17fc63df..00ad2a26 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "I overmorgen", "RUNNING": "Slutter om", "EMPTY": "Ingen kommende arrangementer.", - "WEEK": "Uke {weekNumber}", "N": "N", @@ -26,10 +25,10 @@ "NW": "NV", "NNW": "NNV", + "FEELS": "Føles som {DEGREE}", + "UPDATE_NOTIFICATION": "MagicMirror²-oppdatering er tilgjengelig.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen {MODULE_NAME}.", "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 {DEGREE}" + "UPDATE_INFO_MULTIPLE": "Nåværende installasjon er {COMMIT_COUNT} commits bak {BRANCH_NAME} grenen." } diff --git a/translations/nl.json b/translations/nl.json index cbdeea6e..9d1db24d 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -24,9 +24,10 @@ "NW": "NW", "NNW": "NNW", + "FEELS": "Voelt als {DEGREE}", + "UPDATE_NOTIFICATION": "MagicMirror² update beschikbaar.", "UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.", "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": "Voelt als {DEGREE}" + "UPDATE_INFO_MULTIPLE": "De huidige installatie loopt {COMMIT_COUNT} commits achter op de {BRANCH_NAME} branch." } diff --git a/translations/nn.json b/translations/nn.json index d2c82b94..8b5a38e9 100644 --- a/translations/nn.json +++ b/translations/nn.json @@ -24,10 +24,10 @@ "NW": "NV", "NNW": "NNV", + "FEELS": "Kjenst som {DEGREE}", + "UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengeleg.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengeleg for modulen {MODULE_NAME}.", "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 {DEGREE}" + "UPDATE_INFO_MULTIPLE": "noverande installasjon er {COMMIT_COUNT} commits bak {BRANCH_NAME} greinen." } diff --git a/translations/pl.json b/translations/pl.json index 92265111..2271938f 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Pojutrze", "RUNNING": "Koniec za", "EMPTY": "Brak wydarzeń.", - "WEEK": "Tydzień {weekNumber}", "N": "N", @@ -26,11 +25,11 @@ "NW": "NW", "NNW": "NNW", + "FEELS": "Odczuwalna {DEGREE}", + "PRECIP": "Szansa opadów", + "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} commit od gałęzi {BRANCH_NAME}.", - "UPDATE_INFO_MULTIPLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}.", - - "FEELS": "Odczuwalna {DEGREE}", - "PRECIP": "Szansa opadów" + "UPDATE_INFO_MULTIPLE": "Zainstalowana wersja odbiega o {COMMIT_COUNT} commitów od gałęzi {BRANCH_NAME}." } diff --git a/translations/ps.json b/translations/ps.json index 690ecfc0..b999f0b2 100644 --- a/translations/ps.json +++ b/translations/ps.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "بل سبا", "RUNNING": "روان", "EMPTY": "تش", - "WEEK": "{weekNumber}. اونۍ", "N": "N", @@ -26,12 +25,12 @@ "NW": "NW", "NNW": "NNW", + "FEELS": "حس کېږی {DEGREE}", + "MODULE_CONFIG_CHANGED": "د {MODULE_NAME} بڼی تغیر کړی دی. \n هیله دی چی اسناد و ګوری!", "UPDATE_NOTIFICATION": "د MagicMirror² نوې نسخه سته ", "UPDATE_NOTIFICATION_MODULE": "د {MODULE_NAME} نوی نسخه سته", "UPDATE_INFO_SINGLE": "اوسنی برخه {COMMIT_COUNT} د {BRANCH_NAME} څخه وروسته پاته ده", - "UPDATE_INFO_MULTIPLE": "اوسنی برخه {COMMIT_COUNT} د {BRANCH_NAME} څخه وروسته پاته ده", - - "FEELS": "حس کېږی {DEGREE}" + "UPDATE_INFO_MULTIPLE": "اوسنی برخه {COMMIT_COUNT} د {BRANCH_NAME} څخه وروسته پاته ده" } diff --git a/translations/pt-br.json b/translations/pt-br.json index c9edbde9..236b1f92 100644 --- a/translations/pt-br.json +++ b/translations/pt-br.json @@ -23,11 +23,11 @@ "NW": "NO", "NNW": "NNO", + "FEELS": "Percebida {DEGREE}", + "PRECIP": "PoP", + "UPDATE_NOTIFICATION": "Nova atualização para MagicMirror disponível.", "UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.", "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}.", - - "FEELS": "Percebida {DEGREE}", - "PRECIP": "PoP" + "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 aa118370..e7fc0f8d 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -1,11 +1,11 @@ { "LOADING": "A carregar …", + "TODAY": "Hoje", "TOMORROW": "Amanhã", "DAYAFTERTOMORROW": "Depois de amanhã", "RUNNING": "Termina em", "EMPTY": "Sem eventos programados.", - "WEEK": "Semana {weekNumber}", "N": "N", @@ -25,13 +25,13 @@ "NW": "NO", "NNW": "NNO", + "FEELS": "Sentida {DEGREE}", + "PRECIP": "Prob. Precipitação", + "MODULE_CONFIG_CHANGED": "As opções na configuração do módulo {MODULE_NAME} foram alteradas.\nPor favor, verifica a documentação.", "UPDATE_NOTIFICATION": "Atualização do MagicMirror² disponível.", "UPDATE_NOTIFICATION_MODULE": "Atualização para o módulo {MODULE_NAME} disponível.", "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}.", - - "FEELS": "Sentida {DEGREE}", - "PRECIP": "Prob. Precipitação" + "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 78ef76bc..7b91c943 100644 --- a/translations/ro.json +++ b/translations/ro.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Poimâine", "RUNNING": "Se termină în", "EMPTY": "Nici un eveniment.", - "WEEK": "Săptămâna {weekNumber}", "N": "N", @@ -26,10 +25,10 @@ "NW": "NW", "NNW": "NNW", + "FEELS": "Se simte ca fiind {DEGREE}", + "UPDATE_NOTIFICATION": "Un update este disponibil pentru MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Un update este disponibil pentru modulul {MODULE_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}.", - - "FEELS": "Se simte ca fiind {DEGREE}" + "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 b9e52ed1..e2cce1ac 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Послезавтра", "RUNNING": "Заканчивается через", "EMPTY": "Нет предстоящих событий", - "WEEK": "Неделя {weekNumber}", "N": "С", @@ -25,6 +24,7 @@ "WNW": "ЗСЗ", "NW": "СЗ", "NNW": "ССЗ", + "FEELS": "По ощущению {DEGREE}", "UPDATE_NOTIFICATION": "Есть обновление для MagicMirror².", diff --git a/translations/sk.json b/translations/sk.json index 8eaeba6d..c4b98117 100644 --- a/translations/sk.json +++ b/translations/sk.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Pozajtra", "RUNNING": "Končí o", "EMPTY": "Žiadne nadchádzajúce udalosti.", - "WEEK": "{weekNumber}. týždeň", "N": "S", diff --git a/translations/sv.json b/translations/sv.json index 0d1c6746..79b138c6 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "I övermorgon", "RUNNING": "Slutar", "EMPTY": "Inga kommande händelser.", - "WEEK": "Vecka {weekNumber}", "N": "N", @@ -26,10 +25,10 @@ "NW": "NV", "NNW": "NNV", + "FEELS": "Känns som {DEGREE}", + "UPDATE_NOTIFICATION": "MagicMirror² uppdatering finns tillgänglig.", "UPDATE_NOTIFICATION_MODULE": "Uppdatering finns tillgänglig av {MODULE_NAME} modulen.", "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 {DEGREE}" + "UPDATE_INFO_MULTIPLE": "Denna installation ligger {COMMIT_COUNT} commits steg bakom {BRANCH_NAME} grenen." } diff --git a/translations/tlh.json b/translations/tlh.json index 56aef3cf..1f071202 100644 --- a/translations/tlh.json +++ b/translations/tlh.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "cha'leS", "RUNNING": "Dor", "EMPTY": "Sumbe' wanI'.", - "WEEK": "Hogh (terran) {weekNumber}", "N": "N", @@ -26,10 +25,10 @@ "NW": "'ev", "NNW": "NNW", + "FEELS": "jem {DEGREE}", + "UPDATE_NOTIFICATION": " De'chu' MagicMirror² lI'laH.", "UPDATE_NOTIFICATION_MODULE": "bobcho' {MODULE_NAME} lI'laH De'chu.", "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": "jem {DEGREE}" + "UPDATE_INFO_MULTIPLE": "The current installation is {COMMIT_COUNT} commits behind on the {BRANCH_NAME} branch." } diff --git a/translations/tr.json b/translations/tr.json index 14ee8065..28d6dcc9 100644 --- a/translations/tr.json +++ b/translations/tr.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "İki gün içinde", "RUNNING": "Biten", "EMPTY": "Yakında etkinlik yok.", - "WEEK": "Hafta {weekNumber}", "N": "K", @@ -26,11 +25,11 @@ "NW": "KB", "NNW": "KKB", + "FEELS": "Hissedilen {DEGREE}", + "PRECIP": "Yağış", + "UPDATE_NOTIFICATION": "MagicMirror² güncellemesi mevcut.", "UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME} modulü için güncelleme mevcut.", "UPDATE_INFO_SINGLE": "Sahip olduğunuz kurulum {BRANCH_NAME} branchinden {COMMIT_COUNT} commit geridedir.", - "UPDATE_INFO_MULTIPLE": "Sahip olduğunuz kurulum {BRANCH_NAME} branchinden {COMMIT_COUNT} commit geridedir.", - - "FEELS": "Hissedilen {DEGREE}", - "PRECIP": "Yağış" + "UPDATE_INFO_MULTIPLE": "Sahip olduğunuz kurulum {BRANCH_NAME} branchinden {COMMIT_COUNT} commit geridedir." } diff --git a/translations/uk.json b/translations/uk.json index 88bbc87b..37585b00 100644 --- a/translations/uk.json +++ b/translations/uk.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "Післязавтра", "RUNNING": "Закінчується через", "EMPTY": "Немає найближчих подій", - "WEEK": "Тиждень {weekNumber}", "N": "Пн", @@ -26,11 +25,11 @@ "NW": "ПнЗх", "NNW": "ПнПнЗх", + "FEELS": "Відчувається як {DEGREE}", + "PRECIP": "Опади", + "UPDATE_NOTIFICATION": "Є оновлення для MagicMirror².", "UPDATE_NOTIFICATION_MODULE": "Є оновлення для модуля {MODULE_NAME}.", "UPDATE_INFO_SINGLE": "Поточна версія на {COMMIT_COUNT} комміт позаду від гілки {BRANCH_NAME}.", - "UPDATE_INFO_MULTIPLE": "Поточна інсталяція на {COMMIT_COUNT} комітів позаду від гілки {BRANCH_NAME}.", - - "FEELS": "Відчувається як {DEGREE}", - "PRECIP": "Опади" + "UPDATE_INFO_MULTIPLE": "Поточна інсталяція на {COMMIT_COUNT} комітів позаду від гілки {BRANCH_NAME}." } diff --git a/translations/zh-cn.json b/translations/zh-cn.json index 1371ecf8..0d41cf70 100644 --- a/translations/zh-cn.json +++ b/translations/zh-cn.json @@ -6,7 +6,6 @@ "DAYAFTERTOMORROW": "后天", "RUNNING": "结束日期", "EMPTY": "无日程安排。", - "WEEK": "第{weekNumber}周", "N": "北风", @@ -26,10 +25,10 @@ "NW": "西北风", "NNW": "北偏西风", + "FEELS": "体感 {DEGREE}", + "UPDATE_NOTIFICATION": "MagicMirror²有新的版本。", "UPDATE_NOTIFICATION_MODULE": "{MODULE_NAME}模块可更新。", "UPDATE_INFO_SINGLE": "当前已安装版本比{BRANCH_NAME}分支落后{COMMIT_COUNT}次代码更新。", - "UPDATE_INFO_MULTIPLE": "当前已安装版本比{BRANCH_NAME}分支落后{COMMIT_COUNT}次代码更新。", - - "FEELS": "体感 {DEGREE}" + "UPDATE_INFO_MULTIPLE": "当前已安装版本比{BRANCH_NAME}分支落后{COMMIT_COUNT}次代码更新。" } From 670a760404b42e273b491da889c72bab69822697 Mon Sep 17 00:00:00 2001 From: rejas Date: Thu, 25 Mar 2021 17:29:27 +0100 Subject: [PATCH 2/4] Use some es6 notation --- js/translator.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/js/translator.js b/js/translator.js index 841adb66..1144e899 100644 --- a/js/translator.js +++ b/js/translator.js @@ -14,7 +14,7 @@ var Translator = (function () { * @param {Function} callback Function called when done. */ function loadJSON(file, callback) { - var xhr = new XMLHttpRequest(); + const xhr = new XMLHttpRequest(); xhr.overrideMimeType("application/json"); xhr.open("GET", file, true); xhr.onreadystatechange = function () { @@ -124,18 +124,16 @@ var Translator = (function () { * @param {string} lang The language identifier of the core language. */ loadCoreTranslations: function (lang) { - var self = this; - if (lang in translations) { Log.log("Loading core translation file: " + translations[lang]); - loadJSON(translations[lang], function (translations) { - self.coreTranslations = translations; + loadJSON(translations[lang], (translations) => { + this.coreTranslations = translations; }); } else { Log.log("Configured language not found in core translations."); } - self.loadCoreTranslationsFallback(); + this.loadCoreTranslationsFallback(); }, /** @@ -143,8 +141,6 @@ var Translator = (function () { * The first language defined in translations.js will be used. */ loadCoreTranslationsFallback: function () { - var self = this; - // The variable `first` will contain the first // defined translation after the following line. for (var first in translations) { @@ -153,8 +149,8 @@ var Translator = (function () { if (first) { Log.log("Loading core translation fallback file: " + translations[first]); - loadJSON(translations[first], function (translations) { - self.coreTranslationsFallback = translations; + loadJSON(translations[first], (translations) => { + this.coreTranslationsFallback = translations; }); } } From 7bcdd2a42cbcb02ceaa4b5cd3021e4458508be14 Mon Sep 17 00:00:00 2001 From: rejas Date: Thu, 25 Mar 2021 17:30:27 +0100 Subject: [PATCH 3/4] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbd9ae11..dbc13a59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ _This release is scheduled to be released on 2021-04-01._ - Replaced deprecated `request` package with `node-fetch` and `digest-fetch` - Refactored calendar fetcher - Cleaned up newsfeed module +- Cleaned up translations and translator code ### Removed From 6a0e6eb84e39abe92139181a6e24b09717b90bad Mon Sep 17 00:00:00 2001 From: rejas Date: Thu, 25 Mar 2021 17:35:36 +0100 Subject: [PATCH 4/4] Fix styling issue --- translations/lt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/lt.json b/translations/lt.json index cfc47179..c5e6f31f 100644 --- a/translations/lt.json +++ b/translations/lt.json @@ -31,5 +31,5 @@ "UPDATE_NOTIFICATION": "Galimas MagicMirror² naujinimas.", "UPDATE_NOTIFICATION_MODULE": "Galimas {MODULE_NAME} naujinimas.", "UPDATE_INFO_SINGLE": "Šis įdiegimas atsilieka {COMMIT_COUNT} įsipareigojimu {BRANCH_NAME} šakoje.", - "UPDATE_INFO_MULTIPLE": "Šis įdiegimas atsilieka {COMMIT_COUNT} įsipareigojimais {BRANCH_NAME} šakoje.", + "UPDATE_INFO_MULTIPLE": "Šis įdiegimas atsilieka {COMMIT_COUNT} įsipareigojimais {BRANCH_NAME} šakoje." }