diff --git a/nymea-app/translations/nymea-app-de.ts b/nymea-app/translations/nymea-app-de.ts index 03f6a0b6..d99ba890 100644 --- a/nymea-app/translations/nymea-app-de.ts +++ b/nymea-app/translations/nymea-app-de.ts @@ -1475,6 +1475,14 @@ Filter by Filtern nach + + Yes + Ja + + + No + Nein + DoorbellDevicePage @@ -5224,22 +5232,10 @@ Die Versuchsdauer muss mindestens 10 ms betragen. - PackageListPage - - All packages - Alle Pakete - - - No package found - Keine Pakete gefunden - - - We're sorry. We couldn't find any package matching the search term %1. - Es tut uns leid. Wir konnten keine Pakete finden, auf denen der Suchbegriff %1 zutrifft. - + PackageDetailsPage Package information - Paket-Informationen + Paketinformationen Installed version: @@ -5251,7 +5247,7 @@ Die Versuchsdauer muss mindestens 10 ms betragen. Candidate version: - Kandidat-Version: + Versionskandidat: Update @@ -5263,7 +5259,7 @@ Die Versuchsdauer muss mindestens 10 ms betragen. This will start a system update. Note that the update might take several minutes and your %1 might not be functioning properly or restart during this time. - Diese Aktion wird ein System-Update starten. Dies kann mehrere Minuten dauern und Dein %1 System könnte in dieser Zeit gegebenenfalls nicht ordungsgemäß funktionieren. + Diese Aktion wird ein System-Update starten. Dies kann mehrere Miuten dauern und Dein %1 System könnte in dieser Zeit gegebenenfalls nicht ordungsgemäß funktionieren. @@ -5290,6 +5286,73 @@ Möchtest Du fortfahren? Paket entfernen + + PackageListPage + + All packages + Alle Pakete + + + No package found + Keine Pakete gefunden + + + We're sorry. We couldn't find any package matching the search term %1. + Es tut uns leid. Wir konnten keine Pakete finden, auf denen der Suchbegriff %1 zutrifft. + + + Package information + Paket-Informationen + + + Installed version: + Installierte Version: + + + Not installed + Nicht installiert + + + Candidate version: + Kandidat-Version: + + + Update + Aktualisierung + + + Install + Installieren + + + This will start a system update. Note that the update might take several minutes and your %1 might not be functioning properly or restart during this time. + Diese Aktion wird ein System-Update starten. Dies kann mehrere Minuten dauern und Dein %1 System könnte in dieser Zeit gegebenenfalls nicht ordungsgemäß funktionieren. + + + +Do you want to proceed? + +Möchtest Du fortfahren? + + + Start update + Aktualisierung starten + + + Remove + Entfernen + + + This will start a system update. Note that the update might take several minutes and your %1 system might not be functioning properly during this time and restart during the process. +Do you want to proceed? + Diese Aktion wird ein System-Update starten. Dies kann mehrere Miuten dauern und Dein %1 System könnte in dieser Zeit gegebenenfalls nicht ordungsgemäß funktionieren. +Möchtest Du fortfahren? + + + Remove package + Paket entfernen + + ParamDescriptorDelegate @@ -5587,11 +5650,19 @@ Möchtest Du fortfahren? True - Wahr + Wahr False - Falsch + Falsch + + + Yes + Ja + + + No + Nein @@ -6249,11 +6320,19 @@ Möchtest Du fortfahren? True - Wahr + Wahr False - Falsch + Falsch + + + Yes + Ja + + + No + Nein diff --git a/nymea-app/translations/nymea-app-en.ts b/nymea-app/translations/nymea-app-en.ts index 9798ad40..9f345e20 100644 --- a/nymea-app/translations/nymea-app-en.ts +++ b/nymea-app/translations/nymea-app-en.ts @@ -1373,6 +1373,14 @@ Filter by + + Yes + + + + No + + DoorbellDevicePage @@ -5006,19 +5014,7 @@ Use a timeout value greater or equal to 10 ms. - PackageListPage - - All packages - - - - No package found - - - - We're sorry. We couldn't find any package matching the search term %1. - - + PackageDetailsPage Package information @@ -5070,6 +5066,21 @@ Do you want to proceed? + + PackageListPage + + All packages + + + + No package found + + + + We're sorry. We couldn't find any package matching the search term %1. + + + ParamDescriptorDelegate @@ -5358,11 +5369,11 @@ Do you want to proceed? - True + Yes - False + No @@ -6004,11 +6015,11 @@ Do you want to proceed? - True + Yes - False + No diff --git a/nymea-app/translations/nymea-app-en_US.ts b/nymea-app/translations/nymea-app-en_US.ts index 552c15e2..ec712795 100644 --- a/nymea-app/translations/nymea-app-en_US.ts +++ b/nymea-app/translations/nymea-app-en_US.ts @@ -1373,6 +1373,14 @@ Filter by + + Yes + + + + No + + DoorbellDevicePage @@ -5006,19 +5014,7 @@ Use a timeout value greater or equal to 10 ms. - PackageListPage - - All packages - - - - No package found - - - - We're sorry. We couldn't find any package matching the search term %1. - - + PackageDetailsPage Package information @@ -5070,6 +5066,21 @@ Do you want to proceed? + + PackageListPage + + All packages + + + + No package found + + + + We're sorry. We couldn't find any package matching the search term %1. + + + ParamDescriptorDelegate @@ -5358,11 +5369,11 @@ Do you want to proceed? - True + Yes - False + No @@ -6004,11 +6015,11 @@ Do you want to proceed? - True + Yes - False + No diff --git a/nymea-app/translations/nymea-app-it.ts b/nymea-app/translations/nymea-app-it.ts index cc7ba34c..163ed8ad 100644 --- a/nymea-app/translations/nymea-app-it.ts +++ b/nymea-app/translations/nymea-app-it.ts @@ -1416,6 +1416,14 @@ Filter by + + Yes + + + + No + + DoorbellDevicePage @@ -5053,19 +5061,7 @@ Use a timeout value greater or equal to 10 ms. - PackageListPage - - All packages - - - - No package found - - - - We're sorry. We couldn't find any package matching the search term %1. - - + PackageDetailsPage Package information @@ -5117,6 +5113,21 @@ Do you want to proceed? + + PackageListPage + + All packages + + + + No package found + + + + We're sorry. We couldn't find any package matching the search term %1. + + + ParamDescriptorDelegate @@ -5405,12 +5416,12 @@ Do you want to proceed? - True - + Yes + - False - + No + @@ -6052,11 +6063,19 @@ Do you want to proceed? True - Vero + Vero False - Falso + Falso + + + Yes + + + + No + diff --git a/nymea-app/translations/nymea-app-ko.ts b/nymea-app/translations/nymea-app-ko.ts index a51e5d30..9c798710 100644 --- a/nymea-app/translations/nymea-app-ko.ts +++ b/nymea-app/translations/nymea-app-ko.ts @@ -1431,6 +1431,14 @@ Filter by 필터 기준 + + Yes + + + + No + + DoorbellDevicePage @@ -5121,19 +5129,7 @@ Use a timeout value greater or equal to 10 ms. - PackageListPage - - All packages - 모든 패키지 - - - No package found - - - - We're sorry. We couldn't find any package matching the search term %1. - - + PackageDetailsPage Package information 패키지 정보 @@ -5186,6 +5182,63 @@ Do you want to proceed? 패키지 제거 + + PackageListPage + + All packages + 모든 패키지 + + + No package found + + + + We're sorry. We couldn't find any package matching the search term %1. + + + + Package information + 패키지 정보 + + + Installed version: + 설치된 버전: + + + Not installed + 설치되지 않음 + + + Candidate version: + 후보 버전: + + + Update + 업데이트 + + + Install + 설치 + + + +Do you want to proceed? + +진행 하시겠습니까? + + + Start update + 업데이트 시작 + + + Remove + 제거 + + + Remove package + 패키지 제거 + + ParamDescriptorDelegate @@ -5474,11 +5527,11 @@ Do you want to proceed? 알 수 없는 항목 - True + Yes - False + No @@ -6132,11 +6185,11 @@ Do you want to proceed? 조건을 편집하려면 누르십시오 - True + Yes - False + No diff --git a/nymea-app/translations/nymea-app-nl.ts b/nymea-app/translations/nymea-app-nl.ts index 825b1654..2839e6db 100644 --- a/nymea-app/translations/nymea-app-nl.ts +++ b/nymea-app/translations/nymea-app-nl.ts @@ -1423,6 +1423,14 @@ Filter by + + Yes + + + + No + + DoorbellDevicePage @@ -5060,19 +5068,7 @@ Use a timeout value greater or equal to 10 ms. - PackageListPage - - All packages - - - - No package found - - - - We're sorry. We couldn't find any package matching the search term %1. - - + PackageDetailsPage Package information @@ -5124,6 +5120,25 @@ Do you want to proceed? + + PackageListPage + + All packages + + + + No package found + + + + We're sorry. We couldn't find any package matching the search term %1. + + + + Remove + Verwijderen + + ParamDescriptorDelegate @@ -5412,12 +5427,12 @@ Do you want to proceed? - True - + Yes + - False - + No + @@ -6058,12 +6073,12 @@ Do you want to proceed? - True - + Yes + - False - + No + diff --git a/nymea-app/translations/nymea-app-tr.ts b/nymea-app/translations/nymea-app-tr.ts index 3cfdc096..72dd956f 100644 --- a/nymea-app/translations/nymea-app-tr.ts +++ b/nymea-app/translations/nymea-app-tr.ts @@ -1465,6 +1465,14 @@ Filter by Tarafından filtre + + Yes + + + + No + + DoorbellDevicePage @@ -5154,19 +5162,7 @@ Use a timeout value greater or equal to 10 ms. - PackageListPage - - All packages - Tüm paketler - - - No package found - - - - We're sorry. We couldn't find any package matching the search term %1. - - + PackageDetailsPage Package information Paket Bilgileri @@ -5219,6 +5215,68 @@ Do you want to proceed? Paketi kaldır + + PackageListPage + + All packages + Tüm paketler + + + No package found + + + + We're sorry. We couldn't find any package matching the search term %1. + + + + Package information + Paket Bilgileri + + + Installed version: + Yüklü sürüm: + + + Not installed + Yüklü değil + + + Candidate version: + Aday versiyonu: + + + Update + Güncelleme + + + Install + Yükle + + + This will start a system update. Note that the update might take several minutes and your %1 might not be functioning properly or restart during this time. + Bu bir sistem güncellemesi başlatacaktır. Güncellemenin birkaç dakika sürebileceğini ve bu süre içinde %1'inizin düzgün çalışmayabileceğini veya yeniden başlamayabileceğini unutmayın. + + + +Do you want to proceed? + +Devam etmek istiyor musunuz? + + + Start update + Güncellemeyi Başlat + + + This will start a system update. Note that the update might take several minutes and your %1 system might not be functioning properly during this time and restart during the process. +Do you want to proceed? + Bu bir sistem güncellemesi başlatacaktır. Güncellemenin birkaç dakika sürebileceğini ve %1 sisteminizin bu süre içinde düzgün çalışmayabileceğini ve işlem sırasında yeniden başlatılabileceğini unutmayın. Devam etmek istiyor musunuz? + + + Remove package + Paketi kaldır + + ParamDescriptorDelegate @@ -5516,11 +5574,19 @@ Do you want to proceed? True - Doğru + Doğru False - YANLIŞ + YANLIŞ + + + Yes + + + + No + @@ -6178,11 +6244,19 @@ Do you want to proceed? True - Doğru + Doğru False - Yanlış + Yanlış + + + Yes + + + + No + diff --git a/nymea-app/translations/nymea-app-vi.ts b/nymea-app/translations/nymea-app-vi.ts index 04c0dcc8..c3973ad6 100644 --- a/nymea-app/translations/nymea-app-vi.ts +++ b/nymea-app/translations/nymea-app-vi.ts @@ -1372,6 +1372,14 @@ Filter by + + Yes + + + + No + + DoorbellDevicePage @@ -4989,19 +4997,7 @@ Use a timeout value greater or equal to 10 ms. - PackageListPage - - All packages - - - - No package found - - - - We're sorry. We couldn't find any package matching the search term %1. - - + PackageDetailsPage Package information @@ -5053,6 +5049,21 @@ Do you want to proceed? + + PackageListPage + + All packages + + + + No package found + + + + We're sorry. We couldn't find any package matching the search term %1. + + + ParamDescriptorDelegate @@ -5341,12 +5352,12 @@ Do you want to proceed? - True - + Yes + - False - + No + @@ -5987,12 +5998,12 @@ Do you want to proceed? - True - + Yes + - False - + No + diff --git a/nymea-app/ui/devicepages/DeviceLogPage.qml b/nymea-app/ui/devicepages/DeviceLogPage.qml index 39b3cd66..1571cc33 100644 --- a/nymea-app/ui/devicepages/DeviceLogPage.qml +++ b/nymea-app/ui/devicepages/DeviceLogPage.qml @@ -206,7 +206,7 @@ Page { text: { switch (model.source) { case LogEntry.LoggingSourceStates: -// return entryDelegate.stateType.displayName + return entryDelegate.stateType.displayName case LogEntry.LoggingSourceEvents: return entryDelegate.eventType.displayName case LogEntry.LoggingSourceActions: @@ -215,6 +215,7 @@ Page { } Layout.fillWidth: true elide: Text.ElideRight + font: Style.smallFont } Label { text: Qt.formatDateTime(model.timestamp,"dd.MM.yy hh:mm:ss") @@ -247,6 +248,10 @@ Page { } case LogEntry.LoggingSourceActions: + switch (entryDelegate.stateType.type.toLowerCase()) { + case "bool": + return boolComponent; + } break; case LogEntry.LoggingSourceEvents: @@ -275,7 +280,7 @@ Page { property var value property string unitString text: value + " " + unitString - font.pixelSize: app.smallFont + font: Style.smallFont elide: Text.ElideRight } } @@ -286,7 +291,7 @@ Page { property double value property string unitString text: value.toFixed(value > 1000 ? 0 : 2) + " " + unitString - font.pixelSize: app.smallFont + font: Style.smallFont elide: Text.ElideRight } } @@ -295,19 +300,25 @@ Page { id: dateTimeComponent Label { property var value + font: Style.smallFont text: Qt.formatDateTime(new Date(value * 1000), Qt.DefaultLocaleShortDate) } } Component { id: boolComponent - Item { + RowLayout { id: boolLed property var value Led { implicitHeight: app.smallFont state: boolLed.value === "true" ? "on" : "off" } + Label { + font: Style.smallFont + text: boolLed.value === "true" ? qsTr("Yes") : qsTr("No") + Layout.fillWidth: true + } } } diff --git a/nymea-app/ui/magic/RuleActionDelegate.qml b/nymea-app/ui/magic/RuleActionDelegate.qml index 35cee485..82292bf3 100644 --- a/nymea-app/ui/magic/RuleActionDelegate.qml +++ b/nymea-app/ui/magic/RuleActionDelegate.qml @@ -69,7 +69,7 @@ NymeaSwipeDelegate { var text = "" switch (paramType.type.toLowerCase()) { case "bool": - text = ruleActionParam.value === true ? qsTr("True") : qsTr("False") + text = ruleActionParam.value === true ? qsTr("Yes") : qsTr("No") break; case "color": text = "⬤" diff --git a/nymea-app/ui/magic/SimpleStateEvaluatorDelegate.qml b/nymea-app/ui/magic/SimpleStateEvaluatorDelegate.qml index 87747a13..66f504a5 100644 --- a/nymea-app/ui/magic/SimpleStateEvaluatorDelegate.qml +++ b/nymea-app/ui/magic/SimpleStateEvaluatorDelegate.qml @@ -102,7 +102,7 @@ SwipeDelegate { valueText = root.stateEvaluator.stateDescriptor.value; switch (root.stateType.type.toLowerCase()) { case "bool": - valueText = root.stateEvaluator.stateDescriptor.value === true ? qsTr("True") : qsTr("False") + valueText = root.stateEvaluator.stateDescriptor.value === true ? qsTr("Yes") : qsTr("No") break; } } else {