ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #408: More fixes and translations

Browse Source
This commit is contained in:
Jenkins nymea 2020-08-28 17:21:03 +02:00
commit 299605c956
12 changed files with 705 additions and 373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

246
nymea-app/translations/nymea-app-de.ts
View File

@ -254,11 +254,11 @@
</message>
<message>
<source>Scan a code to see it appearing here.</source>
<translation>Scanne einen Code um ihn hier anzuzeigen.</translation>
<translation>Scanne einen Code um ihn hier zu sehen.</translation>
</message>
<message>
<source>Last scan</source>
<translation>Letzter scan</translation>
<translation>Letzter Scan</translation>
</message>
</context>
<context>
@ -794,8 +794,8 @@
<message numerus="yes">
<source>There are %n %1:core systems connected to your cloud.</source>
<translation>
<numerusform>Es ist %n %1:core System mit Deiner cloud verbunden.</numerusform>
<numerusform>Es sind %n %1:ore Systeme mit Deiner cloud verbunden.</numerusform>
<numerusform>Es ist ein %1:core System mit Deiner cloud verbunden.</numerusform>
<numerusform>Es sind %n %1:core Systeme mit Deiner cloud verbunden.</numerusform>
</translation>
</message>
<message>
@ -2213,57 +2213,106 @@
</context>
<context>
<name>EnergyView</name>
<message>
<source>Total consumed energy</source>
<translation>Energieverbrauch</translation>
</message>
<message>
<source>Power usage history</source>
<translation>Verbrauchshistorie</translation>
</message>
<message>
<source>%1 seconds</source>
<translation type="obsolete">%1 Sekunden</translation>
</message>
<message>
<source>%1 minutes</source>
<translation type="obsolete">%1 Minuten</translation>
</message>
<message>
<source>%1 hours</source>
<translation type="obsolete">%1 Stunden</translation>
</message>
<message>
<source>%1 days</source>
<translation type="obsolete">%1 Tage</translation>
</message>
<message>
<source>%1 weeks</source>
<translation type="obsolete">%1 Wochen</translation>
</message>
<message>
<source>%1 months</source>
<translation type="obsolete">%1 Monate</translation>
</message>
<message>
<source>%1 years</source>
<translation type="obsolete">%1 Jahre</translation>
</message>
<message>
<source>Total produced energy</source>
<translation>Erzeugte Energie</translation>
</message>
<message>
<source>There are no energy meters installed.</source>
<translation>Es sind keine Stromzähler eingerichtet.</translation>
<translation>Es sind noch keine Stromzähler installiert.</translation>
</message>
<message>
<source>To get an overview of your current energy usage, install some energy meters.</source>
<translation>Um einen Überblick über den aktuellen Energieverbrauch zu bekommen, installiere einen oder mehrere Stromzähler.</translation>
<translation>Installiere einen oder mehrere Stromzähler um einen Überlick über Deinen Energieverbrauch zu sehen.</translation>
</message>
<message>
<source>Add things</source>
<translation>&quot;Things&quot; hinzufügen</translation>
</message>
<message>
<source>Total consumed energy</source>
<translation>Gesamtverbrauch</translation>
<message numerus="yes">
<source>%n seconds</source>
<translation>
<numerusform>Eine Sekunde</numerusform>
<numerusform>%n Sekunden</numerusform>
</translation>
</message>
<message>
<source>Power usage history</source>
<translation>Verbrrauchshistorie</translation>
<message numerus="yes">
<source>%n minutes</source>
<translation>
<numerusform>Eine Minute</numerusform>
<numerusform>%n Minuten</numerusform>
</translation>
</message>
<message>
<source>%1 seconds</source>
<translation>%1 Sekunden</translation>
<message numerus="yes">
<source>%n hours</source>
<translation>
<numerusform>Eine Stunde</numerusform>
<numerusform>%n Stunden</numerusform>
</translation>
</message>
<message>
<source>%1 minutes</source>
<translation>%1 Minuten</translation>
<message numerus="yes">
<source>%n days</source>
<translation>
<numerusform>Einen Tag</numerusform>
<numerusform>%n Tage</numerusform>
</translation>
</message>
<message>
<source>%1 hours</source>
<translation>%1 Stunden</translation>
<message numerus="yes">
<source>%n weeks</source>
<translation>
<numerusform>Eine Woche</numerusform>
<numerusform>%n Wochen</numerusform>
</translation>
</message>
<message>
<source>%1 days</source>
<translation>%1 Tage</translation>
<message numerus="yes">
<source>%n months</source>
<translation>
<numerusform>Einen Monat</numerusform>
<numerusform>%n Monate</numerusform>
</translation>
</message>
<message>
<source>%1 weeks</source>
<translation>%1 Wochen</translation>
</message>
<message>
<source>%1 months</source>
<translation>%1 Monate</translation>
</message>
<message>
<source>%1 years</source>
<translation>%1 Jahre</translation>
</message>
<message>
<source>Total produced energy</source>
<translation>Gesamtertrag</translation>
<message numerus="yes">
<source>%n years</source>
<translation>
<numerusform>Ein Jahr</numerusform>
<numerusform>%n Jahre</numerusform>
</translation>
</message>
</context>
<context>
@ -2322,8 +2371,8 @@
<translation>Favoriten erlauben es den Überblick über die wichtigsten &quot;Things&quot; zu behalten wenn Du viele davon eingebunden hast. Halte ausschau nach dem Stern wenn Du mit &quot;Things&quot; interagierst umd benutze ihn um diese als Favoriten zu markieren.</translation>
</message>
<message>
<source>Add a thing</source>
<translation>&quot;Thing&quot; hinzufügen</translation>
<source>Add things</source>
<translation>&quot;Things&quot; hinzufügen</translation>
</message>
</context>
<context>
@ -2477,8 +2526,12 @@ Bitte versuche es erneut.</translation>
<translation>Es sind noch keine Garagentore eingerichtet.</translation>
</message>
<message>
<source>Set up now</source>
<translation>Jetzt einrichten</translation>
<source>Connect your garage doors in order to control them from here.</source>
<translation>Verbinde deine Garagentore um diese von hier aus zu steuern.</translation>
</message>
<message>
<source>Add things</source>
<translation>&quot;Things&quot; hinzufügen</translation>
</message>
</context>
<context>
@ -2622,36 +2675,85 @@ Bitte versuche es erneut.</translation>
<name>GenericTypeGraph</name>
<message>
<source>%1 seconds</source>
<translation>%1 Sekunden</translation>
<translation type="vanished">%1 Sekunden</translation>
</message>
<message>
<source>%1 minutes</source>
<translation>%1 Minuten</translation>
<translation type="vanished">%1 Minuten</translation>
</message>
<message>
<source>%1 hours</source>
<translation>%1 Stunden</translation>
<translation type="vanished">%1 Stunden</translation>
</message>
<message>
<source>%1 days</source>
<translation>%1 Tage</translation>
<translation type="vanished">%1 Tage</translation>
</message>
<message>
<source>%1 weeks</source>
<translation>%1 Wochen</translation>
<translation type="vanished">%1 Wochen</translation>
</message>
<message>
<source>%1 months</source>
<translation>%1 Monate</translation>
<translation type="vanished">%1 Monate</translation>
</message>
<message>
<source>%1 years</source>
<translation>%1 Jahre</translation>
<translation type="vanished">%1 Jahre</translation>
</message>
<message>
<source>Not connected</source>
<translation>Nicht verbunden</translation>
</message>
<message numerus="yes">
<source>%n seconds</source>
<translation>
<numerusform>Eine Sekunde</numerusform>
<numerusform>%n Sekunden</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n minutes</source>
<translation>
<numerusform>Eine Minute</numerusform>
<numerusform>%n Minuten</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n hours</source>
<translation>
<numerusform>Eine Stunde</numerusform>
<numerusform>%n Stunden</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n days</source>
<translation>
<numerusform>Einen Tag</numerusform>
<numerusform>%n Tage</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n weeks</source>
<translation>
<numerusform>Eine Woche</numerusform>
<numerusform>%n Wochen</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n months</source>
<translation>
<numerusform>Einen Monat</numerusform>
<numerusform>%n Monate</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n years</source>
<translation>
<numerusform>Ein Jahr</numerusform>
<numerusform>%n Jahre</numerusform>
</translation>
</message>
</context>
<context>
<name>GenericTypeGraphPre110</name>
@ -3661,11 +3763,11 @@ Bitte versuche es erneut.</translation>
</message>
<message>
<source>Media controllers with seeking</source>
<translation>Mediensteuerung mit Positionssuche</translation>
<translation>Medienabspielgeräte mit Suchfunktion</translation>
</message>
<message>
<source>Navigation pad with menu</source>
<translation>Navigationsfeld mit Menü</translation>
<translation>Navigationsfläche mit Menü</translation>
</message>
<message>
<source>Operate</source>
@ -3703,7 +3805,7 @@ Bitte versuche es erneut.</translation>
</message>
<message>
<source>Watering since</source>
<translation>Bewässerung läuft seit</translation>
<translation>Bewässerung seit</translation>
</message>
<message>
<source>Last watering</source>
@ -3711,26 +3813,26 @@ Bitte versuche es erneut.</translation>
</message>
<message>
<source>This irrigation has not been used yet</source>
<translation>Diese Bewässerung wurde noch nicht benutzt.</translation>
<translation>Diese Bewässerung wurde noch nicht benutzt</translation>
</message>
<message numerus="yes">
<source>%n minute(s)</source>
<translation>
<numerusform>%n Minute</numerusform>
<numerusform>Eine Minute</numerusform>
<numerusform>%n Minuten</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n hour(s)</source>
<translation>
<numerusform>%n Stunde</numerusform>
<numerusform>Eine Stunde</numerusform>
<numerusform>%n Stunden</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n day(s)</source>
<translation>
<numerusform>%n Tag</numerusform>
<numerusform>Ein Tag</numerusform>
<numerusform>%n Tage</numerusform>
</translation>
</message>
@ -3758,7 +3860,7 @@ Bitte versuche es erneut.</translation>
<message>
<source>Watering until</source>
<extracomment>Irrigation will be turned of at, e.g. 09:00</extracomment>
<translation>Bewässerung bis</translation>
<translation>Wässern bis</translation>
</message>
<message>
<source>Turn off in</source>
@ -3796,22 +3898,22 @@ Bitte versuche es erneut.</translation>
<message numerus="yes">
<source>%n minute(s) left</source>
<translation>
<numerusform>Eine Minute verbeibend</numerusform>
<numerusform>%n Minuten verbleibend</numerusform>
<numerusform>Noch eine Minute</numerusform>
<numerusform>Noch %n Minuten</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n hour(s) left</source>
<translation>
<numerusform>Eine Stunde verbleibend</numerusform>
<numerusform>%n Stunden verbleibend</numerusform>
<numerusform>Noch eine Stunde</numerusform>
<numerusform>Noch %n Stunden</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n day(s) left</source>
<translation>
<numerusform>Ein Tag verbleibend</numerusform>
<numerusform>%n Tage verbleibend</numerusform>
<numerusform>Noch einen Tag</numerusform>
<numerusform>Noch %n Tage</numerusform>
</translation>
</message>
</context>
@ -4423,7 +4525,7 @@ Bitte versuche es erneut.</translation>
<name>MediaView</name>
<message>
<source>There are no media players set up.</source>
<translation>Es sind keine Medienabspielgeräte eingerichtet.</translation>
<translation>Es sind noch keine Medienabspielgeräte eingerichtet.</translation>
</message>
<message>
<source>Connect your media players in order to control them from here.</source>
@ -5459,12 +5561,12 @@ Möchtest Du fortfahren?</translation>
<translation>Szenen bieten einen einfachen Weg um deine &quot;Things&quot; mit nur einem klick zu steuern.</translation>
</message>
<message>
<source>Add a thing</source>
<translation>&quot;Thing&quot; hinzufügen</translation>
<source>Add things</source>
<translation>&quot;Things&quot; hinzufügen</translation>
</message>
<message>
<source>Add a scene</source>
<translation>Szene hinzufügen</translation>
<source>Add scenes</source>
<translation>Szenen hinzufügen</translation>
</message>
</context>
<context>
@ -6416,11 +6518,11 @@ Möchtest Du fortfahren?</translation>
</message>
<message>
<source>In order for your %1 system to be useful, go ahead and add some things.</source>
<translation>Um dein %1 System zu benutzen, füge einige Geräte oder Dienste hinzu.</translation>
<translation>Um dein %1 system zu nutzen, füge einige &quot;Things&quot; hinzu.</translation>
</message>
<message>
<source>Add a thing</source>
<translation>&quot;Thing&quot; hinzufügen</translation>
<source>Add things</source>
<translation>&quot;Things&quot; hinzufügen</translation>
</message>
</context>
<context>

180
nymea-app/translations/nymea-app-en.ts
View File

@ -533,7 +533,7 @@
<message numerus="yes">
<source>There are %n %1:core systems connected to your cloud.</source>
<translation>
<numerusform>There is %n %1:core system connected to your cloud.</numerusform>
<numerusform>There is one %1:core system connected to your cloud.</numerusform>
<numerusform>There are %n %1:core systems connected to your cloud.</numerusform>
</translation>
</message>
@ -1573,6 +1573,18 @@
</context>
<context>
<name>EnergyView</name>
<message>
<source>Total consumed energy</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Power usage history</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Total produced energy</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>There are no energy meters installed.</source>
<translation type="unfinished"></translation>
@ -1585,45 +1597,54 @@
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Total consumed energy</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n seconds</source>
<translation>
<numerusform>One second</numerusform>
<numerusform>%n seconds</numerusform>
</translation>
</message>
<message>
<source>Power usage history</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n minutes</source>
<translation>
<numerusform>One minute</numerusform>
<numerusform>%n minutes</numerusform>
</translation>
</message>
<message>
<source>%1 seconds</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n hours</source>
<translation>
<numerusform>One hour</numerusform>
<numerusform>%n hours</numerusform>
</translation>
</message>
<message>
<source>%1 minutes</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n days</source>
<translation>
<numerusform>One day</numerusform>
<numerusform>%n days</numerusform>
</translation>
</message>
<message>
<source>%1 hours</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n weeks</source>
<translation>
<numerusform>One week</numerusform>
<numerusform>%n weeks</numerusform>
</translation>
</message>
<message>
<source>%1 days</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n months</source>
<translation>
<numerusform>One month</numerusform>
<numerusform>%n months</numerusform>
</translation>
</message>
<message>
<source>%1 weeks</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 months</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 years</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Total produced energy</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n years</source>
<translation>
<numerusform>One year</numerusform>
<numerusform>%n years</numerusform>
</translation>
</message>
</context>
<context>
@ -1674,7 +1695,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Add a thing</source>
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1817,7 +1838,11 @@ Please try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set up now</source>
<source>Connect your garage doors in order to control them from here.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1928,38 +1953,59 @@ Please try again.</source>
</context>
<context>
<name>GenericTypeGraph</name>
<message>
<source>%1 seconds</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 minutes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 hours</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 days</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 weeks</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 months</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 years</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<source>%n seconds</source>
<translation>
<numerusform>One second</numerusform>
<numerusform>%n seconds</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n minutes</source>
<translation>
<numerusform>One minute</numerusform>
<numerusform>%n minutes</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n hours</source>
<translation>
<numerusform>One hour</numerusform>
<numerusform>%n hours</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n days</source>
<translation>
<numerusform>One day</numerusform>
<numerusform>%n days</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n weeks</source>
<translation>
<numerusform>One week</numerusform>
<numerusform>%n weeks</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n months</source>
<translation>
<numerusform>One month</numerusform>
<numerusform>%n months</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n years</source>
<translation>
<numerusform>One year</numerusform>
<numerusform>%n years</numerusform>
</translation>
</message>
</context>
<context>
<name>GenericTypeLogView</name>
@ -4283,11 +4329,11 @@ Please try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add a thing</source>
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add a scene</source>
<source>Add scenes</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -4999,7 +5045,7 @@ Do you want to proceed?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add a thing</source>
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
</context>

182
nymea-app/translations/nymea-app-en_US.ts
View File

@ -1573,6 +1573,18 @@
</context>
<context>
<name>EnergyView</name>
<message>
<source>Total consumed energy</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Power usage history</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Total produced energy</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>There are no energy meters installed.</source>
<translation type="unfinished"></translation>
@ -1585,45 +1597,54 @@
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Total consumed energy</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n seconds</source>
<translation>
<numerusform>One second</numerusform>
<numerusform>%n seconds</numerusform>
</translation>
</message>
<message>
<source>Power usage history</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n minutes</source>
<translation>
<numerusform>One minute</numerusform>
<numerusform>%n minutes</numerusform>
</translation>
</message>
<message>
<source>%1 seconds</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n hours</source>
<translation>
<numerusform>One hour</numerusform>
<numerusform>%n hours</numerusform>
</translation>
</message>
<message>
<source>%1 minutes</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n days</source>
<translation>
<numerusform>One day</numerusform>
<numerusform>%n days</numerusform>
</translation>
</message>
<message>
<source>%1 hours</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n weeks</source>
<translation>
<numerusform>One week</numerusform>
<numerusform>%n weeks</numerusform>
</translation>
</message>
<message>
<source>%1 days</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n months</source>
<translation>
<numerusform>One month</numerusform>
<numerusform>%n months</numerusform>
</translation>
</message>
<message>
<source>%1 weeks</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 months</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 years</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Total produced energy</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n years</source>
<translation>
<numerusform>One year</numerusform>
<numerusform>%n years</numerusform>
</translation>
</message>
</context>
<context>
@ -1674,7 +1695,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Add a thing</source>
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1817,7 +1838,11 @@ Please try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set up now</source>
<source>Connect your garage doors in order to control them from here.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1928,38 +1953,59 @@ Please try again.</source>
</context>
<context>
<name>GenericTypeGraph</name>
<message>
<source>%1 seconds</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 minutes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 hours</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 days</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 weeks</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 months</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 years</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<source>%n seconds</source>
<translation>
<numerusform>One second</numerusform>
<numerusform>%n seconds</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n minutes</source>
<translation>
<numerusform>One minute</numerusform>
<numerusform>%n minutes</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n hours</source>
<translation>
<numerusform>One hour</numerusform>
<numerusform>%n hours</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n days</source>
<translation>
<numerusform>One day</numerusform>
<numerusform>%n days</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n weeks</source>
<translation>
<numerusform>One week</numerusform>
<numerusform>%n weeks</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n months</source>
<translation>
<numerusform>One month</numerusform>
<numerusform>%n months</numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n years</source>
<translation>
<numerusform>One year</numerusform>
<numerusform>%n years</numerusform>
</translation>
</message>
</context>
<context>
<name>GenericTypeLogView</name>
@ -2958,7 +3004,7 @@ Please try again.</source>
<message numerus="yes">
<source>%n day(s) ago</source>
<translation>
<numerusform>One days ago</numerusform>
<numerusform>One day ago</numerusform>
<numerusform>%n days ago</numerusform>
</translation>
</message>
@ -3308,7 +3354,7 @@ Please try again.</source>
</message>
<message numerus="yes">
<source>%n system update(s) available</source>
<translation type="unfinished">
<translation>
<numerusform>%n system update available</numerusform>
<numerusform>%n system updates available</numerusform>
</translation>
@ -4283,11 +4329,11 @@ Please try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add a thing</source>
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add a scene</source>
<source>Add scenes</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -4999,7 +5045,7 @@ Do you want to proceed?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add a thing</source>
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
</context>

178
nymea-app/translations/nymea-app-it.ts
View File

@ -1566,6 +1566,18 @@
</context>
<context>
<name>EnergyView</name>
<message>
<source>Total consumed energy</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Power usage history</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Total produced energy</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>There are no energy meters installed.</source>
<translation type="unfinished"></translation>
@ -1578,45 +1590,54 @@
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Total consumed energy</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n seconds</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
<source>Power usage history</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n minutes</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
<source>%1 seconds</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n hours</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
<source>%1 minutes</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n days</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
<source>%1 hours</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n weeks</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
<source>%1 days</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n months</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
<source>%1 weeks</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 months</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>%1 years</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Total produced energy</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<source>%n years</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
</context>
<context>
@ -1667,7 +1688,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<source>Add a thing</source>
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1810,7 +1831,11 @@ Please try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set up now</source>
<source>Connect your garage doors in order to control them from here.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1921,38 +1946,59 @@ Please try again.</source>
</context>
<context>
<name>GenericTypeGraph</name>
<message>
<source>%1 seconds</source>
<translation></translation>
</message>
<message>
<source>%1 minutes</source>
<translation></translation>
</message>
<message>
<source>%1 hours</source>
<translation></translation>
</message>
<message>
<source>%1 days</source>
<translation></translation>
</message>
<message>
<source>%1 weeks</source>
<translation></translation>
</message>
<message>
<source>%1 months</source>
<translation></translation>
</message>
<message>
<source>%1 years</source>
<translation></translation>
</message>
<message>
<source>Not connected</source>
<translation></translation>
</message>
<message numerus="yes">
<source>%n seconds</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n minutes</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n hours</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n days</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n weeks</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n months</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n years</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
</context>
<context>
<name>GenericTypeLogView</name>
@ -4292,11 +4338,11 @@ Please try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add a thing</source>
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add a scene</source>
<source>Add scenes</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -5008,7 +5054,7 @@ Do you want to proceed?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add a thing</source>
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
</context>

156
nymea-app/translations/nymea-app-ko.ts
View File

@ -1707,18 +1707,6 @@
</context>
<context>
<name>EnergyView</name>
<message>
<source>There are no energy meters installed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>To get an overview of your current energy usage, install some energy meters.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add things</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Total consumed energy</source>
<translation type="unfinished"></translation>
@ -1729,36 +1717,90 @@
</message>
<message>
<source>%1 seconds</source>
<translation type="unfinished">%1 초</translation>
<translation type="obsolete">%1 초</translation>
</message>
<message>
<source>%1 minutes</source>
<translation type="unfinished">%1 분</translation>
<translation type="obsolete">%1 분</translation>
</message>
<message>
<source>%1 hours</source>
<translation type="unfinished">%1 시간</translation>
<translation type="obsolete">%1 시간</translation>
</message>
<message>
<source>%1 days</source>
<translation type="unfinished">%1 일</translation>
<translation type="obsolete">%1 일</translation>
</message>
<message>
<source>%1 weeks</source>
<translation type="unfinished">%1 주</translation>
<translation type="obsolete">%1 주</translation>
</message>
<message>
<source>%1 months</source>
<translation type="unfinished">%1 달</translation>
<translation type="obsolete">%1 달</translation>
</message>
<message>
<source>%1 years</source>
<translation type="unfinished">%1 년</translation>
<translation type="obsolete">%1 년</translation>
</message>
<message>
<source>Total produced energy</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>There are no energy meters installed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>To get an overview of your current energy usage, install some energy meters.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add things</source>
<translation type="unfinished">사물(장치) 추가</translation>
</message>
<message numerus="yes">
<source>%n seconds</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n minutes</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n hours</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n days</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n weeks</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n months</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n years</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
</context>
<context>
<name>ErrorDialog</name>
@ -1808,7 +1850,7 @@
<translation type="unfinished">즐겨찾기는 당신이 많은 것을 가질 때 가장 중요한 것들을 추적할 수 있게 해줍니다. 사물(장치)과 상호작용할 때 별을 주의하여 즐겨찾기로 표시하십시오.</translation>
</message>
<message>
<source>Add a thing</source>
<source>Add things</source>
<translation type="unfinished">사물(장치) 추가</translation>
</message>
</context>
@ -1959,8 +2001,12 @@ Please try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set up now</source>
<translation type="unfinished">지금 설정</translation>
<source>Connect your garage doors in order to control them from here.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add things</source>
<translation type="unfinished">사물(장치) 추가</translation>
</message>
</context>
<context>
@ -2092,36 +2138,78 @@ Please try again.</source>
<name>GenericTypeGraph</name>
<message>
<source>%1 seconds</source>
<translation>%1 초</translation>
<translation type="vanished">%1 초</translation>
</message>
<message>
<source>%1 minutes</source>
<translation>%1 분</translation>
<translation type="vanished">%1 분</translation>
</message>
<message>
<source>%1 hours</source>
<translation>%1 시간</translation>
<translation type="vanished">%1 시간</translation>
</message>
<message>
<source>%1 days</source>
<translation>%1 일</translation>
<translation type="vanished">%1 일</translation>
</message>
<message>
<source>%1 weeks</source>
<translation>%1 주</translation>
<translation type="vanished">%1 주</translation>
</message>
<message>
<source>%1 months</source>
<translation>%1 달</translation>
<translation type="vanished">%1 달</translation>
</message>
<message>
<source>%1 years</source>
<translation>%1 년</translation>
<translation type="vanished">%1 년</translation>
</message>
<message>
<source>Not connected</source>
<translation>연결되지 않았습니다</translation>
</message>
<message numerus="yes">
<source>%n seconds</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n minutes</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n hours</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n days</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n weeks</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n months</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>%n years</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
</context>
<context>
<name>GenericTypeLogView</name>
@ -3663,7 +3751,7 @@ Please try again.</source>
</message>
<message>
<source>Add things</source>
<translation type="unfinished"></translation>
<translation type="unfinished">사물(장치) 추가</translation>
</message>
</context>
<context>
@ -4586,12 +4674,12 @@ Please try again.</source>
<translation type="unfinished">시나리오는 단 한 번의 클릭으로 여러분의 사물(장치)들을 조절할 수 있는 유용한 방법을 제공합니다.</translation>
</message>
<message>
<source>Add a thing</source>
<source>Add things</source>
<translation type="unfinished">사물(장치) 추가</translation>
</message>
<message>
<source>Add a scene</source>
<translation type="unfinished">시나리오 추가</translation>
<source>Add scenes</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -5333,7 +5421,7 @@ Do you want to proceed?</source>
<translation type="unfinished">%1 시스템이 유용하려면 먼저 몇 가지를 추가하십시오.</translation>
</message>
<message>
<source>Add a thing</source>
<source>Add things</source>
<translation type="unfinished">사물(장치) 추가</translation>
</message>
</context>

34
nymea-app/ui/customviews/GenericTypeGraph.qml
View File

@ -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)

54
nymea-app/ui/mainviews/EnergyView.qml
View File

@ -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"))
}
}

2
nymea-app/ui/mainviews/FavoritesView.qml
View File

@ -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"))
}

21
nymea-app/ui/mainviews/GaragesView.qml
View File

@ -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

21
nymea-app/ui/mainviews/MediaView.qml
View File

@ -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"))
}
}

2
nymea-app/ui/mainviews/ScenesView.qml
View File

@ -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"))

2
nymea-app/ui/mainviews/ThingsView.qml
View File

@ -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"))
}
}