From 7013e726aa7413a4e119de3944b7b1b13f755a7e Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 2 Nov 2020 17:16:36 +0100 Subject: [PATCH] ZigBee -> Zigbee, as per spec --- nymea-app/ui/SettingsPage.qml | 4 ++-- nymea-app/ui/system/ZigbeeNetworkAddPage.qml | 6 +++--- nymea-app/ui/system/ZigbeeNetworkSettingsPage.qml | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nymea-app/ui/SettingsPage.qml b/nymea-app/ui/SettingsPage.qml index 77cef0d9..3ab74e44 100644 --- a/nymea-app/ui/SettingsPage.qml +++ b/nymea-app/ui/SettingsPage.qml @@ -162,8 +162,8 @@ Page { NymeaListItemDelegate { width: parent.width iconName: "../images/zigbee.svg" - text: qsTr("ZigBee networking") - subText: qsTr("Manage and configure ZigBee networks") + text: qsTr("Zigbee") + subText: qsTr("Manage and configure Zigbee networks") prominentSubText: false wrapTexts: false onClicked: pageStack.push(Qt.resolvedUrl("system/ZigbeeNetworkSettingsPage.qml")) diff --git a/nymea-app/ui/system/ZigbeeNetworkAddPage.qml b/nymea-app/ui/system/ZigbeeNetworkAddPage.qml index ced5a2b7..a3fe13ca 100644 --- a/nymea-app/ui/system/ZigbeeNetworkAddPage.qml +++ b/nymea-app/ui/system/ZigbeeNetworkAddPage.qml @@ -37,10 +37,10 @@ import "../components" SettingsPageBase { id: root - title: qsTr("Add a new ZigBee network") + title: qsTr("Add a new Zigbee network") SettingsPageSectionHeader { - text: qsTr("ZigBee adapters") + text: qsTr("Zigbee adapters") } Repeater { @@ -59,7 +59,7 @@ SettingsPageBase { } SettingsPageSectionHeader { - text: qsTr("Unrecognized ZigBee adapters") + text: qsTr("Unrecognized Zigbee adapters") } Repeater { diff --git a/nymea-app/ui/system/ZigbeeNetworkSettingsPage.qml b/nymea-app/ui/system/ZigbeeNetworkSettingsPage.qml index 60183519..2b83ad9c 100644 --- a/nymea-app/ui/system/ZigbeeNetworkSettingsPage.qml +++ b/nymea-app/ui/system/ZigbeeNetworkSettingsPage.qml @@ -35,10 +35,10 @@ import QtQuick.Layouts 1.3 import "../components" import Nymea 1.0 -Page { +SettingsPageBase { id: root header: NymeaHeader { - text: qsTr("ZigBee networking") + text: qsTr("Zigbee") backButtonVisible: true onBackPressed: pageStack.pop() @@ -57,15 +57,15 @@ Page { // List networks SettingsPageSectionHeader { - text: qsTr("ZigBee networks") + text: qsTr("Zigbee networks") } NymeaListItemDelegate { Layout.fillWidth: true - text: qsTr("Add ZigBee network") - subText: qsTr("Set up a new ZigBee network") + text: qsTr("Add Zigbee network") + subText: qsTr("Set up a new Zigbee network") prominentSubText: false onClicked: { pageStack.push(Qt.resolvedUrl("../system/ZigbeeNetworkAddPage.qml"))