From c67f550850b2061ca7bb85d7b5f988b21fa24455 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 16 Jan 2020 14:09:26 +0100 Subject: [PATCH] Fix wording for heating and garagedoors --- nymea-app/translations/nymea-app-de.ts | 201 ++++++++++++++++++++- nymea-app/translations/nymea-app-en.ts | 207 +++++++++++++++++++--- nymea-app/translations/nymea-app-en_US.ts | 207 +++++++++++++++++++--- nymea-app/translations/nymea-app-ko.ts | 201 ++++++++++++++++++++- nymea-app/ui/Nymea.qml | 4 +- 5 files changed, 764 insertions(+), 56 deletions(-) diff --git a/nymea-app/translations/nymea-app-de.ts b/nymea-app/translations/nymea-app-de.ts index 5efb1ed9..e91e7bca 100644 --- a/nymea-app/translations/nymea-app-de.ts +++ b/nymea-app/translations/nymea-app-de.ts @@ -722,7 +722,11 @@ An unexpected error happened. Please report this isse. Error code: - Ein Unerwartetet Fehler ist aufgetreten. Bitte benachrichtige uns darüber. Fehler code: + Ein Unerwartetet Fehler ist aufgetreten. Bitte benachrichtige uns darüber. Fehler code: + + + An unexpected error happened. Please report this isse. Error code: %1 + Ein unerwarteter Fehler ist aufgetreten. Bitte berichte dieses Problem. Fehlercode: %1 @@ -1209,6 +1213,85 @@ WebSocket server Schnittstellen + + DatePicker + + January + Januar + + + February + Februar + + + March + März + + + April + April + + + May + Mai + + + June + Juni + + + July + Juli + + + August + August + + + September + September + + + October + Oktober + + + November + November + + + December + Dezember + + + Mon + Mo + + + Tue + Di + + + Wed + Mi + + + Thu + Do + + + Fri + Fr + + + Sat + Sa + + + Sun + So + + DeveloperOptionsPage @@ -2071,7 +2154,7 @@ Bitte versuche es erneut. GeneralSettingsPage Box settings - Box Einstellungen + Box Einstellungen Name @@ -2083,7 +2166,7 @@ Bitte versuche es erneut. Language - Sprache + Sprache Time zone @@ -2113,6 +2196,22 @@ Bitte versuche es erneut. Shut down %1:core %1:core ausschalten + + General settings + Generelle Einstellungen + + + Set date and time automatically + Zeit und Datum automatisch einstellen + + + Date + Datum + + + Time + Zeit + GenericDeviceListPage @@ -2801,6 +2900,10 @@ Bitte versuche es erneut. Screen brightness Bildschirmhelligkeit + + Automatic + Automatisch + MagicPage @@ -3634,7 +3737,7 @@ Möchtest Du fortfahren? Garage gates - Garagentore + Garagentore Uncategorized @@ -3698,7 +3801,7 @@ Möchtest Du fortfahren? Heatings - Heizungen + Heizungen EV-chargers @@ -3771,6 +3874,18 @@ Möchtest Du fortfahren? Select ... "Thing" zum Benachrichtigen + + Garage doors + Garagentore + + + Heating + Heizung + + + Accounts + Konten + NymeaConnection @@ -4006,6 +4121,72 @@ Möchtest Du fortfahren? <font color="%1">Das Passwort muss </font><font color="%2">mindestens %3 Zeichen lang</font><font color="%1"> sein, </font><font color="%4">Kleinbuchstaben</font><font color="%1">, </font><font color="%5">Großbuchstaben</font><font color="%1"> sowie </font><font color="%6">Zahlen</font><font color="%1"> und </font><font color="%7">Sonderzeichen</font><font color="%1"> beinhalten.</font> + + ScriptEditor + + Did you know... + Wusstest Du... + + + nymea:app is available for all kinds of devices. In order to edit scripts we recommend to use nymea:app on your personal computer or connect a keyboard to your tablet. + nymea:app gibt es für alle Arten von Gerägen. Um Scripte zu bearbeiten empfehlen wir nymea:app auf einem PC zu nutzen. + + + Unsaved changes + Ungespeicherte Änderungen + + + There are unsaved changes in the script. Do you want to discard the changes? + Es gibt ungespeicherte Änderungen im Script. Möchtest Du diese verwerfen? + + + Script name + Script Name + + + Help + Hilfe + + + Deploy script + Script bereitstellen + + + The script has not been deployed because it contains errors. + Das Script wurde nicht installiert weil es Fehler enthält. + + + Errors + Fehler + + + Console + Konsole + + + + ScriptsPage + + Scripts + Scripte + + + Add new script + Ein neues Script erstellen + + + No scripts are installed yet. + Es sind noch keine Scripte installiert. + + + Press "Add script" to get started. + Drücke dden "Script erstellen" Knopf um loszulegen. + + + Add script + Script erstellen + + SelectActionPage @@ -4480,7 +4661,7 @@ Möchtest Du fortfahren? SetupWizard Set up thing - "Thing" einrichten + "Thing" einrichten Search again @@ -4562,6 +4743,14 @@ Möchtest Du fortfahren? In order to use OAuth on this platform, make sure qml-module-qtwebview is installed. Um OAuth auf diesem System zu benutzen, stelle sicher, dass qml-module-qtwebview installiert ist. + + Reconfigure %1 + %1 neu konfigurieren + + + Set up %1 + %1 einrichten + ShutterDeviceListPage diff --git a/nymea-app/translations/nymea-app-en.ts b/nymea-app/translations/nymea-app-en.ts index 3547290b..cf630de5 100644 --- a/nymea-app/translations/nymea-app-en.ts +++ b/nymea-app/translations/nymea-app-en.ts @@ -501,7 +501,7 @@ - An unexpected error happened. Please report this isse. Error code: + An unexpected error happened. Please report this isse. Error code: %1 @@ -797,6 +797,85 @@ + + DatePicker + + January + + + + February + + + + March + + + + April + + + + May + + + + June + + + + July + + + + August + + + + September + + + + October + + + + November + + + + December + + + + Mon + + + + Tue + + + + Wed + + + + Thu + + + + Fri + + + + Sat + + + + Sun + + + DeveloperOptionsPage @@ -1528,10 +1607,6 @@ Please try again. GeneralSettingsPage - - Box settings - - Name @@ -1540,10 +1615,6 @@ Please try again. OK - - Language - - Time zone @@ -1568,6 +1639,22 @@ Please try again. Shut down %1:core + + General settings + + + + Set date and time automatically + + + + Date + + + + Time + + GenericDeviceListPage @@ -2151,6 +2238,10 @@ Please try again. Screen brightness + + Automatic + + MagicPage @@ -2838,10 +2929,6 @@ Please try again. Awnings - - Garage gates - - Access control @@ -2850,10 +2937,6 @@ Please try again. Smart meters - - Heatings - - EV-chargers @@ -2949,6 +3032,18 @@ Please try again. Select ... + + Garage doors + + + + Heating + + + + Accounts + + NymeaConnection @@ -3148,6 +3243,72 @@ Please try again. + + ScriptEditor + + Did you know... + + + + nymea:app is available for all kinds of devices. In order to edit scripts we recommend to use nymea:app on your personal computer or connect a keyboard to your tablet. + + + + Unsaved changes + + + + There are unsaved changes in the script. Do you want to discard the changes? + + + + Script name + + + + Help + + + + Deploy script + + + + The script has not been deployed because it contains errors. + + + + Errors + + + + Console + + + + + ScriptsPage + + Scripts + + + + Add new script + + + + No scripts are installed yet. + + + + Press "Add script" to get started. + + + + Add script + + + SelectActionPage @@ -3473,10 +3634,6 @@ Please try again. SetupWizard - - Set up thing - - Search again @@ -3557,6 +3714,14 @@ Please try again. In order to use OAuth on this platform, make sure qml-module-qtwebview is installed. + + Reconfigure %1 + + + + Set up %1 + + ShutterDeviceListPage diff --git a/nymea-app/translations/nymea-app-en_US.ts b/nymea-app/translations/nymea-app-en_US.ts index 3547290b..cf630de5 100644 --- a/nymea-app/translations/nymea-app-en_US.ts +++ b/nymea-app/translations/nymea-app-en_US.ts @@ -501,7 +501,7 @@ - An unexpected error happened. Please report this isse. Error code: + An unexpected error happened. Please report this isse. Error code: %1 @@ -797,6 +797,85 @@ + + DatePicker + + January + + + + February + + + + March + + + + April + + + + May + + + + June + + + + July + + + + August + + + + September + + + + October + + + + November + + + + December + + + + Mon + + + + Tue + + + + Wed + + + + Thu + + + + Fri + + + + Sat + + + + Sun + + + DeveloperOptionsPage @@ -1528,10 +1607,6 @@ Please try again. GeneralSettingsPage - - Box settings - - Name @@ -1540,10 +1615,6 @@ Please try again. OK - - Language - - Time zone @@ -1568,6 +1639,22 @@ Please try again. Shut down %1:core + + General settings + + + + Set date and time automatically + + + + Date + + + + Time + + GenericDeviceListPage @@ -2151,6 +2238,10 @@ Please try again. Screen brightness + + Automatic + + MagicPage @@ -2838,10 +2929,6 @@ Please try again. Awnings - - Garage gates - - Access control @@ -2850,10 +2937,6 @@ Please try again. Smart meters - - Heatings - - EV-chargers @@ -2949,6 +3032,18 @@ Please try again. Select ... + + Garage doors + + + + Heating + + + + Accounts + + NymeaConnection @@ -3148,6 +3243,72 @@ Please try again. + + ScriptEditor + + Did you know... + + + + nymea:app is available for all kinds of devices. In order to edit scripts we recommend to use nymea:app on your personal computer or connect a keyboard to your tablet. + + + + Unsaved changes + + + + There are unsaved changes in the script. Do you want to discard the changes? + + + + Script name + + + + Help + + + + Deploy script + + + + The script has not been deployed because it contains errors. + + + + Errors + + + + Console + + + + + ScriptsPage + + Scripts + + + + Add new script + + + + No scripts are installed yet. + + + + Press "Add script" to get started. + + + + Add script + + + SelectActionPage @@ -3473,10 +3634,6 @@ Please try again. SetupWizard - - Set up thing - - Search again @@ -3557,6 +3714,14 @@ Please try again. In order to use OAuth on this platform, make sure qml-module-qtwebview is installed. + + Reconfigure %1 + + + + Set up %1 + + ShutterDeviceListPage diff --git a/nymea-app/translations/nymea-app-ko.ts b/nymea-app/translations/nymea-app-ko.ts index 0daffa93..98fbf6e9 100644 --- a/nymea-app/translations/nymea-app-ko.ts +++ b/nymea-app/translations/nymea-app-ko.ts @@ -499,7 +499,11 @@ An unexpected error happened. Please report this isse. Error code: - 예기치 않은 오류가 발생했습니다. 이 문제를 신고하십시오. 에러 코드: + 예기치 않은 오류가 발생했습니다. 이 문제를 신고하십시오. 에러 코드: + + + An unexpected error happened. Please report this isse. Error code: %1 + @@ -818,6 +822,85 @@ WebSocket 서버 인터페이스 + + DatePicker + + January + + + + February + + + + March + + + + April + + + + May + 5월 + + + June + + + + July + + + + August + + + + September + + + + October + + + + November + + + + December + + + + Mon + 월요일 + + + Tue + 화요일 + + + Wed + 수요일 + + + Thu + 목요일 + + + Fri + 금요일 + + + Sat + 토요일 + + + Sun + 일요일 + + DeveloperOptionsPage @@ -1566,7 +1649,7 @@ Please try again. GeneralSettingsPage Box settings - 상자(장치) 설정 + 상자(장치) 설정 Name @@ -1578,7 +1661,7 @@ Please try again. Language - 언어 + 언어 Time zone @@ -1604,6 +1687,22 @@ Please try again. Shut down %1:core %1:코어 종료 + + General settings + + + + Set date and time automatically + + + + Date + 날짜 + + + Time + 시간 + GenericDeviceListPage @@ -2191,6 +2290,10 @@ Please try again. Screen brightness 화면 밝기 + + Automatic + + MagicPage @@ -2883,7 +2986,7 @@ Please try again. Garage gates - 차고 문 + 차고 문 Access control @@ -2895,7 +2998,7 @@ Please try again. Heatings - 난방기(온열기) + 난방기(온열기) EV-chargers @@ -2992,6 +3095,18 @@ Please try again. Select ... + + Garage doors + + + + Heating + + + + Accounts + + NymeaConnection @@ -3207,6 +3322,72 @@ Please try again. <font color="%1">비밀번호는 </font><font color="%4">소문자 </font><font color = "% 1">, </ font> <font color = "% 5"> 대문자 </ font> <font color="%1">, </font><font color = "% 1 "> 문자 및 </ font> <font color ="% 6 "> 숫자 </ font><font color="%1">, </font> <font color ="% 7 "> 특수 문자 </ font> <font color="%1">포함 </font><font color="%1">,</font> <font color="%2">최소 % 3 자 이상이어야 합니다<font color="%1">. </ font> + + ScriptEditor + + Did you know... + + + + nymea:app is available for all kinds of devices. In order to edit scripts we recommend to use nymea:app on your personal computer or connect a keyboard to your tablet. + + + + Unsaved changes + + + + There are unsaved changes in the script. Do you want to discard the changes? + + + + Script name + + + + Help + 도움 + + + Deploy script + + + + The script has not been deployed because it contains errors. + + + + Errors + + + + Console + + + + + ScriptsPage + + Scripts + + + + Add new script + + + + No scripts are installed yet. + + + + Press "Add script" to get started. + + + + Add script + + + SelectActionPage @@ -3546,7 +3727,7 @@ Please try again. SetupWizard Set up thing - 사물(장치) 설정 + 사물(장치) 설정 Search again @@ -3628,6 +3809,14 @@ Please try again. In order to use OAuth on this platform, make sure qml-module-qtwebview is installed. + + Reconfigure %1 + + + + Set up %1 + + ShutterDeviceListPage diff --git a/nymea-app/ui/Nymea.qml b/nymea-app/ui/Nymea.qml index d7034a79..0e486569 100644 --- a/nymea-app/ui/Nymea.qml +++ b/nymea-app/ui/Nymea.qml @@ -111,7 +111,7 @@ ApplicationWindow { case "extendedawning": return qsTr("Awnings"); case "garagegate": - return qsTr("Garage gates"); + return qsTr("Garage doors"); case "accesscontrol": return qsTr("Access control"); case "fingerprintreader": @@ -123,7 +123,7 @@ ApplicationWindow { case "extendedsmartmeterconsumer": return qsTr("Smart meters"); case "heating": - return qsTr("Heatings"); + return qsTr("Heating"); case "evcharger": return qsTr("EV-chargers"); case "powersocket":