Cherry-picking upstream version 0.9.0+20150831.

Removed breaks/replaces Fixed control with cme fix Added upstream signing key and use it in watch file Added linker flags -Wl,--as-needed
2015-09-03 01:03:42 +02:00 · 2015-09-03 01:03:42 +02:00 · f4d5a60b31
commit f4d5a60b31
parent ac8e53a12b
28 changed files with 505 additions and 41 deletions
--- a/config/helpers.cpp
+++ b/config/helpers.cpp
@ -34,9 +34,9 @@ void fillComboBox(QComboBox* comboBox)
    comboBox->clear();
    comboBox->addItem(QObject::tr("Nothing"), -1);
    comboBox->addItem(QObject::tr("Lock screen"), -2); // FIXME
-    comboBox->addItem(QObject::tr("Suspend"), LxQt::Power::PowerSuspend);
-    comboBox->addItem(QObject::tr("Hibernate"), LxQt::Power::PowerHibernate);
-    comboBox->addItem(QObject::tr("Shutdown"), LxQt::Power::PowerShutdown);
+    comboBox->addItem(QObject::tr("Suspend"), LXQt::Power::PowerSuspend);
+    comboBox->addItem(QObject::tr("Hibernate"), LXQt::Power::PowerHibernate);
+    comboBox->addItem(QObject::tr("Shutdown"), LXQt::Power::PowerShutdown);
 }

 void setComboBoxToValue(QComboBox* comboBox, int value)
--- a/config/lxqt-config-powermanagement.desktop.in
+++ b/config/lxqt-config-powermanagement.desktop.in
@ -1,7 +1,8 @@
 [Desktop Entry]
 Type=Application
-Name=Power Management
+Name=LXQt Power Management
 GenericName=Power Management Settings
+Comment=Various settings regarding Power Management like battery or idleness watcher
 Exec=lxqt-config-powermanagement
 Icon=preferences-system-power-management
 Categories=Settings;DesktopSettings;Qt;LXQt;
--- a/config/main.cpp
+++ b/config/main.cpp
@ -31,7 +31,7 @@

 int main(int argc, char *argv[])
 {
-    LxQt::SingleApplication a(argc, argv);
+    LXQt::SingleApplication a(argc, argv);

    MainWindow mainWindow;
    mainWindow.setWindowIcon(QIcon::fromTheme("preferences-system-power-management"));
--- a/config/mainwindow.cpp
+++ b/config/mainwindow.cpp
@ -31,7 +31,7 @@
 #include "idlenesswatchersettings.h"

 MainWindow::MainWindow(QWidget *parent) :
-    LxQt::ConfigDialog(tr("Power Management Settings"), new PowerManagementSettings(parent))
+    LXQt::ConfigDialog(tr("Power Management Settings"), new PowerManagementSettings(parent))
 {
    BatteryWatcherSettings* batteryWatcherSettings = new BatteryWatcherSettings(this);
    addPage(batteryWatcherSettings, tr("Battery"), "battery");
--- a/config/mainwindow.h
+++ b/config/mainwindow.h
@ -29,7 +29,7 @@

 #include <LXQt/ConfigDialog>

-class MainWindow : public LxQt::ConfigDialog
+class MainWindow : public LXQt::ConfigDialog
 {
    Q_OBJECT

--- a/config/powermanagementsettings.cpp
+++ b/config/powermanagementsettings.cpp
@ -51,7 +51,7 @@ namespace PowerManagementSettingsConstants

 using namespace PowerManagementSettingsConstants;

-PowerManagementSettings::PowerManagementSettings(QObject* parent) : LxQt::Settings("lxqt-powermanagement")
+PowerManagementSettings::PowerManagementSettings(QObject* parent) : LXQt::Settings("lxqt-powermanagement")
 {
 }

--- a/config/powermanagementsettings.h
+++ b/config/powermanagementsettings.h
@ -33,7 +33,7 @@

 #include <LXQt/Settings>

-class PowerManagementSettings : public LxQt::Settings
+class PowerManagementSettings : public LXQt::Settings
 {
    Q_OBJECT

--- a/config/translations/lxqt-config-powermanagement_el.desktop
+++ b/config/translations/lxqt-config-powermanagement_el.desktop
@ -0,0 +1,3 @@
+Name[el]=Διαχείριση ενέργειας
+GenericName[el]=Ρυθμίσεις της διαχείρισης ενέργειας
+Comment[el]=Διάφορες ρυθμίσεις σχετικά με την διαχείριση ενέργειας όπως ο επόπτης μπαταρίας ή αδράνειας
--- a/config/translations/lxqt-config-powermanagement_el.ts
+++ b/config/translations/lxqt-config-powermanagement_el.ts
@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="el">
+<context>
+    <name>BatteryWatcherSettings</name>
+    <message>
+        <location filename="../batterywatchersettings.ui" line="14"/>
+        <source>Battery Watcher Settings</source>
+        <translation>Ρυθμίσεις επόπτη μπαταρίας</translation>
+    </message>
+    <message>
+        <location filename="../batterywatchersettings.ui" line="37"/>
+        <source>E&amp;nable Battery Watcher</source>
+        <translation>&amp;Ενεργοποίηση του επόπτη της μπαταρίας</translation>
+    </message>
+    <message>
+        <location filename="../batterywatchersettings.ui" line="55"/>
+        <source>Warning:</source>
+        <translation>Προειδοποίηση:</translation>
+    </message>
+    <message>
+        <location filename="../batterywatchersettings.ui" line="68"/>
+        <source> seconds</source>
+        <translation> δευτερόλεπτα</translation>
+    </message>
+    <message>
+        <location filename="../batterywatchersettings.ui" line="78"/>
+        <source>Level is low at:</source>
+        <translation>Το επίπεδο είναι χαμηλό στο:</translation>
+    </message>
+    <message>
+        <location filename="../batterywatchersettings.ui" line="91"/>
+        <source> %</source>
+        <translation> %</translation>
+    </message>
+    <message>
+        <location filename="../batterywatchersettings.ui" line="98"/>
+        <source>Use icons from theme:</source>
+        <translation>Χρήση των εικονιδίων από το θέμα:</translation>
+    </message>
+    <message>
+        <location filename="../batterywatchersettings.ui" line="112"/>
+        <source>When power is low then:</source>
+        <translation>Όταν η ενέργεια είναι χαμηλά τότε:</translation>
+    </message>
+    <message>
+        <location filename="../batterywatchersettings.ui" line="129"/>
+        <source>Show icon:</source>
+        <translation>Εμφάνιση εικονιδίου:</translation>
+    </message>
+</context>
+<context>
+    <name>IdlenessWatcherSettings</name>
+    <message>
+        <location filename="../idlenesswatchersettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Φόρμα</translation>
+    </message>
+    <message>
+        <location filename="../idlenesswatchersettings.ui" line="26"/>
+        <source>Enab&amp;le Idleness Watcher</source>
+        <translation>Ενεργοποίηση του επόπτη α&amp;δράνειας</translation>
+    </message>
+    <message>
+        <location filename="../idlenesswatchersettings.ui" line="47"/>
+        <source>When idle then:</source>
+        <translation>Όταν είναι αδρανής:</translation>
+    </message>
+    <message>
+        <location filename="../idlenesswatchersettings.ui" line="66"/>
+        <source>Idle time:</source>
+        <translation>Χρόνος αδράνειας:</translation>
+    </message>
+    <message>
+        <location filename="../idlenesswatchersettings.ui" line="79"/>
+        <source> minutes</source>
+        <translation> λεπτά</translation>
+    </message>
+    <message>
+        <location filename="../idlenesswatchersettings.ui" line="92"/>
+        <source> seconds</source>
+        <translation> δευτερόλεπτα</translation>
+    </message>
+</context>
+<context>
+    <name>LidWatcherSettings</name>
+    <message>
+        <location filename="../lidwatchersettings.ui" line="14"/>
+        <source>Form</source>
+        <translation>Φόρμα</translation>
+    </message>
+    <message>
+        <location filename="../lidwatchersettings.ui" line="26"/>
+        <source>Enable &amp;Lid Watcher</source>
+        <translation>Ενεργοποίηση του επόπτη &amp;καλύμματος</translation>
+    </message>
+    <message>
+        <location filename="../lidwatchersettings.ui" line="45"/>
+        <source>Action when lid is closed</source>
+        <translation>Ενέργεια κατά το κλείσιμο του καλύμματος</translation>
+    </message>
+    <message>
+        <location filename="../lidwatchersettings.ui" line="57"/>
+        <location filename="../lidwatchersettings.ui" line="160"/>
+        <source>On Battery</source>
+        <translation>Σε μπαταρία</translation>
+    </message>
+    <message>
+        <location filename="../lidwatchersettings.ui" line="77"/>
+        <source>Nothing</source>
+        <translation>Τίποτα</translation>
+    </message>
+    <message>
+        <location filename="../lidwatchersettings.ui" line="82"/>
+        <source>Suspend</source>
+        <translation>Αναστολή</translation>
+    </message>
+    <message>
+        <location filename="../lidwatchersettings.ui" line="87"/>
+        <source>Hibernate</source>
+        <translation>Νάρκη</translation>
+    </message>
+    <message>
+        <location filename="../lidwatchersettings.ui" line="92"/>
+        <source>Shut down</source>
+        <translation>Τερματισμός</translation>
+    </message>
+    <message>
+        <location filename="../lidwatchersettings.ui" line="100"/>
+        <source>On AC</source>
+        <translation>Σε τροφοδοτικό AC</translation>
+    </message>
+    <message>
+        <location filename="../lidwatchersettings.ui" line="139"/>
+        <source>When &amp;using external monitor</source>
+        <translation>Όταν χρησιμοποιείται εξωτερική ο&amp;θόνη</translation>
+    </message>
+    <message>
+        <location filename="../lidwatchersettings.ui" line="177"/>
+        <source>On Ac</source>
+        <translation>Σε τροφοδοτικό AC</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.cpp" line="34"/>
+        <source>LXQt Powermanagement Configuration</source>
+        <translation>Διαμόρφωση της διαχείρισης ενέργειας του LXQt</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="37"/>
+        <source>Battery</source>
+        <translation>Μπαταρία</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="41"/>
+        <source>Lid</source>
+        <translation>Κάλυμμα φορητού</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="45"/>
+        <source>idle</source>
+        <translation>Αδράνεια</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../helpers.cpp" line="35"/>
+        <source>Nothing</source>
+        <translation>Τίποτα</translation>
+    </message>
+    <message>
+        <location filename="../helpers.cpp" line="36"/>
+        <source>Lock screen</source>
+        <translation>Κλείδωμα οθόνης</translation>
+    </message>
+    <message>
+        <location filename="../helpers.cpp" line="37"/>
+        <source>Suspend</source>
+        <translation>Αναστολή</translation>
+    </message>
+    <message>
+        <location filename="../helpers.cpp" line="38"/>
+        <source>Hibernate</source>
+        <translation>Νάρκη</translation>
+    </message>
+    <message>
+        <location filename="../helpers.cpp" line="39"/>
+        <source>Shutdown</source>
+        <translation>Τερματισμός</translation>
+    </message>
+</context>
+</TS>
--- a/config/translations/lxqt-config-powermanagement_pt.ts
+++ b/config/translations/lxqt-config-powermanagement_pt.ts
@ -146,7 +146,7 @@
    <message>
        <location filename="../mainwindow.cpp" line="34"/>
        <source>LXQt Powermanagement Configuration</source>
-        <translation>Configuração do gestor de energia do LxQt</translation>
+        <translation>Configuração do gestor de energia do LXQt</translation>
    </message>
    <message>
        <location filename="../mainwindow.cpp" line="37"/>
--- a/debian/changelog
+++ b/debian/changelog
@ -1,10 +1,12 @@
-lxqt-powermanagement (0.9.0+20150807-2) UNRELEASED; urgency=medium
+lxqt-powermanagement (0.9.0+20150831-1) unstable; urgency=medium

+  * Cherry-picking upstream version 0.9.0+20150831.
  * Removed breaks/replaces
  * Fixed control with cme fix
  * Added upstream signing key and use it in watch file
+  * Added linker flags -Wl,--as-needed

- -- Alf Gaida <agaida@siduction.org>  Sun, 23 Aug 2015 23:38:25 +0200
+ -- Alf Gaida <agaida@siduction.org>  Thu, 03 Sep 2015 00:50:01 +0200

 lxqt-powermanagement (0.9.0+20150807-1) unstable; urgency=medium

--- a/debian/rules
+++ b/debian/rules
@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1

+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
 %:
 	dh ${@} --buildsystem cmake --parallel

--- a/src/batterywatcher.cpp
+++ b/src/batterywatcher.cpp
@ -44,7 +44,7 @@ BatteryWatcher::BatteryWatcher(QObject *parent) : Watcher(parent)

    if (devices.isEmpty())
    {
-	    LxQt::Notification::notify(tr("No battery!"),
+	    LXQt::Notification::notify(tr("No battery!"),
 	                               tr("LXQt could not find data about any battery - monitoring disabled"),
 	                               "lxqt-powermanagement");
    }
@ -64,7 +64,7 @@ BatteryWatcher::BatteryWatcher(QObject *parent) : Watcher(parent)
    mBatteryInfoDialog = new BatteryInfoDialog(mBatteries);

    connect(&mSettings, SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
-    connect(LxQt::Settings::globalSettings(), SIGNAL(iconThemeChanged()), this, SLOT(settingsChanged()));
+    connect(LXQt::Settings::globalSettings(), SIGNAL(iconThemeChanged()), this, SLOT(settingsChanged()));

    settingsChanged();
    batteryChanged();
@ -77,7 +77,7 @@ BatteryWatcher::~BatteryWatcher()
 void BatteryWatcher::batteryChanged()
 {
    static QTime actionTime;
-    static LxQt::Notification *notification = 0;
+    static LXQt::Notification *notification = 0;

    double totalEnergyFull = 0;
    double totalEnergyNow = 0;
@ -110,7 +110,7 @@ void BatteryWatcher::batteryChanged()

        if (!notification)
        {
-            notification = new LxQt::Notification(tr("Power low!"), this);
+            notification = new LXQt::Notification(tr("Power low!"), this);
            notification->setTimeout(2000);
        }

@ -121,13 +121,13 @@ void BatteryWatcher::batteryChanged()
            int secondsToAction = milliSecondsToAction / 1000;
            switch (mSettings.getPowerLowAction())
            {
-            case LxQt::Power::PowerSuspend:
+            case LXQt::Power::PowerSuspend:
                notification->setBody(tr("Suspending in %1 seconds").arg(secondsToAction));
                break;
-            case LxQt::Power::PowerHibernate:
+            case LXQt::Power::PowerHibernate:
                notification->setBody(tr("Hibernating in %1 seconds").arg(secondsToAction));
                break;
-            case LxQt::Power::PowerShutdown:
+            case LXQt::Power::PowerShutdown:
                notification->setBody(tr("Shutting down in %1 seconds").arg(secondsToAction));
                break;
            }
--- a/src/idlenesswatcher.cpp
+++ b/src/idlenesswatcher.cpp
@ -47,7 +47,7 @@
 IdlenessWatcher::IdlenessWatcher(QObject* parent):
    Watcher(parent),
    mPSettings(),
-    mErrorNotification(tr("LxQt Idleness watcher failed to start")),
+    mErrorNotification(tr("LXQt Idleness watcher failed to start")),
    mDBusWatcher(this),
    mInhibitorCookie(0),
    mIsLocked(false)
@ -61,7 +61,7 @@ IdlenessWatcher::IdlenessWatcher(QObject* parent):
    // Note that XCB is asynchronous, so we want to make requests ASAP and get the responses as late as possible.

    mScreen = screenOfDisplay(mConn, 0);
-    mErrorNotification.setUrgencyHint(LxQt::Notification::UrgencyCritical);
+    mErrorNotification.setUrgencyHint(LXQt::Notification::UrgencyCritical);
    mErrorNotification.setIcon("object-unlocked");
    mErrorNotification.setTimeout(0);

@ -113,7 +113,7 @@ IdlenessWatcher::IdlenessWatcher(QObject* parent):

    mErrorNotification.setActions(QStringList(tr("Configure...")));

-    qDebug() << "LxQt Screenlocker started.";
+    qDebug() << "LXQt Screenlocker started.";
    qDebug() << "timeout:" << getMaxIdleTimeoutMs() << "ms, lock command:" << mLockCommand;
    restartTimer();
 }
--- a/src/idlenesswatcher.h
+++ b/src/idlenesswatcher.h
@ -76,7 +76,7 @@ private:
    PowerManagementSettings mPSettings;
    QTimer mTimer;
    QProcess mLockProcess;
-    LxQt::Notification mErrorNotification;
+    LXQt::Notification mErrorNotification;
    QString mLockCommand;
    QDateTime mLockTime;
    QMap<uint,QString> mInhibitors;
--- a/src/lidwatcher.h
+++ b/src/lidwatcher.h
@ -53,7 +53,7 @@ private:
    void inhibitSystemdLogin();

    Lid mLid;
-    LxQt::Power mLxQtPower;
+    LXQt::Power mLXQtPower;
    PowerManagementSettings mSettings;
    QDBusUnixFileDescriptor logindLock;
 };
--- a/src/main.cpp
+++ b/src/main.cpp
@ -33,7 +33,7 @@
 int main(int argc, char *argv[])
 {

-    LxQt::Application a(argc, argv);
+    LXQt::Application a(argc, argv);
    a.setQuitOnLastWindowClosed(false);

    // To ensure only one instance of lxqt-powermanagement is running we register as a DBus service and refuse to run
--- a/src/powermanagementd.h
+++ b/src/powermanagementd.h
@ -36,7 +36,7 @@ private:
    IdlenessWatcher* mIdlenesswatcherd;

    PowerManagementSettings mSettings;
-    LxQt::Notification mNotification;
+    LXQt::Notification mNotification;
 };

 #endif	/* POWERMANAGEMENTD_H */
--- a/src/translations/lxqt-powermanagement.ts
+++ b/src/translations/lxqt-powermanagement.ts
@ -169,7 +169,7 @@
    <name>IdlenessWatcher</name>
    <message>
        <location filename="../idlenesswatcher.cpp" line="50"/>
-        <source>LxQt Idleness watcher failed to start</source>
+        <source>LXQt Idleness watcher failed to start</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
--- a/src/translations/lxqt-powermanagement_el.ts
+++ b/src/translations/lxqt-powermanagement_el.ts
@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="el">
+<context>
+    <name>Battery</name>
+    <message>
+        <location filename="../battery.cpp" line="136"/>
+        <source>Charging</source>
+        <translation>Φόρτιση</translation>
+    </message>
+    <message>
+        <location filename="../battery.cpp" line="137"/>
+        <source>Discharging</source>
+        <translation>Αποφόρτιση</translation>
+    </message>
+    <message>
+        <location filename="../battery.cpp" line="138"/>
+        <source>Empty</source>
+        <translation>Άδεια</translation>
+    </message>
+    <message>
+        <location filename="../battery.cpp" line="139"/>
+        <source>Fully charged</source>
+        <translation>Γεμάτη</translation>
+    </message>
+    <message>
+        <location filename="../battery.cpp" line="140"/>
+        <source>Pending charge</source>
+        <translation>Φορτίζεται</translation>
+    </message>
+    <message>
+        <location filename="../battery.cpp" line="141"/>
+        <source>Pending discharge</source>
+        <translation>Αποφορτίζεται</translation>
+    </message>
+    <message>
+        <location filename="../battery.cpp" line="142"/>
+        <source>Unknown</source>
+        <translation>Άγνωστο</translation>
+    </message>
+</context>
+<context>
+    <name>BatteryInfo</name>
+    <message>
+        <location filename="../batteryinfo.ui" line="14"/>
+        <source>Power Management</source>
+        <translation>Διαχείριση ενέργειας</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.ui" line="25"/>
+        <source>Battery info</source>
+        <translation>Πληροφορίες της μπαταρίας</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.ui" line="40"/>
+        <source>Energy Now:</source>
+        <translation>Η τρέχουσα ενέργεια:</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.ui" line="62"/>
+        <source>Updated:</source>
+        <translation>Ενημερωμένη:</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.ui" line="72"/>
+        <source>Technology:</source>
+        <translation>Τεχνολογία:</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.ui" line="82"/>
+        <source>Model:</source>
+        <translation>Μοντέλο:</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.ui" line="92"/>
+        <source>Energy rate:</source>
+        <translation>Ρυθμός ενέργειας:</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.ui" line="102"/>
+        <source>Voltage:</source>
+        <translation>Τάση:</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.ui" line="112"/>
+        <source>Energy Full, Design:</source>
+        <translation>Πλήρης ενέργεια, σχεδιασμός:</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.ui" line="129"/>
+        <source>Energy Full:</source>
+        <translation>Πλήρης ενέργεια:</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.ui" line="181"/>
+        <source>State:</source>
+        <translation>Κατάσταση:</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.cpp" line="74"/>
+        <source>Lithium ion</source>
+        <translation>Ιόντων λιθίου</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.cpp" line="75"/>
+        <source>Lithium polymer</source>
+        <translation>Πολυμερούς λιθίου</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.cpp" line="76"/>
+        <source>Lithium iron phosphate</source>
+        <translation>Λίθιου Φωσφορικού άλατος σιδήρου</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.cpp" line="77"/>
+        <source>Lead acid</source>
+        <translation>Μολύβδου οξέος</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.cpp" line="78"/>
+        <source>Nickel cadmium</source>
+        <translation>Νικελίου καδμίου</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.cpp" line="79"/>
+        <source>Nickel metal hydride</source>
+        <translation>Υβριδική νικελίου μετάλλου</translation>
+    </message>
+    <message>
+        <location filename="../batteryinfo.cpp" line="80"/>
+        <source>Unknown</source>
+        <translation>Άγνωστη</translation>
+    </message>
+</context>
+<context>
+    <name>BatteryWatcher</name>
+    <message>
+        <location filename="../batterywatcher.cpp" line="49"/>
+        <source>No battery!</source>
+        <translation>Καμιά μπαταρία!</translation>
+    </message>
+    <message>
+        <location filename="../batterywatcher.cpp" line="50"/>
+        <source>LXQt could not find data about any battery - monitoring disabled</source>
+        <translation>Το LXQT δεν μπόρεσε να βρει δεδομένα για οποιαδήποτε μπαταρία - η εποπτεία απενεργοποιήθηκε</translation>
+    </message>
+    <message>
+        <location filename="../batterywatcher.cpp" line="91"/>
+        <source>Power low!</source>
+        <translation>Η ενέργεια είναι χαμηλή!</translation>
+    </message>
+    <message>
+        <location filename="../batterywatcher.cpp" line="103"/>
+        <source>Suspending in %1 seconds</source>
+        <translation>Αναστολή σε %1 δευτερόλεπτα</translation>
+    </message>
+    <message>
+        <location filename="../batterywatcher.cpp" line="106"/>
+        <source>Hibernating in %1 seconds</source>
+        <translation>Νάρκωση σε %1 δευτερόλεπτα</translation>
+    </message>
+    <message>
+        <location filename="../batterywatcher.cpp" line="109"/>
+        <source>Shutting down in %1 seconds</source>
+        <translation>Τερματισμός σε %1 δευτερόλεπτα</translation>
+    </message>
+</context>
+<context>
+    <name>IdlenessWatcher</name>
+    <message>
+        <location filename="../idlenesswatcher.cpp" line="50"/>
+        <source>LXQt Idleness watcher failed to start</source>
+        <translation>Η εκκίνηση του επόπτη αδράνειας του LXQt απέτυχε</translation>
+    </message>
+    <message>
+        <location filename="../idlenesswatcher.cpp" line="73"/>
+        <source>D-Bus interface org.freedesktop.ScreenSaver is already registered</source>
+        <translation>Η διεπαφή του D-Bus org.freedesktop.ScreenSaver έχει καταχωρηθεί ήδη</translation>
+    </message>
+    <message>
+        <location filename="../idlenesswatcher.cpp" line="106"/>
+        <source>The X11 Screensaver extension is not usable</source>
+        <translation>Η επέκταση της προστασίας οθόνης X11 δεν μπορεί να χρησιμοποιηθεί</translation>
+    </message>
+    <message>
+        <location filename="../idlenesswatcher.cpp" line="113"/>
+        <source>Configure...</source>
+        <translation>Διαμόρφωση...</translation>
+    </message>
+    <message>
+        <location filename="../idlenesswatcher.cpp" line="181"/>
+        <source>ERROR: Screen unlocked</source>
+        <translation>ΣΦΑΛΜΑ: Οθόνη ξεκλείδωτη</translation>
+    </message>
+    <message>
+        <location filename="../idlenesswatcher.cpp" line="183"/>
+        <source>Locking program &quot;%1&quot; exited with error code %2</source>
+        <translation>Το πρόγραμμα κλειδώματος «%1» τερματίστηκε με τον κωδικό σφάλματος %2</translation>
+    </message>
+    <message>
+        <location filename="../idlenesswatcher.cpp" line="185"/>
+        <source>Locking program &quot;%1&quot; crashed with error code %2</source>
+        <translation>Το πρόγραμμα κλειδώματος «%1» κατέρρευσε με τον κωδικό σφάλματος %2</translation>
+    </message>
+</context>
+<context>
+    <name>PowerManagementd</name>
+    <message>
+        <location filename="../powermanagementd.cpp" line="104"/>
+        <source>Power Management</source>
+        <translation>Διαχείριση ενέργειας</translation>
+    </message>
+    <message>
+        <location filename="../powermanagementd.cpp" line="105"/>
+        <source>You are running LXQt Power Management for the first time.
+You can configure it from settings... </source>
+        <translation>Εκτελείτε την διαχείριση ενέργειας του LXQt για πρώτη φορά.
+Μπορείτε να την διαμορφώσετε από τις ρυθμίσεις... 
+</translation>
+    </message>
+    <message>
+        <location filename="../powermanagementd.cpp" line="106"/>
+        <source>Configure...</source>
+        <translation>Διαμόρφωση...</translation>
+    </message>
+</context>
+<context>
+    <name>TrayIcon</name>
+    <message>
+        <location filename="../trayicon.cpp" line="132"/>
+        <source>Configure</source>
+        <translation>Διαμόρφωση</translation>
+    </message>
+    <message>
+        <location filename="../trayicon.cpp" line="133"/>
+        <location filename="../trayicon.cpp" line="167"/>
+        <source>About</source>
+        <translation>Σχετικά</translation>
+    </message>
+    <message>
+        <location filename="../trayicon.cpp" line="134"/>
+        <source>Disable icon</source>
+        <translation>Απενεργοποίηση του εικονιδίου</translation>
+    </message>
+    <message>
+        <location filename="../trayicon.cpp" line="154"/>
+        <source>discharging</source>
+        <translation>αποφορτίζεται</translation>
+    </message>
+    <message>
+        <location filename="../trayicon.cpp" line="154"/>
+        <source>charging</source>
+        <translation>φορτίζεται</translation>
+    </message>
+    <message>
+        <location filename="../trayicon.cpp" line="168"/>
+        <source>&lt;p&gt;  &lt;b&gt;LXQt Powermanagement&lt;/b&gt;&lt;br/&gt;  - Powermanagement for the LXQt Desktop Environment&lt;/p&gt;&lt;p&gt;  Authors:&lt;br/&gt;  &amp;nbsp; Christian Surlykke, Alec Moskvin&lt;br/&gt;  &amp;nbsp; - and others from the Razor and LXQt projects&lt;/p&gt;&lt;p&gt;  Copyright &amp;copy; 2012-2014&lt;/p&gt;</source>
+        <translation>&lt;p&gt;  &lt;b&gt;Διαχείριση ενέργειας του LXQt&lt;/b&gt;&lt;br/&gt;  - Διαχείριση της ενέργειας για το γραφικό περιβάλλον LXQt&lt;/p&gt;&lt;p&gt;  Συγγραφείς:&lt;br/&gt;  &amp;nbsp; Christian Surlykke, Alec Moskvin&lt;br/&gt;  &amp;nbsp; - και άλλοι από τα έργα Razor και LXQt&lt;/p&gt;&lt;p&gt;  Πνευματικά δικαιώματα &amp;copy; 2012-2014&lt;/p&gt;</translation>
+    </message>
+</context>
+</TS>
--- a/src/translations/lxqt-powermanagement_hu.ts
+++ b/src/translations/lxqt-powermanagement_hu.ts
@ -169,7 +169,7 @@
    <name>IdlenessWatcher</name>
    <message>
        <location filename="../idlenesswatcher.cpp" line="50"/>
-        <source>LxQt Idleness watcher failed to start</source>
+        <source>LXQt Idleness watcher failed to start</source>
        <translation>Az LXQt tétlenség figyelő indítása sikertelen</translation>
    </message>
    <message>
--- a/src/translations/lxqt-powermanagement_ja.ts
+++ b/src/translations/lxqt-powermanagement_ja.ts
@ -169,7 +169,7 @@
    <name>IdlenessWatcher</name>
    <message>
        <location filename="../idlenesswatcher.cpp" line="50"/>
-        <source>LxQt Idleness watcher failed to start</source>
+        <source>LXQt Idleness watcher failed to start</source>
        <translation>LXQtのアイドル状態監視は始動に失敗しました</translation>
    </message>
    <message>
--- a/src/translations/lxqt-powermanagement_pl_PL.ts
+++ b/src/translations/lxqt-powermanagement_pl_PL.ts
@ -169,7 +169,7 @@
    <name>IdlenessWatcher</name>
    <message>
        <location filename="../idlenesswatcher.cpp" line="50"/>
-        <source>LxQt Idleness watcher failed to start</source>
+        <source>LXQt Idleness watcher failed to start</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
--- a/src/translations/lxqt-powermanagement_pt.ts
+++ b/src/translations/lxqt-powermanagement_pt.ts
@ -142,7 +142,7 @@
    <message>
        <location filename="../batterywatcher.cpp" line="50"/>
        <source>LXQt could not find data about any battery - monitoring disabled</source>
-        <translation>O LxQt não consegui encontrar qualquer bateria e a monitorização foi desativada</translation>
+        <translation>O LXQt não consegui encontrar qualquer bateria e a monitorização foi desativada</translation>
    </message>
    <message>
        <location filename="../batterywatcher.cpp" line="91"/>
@ -169,7 +169,7 @@
    <name>IdlenessWatcher</name>
    <message>
        <location filename="../idlenesswatcher.cpp" line="50"/>
-        <source>LxQt Idleness watcher failed to start</source>
+        <source>LXQt Idleness watcher failed to start</source>
        <translation>O monitorizador de inatividade não foi iniciado</translation>
    </message>
    <message>
@ -214,7 +214,7 @@
        <location filename="../powermanagementd.cpp" line="105"/>
        <source>You are running LXQt Power Management for the first time.
 You can configure it from settings... </source>
-        <translation>Está a executar a gestão de energia do LxQt pela primeira vez.
+        <translation>Está a executar a gestão de energia do LXQt pela primeira vez.
 Pode configurar as opções nas definições...</translation>
    </message>
    <message>
@ -254,7 +254,7 @@ Pode configurar as opções nas definições...</translation>
    <message>
        <location filename="../trayicon.cpp" line="168"/>
        <source>&lt;p&gt;  &lt;b&gt;LXQt Powermanagement&lt;/b&gt;&lt;br/&gt;  - Powermanagement for the LXQt Desktop Environment&lt;/p&gt;&lt;p&gt;  Authors:&lt;br/&gt;  &amp;nbsp; Christian Surlykke, Alec Moskvin&lt;br/&gt;  &amp;nbsp; - and others from the Razor and LXQt projects&lt;/p&gt;&lt;p&gt;  Copyright &amp;copy; 2012-2014&lt;/p&gt;</source>
-        <translation>&lt;p&gt;  &lt;b&gt;Gestor de energia do LxQt&lt;/b&gt;&lt;br/&gt;Gestão de energia para o ambiente de trabalho LxQt&lt;/p&gt;&lt;p&gt; Autores:&lt;br/&gt;  &amp;nbsp; Christian Surlykke, Alec Moskvin&lt;br/&gt; &amp;nbsp; - e outros colaboradores dos projetos Razor e LxQt&lt;/p&gt;&lt;p&gt; Direitos de autor &amp;copy; 2012-2015&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;  &lt;b&gt;Gestor de energia do LXQt&lt;/b&gt;&lt;br/&gt;Gestão de energia para o ambiente de trabalho LXQt&lt;/p&gt;&lt;p&gt; Autores:&lt;br/&gt;  &amp;nbsp; Christian Surlykke, Alec Moskvin&lt;br/&gt; &amp;nbsp; - e outros colaboradores dos projetos Razor e LXQt&lt;/p&gt;&lt;p&gt; Direitos de autor &amp;copy; 2012-2015&lt;/p&gt;</translation>
    </message>
 </context>
 </TS>
--- a/src/translations/lxqt-powermanagement_ru.ts
+++ b/src/translations/lxqt-powermanagement_ru.ts
@ -169,8 +169,8 @@
    <name>IdlenessWatcher</name>
    <message>
        <location filename="../idlenesswatcher.cpp" line="50"/>
-        <source>LxQt Idleness watcher failed to start</source>
-        <translation>Не удалось запустить наблюдение за простоем LxQt </translation>
+        <source>LXQt Idleness watcher failed to start</source>
+        <translation>Не удалось запустить наблюдение за простоем LXQt </translation>
    </message>
    <message>
        <location filename="../idlenesswatcher.cpp" line="73"/>
--- a/src/translations/lxqt-powermanagement_ru_RU.ts
+++ b/src/translations/lxqt-powermanagement_ru_RU.ts
@ -169,8 +169,8 @@
    <name>IdlenessWatcher</name>
    <message>
        <location filename="../idlenesswatcher.cpp" line="50"/>
-        <source>LxQt Idleness watcher failed to start</source>
-        <translation>Не удалось запустить наблюдение за простоем LxQt </translation>
+        <source>LXQt Idleness watcher failed to start</source>
+        <translation>Не удалось запустить наблюдение за простоем LXQt </translation>
    </message>
    <message>
        <location filename="../idlenesswatcher.cpp" line="73"/>
--- a/src/watcher.cpp
+++ b/src/watcher.cpp
@ -47,7 +47,7 @@ void Watcher::doAction(int action)
        mLoop.exec();
    }
    else if (action >= 0)
-        mPower.doAction((LxQt::Power::Action) action);
+        mPower.doAction((LXQt::Power::Action) action);

    emit done();
 }
--- a/src/watcher.h
+++ b/src/watcher.h
@ -21,8 +21,8 @@ signals:
    void done();

 private:
-    LxQt::Power mPower;
-    LxQt::ScreenSaver mScreenSaver;
+    LXQt::Power mPower;
+    LXQt::ScreenSaver mScreenSaver;
    QEventLoop mLoop;
 };