Merge PR #1095: Update Aboutpage regarding the licence term

This commit is contained in:
jenkins 2024-09-06 12:28:31 +02:00
commit e57bd6999d
11 changed files with 74 additions and 37 deletions

View File

@ -2560,6 +2560,10 @@ Prosím zkuste to znovu.</translation>
<source>nymea is a registered trademark of chargebyte GmbH.</source> <source>nymea is a registered trademark of chargebyte GmbH.</source>
<translation>nymea je registrovaná ochranná známka společnosti chargebyte GmbH.</translation> <translation>nymea je registrovaná ochranná známka společnosti chargebyte GmbH.</translation>
</message> </message>
<message>
<source>Licensed under the terms of the nymea commercial license.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>InterfaceTile</name> <name>InterfaceTile</name>
@ -3769,10 +3773,6 @@ Prosím zkuste to znovu.</translation>
</context> </context>
<context> <context>
<name>LoginPage</name> <name>LoginPage</name>
<message>
<source>Welcome to %1!</source>
<translation>Vítejte v %1!</translation>
</message>
<message> <message>
<source>Sorry, that wasn&apos;t right. Try again please.</source> <source>Sorry, that wasn&apos;t right. Try again please.</source>
<translation>Promiňte, to nebylo správné. Zkuste to prosím znovu.</translation> <translation>Promiňte, to nebylo správné. Zkuste to prosím znovu.</translation>
@ -3837,6 +3837,10 @@ Prosím zkuste to znovu.</translation>
<source>Email</source> <source>Email</source>
<translation>E-Mail</translation> <translation>E-Mail</translation>
</message> </message>
<message>
<source>Welcome!</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LookAndFeelSettingsPage</name> <name>LookAndFeelSettingsPage</name>

View File

@ -2552,6 +2552,10 @@ Bitte versuche es erneut.</translation>
<source>nymea is a registered trademark of chargebyte GmbH.</source> <source>nymea is a registered trademark of chargebyte GmbH.</source>
<translation>nymea ist ein eingetragenes Markenzeichen von chargebyte GmbH.</translation> <translation>nymea ist ein eingetragenes Markenzeichen von chargebyte GmbH.</translation>
</message> </message>
<message>
<source>Licensed under the terms of the nymea commercial license.</source>
<translation>Lizensiert unter den Bedingungen der kommerzielle Lizenz von Nymea.</translation>
</message>
</context> </context>
<context> <context>
<name>InterfaceTile</name> <name>InterfaceTile</name>
@ -3751,10 +3755,6 @@ Bitte versuche es erneut.</translation>
</context> </context>
<context> <context>
<name>LoginPage</name> <name>LoginPage</name>
<message>
<source>Welcome to %1!</source>
<translation>Willkommen zu %1!</translation>
</message>
<message> <message>
<source>Sorry, that wasn&apos;t right. Try again please.</source> <source>Sorry, that wasn&apos;t right. Try again please.</source>
<translation>Entschuldingung, das war nicht richtig. Bitte versuche es erneut.</translation> <translation>Entschuldingung, das war nicht richtig. Bitte versuche es erneut.</translation>
@ -3819,6 +3819,10 @@ Bitte versuche es erneut.</translation>
<source>Email</source> <source>Email</source>
<translation>E-Mail</translation> <translation>E-Mail</translation>
</message> </message>
<message>
<source>Welcome!</source>
<translation>Willkommen!</translation>
</message>
</context> </context>
<context> <context>
<name>LookAndFeelSettingsPage</name> <name>LookAndFeelSettingsPage</name>

View File

@ -2545,6 +2545,10 @@ Please try again.</source>
<source>nymea is a registered trademark of chargebyte GmbH.</source> <source>nymea is a registered trademark of chargebyte GmbH.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Licensed under the terms of the nymea commercial license.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>InterfaceTile</name> <name>InterfaceTile</name>
@ -3744,10 +3748,6 @@ Please try again.</source>
</context> </context>
<context> <context>
<name>LoginPage</name> <name>LoginPage</name>
<message>
<source>Welcome to %1!</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Sorry, that wasn&apos;t right. Try again please.</source> <source>Sorry, that wasn&apos;t right. Try again please.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -3812,6 +3812,10 @@ Please try again.</source>
<source>Email</source> <source>Email</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Welcome!</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LookAndFeelSettingsPage</name> <name>LookAndFeelSettingsPage</name>

View File

@ -2545,6 +2545,10 @@ Please try again.</source>
<source>nymea is a registered trademark of chargebyte GmbH.</source> <source>nymea is a registered trademark of chargebyte GmbH.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Licensed under the terms of the nymea commercial license.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>InterfaceTile</name> <name>InterfaceTile</name>
@ -3744,10 +3748,6 @@ Please try again.</source>
</context> </context>
<context> <context>
<name>LoginPage</name> <name>LoginPage</name>
<message>
<source>Welcome to %1!</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Sorry, that wasn&apos;t right. Try again please.</source> <source>Sorry, that wasn&apos;t right. Try again please.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -3812,6 +3812,10 @@ Please try again.</source>
<source>Email</source> <source>Email</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Welcome!</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LookAndFeelSettingsPage</name> <name>LookAndFeelSettingsPage</name>

View File

@ -2545,6 +2545,10 @@ Please try again.</source>
<source>nymea is a registered trademark of chargebyte GmbH.</source> <source>nymea is a registered trademark of chargebyte GmbH.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Licensed under the terms of the nymea commercial license.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>InterfaceTile</name> <name>InterfaceTile</name>
@ -3744,10 +3748,6 @@ Please try again.</source>
</context> </context>
<context> <context>
<name>LoginPage</name> <name>LoginPage</name>
<message>
<source>Welcome to %1!</source>
<translation>Benvenuto in %1!</translation>
</message>
<message> <message>
<source>Sorry, that wasn&apos;t right. Try again please.</source> <source>Sorry, that wasn&apos;t right. Try again please.</source>
<translation></translation> <translation></translation>
@ -3812,6 +3812,10 @@ Please try again.</source>
<source>Email</source> <source>Email</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Welcome!</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LookAndFeelSettingsPage</name> <name>LookAndFeelSettingsPage</name>

View File

@ -2541,6 +2541,10 @@ Please try again.</source>
<source>nymea is a registered trademark of chargebyte GmbH.</source> <source>nymea is a registered trademark of chargebyte GmbH.</source>
<translation>nymea는 chargebyte GmbH .</translation> <translation>nymea는 chargebyte GmbH .</translation>
</message> </message>
<message>
<source>Licensed under the terms of the nymea commercial license.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>InterfaceTile</name> <name>InterfaceTile</name>
@ -3730,10 +3734,6 @@ Please try again.</source>
</context> </context>
<context> <context>
<name>LoginPage</name> <name>LoginPage</name>
<message>
<source>Welcome to %1!</source>
<translation>%1 !</translation>
</message>
<message> <message>
<source>Sorry, that wasn&apos;t right. Try again please.</source> <source>Sorry, that wasn&apos;t right. Try again please.</source>
<translation>, . .</translation> <translation>, . .</translation>
@ -3798,6 +3798,10 @@ Please try again.</source>
<source>Email</source> <source>Email</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Welcome!</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LookAndFeelSettingsPage</name> <name>LookAndFeelSettingsPage</name>

View File

@ -2554,6 +2554,10 @@ Probeer het nog een keer.</translation>
<source>nymea is a registered trademark of chargebyte GmbH.</source> <source>nymea is a registered trademark of chargebyte GmbH.</source>
<translation>nymea is een geregistreerd handelsmerk van chargebyte GmbH.</translation> <translation>nymea is een geregistreerd handelsmerk van chargebyte GmbH.</translation>
</message> </message>
<message>
<source>Licensed under the terms of the nymea commercial license.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>InterfaceTile</name> <name>InterfaceTile</name>
@ -3755,10 +3759,6 @@ Probeer het nog een keer.</translation>
</context> </context>
<context> <context>
<name>LoginPage</name> <name>LoginPage</name>
<message>
<source>Welcome to %1!</source>
<translation>Welkom bij %1!</translation>
</message>
<message> <message>
<source>Sorry, that wasn&apos;t right. Try again please.</source> <source>Sorry, that wasn&apos;t right. Try again please.</source>
<translation>Sorry, dat was niet goed. Probeer het nog eens.</translation> <translation>Sorry, dat was niet goed. Probeer het nog eens.</translation>
@ -3823,6 +3823,10 @@ Probeer het nog een keer.</translation>
<source>Email</source> <source>Email</source>
<translation>E-mail</translation> <translation>E-mail</translation>
</message> </message>
<message>
<source>Welcome!</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LookAndFeelSettingsPage</name> <name>LookAndFeelSettingsPage</name>

View File

@ -2540,6 +2540,10 @@ Please try again.</source>
<source>nymea is a registered trademark of chargebyte GmbH.</source> <source>nymea is a registered trademark of chargebyte GmbH.</source>
<translation>nymea, chargebyte GmbH.nin tescilli ticari markasıdır.</translation> <translation>nymea, chargebyte GmbH.nin tescilli ticari markasıdır.</translation>
</message> </message>
<message>
<source>Licensed under the terms of the nymea commercial license.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>InterfaceTile</name> <name>InterfaceTile</name>
@ -3729,10 +3733,6 @@ Please try again.</source>
</context> </context>
<context> <context>
<name>LoginPage</name> <name>LoginPage</name>
<message>
<source>Welcome to %1!</source>
<translation>%1&apos;e hoş geldiniz!</translation>
</message>
<message> <message>
<source>Sorry, that wasn&apos;t right. Try again please.</source> <source>Sorry, that wasn&apos;t right. Try again please.</source>
<translation>Üzgünüm, bu doğru değildi. Lütfen tekrar deneyiniz.</translation> <translation>Üzgünüm, bu doğru değildi. Lütfen tekrar deneyiniz.</translation>
@ -3797,6 +3797,10 @@ Please try again.</source>
<source>Email</source> <source>Email</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Welcome!</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LookAndFeelSettingsPage</name> <name>LookAndFeelSettingsPage</name>

View File

@ -2537,6 +2537,10 @@ Please try again.</source>
<source>nymea is a registered trademark of chargebyte GmbH.</source> <source>nymea is a registered trademark of chargebyte GmbH.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Licensed under the terms of the nymea commercial license.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>InterfaceTile</name> <name>InterfaceTile</name>
@ -3726,10 +3730,6 @@ Please try again.</source>
</context> </context>
<context> <context>
<name>LoginPage</name> <name>LoginPage</name>
<message>
<source>Welcome to %1!</source>
<translation></translation>
</message>
<message> <message>
<source>Sorry, that wasn&apos;t right. Try again please.</source> <source>Sorry, that wasn&apos;t right. Try again please.</source>
<translation></translation> <translation></translation>
@ -3794,6 +3794,10 @@ Please try again.</source>
<source>Email</source> <source>Email</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Welcome!</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>LookAndFeelSettingsPage</name> <name>LookAndFeelSettingsPage</name>

View File

@ -26,4 +26,5 @@ Item {
property string defaultMainView: "things" property string defaultMainView: "things"
property var mainMenuLinks: null property var mainMenuLinks: null
property bool closedSource: false
} }

View File

@ -118,7 +118,7 @@ Item {
Layout.rightMargin: app.margins Layout.rightMargin: app.margins
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font.pixelSize: app.smallFont font.pixelSize: app.smallFont
text: qsTr("Licensed under the terms of the GNU General Public License, version 3. Please visit the GitHub page for source code and build instructions.") text: Configuration.closedSource ? qsTr("Licensed under the terms of the nymea commercial license.") : qsTr("Licensed under the terms of the GNU General Public License, version 3. Please visit the GitHub page for source code and build instructions.")
} }
ColumnLayout { ColumnLayout {