From 4191c8c5cbe603b99cd425aca060413ef5ffabf3 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 8 Jun 2020 17:35:26 +0200 Subject: [PATCH 1/2] Add a thing class viewer page to thing settings --- nymea-app/resources.qrc | 1 + .../thingconfiguration/ConfigureThingPage.qml | 10 ++ .../ThingClassDetailsPage.qml | 153 ++++++++++++++++++ 3 files changed, 164 insertions(+) create mode 100644 nymea-app/ui/thingconfiguration/ThingClassDetailsPage.qml diff --git a/nymea-app/resources.qrc b/nymea-app/resources.qrc index 9c20fd4f..979bd4e9 100644 --- a/nymea-app/resources.qrc +++ b/nymea-app/resources.qrc @@ -215,5 +215,6 @@ ui/grouping/GroupInterfacesPage.qml ui/connection/CertificateErrorDialog.qml ui/devicepages/VentilationDevicePage.qml + ui/thingconfiguration/ThingClassDetailsPage.qml diff --git a/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml b/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml index b7119a30..72d38f11 100644 --- a/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml +++ b/nymea-app/ui/thingconfiguration/ConfigureThingPage.qml @@ -126,6 +126,7 @@ SettingsPageBase { subText: root.deviceClass.displayName progressive: false } + NymeaListItemDelegate { Layout.fillWidth: true text: qsTr("ID:") @@ -137,6 +138,15 @@ SettingsPageBase { } } + NymeaListItemDelegate { + Layout.fillWidth: true + text: qsTr("Thing class") + subText: qsTr("View the type definition for this thing") + onClicked: { + pageStack.push(Qt.resolvedUrl("ThingClassDetailsPage.qml"), {device: root.device}) + } + } + SettingsPageSectionHeader { text: qsTr("Parameters") visible: root.device.params.count > 0 diff --git a/nymea-app/ui/thingconfiguration/ThingClassDetailsPage.qml b/nymea-app/ui/thingconfiguration/ThingClassDetailsPage.qml new file mode 100644 index 00000000..5b7236c8 --- /dev/null +++ b/nymea-app/ui/thingconfiguration/ThingClassDetailsPage.qml @@ -0,0 +1,153 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +* +* Copyright 2013 - 2020, nymea GmbH +* Contact: contact@nymea.io +* +* This file is part of nymea. +* This project including source code and documentation is protected by +* copyright law, and remains the property of nymea GmbH. All rights, including +* reproduction, publication, editing and translation, are reserved. The use of +* this project is subject to the terms of a license agreement to be concluded +* with nymea GmbH in accordance with the terms of use of nymea GmbH, available +* under https://nymea.io/license +* +* GNU General Public License Usage +* Alternatively, this project may be redistributed and/or modified under the +* terms of the GNU General Public License as published by the Free Software +* Foundation, GNU version 3. This project is distributed in the hope that it +* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +* Public License for more details. +* +* You should have received a copy of the GNU General Public License along with +* this project. If not, see . +* +* For any further details and any questions please contact us under +* contact@nymea.io or see our FAQ/Licensing Information on +* https://nymea.io/license/faq +* +* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +import QtQuick 2.8 +import QtQuick.Controls 2.1 +import QtQuick.Layouts 1.2 +import Nymea 1.0 +import "../components" +import "../delegates" + +SettingsPageBase { + id: root + property Device device: null + readonly property DeviceClass thingClass: device ? device.deviceClass : null + + header: NymeaHeader { + text: root.thingClass.displayName + onBackPressed: pageStack.pop() + } + + SettingsPageSectionHeader { + text: qsTr("Type") + } + + NymeaListItemDelegate { + Layout.fillWidth: true + text: root.thingClass.displayName + subText: root.thingClass.id.toString().replace(/[{}]/g, "") + progressive: false + } + + SettingsPageSectionHeader { + text: qsTr("Parameters") + visible: root.thingClass.paramTypes.count > 0 + } + + Repeater { + model: root.thingClass.paramTypes + NymeaListItemDelegate { + Layout.fillWidth: true + text: root.thingClass.paramTypes.get(index).displayName + subText: root.thingClass.paramTypes.get(index).id.toString().replace(/[{}]/g, "") + progressive: false + onClicked: { + PlatformHelper.toClipBoard(subText); + ToolTip.show(qsTr("ID copied to clipboard"), 500); + } + } + } + + SettingsPageSectionHeader { + text: qsTr("Settings") + visible: root.thingClass.settingsTypes.count > 0 + } + + Repeater { + model: root.thingClass.settingsTypes + NymeaListItemDelegate { + Layout.fillWidth: true + text: root.thingClass.settingsTypes.get(index).displayName + subText: root.thingClass.settingsTypes.get(index).id.toString().replace(/[{}]/g, "") + progressive: false + onClicked: { + PlatformHelper.toClipBoard(subText); + ToolTip.show(qsTr("ID copied to clipboard"), 500); + } + } + } + + SettingsPageSectionHeader { + text: qsTr("Events") + visible: root.thingClass.eventTypes.count > 0 + } + + Repeater { + model: root.thingClass.eventTypes + NymeaListItemDelegate { + Layout.fillWidth: true + text: root.thingClass.eventTypes.get(index).displayName + subText: root.thingClass.eventTypes.get(index).id.toString().replace(/[{}]/g, "") + progressive: false + onClicked: { + PlatformHelper.toClipBoard(subText); + ToolTip.show(qsTr("ID copied to clipboard"), 500); + } + } + } + + SettingsPageSectionHeader { + text: qsTr("States") + visible: root.thingClass.stateTypes.count > 0 + } + + Repeater { + model: root.thingClass.stateTypes + NymeaListItemDelegate { + Layout.fillWidth: true + text: root.thingClass.stateTypes.get(index).displayName + subText: root.thingClass.stateTypes.get(index).id.toString().replace(/[{}]/g, "") + progressive: false + onClicked: { + PlatformHelper.toClipBoard(subText); + ToolTip.show(qsTr("ID copied to clipboard"), 500); + } + } + } + + SettingsPageSectionHeader { + text: qsTr("Actions") + visible: root.thingClass.actionTypes.count > 0 + } + + Repeater { + model: root.thingClass.actionTypes + NymeaListItemDelegate { + Layout.fillWidth: true + text: root.thingClass.actionTypes.get(index).displayName + subText: root.thingClass.actionTypes.get(index).id.toString().replace(/[{}]/g, "") + progressive: false + onClicked: { + PlatformHelper.toClipBoard(subText); + ToolTip.show(qsTr("ID copied to clipboard"), 500); + } + } + } +} From 991eb1961c18be98f5bc1d99ce81653762836313 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 8 Jun 2020 17:55:59 +0200 Subject: [PATCH 2/2] Update translations --- nymea-app/translations/nymea-app-de.ts | 314 ++++++++++++++++++-- nymea-app/translations/nymea-app-en.ts | 291 +++++++++++++++--- nymea-app/translations/nymea-app-en_US.ts | 291 +++++++++++++++--- nymea-app/translations/nymea-app-ko.ts | 312 +++++++++++++++++-- nymea-app/ui/system/GeneralSettingsPage.qml | 6 +- 5 files changed, 1072 insertions(+), 142 deletions(-) diff --git a/nymea-app/translations/nymea-app-de.ts b/nymea-app/translations/nymea-app-de.ts index 67e62489..ed146a1e 100644 --- a/nymea-app/translations/nymea-app-de.ts +++ b/nymea-app/translations/nymea-app-de.ts @@ -522,11 +522,11 @@ CertificateDialog Warning - Warnung + Warnung Hi there! - Hallo! + Hallo! The certificate of this %1 box has changed! @@ -546,31 +546,62 @@ Fingerprint: - Fingerabdruck: + Fingerabdruck: Do you want to connect nevertheless? - Möchtest Du trotzdem verbinden? + Möchtest Du trotzdem verbinden? Do you want to trust this device? - Möchten Sie diesem Gerät vertrauen? + Möchten Sie diesem Gerät vertrauen? The certificate of this %1:core has changed! - Das Zertifikat dieses %1:cores hat sich geändert! + Das Zertifikat dieses %1:cores hat sich geändert! It seems this is the first time you connect to this %1:core. - Es scheint als würdest Du dich zum ersten Mal zu diesem %1:core verbinden. + Es scheint als würdest Du dich zum ersten Mal zu diesem %1:core verbinden. Did you change the system's configuration? Verify if this information is correct. - Hast Du die Konfiguration des Systems verändert? Bitte überprüfe ob diese Information korrekt ist. + Hast Du die Konfiguration des Systems verändert? Bitte überprüfe ob diese Information korrekt ist. This is the certificate for this %1:core. Once you trust it, an encrypted connection will be established. - Die ist das Zertifikat dieses %1:cores. Sobald Du ihm vertraust wird eine verschlüsselte Verbindung aufgebaut. + Die ist das Zertifikat dieses %1:cores. Sobald Du ihm vertraust wird eine verschlüsselte Verbindung aufgebaut. + + + Certificate information + Zertifikatinformationen + + + nymea UUID: + nymea UUID: + + + Organisation: + Organisation: + + + Common name: + Name: + + + Fingerprint: + Fingerabdruck: + + + + CertificateErrorDialog + + Insecure connection + Unsichere Verbindung + + + The certificate for this %1 system has changed. This could be because the configuration has been changed, but could also mean the system has been compromised. Do you want to accept the new certificate? + Das Zeritifikat für dieses %1 system hat sich geändert. Dies könnte durch eine Änderrung der Konfiguration verursacht worden sein, könnte jedoch auch darauf hindeuten, dass das System kompromittiert wurde. Möchtest du diesem Zertifikat vertrauen? @@ -931,7 +962,7 @@ Type - Typ + Typ Thing settings @@ -965,6 +996,70 @@ Settings Einstellungen + + Type: + Typ: + + + ID: + ID: + + + ID copied to clipboard + ID in die Zwischenablage kopiert + + + Thing class + "Thing" Klasse + + + View the type definition for this thing + Genaue Typendefinition dieses "Things" anzeigen + + + Input/Output Connections + Verbindungen der Ein-/Ausgänge + + + Not connected + Nicht verbunden + + + Connect Inputs/Outputs + Verbundene Ein-/Ausgäange + + + Connect "%1" to: + Verbinde "%1" zu: + + + Thing + Thing + + + Output + Oausgang + + + Input + Eingang + + + Inverted + Invertiert + + + Cancel + Abbrechen + + + Disconnect + Trennen + + + Connect + Verbinden + ConnectPage @@ -1207,6 +1302,10 @@ Connecting the %1:core to %2 Verbinde %1:core mit %2 + + Hidden Network + Verstecktes Netzwerk + ConnectingPage @@ -2298,11 +2397,11 @@ Bitte versuche es erneut. Reboot %1:core - %1:core neu starten + %1:core system neu starten Shutdown %1:core - %1:core ausschalten + %1:core ausschalten Are you sure you want to reboot your %1:core sytem now? @@ -2318,7 +2417,7 @@ Bitte versuche es erneut. Shut down %1:core - %1:core ausschalten + %1:core System ausschalten General settings @@ -2348,6 +2447,26 @@ Bitte versuche es erneut. System System + + Restart %1:core + %1:core neu starten + + + Are you sure you want to restart %1:core now? + Bist du sicher, dass du %1:core jetzt neu starten möchtest? + + + Reboot %1:core system + %1:core System rebooten + + + Shutdown %1:core system + %1:core System herunterfahren + + + Shut down %1:core system + Das %1:core System herunterfahren + GenericDeviceListPage @@ -2899,7 +3018,7 @@ Bitte versuche es erneut. Sensor - Sensor + Sensor Closable sensors @@ -3385,6 +3504,22 @@ Bitte versuche es erneut. Signal strength changed Signalstärke geändert + + Sensors + Sensoren + + + Heating + Heizung + + + Irrigation + Bewässerung + + + Ventilation + Belüftung + InterfacesModels @@ -4275,6 +4410,78 @@ Möchtest Du fortfahren? Enabled Aktiv + + No wireless hardware available. + Keine Hardware für Funkverbindung verfügbar. + + + The access point cannot be found. + Der Access Point konnte nicht gefunden werden. + + + The network interface cannot be found. + Die Netzwerkschnittstelle konnte nicht gefunden werden. + + + Invalid network device type. + Ungültiges Netzwerkgerät. + + + Wireless networking is disabled. + Die Funkverbindung ist deaktiviert. + + + The wireless connection failed. + Die Funkverbindung ist fehlgeschlagen. + + + Networking is disabled. + Das Netzwerk ist deaktiviert. + + + The network manager is not available. + Der Netzwerk-Manager ist nicht verfügbar. + + + Hosting access point + Access Point bereit + + + Network management is unavailable on this system. + Die Netwerkverwaltung ist auf dieses System nicht verfügbar. + + + Access Point + Access Point + + + Create Access Point + Access Point erstellen + + + Connect to wireless network + Mit Funknetzwerk verbinden + + + Hidden Network + Verstecktes Netzwerk + + + Connected to + Verbunden mit + + + IPv4 Address + IPv4 Adresse + + + IPv6 Address + IPv6 Adresse + + + WiFi frequency + Funkfrequenz + NewDeviceWizard @@ -4651,28 +4858,46 @@ Möchtest Du fortfahren? Select ... Smartlock + + Irrigation + Bewässerung + + + Ventilation + Belüftung + + + irrigation + Select ... + Bewässerung + + + ventilation + Select ... + Belüftung + NymeaConnection Common Name: - Allgemeiner Name: + Allgemeiner Name: Oragnisation: - Organisation: + Organisation: Locality: - Lokalität: + Lokalität: Oragnisational Unit: - Organisationseinheit: + Organisationseinheit: Country: - Land: + Land: @@ -4739,6 +4964,10 @@ Möchtest Du fortfahren? Confirm password Passwort bestätigen + + Password + Passwort + PluginParamsPage @@ -4852,6 +5081,14 @@ Möchtest Du fortfahren? Unknown item Unbekanntes Element + + True + Wahr + + + False + Falsch + S: @@ -5553,6 +5790,14 @@ Möchtest Du fortfahren? %1 %2: %3 %4 %5%6 %1 %2: %3 %4 %5%6 + + True + Wahr + + + False + Falsch + SmartMeterDeviceListPage @@ -5776,6 +6021,37 @@ Möchtest Du fortfahren? Fehler beim Hinzufügen der Paketquelle. + + ThingClassDetailsPage + + Type + Typ + + + Parameters + Parameter + + + ID copied to clipboard + ID in die Zwischenablage kopiert + + + Settings + Einstellungen + + + Events + Ereignisse + + + States + Zustände + + + Actions + Aktionen + + TimeEventDelegate diff --git a/nymea-app/translations/nymea-app-en.ts b/nymea-app/translations/nymea-app-en.ts index 1c57c086..b544ac2d 100644 --- a/nymea-app/translations/nymea-app-en.ts +++ b/nymea-app/translations/nymea-app-en.ts @@ -332,39 +332,34 @@ CertificateDialog - Warning + Certificate information - Hi there! + nymea UUID: - Fingerprint: + Organisation: - Do you want to connect nevertheless? + Common name: - Do you want to trust this device? + Fingerprint: + + + + + CertificateErrorDialog + + Insecure connection - The certificate of this %1:core has changed! - - - - It seems this is the first time you connect to this %1:core. - - - - Did you change the system's configuration? Verify if this information is correct. - - - - This is the certificate for this %1:core. Once you trust it, an encrypted connection will be established. + The certificate for this %1 system has changed. This could be because the configuration has been changed, but could also mean the system has been compromised. Do you want to accept the new certificate? @@ -648,10 +643,6 @@ Vendor: - - Type - - Apply @@ -680,6 +671,70 @@ Settings + + Type: + + + + ID: + + + + ID copied to clipboard + + + + Thing class + + + + View the type definition for this thing + + + + Input/Output Connections + + + + Not connected + + + + Connect Inputs/Outputs + + + + Connect "%1" to: + + + + Thing + + + + Output + + + + Input + + + + Inverted + + + + Cancel + + + + Disconnect + + + + Connect + + ConnectPage @@ -790,6 +845,10 @@ Connecting the %1:core to %2 + + Hidden Network + + ConnectingPage @@ -1718,14 +1777,6 @@ Please try again. Time zone - - Reboot %1:core - - - - Shutdown %1:core - - Are you sure you want to reboot your %1:core sytem now? @@ -1734,10 +1785,6 @@ Please try again. Are you sure you want to shut down your %1:core sytem now? - - Shut down %1:core - - General settings @@ -1766,6 +1813,22 @@ Please try again. System + + Restart %1:core + + + + Are you sure you want to restart %1:core now? + + + + Reboot %1:core system + + + + Shut down %1:core system + + GenericDeviceListPage @@ -2260,10 +2323,6 @@ Please try again. Button pressed - - Sensor - - Closable sensors @@ -2740,6 +2799,22 @@ Please try again. Signal strength changed + + Sensors + + + + Heating + + + + Irrigation + + + + Ventilation + + LightsDeviceListPage @@ -3446,6 +3521,78 @@ Please try again. Enabled + + No wireless hardware available. + + + + The access point cannot be found. + + + + The network interface cannot be found. + + + + Invalid network device type. + + + + Wireless networking is disabled. + + + + The wireless connection failed. + + + + Networking is disabled. + + + + The network manager is not available. + + + + Hosting access point + + + + Network management is unavailable on this system. + + + + Access Point + + + + Create Access Point + + + + Connect to wireless network + + + + Hidden Network + + + + Connected to + + + + IPv4 Address + + + + IPv6 Address + + + + WiFi frequency + + NewMagicPage @@ -3743,27 +3890,22 @@ Please try again. Select ... - - - NymeaConnection - Common Name: + Irrigation - Oragnisation: + Ventilation - Locality: + irrigation + Select ... - Oragnisational Unit: - - - - Country: + ventilation + Select ... @@ -3831,6 +3973,10 @@ Please try again. Confirm password + + Password + + PluginParamsPage @@ -3932,6 +4078,14 @@ Please try again. Unknown item + + True + + + + False + + S: @@ -4454,6 +4608,14 @@ Please try again. %1: %2 %3 %4 + + True + + + + False + + SmartMeterDeviceListPage @@ -4618,6 +4780,37 @@ Do you want to proceed? + + ThingClassDetailsPage + + Type + + + + Parameters + + + + ID copied to clipboard + + + + Settings + + + + Events + + + + States + + + + Actions + + + TimeEventDelegate diff --git a/nymea-app/translations/nymea-app-en_US.ts b/nymea-app/translations/nymea-app-en_US.ts index 1c57c086..b544ac2d 100644 --- a/nymea-app/translations/nymea-app-en_US.ts +++ b/nymea-app/translations/nymea-app-en_US.ts @@ -332,39 +332,34 @@ CertificateDialog - Warning + Certificate information - Hi there! + nymea UUID: - Fingerprint: + Organisation: - Do you want to connect nevertheless? + Common name: - Do you want to trust this device? + Fingerprint: + + + + + CertificateErrorDialog + + Insecure connection - The certificate of this %1:core has changed! - - - - It seems this is the first time you connect to this %1:core. - - - - Did you change the system's configuration? Verify if this information is correct. - - - - This is the certificate for this %1:core. Once you trust it, an encrypted connection will be established. + The certificate for this %1 system has changed. This could be because the configuration has been changed, but could also mean the system has been compromised. Do you want to accept the new certificate? @@ -648,10 +643,6 @@ Vendor: - - Type - - Apply @@ -680,6 +671,70 @@ Settings + + Type: + + + + ID: + + + + ID copied to clipboard + + + + Thing class + + + + View the type definition for this thing + + + + Input/Output Connections + + + + Not connected + + + + Connect Inputs/Outputs + + + + Connect "%1" to: + + + + Thing + + + + Output + + + + Input + + + + Inverted + + + + Cancel + + + + Disconnect + + + + Connect + + ConnectPage @@ -790,6 +845,10 @@ Connecting the %1:core to %2 + + Hidden Network + + ConnectingPage @@ -1718,14 +1777,6 @@ Please try again. Time zone - - Reboot %1:core - - - - Shutdown %1:core - - Are you sure you want to reboot your %1:core sytem now? @@ -1734,10 +1785,6 @@ Please try again. Are you sure you want to shut down your %1:core sytem now? - - Shut down %1:core - - General settings @@ -1766,6 +1813,22 @@ Please try again. System + + Restart %1:core + + + + Are you sure you want to restart %1:core now? + + + + Reboot %1:core system + + + + Shut down %1:core system + + GenericDeviceListPage @@ -2260,10 +2323,6 @@ Please try again. Button pressed - - Sensor - - Closable sensors @@ -2740,6 +2799,22 @@ Please try again. Signal strength changed + + Sensors + + + + Heating + + + + Irrigation + + + + Ventilation + + LightsDeviceListPage @@ -3446,6 +3521,78 @@ Please try again. Enabled + + No wireless hardware available. + + + + The access point cannot be found. + + + + The network interface cannot be found. + + + + Invalid network device type. + + + + Wireless networking is disabled. + + + + The wireless connection failed. + + + + Networking is disabled. + + + + The network manager is not available. + + + + Hosting access point + + + + Network management is unavailable on this system. + + + + Access Point + + + + Create Access Point + + + + Connect to wireless network + + + + Hidden Network + + + + Connected to + + + + IPv4 Address + + + + IPv6 Address + + + + WiFi frequency + + NewMagicPage @@ -3743,27 +3890,22 @@ Please try again. Select ... - - - NymeaConnection - Common Name: + Irrigation - Oragnisation: + Ventilation - Locality: + irrigation + Select ... - Oragnisational Unit: - - - - Country: + ventilation + Select ... @@ -3831,6 +3973,10 @@ Please try again. Confirm password + + Password + + PluginParamsPage @@ -3932,6 +4078,14 @@ Please try again. Unknown item + + True + + + + False + + S: @@ -4454,6 +4608,14 @@ Please try again. %1: %2 %3 %4 + + True + + + + False + + SmartMeterDeviceListPage @@ -4618,6 +4780,37 @@ Do you want to proceed? + + ThingClassDetailsPage + + Type + + + + Parameters + + + + ID copied to clipboard + + + + Settings + + + + Events + + + + States + + + + Actions + + + TimeEventDelegate diff --git a/nymea-app/translations/nymea-app-ko.ts b/nymea-app/translations/nymea-app-ko.ts index cf2ab4c3..7b6937c9 100644 --- a/nymea-app/translations/nymea-app-ko.ts +++ b/nymea-app/translations/nymea-app-ko.ts @@ -337,39 +337,70 @@ CertificateDialog Warning - 경고 + 경고 Hi there! - 여러분 안녕하세요! + 여러분 안녕하세요! Fingerprint: - 지문: + 지문: Do you want to connect nevertheless? - 그럼에도 불구하고 연결하시겠습니까? + 그럼에도 불구하고 연결하시겠습니까? Do you want to trust this device? - 이 장치를 신뢰하시겠습니까? + 이 장치를 신뢰하시겠습니까? The certificate of this %1:core has changed! - 이 %1:코어의 인증서가 변경되었습니다! + 이 %1:코어의 인증서가 변경되었습니다! It seems this is the first time you connect to this %1:core. - 이 %1:core에 처음 연결하는 것 같습니다. + 이 %1:core에 처음 연결하는 것 같습니다. Did you change the system's configuration? Verify if this information is correct. - 시스템의 구성을 변경했습니까? 이 정보가 올바른지 확인합니다. + 시스템의 구성을 변경했습니까? 이 정보가 올바른지 확인합니다. This is the certificate for this %1:core. Once you trust it, an encrypted connection will be established. - 이 %1:core에 대한 인증서입니다. 신뢰하면 암호화된 연결이 설정됩니다. + 이 %1:core에 대한 인증서입니다. 신뢰하면 암호화된 연결이 설정됩니다. + + + Certificate information + + + + nymea UUID: + + + + Organisation: + + + + Common name: + + + + Fingerprint: + + + + + CertificateErrorDialog + + Insecure connection + + + + The certificate for this %1 system has changed. This could be because the configuration has been changed, but could also mean the system has been compromised. Do you want to accept the new certificate? + @@ -687,7 +718,7 @@ Type - 유형 + 유형 Thing parameters @@ -725,6 +756,70 @@ Settings 설정 + + Type: + + + + ID: + + + + ID copied to clipboard + + + + Thing class + + + + View the type definition for this thing + + + + Input/Output Connections + + + + Not connected + 연결되지 않았습니다 + + + Connect Inputs/Outputs + + + + Connect "%1" to: + + + + Thing + + + + Output + + + + Input + + + + Inverted + + + + Cancel + 취소 + + + Disconnect + + + + Connect + 접속하기 + ConnectPage @@ -835,6 +930,10 @@ Connecting the %1:core to %2 %1:코어를 %2에 연결 + + Hidden Network + + ConnectingPage @@ -1796,11 +1895,11 @@ Please try again. Reboot %1:core - 재부팅 %1:코어 + 재부팅 %1:코어 Shutdown %1:core - 종료 %1:코어 + 종료 %1:코어 Are you sure you want to reboot your %1:core sytem now? @@ -1812,7 +1911,7 @@ Please try again. Shut down %1:core - %1:코어 종료 + %1:코어 종료 General settings @@ -1842,6 +1941,22 @@ Please try again. System + + Restart %1:core + + + + Are you sure you want to restart %1:core now? + + + + Reboot %1:core system + + + + Shut down %1:core system + + GenericDeviceListPage @@ -2368,10 +2483,6 @@ Please try again. Button pressed - - Sensor - - Closable sensors @@ -2848,6 +2959,22 @@ Please try again. Signal strength changed + + Sensors + 센서 + + + Heating + + + + Irrigation + + + + Ventilation + + LightsDeviceListPage @@ -3561,6 +3688,78 @@ Please try again. Enabled + + No wireless hardware available. + + + + The access point cannot be found. + + + + The network interface cannot be found. + + + + Invalid network device type. + + + + Wireless networking is disabled. + + + + The wireless connection failed. + + + + Networking is disabled. + + + + The network manager is not available. + + + + Hosting access point + + + + Network management is unavailable on this system. + + + + Access Point + + + + Create Access Point + + + + Connect to wireless network + + + + Hidden Network + + + + Connected to + 연결됨 + + + IPv4 Address + + + + IPv6 Address + + + + WiFi frequency + + NewMagicPage @@ -3866,28 +4065,46 @@ Please try again. Select ... + + Irrigation + + + + Ventilation + + + + irrigation + Select ... + + + + ventilation + Select ... + + NymeaConnection Common Name: - 공용 이름: + 공용 이름: Oragnisation: - 조직: + 조직: Locality: - 지역: + 지역: Oragnisational Unit: - 단체: + 단체: Country: - 국가: + 국가: @@ -3954,6 +4171,10 @@ Please try again. Confirm password 비밀번호 확인 + + Password + 암호 + PluginParamsPage @@ -4055,6 +4276,14 @@ Please try again. Unknown item 알 수 없는 항목 + + True + + + + False + + S: @@ -4609,6 +4838,14 @@ Please try again. %1: %2 %3 %4 + + True + + + + False + + SmartMeterDeviceListPage @@ -4773,6 +5010,37 @@ Do you want to proceed? + + ThingClassDetailsPage + + Type + 유형 + + + Parameters + + + + ID copied to clipboard + + + + Settings + 설정 + + + Events + 이벤트 + + + States + 상태 + + + Actions + 작동(조치) + + TimeEventDelegate diff --git a/nymea-app/ui/system/GeneralSettingsPage.qml b/nymea-app/ui/system/GeneralSettingsPage.qml index 1373ede3..a746318c 100644 --- a/nymea-app/ui/system/GeneralSettingsPage.qml +++ b/nymea-app/ui/system/GeneralSettingsPage.qml @@ -254,7 +254,7 @@ SettingsPageBase { var popup = dialog.createObject(app, { headerIcon: "../images/dialog-warning-symbolic.svg", - title: qsTr("Reboot %1:core").arg(app.systemName), + title: qsTr("Reboot %1:core system").arg(app.systemName), text: text, standardButtons: Dialog.Ok | Dialog.Cancel }); @@ -268,7 +268,7 @@ SettingsPageBase { Layout.fillWidth: true Layout.leftMargin: app.margins Layout.rightMargin: app.margins - text: qsTr("Shutdown %1:core system").arg(app.systemName) + text: qsTr("Shut down %1:core system").arg(app.systemName) visible: engine.systemController.powerManagementAvailable onClicked: { var dialog = Qt.createComponent(Qt.resolvedUrl("../components/MeaDialog.qml")); @@ -276,7 +276,7 @@ SettingsPageBase { var popup = dialog.createObject(app, { headerIcon: "../images/dialog-warning-symbolic.svg", - title: qsTr("Shut down %1:core").arg(app.systemName), + title: qsTr("Shut down %1:core system").arg(app.systemName), text: text, standardButtons: Dialog.Ok | Dialog.Cancel });