diff --git a/nymea-app/translations/nymea-app-de.ts b/nymea-app/translations/nymea-app-de.ts index ffd6e75c..1596c603 100644 --- a/nymea-app/translations/nymea-app-de.ts +++ b/nymea-app/translations/nymea-app-de.ts @@ -254,11 +254,11 @@ Scan a code to see it appearing here. - Scanne einen Code um ihn hier anzuzeigen. + Scanne einen Code um ihn hier zu sehen. Last scan - Letzter scan + Letzter Scan @@ -794,8 +794,8 @@ There are %n %1:core systems connected to your cloud. - Es ist %n %1:core System mit Deiner cloud verbunden. - Es sind %n %1:ore Systeme mit Deiner cloud verbunden. + Es ist ein %1:core System mit Deiner cloud verbunden. + Es sind %n %1:core Systeme mit Deiner cloud verbunden. @@ -2213,57 +2213,106 @@ EnergyView + + Total consumed energy + Energieverbrauch + + + Power usage history + Verbrauchshistorie + + + %1 seconds + %1 Sekunden + + + %1 minutes + %1 Minuten + + + %1 hours + %1 Stunden + + + %1 days + %1 Tage + + + %1 weeks + %1 Wochen + + + %1 months + %1 Monate + + + %1 years + %1 Jahre + + + Total produced energy + Erzeugte Energie + There are no energy meters installed. - Es sind keine Stromzähler eingerichtet. + Es sind noch keine Stromzähler installiert. To get an overview of your current energy usage, install some energy meters. - Um einen Überblick über den aktuellen Energieverbrauch zu bekommen, installiere einen oder mehrere Stromzähler. + Installiere einen oder mehrere Stromzähler um einen Überlick über Deinen Energieverbrauch zu sehen. Add things "Things" hinzufügen - - Total consumed energy - Gesamtverbrauch + + %n seconds + + Eine Sekunde + %n Sekunden + - - Power usage history - Verbrrauchshistorie + + %n minutes + + Eine Minute + %n Minuten + - - %1 seconds - %1 Sekunden + + %n hours + + Eine Stunde + %n Stunden + - - %1 minutes - %1 Minuten + + %n days + + Einen Tag + %n Tage + - - %1 hours - %1 Stunden + + %n weeks + + Eine Woche + %n Wochen + - - %1 days - %1 Tage + + %n months + + Einen Monat + %n Monate + - - %1 weeks - %1 Wochen - - - %1 months - %1 Monate - - - %1 years - %1 Jahre - - - Total produced energy - Gesamtertrag + + %n years + + Ein Jahr + %n Jahre + @@ -2322,8 +2371,8 @@ Favoriten erlauben es den Überblick über die wichtigsten "Things" zu behalten wenn Du viele davon eingebunden hast. Halte ausschau nach dem Stern wenn Du mit "Things" interagierst umd benutze ihn um diese als Favoriten zu markieren. - Add a thing - "Thing" hinzufügen + Add things + "Things" hinzufügen @@ -2477,8 +2526,12 @@ Bitte versuche es erneut. Es sind noch keine Garagentore eingerichtet. - Set up now - Jetzt einrichten + Connect your garage doors in order to control them from here. + Verbinde deine Garagentore um diese von hier aus zu steuern. + + + Add things + "Things" hinzufügen @@ -2622,36 +2675,85 @@ Bitte versuche es erneut. GenericTypeGraph %1 seconds - %1 Sekunden + %1 Sekunden %1 minutes - %1 Minuten + %1 Minuten %1 hours - %1 Stunden + %1 Stunden %1 days - %1 Tage + %1 Tage %1 weeks - %1 Wochen + %1 Wochen %1 months - %1 Monate + %1 Monate %1 years - %1 Jahre + %1 Jahre Not connected Nicht verbunden + + %n seconds + + Eine Sekunde + %n Sekunden + + + + %n minutes + + Eine Minute + %n Minuten + + + + %n hours + + Eine Stunde + %n Stunden + + + + %n days + + Einen Tag + %n Tage + + + + %n weeks + + Eine Woche + %n Wochen + + + + %n months + + Einen Monat + %n Monate + + + + %n years + + Ein Jahr + %n Jahre + + GenericTypeGraphPre110 @@ -3661,11 +3763,11 @@ Bitte versuche es erneut. Media controllers with seeking - Mediensteuerung mit Positionssuche + Medienabspielgeräte mit Suchfunktion Navigation pad with menu - Navigationsfeld mit Menü + Navigationsfläche mit Menü Operate @@ -3703,7 +3805,7 @@ Bitte versuche es erneut. Watering since - Bewässerung läuft seit + Bewässerung seit Last watering @@ -3711,26 +3813,26 @@ Bitte versuche es erneut. This irrigation has not been used yet - Diese Bewässerung wurde noch nicht benutzt. + Diese Bewässerung wurde noch nicht benutzt %n minute(s) - %n Minute + Eine Minute %n Minuten %n hour(s) - %n Stunde + Eine Stunde %n Stunden %n day(s) - %n Tag + Ein Tag %n Tage @@ -3758,7 +3860,7 @@ Bitte versuche es erneut. Watering until Irrigation will be turned of at, e.g. 09:00 - Bewässerung bis + Wässern bis Turn off in @@ -3796,22 +3898,22 @@ Bitte versuche es erneut. %n minute(s) left - Eine Minute verbeibend - %n Minuten verbleibend + Noch eine Minute + Noch %n Minuten %n hour(s) left - Eine Stunde verbleibend - %n Stunden verbleibend + Noch eine Stunde + Noch %n Stunden %n day(s) left - Ein Tag verbleibend - %n Tage verbleibend + Noch einen Tag + Noch %n Tage @@ -4423,7 +4525,7 @@ Bitte versuche es erneut. MediaView There are no media players set up. - Es sind keine Medienabspielgeräte eingerichtet. + Es sind noch keine Medienabspielgeräte eingerichtet. Connect your media players in order to control them from here. @@ -5459,12 +5561,12 @@ Möchtest Du fortfahren? Szenen bieten einen einfachen Weg um deine "Things" mit nur einem klick zu steuern. - Add a thing - "Thing" hinzufügen + Add things + "Things" hinzufügen - Add a scene - Szene hinzufügen + Add scenes + Szenen hinzufügen @@ -6416,11 +6518,11 @@ Möchtest Du fortfahren? In order for your %1 system to be useful, go ahead and add some things. - Um dein %1 System zu benutzen, füge einige Geräte oder Dienste hinzu. + Um dein %1 system zu nutzen, füge einige "Things" hinzu. - Add a thing - "Thing" hinzufügen + Add things + "Things" hinzufügen diff --git a/nymea-app/translations/nymea-app-en.ts b/nymea-app/translations/nymea-app-en.ts index a0c20f8e..01c05e09 100644 --- a/nymea-app/translations/nymea-app-en.ts +++ b/nymea-app/translations/nymea-app-en.ts @@ -533,7 +533,7 @@ There are %n %1:core systems connected to your cloud. - There is %n %1:core system connected to your cloud. + There is one %1:core system connected to your cloud. There are %n %1:core systems connected to your cloud. @@ -1573,6 +1573,18 @@ EnergyView + + Total consumed energy + + + + Power usage history + + + + Total produced energy + + There are no energy meters installed. @@ -1585,45 +1597,54 @@ Add things - - Total consumed energy - + + %n seconds + + One second + %n seconds + - - Power usage history - + + %n minutes + + One minute + %n minutes + - - %1 seconds - + + %n hours + + One hour + %n hours + - - %1 minutes - + + %n days + + One day + %n days + - - %1 hours - + + %n weeks + + One week + %n weeks + - - %1 days - + + %n months + + One month + %n months + - - %1 weeks - - - - %1 months - - - - %1 years - - - - Total produced energy - + + %n years + + One year + %n years + @@ -1674,7 +1695,7 @@ - Add a thing + Add things @@ -1817,7 +1838,11 @@ Please try again. - Set up now + Connect your garage doors in order to control them from here. + + + + Add things @@ -1928,38 +1953,59 @@ Please try again. GenericTypeGraph - - %1 seconds - - - - %1 minutes - - - - %1 hours - - - - %1 days - - - - %1 weeks - - - - %1 months - - - - %1 years - - Not connected + + %n seconds + + One second + %n seconds + + + + %n minutes + + One minute + %n minutes + + + + %n hours + + One hour + %n hours + + + + %n days + + One day + %n days + + + + %n weeks + + One week + %n weeks + + + + %n months + + One month + %n months + + + + %n years + + One year + %n years + + GenericTypeLogView @@ -4283,11 +4329,11 @@ Please try again. - Add a thing + Add things - Add a scene + Add scenes @@ -4999,7 +5045,7 @@ Do you want to proceed? - Add a thing + Add things diff --git a/nymea-app/translations/nymea-app-en_US.ts b/nymea-app/translations/nymea-app-en_US.ts index c4d15b3a..dc72e545 100644 --- a/nymea-app/translations/nymea-app-en_US.ts +++ b/nymea-app/translations/nymea-app-en_US.ts @@ -1573,6 +1573,18 @@ EnergyView + + Total consumed energy + + + + Power usage history + + + + Total produced energy + + There are no energy meters installed. @@ -1585,45 +1597,54 @@ Add things - - Total consumed energy - + + %n seconds + + One second + %n seconds + - - Power usage history - + + %n minutes + + One minute + %n minutes + - - %1 seconds - + + %n hours + + One hour + %n hours + - - %1 minutes - + + %n days + + One day + %n days + - - %1 hours - + + %n weeks + + One week + %n weeks + - - %1 days - + + %n months + + One month + %n months + - - %1 weeks - - - - %1 months - - - - %1 years - - - - Total produced energy - + + %n years + + One year + %n years + @@ -1674,7 +1695,7 @@ - Add a thing + Add things @@ -1817,7 +1838,11 @@ Please try again. - Set up now + Connect your garage doors in order to control them from here. + + + + Add things @@ -1928,38 +1953,59 @@ Please try again. GenericTypeGraph - - %1 seconds - - - - %1 minutes - - - - %1 hours - - - - %1 days - - - - %1 weeks - - - - %1 months - - - - %1 years - - Not connected + + %n seconds + + One second + %n seconds + + + + %n minutes + + One minute + %n minutes + + + + %n hours + + One hour + %n hours + + + + %n days + + One day + %n days + + + + %n weeks + + One week + %n weeks + + + + %n months + + One month + %n months + + + + %n years + + One year + %n years + + GenericTypeLogView @@ -2958,7 +3004,7 @@ Please try again. %n day(s) ago - One days ago + One day ago %n days ago @@ -3308,7 +3354,7 @@ Please try again. %n system update(s) available - + %n system update available %n system updates available @@ -4283,11 +4329,11 @@ Please try again. - Add a thing + Add things - Add a scene + Add scenes @@ -4999,7 +5045,7 @@ Do you want to proceed? - Add a thing + Add things diff --git a/nymea-app/translations/nymea-app-it.ts b/nymea-app/translations/nymea-app-it.ts index 8c3ca96a..78169b46 100644 --- a/nymea-app/translations/nymea-app-it.ts +++ b/nymea-app/translations/nymea-app-it.ts @@ -1566,6 +1566,18 @@ EnergyView + + Total consumed energy + + + + Power usage history + + + + Total produced energy + + There are no energy meters installed. @@ -1578,45 +1590,54 @@ Add things - - Total consumed energy - + + %n seconds + + + + - - Power usage history - + + %n minutes + + + + - - %1 seconds - + + %n hours + + + + - - %1 minutes - + + %n days + + + + - - %1 hours - + + %n weeks + + + + - - %1 days - + + %n months + + + + - - %1 weeks - - - - %1 months - - - - %1 years - - - - Total produced energy - + + %n years + + + + @@ -1667,7 +1688,7 @@ - Add a thing + Add things @@ -1810,7 +1831,11 @@ Please try again. - Set up now + Connect your garage doors in order to control them from here. + + + + Add things @@ -1921,38 +1946,59 @@ Please try again. GenericTypeGraph - - %1 seconds - - - - %1 minutes - - - - %1 hours - - - - %1 days - - - - %1 weeks - - - - %1 months - - - - %1 years - - Not connected + + %n seconds + + + + + + + %n minutes + + + + + + + %n hours + + + + + + + %n days + + + + + + + %n weeks + + + + + + + %n months + + + + + + + %n years + + + + + GenericTypeLogView @@ -4292,11 +4338,11 @@ Please try again. - Add a thing + Add things - Add a scene + Add scenes @@ -5008,7 +5054,7 @@ Do you want to proceed? - Add a thing + Add things diff --git a/nymea-app/translations/nymea-app-ko.ts b/nymea-app/translations/nymea-app-ko.ts index 678508af..17d6f737 100644 --- a/nymea-app/translations/nymea-app-ko.ts +++ b/nymea-app/translations/nymea-app-ko.ts @@ -1707,18 +1707,6 @@ EnergyView - - There are no energy meters installed. - - - - To get an overview of your current energy usage, install some energy meters. - - - - Add things - - Total consumed energy @@ -1729,36 +1717,90 @@ %1 seconds - %1 초 + %1 초 %1 minutes - %1 분 + %1 분 %1 hours - %1 시간 + %1 시간 %1 days - %1 일 + %1 일 %1 weeks - %1 주 + %1 주 %1 months - %1 달 + %1 달 %1 years - %1 년 + %1 년 Total produced energy + + There are no energy meters installed. + + + + To get an overview of your current energy usage, install some energy meters. + + + + Add things + 사물(장치) 추가 + + + %n seconds + + + + + + %n minutes + + + + + + %n hours + + + + + + %n days + + + + + + %n weeks + + + + + + %n months + + + + + + %n years + + + + ErrorDialog @@ -1808,7 +1850,7 @@ 즐겨찾기는 당신이 많은 것을 가질 때 가장 중요한 것들을 추적할 수 있게 해줍니다. 사물(장치)과 상호작용할 때 별을 주의하여 즐겨찾기로 표시하십시오. - Add a thing + Add things 사물(장치) 추가 @@ -1959,8 +2001,12 @@ Please try again. - Set up now - 지금 설정 + Connect your garage doors in order to control them from here. + + + + Add things + 사물(장치) 추가 @@ -2092,36 +2138,78 @@ Please try again. GenericTypeGraph %1 seconds - %1 초 + %1 초 %1 minutes - %1 분 + %1 분 %1 hours - %1 시간 + %1 시간 %1 days - %1 일 + %1 일 %1 weeks - %1 주 + %1 주 %1 months - %1 달 + %1 달 %1 years - %1 년 + %1 년 Not connected 연결되지 않았습니다 + + %n seconds + + + + + + %n minutes + + + + + + %n hours + + + + + + %n days + + + + + + %n weeks + + + + + + %n months + + + + + + %n years + + + + GenericTypeLogView @@ -3663,7 +3751,7 @@ Please try again. Add things - + 사물(장치) 추가 @@ -4586,12 +4674,12 @@ Please try again. 시나리오는 단 한 번의 클릭으로 여러분의 사물(장치)들을 조절할 수 있는 유용한 방법을 제공합니다. - Add a thing + Add things 사물(장치) 추가 - Add a scene - 시나리오 추가 + Add scenes + @@ -5333,7 +5421,7 @@ Do you want to proceed? %1 시스템이 유용하려면 먼저 몇 가지를 추가하십시오. - Add a thing + Add things 사물(장치) 추가 diff --git a/nymea-app/ui/customviews/GenericTypeGraph.qml b/nymea-app/ui/customviews/GenericTypeGraph.qml index ccb863a2..420fe1f6 100644 --- a/nymea-app/ui/customviews/GenericTypeGraph.qml +++ b/nymea-app/ui/customviews/GenericTypeGraph.qml @@ -143,8 +143,8 @@ Item { } } min: Math.floor(logsModelNg.minValue - Math.abs(logsModelNg.minValue * .05)) - onMinChanged: applyNiceNumbers(); - onMaxChanged: applyNiceNumbers(); +// onMinChanged: applyNiceNumbers(); +// onMaxChanged: applyNiceNumbers(); labelsFont.pixelSize: app.smallFont labelFormat: { switch (root.stateType.type.toLowerCase()) { @@ -177,32 +177,32 @@ Item { property int timeDiff: (xAxis.max.getTime() - xAxis.min.getTime()) / 1000 function getTimeSpanString() { - var td = timeDiff + var td = Math.round(timeDiff) if (td < 60) { - return qsTr("%1 seconds").arg(Math.round(td)); + return qsTr("%n seconds", "", td).arg(td); } - td = td / 60 + td = Math.round(td / 60) if (td < 60) { - return qsTr("%1 minutes").arg(Math.round(td)); + return qsTr("%n minutes", "", td).arg(td); } - td = td / 60 + td = Math.round(td / 60) if (td < 48) { - return qsTr("%1 hours").arg(Math.round(td)); + return qsTr("%n hours", "", td).arg(td); } - td = td / 24; + td = Math.round(td / 24); if (td < 14) { - return qsTr("%1 days").arg(Math.round(td)); + return qsTr("%n days", "", td).arg(td); } - td = td / 7 + td = Math.round(td / 7) if (td < 9) { - return qsTr("%1 weeks").arg(Math.round(td)); + return qsTr("%n weeks", "", td).arg(td); } - td = td * 7 / 30 + td = Math.round(td * 7 / 30) if (td < 24) { - return qsTr("%1 months").arg(Math.round(td)); + return qsTr("%n months", "", td).arg(td); } - td = td * 30 / 356 - return qsTr("%1 years").arg(Math.round(td)) + td = Math.round(td * 30 / 356) + return qsTr("%n years", "", td).arg(td) } titleText: { @@ -284,7 +284,7 @@ Item { id: lineSeries1 onPointAdded: { var newPoint = lineSeries1.at(index) -// print("pointadded", newPoint.x, newPoint.y) + print("pointadded", newPoint.x, newPoint.y) if (newPoint.x > lineSeries0.at(0).x) { lineSeries0.replace(0, newPoint.x, 0) diff --git a/nymea-app/ui/mainviews/EnergyView.qml b/nymea-app/ui/mainviews/EnergyView.qml index 0c836634..3115e2c7 100644 --- a/nymea-app/ui/mainviews/EnergyView.qml +++ b/nymea-app/ui/mainviews/EnergyView.qml @@ -51,16 +51,6 @@ MainViewBase { shownInterfaces: ["smartmeterproducer"] } - EmptyViewPlaceholder { - anchors.centerIn: parent - width: parent.width - app.margins * 2 - visible: !engine.thingManager.fetchingData && consumers.count == 0 - title: qsTr("There are no energy meters installed.") - text: qsTr("To get an overview of your current energy usage, install some energy meters.") - imageSource: "../images/smartmeter.svg" - buttonText: qsTr("Add things") - } - Flickable { anchors.fill: parent topMargin: app.margins @@ -191,8 +181,9 @@ MainViewBase { readonly property XYSeriesAdapter adapter: consumersRepeater.itemAt(consumersRepeater.count - 1).adapter; max: Math.ceil(adapter.maxValue + Math.abs(adapter.maxValue * .05)) min: Math.floor(adapter.minValue - Math.abs(adapter.minValue * .05)) - onMinChanged: applyNiceNumbers(); - onMaxChanged: applyNiceNumbers(); + // This seems to crash occationally +// onMinChanged: applyNiceNumbers(); +// onMaxChanged: applyNiceNumbers(); labelsFont.pixelSize: app.smallFont labelFormat: "%d" labelsColor: app.foregroundColor @@ -210,32 +201,32 @@ MainViewBase { property int timeDiff: (xAxis.max.getTime() - xAxis.min.getTime()) / 1000 function getTimeSpanString() { - var td = timeDiff + var td = Math.round(timeDiff) if (td < 60) { - return qsTr("%1 seconds").arg(Math.round(td)); + return qsTr("%n seconds", "", td).arg(td); } - td = td / 60 + td = Math.round(td / 60) if (td < 60) { - return qsTr("%1 minutes").arg(Math.round(td)); + return qsTr("%n minutes", "", td).arg(td); } - td = td / 60 + td = Math.round(td / 60) if (td < 48) { - return qsTr("%1 hours").arg(Math.round(td)); + return qsTr("%n hours", "", td).arg(td); } - td = td / 24; + td = Math.round(td / 24); if (td < 14) { - return qsTr("%1 days").arg(Math.round(td)); + return qsTr("%n days", "", td).arg(td); } - td = td / 7 + td = Math.round(td / 7) if (td < 9) { - return qsTr("%1 weeks").arg(Math.round(td)); + return qsTr("%n weeks", "", td).arg(td); } - td = td * 7 / 30 + td = Math.round(td * 7 / 30) if (td < 24) { - return qsTr("%1 months").arg(Math.round(td)); + return qsTr("%n months", "", td).arg(td); } - td = td * 30 / 356 - return qsTr("%1 years").arg(Math.round(td)) + td = Math.round(td * 30 / 356) + return qsTr("%n years", "", td).arg(td) } titleText: { @@ -370,4 +361,15 @@ MainViewBase { } } } + + EmptyViewPlaceholder { + anchors.centerIn: parent + width: parent.width - app.margins * 2 + visible: !engine.thingManager.fetchingData && consumers.count == 0 + title: qsTr("There are no energy meters installed.") + text: qsTr("To get an overview of your current energy usage, install some energy meters.") + imageSource: "../images/smartmeter.svg" + buttonText: qsTr("Add things") + onButtonClicked: pageStack.push(Qt.resolvedUrl("../thingconfiguration/NewThingPage.qml")) + } } diff --git a/nymea-app/ui/mainviews/FavoritesView.qml b/nymea-app/ui/mainviews/FavoritesView.qml index 5695f373..48c4eaf9 100644 --- a/nymea-app/ui/mainviews/FavoritesView.qml +++ b/nymea-app/ui/mainviews/FavoritesView.qml @@ -173,7 +173,7 @@ MainViewBase { qsTr("Favorites allow you to keep track of your most important things when you have lots of them. Watch out for the star when interacting with things and use it to mark them as your favorites.") imageSource: "../images/starred.svg" buttonVisible: engine.deviceManager.devices.count === 0 - buttonText: qsTr("Add a thing") + buttonText: qsTr("Add things") onButtonClicked: pageStack.push(Qt.resolvedUrl("../thingconfiguration/NewThingPage.qml")) } diff --git a/nymea-app/ui/mainviews/GaragesView.qml b/nymea-app/ui/mainviews/GaragesView.qml index add60278..7b1f530c 100644 --- a/nymea-app/ui/mainviews/GaragesView.qml +++ b/nymea-app/ui/mainviews/GaragesView.qml @@ -45,16 +45,6 @@ MainViewBase { shownInterfaces: ["garagedoor", "garagegate"] } - EmptyViewPlaceholder { - anchors.centerIn: parent - width: parent.width - app.margins * 2 - text: qsTr("There are no garage doors set up yet.") - imageSource: "qrc:/ui/images/garage/garage-100.svg" - buttonText: qsTr("Set up now") - visible: garagesFilterModel.count === 0 && !engine.thingManager.fetchingData - onButtonClicked: pageStack.push(Qt.resolvedUrl("../thingconfiguration/NewThingPage.qml")) - } - SwipeView { id: swipeView anchors.fill: parent @@ -232,6 +222,17 @@ MainViewBase { } } + EmptyViewPlaceholder { + anchors.centerIn: parent + width: parent.width - app.margins * 2 + title: qsTr("There are no garage doors set up yet.") + text: qsTr("Connect your garage doors in order to control them from here.") + imageSource: "qrc:/ui/images/garage/garage-100.svg" + buttonText: qsTr("Add things") + visible: garagesFilterModel.count === 0 && !engine.thingManager.fetchingData + onButtonClicked: pageStack.push(Qt.resolvedUrl("../thingconfiguration/NewThingPage.qml")) + } + PageIndicator { anchors { bottom: parent.bottom; horizontalCenter: parent.horizontalCenter } count: garagesFilterModel.count diff --git a/nymea-app/ui/mainviews/MediaView.qml b/nymea-app/ui/mainviews/MediaView.qml index 0f240272..9eee5971 100644 --- a/nymea-app/ui/mainviews/MediaView.qml +++ b/nymea-app/ui/mainviews/MediaView.qml @@ -46,16 +46,6 @@ MainViewBase { shownInterfaces: ["mediaplayer"] } - EmptyViewPlaceholder { - anchors.centerIn: parent - width: parent.width - app.margins * 2 - visible: !engine.thingManager.fetchingData && mediaDevices.count == 0 - title: qsTr("There are no media players set up.") - text: qsTr("Connect your media players in order to control them from here.") - imageSource: "../images/media.svg" - buttonText: qsTr("Add things") - } - SwipeView { id: swipeView anchors.fill: parent @@ -183,4 +173,15 @@ MainViewBase { anchors.horizontalCenter: parent.horizontalCenter } + EmptyViewPlaceholder { + anchors.centerIn: parent + width: parent.width - app.margins * 2 + visible: !engine.thingManager.fetchingData && mediaDevices.count == 0 + title: qsTr("There are no media players set up.") + text: qsTr("Connect your media players in order to control them from here.") + imageSource: "../images/media.svg" + buttonText: qsTr("Add things") + onButtonClicked: pageStack.push(Qt.resolvedUrl("../thingconfiguration/NewThingPage.qml")) + } + } diff --git a/nymea-app/ui/mainviews/ScenesView.qml b/nymea-app/ui/mainviews/ScenesView.qml index d8235a32..7ad53e79 100644 --- a/nymea-app/ui/mainviews/ScenesView.qml +++ b/nymea-app/ui/mainviews/ScenesView.qml @@ -86,7 +86,7 @@ MainViewBase { qsTr("It appears there are no things set up either yet. In order to use scenes you need to add some things first.") : qsTr("Scenes provide a useful way to control your things with just one click.") imageSource: "../images/slideshow.svg" - buttonText: engine.deviceManager.devices.count === 0 ? qsTr("Add a thing") : qsTr("Add a scene") + buttonText: engine.deviceManager.devices.count === 0 ? qsTr("Add things") : qsTr("Add scenes") onButtonClicked: { if (engine.deviceManager.devices.count === 0) { pageStack.push(Qt.resolvedUrl("../thingconfiguration/NewThingPage.qml")) diff --git a/nymea-app/ui/mainviews/ThingsView.qml b/nymea-app/ui/mainviews/ThingsView.qml index 72da5b29..12b92e39 100644 --- a/nymea-app/ui/mainviews/ThingsView.qml +++ b/nymea-app/ui/mainviews/ThingsView.qml @@ -77,7 +77,7 @@ MainViewBase { // Have that split in 2 because we need those strings separated in EditDevicesPage too and don't want translators to do them twice text: qsTr("There are no things set up yet.") + "\n" + qsTr("In order for your %1 system to be useful, go ahead and add some things.").arg(app.systemName) imageSource: "qrc:/styles/%1/logo.svg".arg(styleController.currentStyle) - buttonText: qsTr("Add a thing") + buttonText: qsTr("Add things") onButtonClicked: pageStack.push(Qt.resolvedUrl("../thingconfiguration/NewThingPage.qml")) } }