From c9281ccabdf8b6bebbb3ee22b71fe41e30f0fb52 Mon Sep 17 00:00:00 2001 From: "Peter G. (nephros)" Date: Sun, 2 May 2021 17:18:25 +0200 Subject: [PATCH] Add several strings for health notification update German translation improve wording --- application/qml/pages/SettingsPage.qml | 10 +- application/src/settings.cpp | 28 ++++-- application/src/settings.h | 24 +++-- .../harbour-batterybuddy-de_DE.ts | 93 ++++++++++++++++--- 4 files changed, 127 insertions(+), 28 deletions(-) diff --git a/application/qml/pages/SettingsPage.qml b/application/qml/pages/SettingsPage.qml index 040f479..7e71107 100644 --- a/application/qml/pages/SettingsPage.qml +++ b/application/qml/pages/SettingsPage.qml @@ -374,7 +374,7 @@ Page { color: Theme.highlightColor } Label { - text: qsTr("Display visual and audible notifications about battery health, when the battery temperature is below or above safe values.") + text: qsTr("Display visual and audible notifications about battery health, when the battery status exceeds safe values.
This usually means high temperature but can be affected by other factors depending on the hardware.") anchors { left: parent.left right: parent.right @@ -386,15 +386,15 @@ Page { wrapMode: Text.Wrap } - SectionHeader { text: qsTr("Battery health notification") } + SectionHeader { text: qsTr("Health notification") } ComboBox { id: healthSelector width: parent.width - label: qsTr("Warn on Health status" + ":") + label: qsTr("Notify on Health status" + ":") currentIndex: settings.healthAlert menu: ContextMenu { - MenuItem { text: qsTr("None") } + MenuItem { text: qsTr("Never") } MenuItem { text: qsTr("Warning") } MenuItem { text: qsTr("Critical") } } @@ -404,7 +404,7 @@ Page { } } - SectionHeader { text: qsTr("Battery health warning interval") } + SectionHeader { text: qsTr("Health notification interval") } MySlider { id: healthIntervalSlider diff --git a/application/src/settings.cpp b/application/src/settings.cpp index 29bbe64..ebf9e42 100644 --- a/application/src/settings.cpp +++ b/application/src/settings.cpp @@ -45,12 +45,16 @@ Settings::Settings(Logger *newLogger, QObject *parent) : QObject(parent) loadString(sNotificationTitle, notificationTitle); loadString(sNotificationLowText, notificationLowText); loadString(sNotificationHighText, notificationHighText); - loadString(sNotificationHealthText, notificationHealthText); + loadString(sNotificationHealthTitle, notificationHealthTitle); + loadString(sNotificationHealthWarnText, notificationHealthWarnText); + loadString(sNotificationHealthCritText, notificationHealthCritText); saveString(sNotificationTitle, tr("Battery charge %1%"), notificationTitle); saveString(sNotificationLowText, tr("Please connect the charger."), notificationLowText); saveString(sNotificationHighText, tr("Please disconnect the charger."), notificationHighText); - saveString(sNotificationHealthText, tr("Battery health"), notificationHealthText); + saveString(sNotificationHealthTitle, tr("Battery health %1"), notificationHealthTitle); + saveString(sNotificationHealthWarnText, tr("Battery health is not good"), notificationHealthWarnText); + saveString(sNotificationHealthCritText, tr("Battery health is critical"), notificationHealthCritText); } Settings::~Settings() @@ -76,7 +80,9 @@ QString Settings::getLogFilename() { return logFilename; } QString Settings::getNotificationTitle() { return notificationTitle; } QString Settings::getNotificationLowText() { return notificationLowText; } QString Settings::getNotificationHighText() { return notificationHighText; } -QString Settings::getNotificationHealthText() { return notificationHealthText; } +QString Settings::getNotificationHealthTitle() { return notificationHealthTitle; } +QString Settings::getNotificationHealthWarnText() { return notificationHealthWarnText; } +QString Settings::getNotificationHealthCritText() { return notificationHealthCritText; } int Settings::getLogLevel() { return logLevel; } void Settings::setLowAlert(const int newLimit) { @@ -146,9 +152,19 @@ void Settings::setNotificationHighText(const QString newText) { emit notificationHighTextChanged(notificationHighText); } -void Settings::setNotificationHealthText(const QString newText) { - if(saveString(sNotificationHealthText, newText, notificationHealthText)) - emit notificationHealthTextChanged(notificationHealthText); +void Settings::setNotificationHealthTitle(const QString newText) { + if(saveString(sNotificationHealthTitle, newText, notificationTitle)) + emit notificationHealthTitleChanged(notificationTitle); +} + +void Settings::setNotificationHealthWarnText(const QString newText) { + if(saveString(sNotificationHealthWarnText, newText, notificationHealthWarnText)) + emit notificationHealthWarnTextChanged(notificationHealthWarnText); +} + +void Settings::setNotificationHealthCritText(const QString newText) { + if(saveString(sNotificationHealthCritText, newText, notificationHealthCritText)) + emit notificationHealthCritTextChanged(notificationHealthCritText); } void Settings::setLogLevel(const int newLogLevel) { diff --git a/application/src/settings.h b/application/src/settings.h index 497ba44..b30fc7d 100644 --- a/application/src/settings.h +++ b/application/src/settings.h @@ -40,7 +40,9 @@ class Settings : public QObject Q_PROPERTY(QString notificationTitle READ getNotificationTitle WRITE setNotificationTitle NOTIFY notificationTitleChanged) Q_PROPERTY(QString notificationLowText READ getNotificationLowText WRITE setNotificationLowText NOTIFY notificationLowTextChanged) Q_PROPERTY(QString notificationHighText READ getNotificationHighText WRITE setNotificationHighText NOTIFY notificationHighTextChanged) - Q_PROPERTY(QString notificationHealthText READ getNotificationHealthText WRITE setNotificationHealthText NOTIFY notificationHealthTextChanged) + Q_PROPERTY(QString notificationHealthTitle READ getNotificationHealthTitle WRITE setNotificationHealthTitle NOTIFY notificationHealthTitleChanged) + Q_PROPERTY(QString notificationHealthWarnText READ getNotificationHealthWarnText WRITE setNotificationHealthWarnText NOTIFY notificationHealthWarnTextChanged) + Q_PROPERTY(QString notificationHealthCritText READ getNotificationHealthCritText WRITE setNotificationHealthCritText NOTIFY notificationHealthCritTextChanged) Q_PROPERTY(QString logFilename READ getLogFilename NOTIFY logFilenameChanged) Q_PROPERTY(int logLevel READ getLogLevel WRITE setLogLevel NOTIFY logLevelChanged) @@ -63,7 +65,9 @@ public: QString getNotificationTitle(); QString getNotificationLowText(); QString getNotificationHighText(); - QString getNotificationHealthText(); + QString getNotificationHealthTitle(); + QString getNotificationHealthWarnText(); + QString getNotificationHealthCritText(); QString getLogFilename(); int getLogLevel(); @@ -79,7 +83,9 @@ public: void setNotificationTitle(const QString newText); void setNotificationLowText(const QString newText); void setNotificationHighText(const QString newText); - void setNotificationHealthText(const QString newText); + void setNotificationHealthTitle(const QString newText); + void setNotificationHealthWarnText(const QString newText); + void setNotificationHealthCritText(const QString newText); void setLogLevel(const int newLogLevel); private: @@ -103,7 +109,9 @@ private: QString notificationTitle; QString notificationLowText; QString notificationHighText; - QString notificationHealthText; + QString notificationHealthTitle; + QString notificationHealthWarnText; + QString notificationHealthCritText; QString logFilename; int logLevel; @@ -123,7 +131,9 @@ private: const char* sNotificationTitle = "notificationTitle"; const char* sNotificationLowText = "notificationLowText"; const char* sNotificationHighText = "notificationHighText"; - const char* sNotificationHealthText = "notificationHealthText"; + const char* sNotificationHealthTitle = "notificationHealthTitle"; + const char* sNotificationHealthWarnText = "notificationHealthWarnText"; + const char* sNotificationHealthCritText = "notificationHealthCritText"; const char* sLogFilename = "logFilename"; const char* sLogLevel = "logLevel"; @@ -149,7 +159,9 @@ signals: void notificationTitleChanged(QString); void notificationLowTextChanged(QString); void notificationHighTextChanged(QString); - void notificationHealthTextChanged(QString); + void notificationHealthTitleChanged(QString); + void notificationHealthWarnTextChanged(QString); + void notificationHealthCritTextChanged(QString); void logFilenameChanged(QString); void logLevelChanged(int); }; diff --git a/application/translations/harbour-batterybuddy-de_DE.ts b/application/translations/harbour-batterybuddy-de_DE.ts index a0bf919..758b046 100644 --- a/application/translations/harbour-batterybuddy-de_DE.ts +++ b/application/translations/harbour-batterybuddy-de_DE.ts @@ -156,34 +156,34 @@ LogPage View log - + Logdatei ansehen Update - + Aktualisieren Copy - + Kopieren Log level - + Log Level Quiet Low log setting - + Still Verbose Medium log setting - + Mittel Debug High log setting - + Debug @@ -275,20 +275,43 @@ Current: Strom: + + Good + Battery is OK + die Batterie ist OK + + + Warm + Battery is warm + die Batterie ist warm + + + Overheated + Battery is very hot + die Batterie ist sehr heiss + + + Health: + Zustand: + + + Temperature: + Temperatur: + Settings Battery charge %1% - Akkustand %1% + Akkustand %1% Please connect the charger. - Bitte Ladegerät anschließen. + Bitte Ladegerät anschließen. Please disconnect the charger. - Bitte Ladegerät trennen. + Bitte Ladegerät trennen. @@ -364,7 +387,55 @@ View log - + Logdatei ansehen + + + Health Notification settings + Einstellungen zur Zustandbenachrichtigung + + + Display visual and audible notifications about battery health, when the battery temperature is below or above safe values. + Visuelle und akustische Benachrichtigungen zum Batteriezustand anzeigen, sobald die Temperatur über gewissen Schwellwerten liegt. + + + Battery health notification + Zustandsbenachrichtigung + + + Warn on Health status: + Benachrichtigung bei Zustand: + + + None + Keine + + + Warning + Warnung + + + Critical + Kritisch + + + Battery health warning interval + Zustandsbenachrichtigungsintervall + + + Display visual and audible notifications about battery health, when the battery status exceeds safe values.<br />This usually means high temperature but can be affected by other factors depending on the hardware. + Visuelle und akustische Benachrichtigungen zum Batteriezustand anzeigen, sobald gewisse Schwellwerte erreicht werden.<br />Das betrifft meist die Temperatur, kann aber je nach Hardware auch andere Faktoren beinhalten. + + + Health notification + Zustandsbenachrichtigung + + + Notify on Health status: + Benachrichtigung zum Zustand: + + + Health notification interval + Zustandsbenachrichtigungsintervall