diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..da140d9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +build +nbproject +*kdev4* diff --git a/LICENSE b/LICENSE index 56f967f..20fb9c7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -GNU LESSER GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. @@ -456,47 +456,3 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - powermanagement module for lxde-qt - Copyright (C) 2013 Christian Surlykke - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - {signature of Ty Coon}, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/config/helpers.cpp b/config/helpers.cpp index d8ed276..3181488 100644 --- 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) diff --git a/config/helpers.h b/config/helpers.h index 128a4db..8d54fcb 100644 --- a/config/helpers.h +++ b/config/helpers.h @@ -1,9 +1,10 @@ /* - * File: Settings.h - * Author: christian - * - * Created on 15. februar 2014, 11:44 - */ +* Copyright (c) 2014 Christian Surlykke +* +* This file is part of the LXQt project. +* It is distributed under the LGPL 2.1 or later license. +* Please refer to the LICENSE file for a copy of the license. +*/ #ifndef POWER_MANAGEMENT_SETTINGS_H #define POWER_MANAGEMENT_SETTINGS_H diff --git a/config/lidwatchersettings.ui b/config/lidwatchersettings.ui index 623ecbe..d5e1647 100644 --- a/config/lidwatchersettings.ui +++ b/config/lidwatchersettings.ui @@ -125,7 +125,7 @@ padding-top: 30px; - On Ac + On AC diff --git a/config/lxqt-config-powermanagement.desktop.in b/config/lxqt-config-powermanagement.desktop.in index 7a3d720..2da97fd 100644 --- a/config/lxqt-config-powermanagement.desktop.in +++ b/config/lxqt-config-powermanagement.desktop.in @@ -2,9 +2,10 @@ Type=Application Name=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; -OnlyShowIn=LXQt;LXDE; +OnlyShowIn=LXQt; #TRANSLATIONS_DIR=translations diff --git a/config/main.cpp b/config/main.cpp index 8ce09d3..e1eab9e 100644 --- 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")); diff --git a/config/mainwindow.cpp b/config/mainwindow.cpp index 848ba2f..e54fa5c 100644 --- 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"); diff --git a/config/mainwindow.h b/config/mainwindow.h index c660df2..51aad10 100644 --- a/config/mainwindow.h +++ b/config/mainwindow.h @@ -29,7 +29,7 @@ #include -class MainWindow : public LxQt::ConfigDialog +class MainWindow : public LXQt::ConfigDialog { Q_OBJECT diff --git a/config/powermanagementsettings.cpp b/config/powermanagementsettings.cpp index e593bc6..996f608 100644 --- 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") { } diff --git a/config/powermanagementsettings.h b/config/powermanagementsettings.h index 73c69d5..f30b93f 100644 --- a/config/powermanagementsettings.h +++ b/config/powermanagementsettings.h @@ -33,7 +33,7 @@ #include -class PowerManagementSettings : public LxQt::Settings +class PowerManagementSettings : public LXQt::Settings { Q_OBJECT diff --git a/config/translations/lxqt-config-powermanagement.ts b/config/translations/lxqt-config-powermanagement.ts index 6c5c01c..0272723 100644 --- a/config/translations/lxqt-config-powermanagement.ts +++ b/config/translations/lxqt-config-powermanagement.ts @@ -9,45 +9,71 @@ - + E&nable Battery Watcher - + Warning: - + seconds - + Level is low at: - + % - + Use icons from theme: - + + + Preview + + + + + Charging + + + + + Discharging + + + + When power is low then: - + Show icon: + + + built in + + + + + Level: %1% + + IdlenessWatcherSettings @@ -57,27 +83,27 @@ - + Enab&le Idleness Watcher - + When idle then: - + Idle time: - + minutes - + seconds @@ -95,57 +121,53 @@ - + Action when lid is closed - - + + On Battery - + Nothing - + Suspend - + Hibernate - + Shut down - + + On AC - + When &using external monitor - - - On Ac - - MainWindow - LXQt Powermanagement Configuration + Power Management Settings @@ -160,7 +182,7 @@ - idle + Idle diff --git a/config/translations/lxqt-config-powermanagement_el.desktop b/config/translations/lxqt-config-powermanagement_el.desktop new file mode 100644 index 0000000..fba769a --- /dev/null +++ b/config/translations/lxqt-config-powermanagement_el.desktop @@ -0,0 +1,3 @@ +Name[el]=Διαχείριση ενέργειας +GenericName[el]=Ρυθμίσεις της διαχείρισης ενέργειας +Comment[el]=Διάφορες ρυθμίσεις σχετικά με την διαχείριση ενέργειας όπως ο επόπτης μπαταρίας ή αδράνειας diff --git a/config/translations/lxqt-config-powermanagement_el.ts b/config/translations/lxqt-config-powermanagement_el.ts new file mode 100644 index 0000000..79c19d8 --- /dev/null +++ b/config/translations/lxqt-config-powermanagement_el.ts @@ -0,0 +1,229 @@ + + + + + BatteryWatcherSettings + + + Battery Watcher Settings + Ρυθμίσεις επόπτη μπαταρίας + + + + E&nable Battery Watcher + &Ενεργοποίηση του επόπτη της μπαταρίας + + + + Warning: + Προειδοποίηση: + + + + seconds + δευτερόλεπτα + + + + Level is low at: + Το επίπεδο είναι χαμηλό στο: + + + + % + % + + + + Use icons from theme: + Χρήση των εικονιδίων από το θέμα: + + + + + Preview + + + + + Charging + + + + + Discharging + + + + + When power is low then: + Όταν η ενέργεια είναι χαμηλά τότε: + + + + Show icon: + Εμφάνιση εικονιδίου: + + + + built in + + + + + Level: %1% + + + + + IdlenessWatcherSettings + + + Form + Φόρμα + + + + Enab&le Idleness Watcher + Ενεργοποίηση του επόπτη α&δράνειας + + + + When idle then: + Όταν είναι αδρανής: + + + + Idle time: + Χρόνος αδράνειας: + + + + minutes + λεπτά + + + + seconds + δευτερόλεπτα + + + + LidWatcherSettings + + + Form + Φόρμα + + + + Enable &Lid Watcher + Ενεργοποίηση του επόπτη &καλύμματος + + + + Action when lid is closed + Ενέργεια κατά το κλείσιμο του καλύμματος + + + + + On Battery + Σε μπαταρία + + + + Nothing + Τίποτα + + + + Suspend + Αναστολή + + + + Hibernate + Νάρκη + + + + Shut down + Τερματισμός + + + + + On AC + Σε τροφοδοτικό AC + + + + When &using external monitor + Όταν χρησιμοποιείται εξωτερική ο&θόνη + + + On Ac + Σε τροφοδοτικό AC + + + + MainWindow + + LXQt Powermanagement Configuration + Διαμόρφωση της διαχείρισης ενέργειας του LXQt + + + + Power Management Settings + + + + + Battery + Μπαταρία + + + + Lid + Κάλυμμα φορητού + + + + Idle + + + + idle + Αδράνεια + + + + QObject + + + Nothing + Τίποτα + + + + Lock screen + Κλείδωμα οθόνης + + + + Suspend + Αναστολή + + + + Hibernate + Νάρκη + + + + Shutdown + Τερματισμός + + + diff --git a/config/translations/lxqt-config-powermanagement_hu.ts b/config/translations/lxqt-config-powermanagement_hu.ts index 4bec70b..c70c814 100644 --- a/config/translations/lxqt-config-powermanagement_hu.ts +++ b/config/translations/lxqt-config-powermanagement_hu.ts @@ -9,45 +9,71 @@ Akkumulátor figyelő beállítás - + E&nable Battery Watcher Akkumulátor figyelő e&ngedélyezése - + Warning: Figyelmeztetés: - + seconds másodperc - + Level is low at: Alacsony energiaszint: - + % - + Use icons from theme: Ikonok a témából: - + + + Preview + + + + + Charging + + + + + Discharging + + + + When power is low then: Alacsony energiánál: - + Show icon: Ikon mutatás: + + + built in + + + + + Level: %1% + + IdlenessWatcherSettings @@ -57,27 +83,27 @@ Űrlap - + Enab&le Idleness Watcher Tétle&nségi felügyelet - + When idle then: Tétlenség esetén: - + Idle time: Tétlenségi idő: - + minutes perc - + seconds másodperc @@ -95,58 +121,62 @@ Fedélfelügyelet - + Action when lid is closed Teendő fedélzáráskor - - + + On Battery Akkumulátor - + Nothing Semmi - + Suspend Készenlét - + Hibernate Alvás - + Shut down Kikapcsolás - + + On AC Külső táp - + When &using external monitor &Külső monitor használatakor - On Ac - Külső táp + Külső táp MainWindow - LXQt Powermanagement Configuration - LXQt energiafelügyelet beállítás + LXQt energiafelügyelet beállítás + + + + Power Management Settings + @@ -160,8 +190,12 @@ + Idle + + + idle - Tétlenség + Tétlenség diff --git a/config/translations/lxqt-config-powermanagement_it.ts b/config/translations/lxqt-config-powermanagement_it.ts index 607f01c..468c8d6 100644 --- a/config/translations/lxqt-config-powermanagement_it.ts +++ b/config/translations/lxqt-config-powermanagement_it.ts @@ -9,45 +9,71 @@ Impostazioni monitor batteria - + E&nable Battery Watcher &Attiva il monitor della batteria - + Warning: Tempo di attesa: - + seconds secondi - + Level is low at: Livello basso : - + % - + Use icons from theme: Usa icone del tema: - + + + Preview + + + + + Charging + + + + + Discharging + + + + When power is low then: Quando il livello è basso: - + Show icon: Mostra icona: + + + built in + + + + + Level: %1% + + IdlenessWatcherSettings @@ -57,27 +83,27 @@ - + Enab&le Idleness Watcher &Attiva monitor attività sistema - + When idle then: Quando inattivo: - + Idle time: Tempo di inattività: - + minutes minuti - + seconds secondi @@ -95,58 +121,62 @@ &Attiva monitor coperchio - + Action when lid is closed Azione a chiusura - - + + On Battery Alimentazione a batteria - + Nothing Niente - + Suspend Sospendi - + Hibernate Iberna - + Shut down Spegni - + + On AC Alimentazione di rete - + When &using external monitor Quando è in uso un monitor &esterno - On Ac - Alimentazione di rete + Alimentazione di rete MainWindow - LXQt Powermanagement Configuration - Configurazione gestione energetica di LXQt + Configurazione gestione energetica di LXQt + + + + Power Management Settings + @@ -160,8 +190,12 @@ + Idle + + + idle - Inattività + Inattività diff --git a/config/translations/lxqt-config-powermanagement_ja.ts b/config/translations/lxqt-config-powermanagement_ja.ts index 4362a61..dc39fe4 100644 --- a/config/translations/lxqt-config-powermanagement_ja.ts +++ b/config/translations/lxqt-config-powermanagement_ja.ts @@ -9,45 +9,71 @@ バッテリーの監視設定 - + E&nable Battery Watcher バッテリー監視を有効にする(&N) - + Warning: 警告: - + seconds 秒 - + Level is low at: 低いと判断するレベル: - + % % - + Use icons from theme: テーマのアイコンを用いる: - + + + Preview + + + + + Charging + + + + + Discharging + + + + When power is low then: 電源が低いときには: - + Show icon: アイコンを表示: + + + built in + + + + + Level: %1% + + IdlenessWatcherSettings @@ -57,27 +83,27 @@ フォーム - + Enab&le Idleness Watcher アイドル状態の監視 - + When idle then: アイドル時には: - + Idle time: アイドル状態の時間 - + minutes 分 - + seconds 秒 @@ -95,58 +121,62 @@ フタの監視を有効にする - + Action when lid is closed フタが閉じていたときの動作 - - + + On Battery バッテリー動作時 - + Nothing 何もしない - + Suspend サスペンド - + Hibernate ハイバネート - + Shut down シャットダウン - + + On AC AC電源時 - + When &using external monitor 外部モニター使用時 - On Ac - AC電源時 + AC電源時 MainWindow - LXQt Powermanagement Configuration - LXQt電源管理の設定 + LXQt電源管理の設定 + + + + Power Management Settings + @@ -160,8 +190,12 @@ + Idle + + + idle - アイドル + アイドル diff --git a/config/translations/lxqt-config-powermanagement_pl_PL.ts b/config/translations/lxqt-config-powermanagement_pl_PL.ts index 85c8642..50c4eab 100644 --- a/config/translations/lxqt-config-powermanagement_pl_PL.ts +++ b/config/translations/lxqt-config-powermanagement_pl_PL.ts @@ -9,45 +9,71 @@ Ustawienia monitorowania baterii - + E&nable Battery Watcher W&łącz monitorowanie baterii - + Warning: Ostrzeżenie: - + seconds sek - + Level is low at: Poziom niski od: - + % % - + Use icons from theme: Użyj ikon z motywu: - + + + Preview + + + + + Charging + + + + + Discharging + + + + When power is low then: Gdy poziom jest niski: - + Show icon: Pokaż ikonę: + + + built in + + + + + Level: %1% + + IdlenessWatcherSettings @@ -57,27 +83,27 @@ Form - + Enab&le Idleness Watcher W&łącz monitorowanie bezczynności - + When idle then: Gdy bezczynny: - + Idle time: Czas bezczynności: - + minutes min - + seconds sek @@ -95,58 +121,62 @@ W&łącz monitorowanie pokrywy - + Action when lid is closed Reakcja na zamknięcie pokrywy - - + + On Battery Na baterii - + Nothing Brak - + Suspend Wstrzymaj - + Hibernate Hibernuj - + Shut down Wyłącz - + + On AC Na zasilaniu - + When &using external monitor Przy używaniu &zewnętrznego monitora - On Ac - Na zasilaniu + Na zasilaniu MainWindow - LXQt Powermanagement Configuration - LXQt Konfiguracja zarządzania energią + LXQt Konfiguracja zarządzania energią + + + + Power Management Settings + @@ -160,8 +190,12 @@ + Idle + + + idle - Bezczynność + Bezczynność diff --git a/config/translations/lxqt-config-powermanagement_pt.ts b/config/translations/lxqt-config-powermanagement_pt.ts index 33e1feb..bb4bbc9 100644 --- a/config/translations/lxqt-config-powermanagement_pt.ts +++ b/config/translations/lxqt-config-powermanagement_pt.ts @@ -1,6 +1,6 @@ - + BatteryWatcherSettings @@ -9,45 +9,71 @@ Definições do monitorizador de energia - + E&nable Battery Watcher &Ativar monitorizador de energia - + Warning: Aviso: - + seconds segundos - + Level is low at: O nível está baixo em: - + % % - + Use icons from theme: Utilizar ícones do tema: - + + + Preview + + + + + Charging + + + + + Discharging + + + + When power is low then: Se a energia estiver baixa: - + Show icon: Mostrar ícone: + + + built in + + + + + Level: %1% + + IdlenessWatcherSettings @@ -57,27 +83,27 @@ Formulário - + Enab&le Idleness Watcher Ativar monitori&zador de inatividade - + When idle then: Se existir inatividade: - + Idle time: Tempo para inatividade: - + minutes minutos - + seconds segundos @@ -95,58 +121,62 @@ Ativar monitori&zador da tampa - + Action when lid is closed Ação ao fechar a tampa - - + + On Battery Com bateria - + Nothing Nada fazer - + Suspend Suspender - + Hibernate Hibernar - + Shut down Desligar - + + On AC Com corrente - + When &using external monitor Ao &utilizar monitor externo - On Ac - Com corrente + Com corrente MainWindow - LXQt Powermanagement Configuration - Configuração do gestor de energia do LxQt + Configuração do gestor de energia do LXQt + + + + Power Management Settings + @@ -160,8 +190,12 @@ + Idle + + + idle - inatividade + inatividade diff --git a/config/translations/lxqt-config-powermanagement_ru.ts b/config/translations/lxqt-config-powermanagement_ru.ts index 553dd69..ce1ab3a 100644 --- a/config/translations/lxqt-config-powermanagement_ru.ts +++ b/config/translations/lxqt-config-powermanagement_ru.ts @@ -9,45 +9,71 @@ Настройки наблюдения за батареей - + E&nable Battery Watcher &Разрешить наблюдение за батареей - + Warning: Предупреждение: - + seconds секунд - + Level is low at: Низкий уровень при: - + % % - + Use icons from theme: Использовать значки из темы: - + + + Preview + + + + + Charging + + + + + Discharging + + + + When power is low then: При низком заряде: - + Show icon: Показывать значок: + + + built in + + + + + Level: %1% + + IdlenessWatcherSettings @@ -57,27 +83,27 @@ - + Enab&le Idleness Watcher Включить наблюдение за простоем - + When idle then: При простое: - + Idle time: Время простоя: - + minutes минут - + seconds секунд @@ -95,58 +121,62 @@ Включить наблюдение за крышкой - + Action when lid is closed Действие при закрытии крышки - - + + On Battery От батареи - + Nothing Ничего - + Suspend Ждущий режим - + Hibernate Спящий режим - + Shut down Выключить - + + On AC От сети - + When &using external monitor При использовании внешнего монитора - On Ac - От сети + От сети MainWindow - LXQt Powermanagement Configuration - Настройка энергопотребления LXQt + Настройка энергопотребления LXQt + + + + Power Management Settings + @@ -160,8 +190,12 @@ + Idle + + + idle - бездействие + бездействие diff --git a/config/translations/lxqt-config-powermanagement_ru_RU.ts b/config/translations/lxqt-config-powermanagement_ru_RU.ts index 77c9b5f..d6087f1 100644 --- a/config/translations/lxqt-config-powermanagement_ru_RU.ts +++ b/config/translations/lxqt-config-powermanagement_ru_RU.ts @@ -9,45 +9,71 @@ Настройки наблюдения за батареей - + E&nable Battery Watcher &Разрешить наблюдение за батареей - + Warning: Предупреждение: - + seconds секунд - + Level is low at: Низкий уровень при: - + % % - + Use icons from theme: Использовать значки из темы: - + + + Preview + + + + + Charging + + + + + Discharging + + + + When power is low then: При низком заряде: - + Show icon: Показывать значок: + + + built in + + + + + Level: %1% + + IdlenessWatcherSettings @@ -57,27 +83,27 @@ - + Enab&le Idleness Watcher Включить наблюдение за простоем - + When idle then: При простое: - + Idle time: Время простоя: - + minutes минут - + seconds секунд @@ -95,58 +121,62 @@ Включить наблюдение за крышкой - + Action when lid is closed Действие при закрытии крышки - - + + On Battery От батареи - + Nothing Ничего - + Suspend Ждущий режим - + Hibernate Спящий режим - + Shut down Выключить - + + On AC От сети - + When &using external monitor При использовании внешнего монитора - On Ac - От сети + От сети MainWindow - LXQt Powermanagement Configuration - Настройка энергопотребления LXQt + Настройка энергопотребления LXQt + + + + Power Management Settings + @@ -160,8 +190,12 @@ + Idle + + + idle - бездействие + бездействие diff --git a/debian/changelog b/debian/changelog index 7e8fe9b..38fcd4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +lxqt-powermanagement (0.10.0-2) experimental; urgency=medium + + * Merge from experimental. + * New upstream release. + * Set minimum version for liblxqt and libqtxdg. + + -- ChangZhuo Chen (陳昌倬) Thu, 19 Nov 2015 21:55:09 +0800 + lxqt-powermanagement (0.9.0+20150807-2) unstable; urgency=medium * Fixed czchen's email address diff --git a/debian/control b/debian/control index abc60b4..ed6e5ec 100644 --- a/debian/control +++ b/debian/control @@ -9,10 +9,11 @@ Build-Depends: debhelper (>= 9), cmake (>= 3.0.2), libkf5solid-dev, libkf5windowsystem-dev, - liblxqt0-dev, + liblxqt0-dev (>= 0.10.0), libqt5svg5-dev, libqt5x11extras5-dev, libqt5xdg-dev, + libqt5xdg-dev (>= 1.3.0), libx11-dev, libx11-xcb-dev, libxcb-dpms0-dev, diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..9737966 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,7 @@ +[DEFAULT] +debian-branch = debian +pristine-tar = True + +[import-orig] +# Use git cherrypick -n upstream instead. +merge = False diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..05cd1df --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,63 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.22 (GNU/Linux) + +mQINBFJevCYBEACx+Hvy+Vsuf+V5jeLUnzjAmHoy8DfTeGWr3ts30IapLHrfi0+U +WpzNnISO77yTr4VNboVZH+GHM/rnPfieODfB4ZW6CZLlInMSKUXcgQsEqXpyBZhA +Ib/SPy2bOfHly1uRJes0uRDsH5+v/hD74sByfnjQlrvI68O6wvGZmDFMNNPVO8+/ +OWBSBNkBuVrrZOMSPsLwQGJ4UtUQ4whburaPJG4VZJc5DLbzJGbEuACc0IAEYJS3 +7AfXVXn4j4Gc9F3o1xTUnbOBnwGPquWwUIm3FM7Ec2OdkvMt3EwvnkMAfeVrq3iE +FDD/KZTxdL0BZH3QD8gB7Jm4v4f3Nkobg6JCvCbcH3wBdZW4mASbwWzfRaDC2zHb +ErTglD7PpShLKZZ0pr9okWZEGw4Ku3q8ALi1JXK/ePTmsBlvkVskOJ3Nnd0avgH4 ++Q/vZoKfH8EhNY745rI+8CE9iv6V9XiSUt4CKEWAENt4A8hq6U2vV+jZv3B6AgD7 +ZjiI59yD4YuYubu8rCnNizTgh1voVw3ietknn/x2H5yH8fByWZ5uL87C0ky/uma6 +ZGbiiAtM4kdkyDMrfRV5nlEG9EKAGPVu5mjeSCrfkETwZ9OFPz1AuDye4ZEXrrcC +iRQ7RX6/GtW18aHER0kzGnfwx5KJzkDrRBY8A2PdXLBcrsN4WpK9EX01PQARAQAB +tCNKZXJvbWUgTGVjbGFuY2hlIDxqZXJvbWVAbGVjbGFuLmNoPokCPwQTAQIAKQUC +Ul68JgIbAwUJAeEzgAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEDfgrx/a +SPNzSHIP/1ewXcC0TFBcvDD7MrIP7anyNfiWfW7cxkR8GSamkg6HTa6Ndyr1FFjJ +OoDFUP37jWhu59CsHxs2D0zRWJktezfvElscRgqbHcdpIznqsGdI8hXCZafhBGVb +sdAB2LRawcXGxnXt7XajPcSVwLWRE62caBqohznU2iWvI780WNjEbZoA0LhZwaFF +UUPJm8ea9v0IkZVKUyg9WONZ1U7FEG9SaEiSpI8kJdx1fvCwZVDV/NRO5GqnJaho +P1LCne4YdwS6pt1/fRgk32IHxxZfHlLzLHxb6v1JmIg72x28qCmGyK9oFBDbbnYu +6Aq8XbHogOrD5vJM2Pfm2IhV0+JHOjfQbddv8tsAH1M+LI+tToXmg5st1AU3wnTn +pda3hjA1avKwkfBPW/osHc8782ViyS9iX2e9iDtMv608guij4NjpGExzGCypHOd8 ++VXRwJDjvgDynkL206MZ+wn0j5wHsIE8F3Y5Bp1thQOrdDli5MYNQoXhjFmH46XT +bcr84IgW0+AiXZdoFUqvwtzrWy2Onuw5R3k4OyV4skN4DkWXyAk/V+Y4K39JvTKf +H9YuiQ9blNzCu8WiAnjKnh9kNl9E/TyEwI6cHFmIPqF8ST9tJytWHtrKvU9csvXX +n8XNJmpcv2R1e6N+VuWWm5zUPTouv3AxCacLbm8Lh3ymGsk7ZEyhiQIcBBABAgAG +BQJSsFYyAAoJEBMY76xfu9vO6v0P/3wSj3/kE4nP4HfgcVJSzi+lm1ycpbLDZtgh +P1G+zJLVmA+E41vEZimeiYQxBAelatJz+CHzQo3LZ2oVChzVrZcVHn9k4P3pib69 +qCVif3/y0Wmecn+u2TWbOvJ7mthfO7T3W7rkW1/9ES7bUaXcXWQ2sjUBVqFkFsVt +xgJDo8wcxA+K4Yf06GCbxFwrB7X5GraWIkzqGnyse3XAQn8aORAXmE8Yd0FHOjEZ +Beb9shChnkYc3lEvNY8ioCaYSF9xr/Iz9cwpfPkpqFiVYWadtb+Gqeh6zC7vPmcT +zHxrgkq1WwQlSBm724tPt9xuGQoOglqEa23vlQZfv20nyrYjLeYUy6pMCRq7vn/n +nkQOcXF7yQlnqR6xKk0tWsM4e6du0ZvbjBbhHV/kBFVGCLm/upTwoMVm0WJTbr4T +5XfIZo7eA0lvGtUhe1PgcOidBikHfAIfYxu0BoMXoL4jbcQdR5+YBDEfsS0jPhCl +mew2ScW/R/UhUknJUVFTma0KHXzEmKiqeeUCDtwEi6fxdicAYkbcekgkfFiD/w8N +Lk3Uf+0x2MdKA36nUobFkk38oU+GW37kFWJs3f1YRuQFao896eNW/E8ekVMLNxOl +nCjnSbabaxDnxPTyW2KlNjf/QUEK4pT6S5QmuCSrle3PQpaSbAZDHzLBIL9gd3m6 +MH7+SvV4uQINBFJevCYBEADiXDUqstSdhIyuionS2KtE3IeEBIqS7GY8QPRBylIZ +ACVHFI/1HxChBqYVGFaDEQn3gj5lUUQPubfWaxzjF6+UNVQW4+cxmTocndAwfDbI ++E5BLdieFUzbAA05MV5ZjPhTNbSk1jpy4bNy0FILwNqc89Y6SoCbv1r3tZLCrBas +1+AfWknBynx0siGMbLFxtzR6hUkNz9URxt13FrzpUWMpAL8ZQGczOTSaWLrZA5l9 +xLzJ9ww8uM+C2Xej3/sANxi+kQE2GVMKurPS0TICwVWZxbdW/ytIkO67Rhse0q3t +vzjdawfCFRxv7XQB2ZJ6irDxbpHiJoojSWCHJadIyCG03iOiaqsSVvi4KnxtUck+ +udOEJUV5sxdzgeRrsDpeaN//KCWW9WjfsSkvOqP6S1gmWpNFdzF5XrzcgvqvSNqo +XejfakUTJqsIIEHO0zGuJFVzJNh2hQ/9dhjIspUORhtNKaljNvePiBrj2yqmd9PY +FlH1KMHe4H+YVIwPiyeNA87Pu+1yNo8gT7mXhGRfibgWjbt146WUJ7+l2StJMApn +eNSCartNaUNPnw96i2l5c9AsJ3SWC6XWpWzOLVj+9XceeA11lu/ogqEMHzx81NjH +2TePxwKTKxZnAvDmqryp++IgY2/OgIoIk3ZRdYu/dPijTOYWfCet/9/9kAFr9PeJ +KwARAQABiQIlBBgBAgAPBQJSXrwmAhsMBQkB4TOAAAoJEDfgrx/aSPNzJv0QAKkx +lCKEZ6ahAUuNWslsHnNWaHFHNawEO3NIEtQZGVFk2BYISupizvjZF6MnymO/9UFM +pzV6fp3xNdqaKWQBjScOgMgCASRixW2tMAKbJGHZKp3dBixpHgXxy2oOGMS+mQ5m +gWy07usq2YesoMD0K/SG6EnoRPHBvrJihArzMFVUY9hD3hk8bhiy8w9bCYFe+gkm +zpQl3/KN01kyt5LjzEBcIOw8qIBQe9Pk8PyOK75lPoNME714LatgOsyw2kaSQ9Sv +hziRGC5z/fV3PmH7XhSjENPKnCJU51GUMMLaL28t9o7Afh6Q8UV31/JO36vmQXQV ++b+0BoGqEmf3AKBASb2Cr2q4pZFjywwSUXHZ9hQyu1tpbE1dS6aI01kM0y270pk7 +W/ajuzuOxAVL1bJAanL/5+DWM03esZPVdEWhxpWEM40Z6Rhq+Xb2a5xfwCN9PmaQ +o9fez0I+yh53s7Ypv0tBj05FPe5L48+pDi6pz5nddN1B0FzF58jVfsBZUjBlY24+ +VwQeAaWkRXZrSEdtBS5ufsi80x/cNCSTJBWqtborKL1iGgf5MDPYRMSvmZXAeIld +pyL/0pbW7iokewyKzpFfo7KEbwLxB+flWaBZ867JpF4yyRj3b4qcvcyV8QnsoB7Z +KhxTl3gGwD/t0HUcu85zcfs4GkealYhIWfGaAso2 +=fF8P +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index de11d39..8f6e6d9 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -https://github.com/lxde/lxqt-powermanagement/releases .*/([\d\.]+).tar.gz +opts="pgpsigurlmangle=s/$/.asc/" \ + https://github.com/lxde/lxqt-powermanagement/releases .*/([\d\.]+).tar.gz diff --git a/src/batteryhelper.cpp b/src/batteryhelper.cpp index 2e514d8..00ae063 100644 --- a/src/batteryhelper.cpp +++ b/src/batteryhelper.cpp @@ -77,7 +77,7 @@ QString BatteryHelper::typeToString(Solid::Battery::BatteryType type) switch (type) { case Solid::Battery::PdaBattery: - return tr("Personal Digital Assistent's battery"); + return tr("Personal Digital Assistant's battery"); case Solid::Battery::UpsBattery: return tr("Uninterruptible Power Supply's battery"); case Solid::Battery::PrimaryBattery: @@ -96,6 +96,6 @@ QString BatteryHelper::typeToString(Solid::Battery::BatteryType type) return tr("Monitor battery"); case Solid::Battery::UnknownBattery: default: - return tr("Unkown battery"); + return tr("Unknown battery"); } } diff --git a/src/batteryinfodialog.cpp b/src/batteryinfodialog.cpp index 3794553..a6c9a9a 100644 --- a/src/batteryinfodialog.cpp +++ b/src/batteryinfodialog.cpp @@ -1,3 +1,11 @@ +/* +* Copyright (c) 2014 Christian Surlykke +* +* This file is part of the LXQt project. +* It is distributed under the LGPL 2.1 or later license. +* Please refer to the LICENSE file for a copy of the license. +*/ + #include "batteryinfodialog.h" #include "ui_batteryinfodialog.h" diff --git a/src/batteryinfodialog.h b/src/batteryinfodialog.h index eb2afb8..c512060 100644 --- a/src/batteryinfodialog.h +++ b/src/batteryinfodialog.h @@ -1,3 +1,11 @@ +/* +* Copyright (c) 2014 Christian Surlykke +* +* This file is part of the LXQt project. +* It is distributed under the LGPL 2.1 or later license. +* Please refer to the LICENSE file for a copy of the license. +*/ + #ifndef BATTERYINFODIALOG_H #define BATTERYINFODIALOG_H diff --git a/src/batteryinfoframe.cpp b/src/batteryinfoframe.cpp index 6e03975..295fb0b 100644 --- a/src/batteryinfoframe.cpp +++ b/src/batteryinfoframe.cpp @@ -44,7 +44,7 @@ BatteryInfoFrame::BatteryInfoFrame(Solid::Battery *battery) : QString vendor = QString("%1 %2").arg(battery->recallVendor()).arg(battery->serial()); if (vendor.trimmed().isEmpty()) - vendor = "Unkown"; + vendor = "Unknown"; mUi->vendorValue->setText(vendor); connect(mBattery, SIGNAL(energyChanged(double, const QString)), this, SLOT(onBatteryChanged())); diff --git a/src/batterywatcher.cpp b/src/batterywatcher.cpp index a09a3ad..3ed56f3 100644 --- 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; } diff --git a/src/iconproducer.cpp b/src/iconproducer.cpp index f19dbde..6fcf751 100644 --- a/src/iconproducer.cpp +++ b/src/iconproducer.cpp @@ -1,3 +1,10 @@ +/* +* Copyright (c) 2014, 2015 Christian Surlykke, Paulo Lieuthier +* +* This file is part of the LXQt project. +* It is distributed under the LGPL 2.1 or later license. +* Please refer to the LICENSE file for a copy of the license. +*/ #include "iconproducer.h" #include #include diff --git a/src/iconproducer.h b/src/iconproducer.h index f80857f..4e5d166 100644 --- a/src/iconproducer.h +++ b/src/iconproducer.h @@ -1,3 +1,11 @@ +/* +* Copyright (c) 2014 Christian Surlykke +* +* This file is part of the LXQt project. +* It is distributed under the LGPL 2.1 or later license. +* Please refer to the LICENSE file for a copy of the license. +*/ + #ifndef ICONPRODUCER_H #define ICONPRODUCER_H #include diff --git a/src/idlenesswatcher.cpp b/src/idlenesswatcher.cpp index 22bd9d4..44b33dc 100644 --- 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(); } diff --git a/src/idlenesswatcher.h b/src/idlenesswatcher.h index c80b011..d88b97e 100644 --- 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 mInhibitors; diff --git a/src/lid.cpp b/src/lid.cpp index 05338eb..35216c4 100644 --- a/src/lid.cpp +++ b/src/lid.cpp @@ -34,22 +34,25 @@ Lid::Lid() { - mUPowerInterface = new QDBusInterface("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", - QDBusConnection::systemBus(), this); - mUPowerPropertiesInterface = new QDBusInterface("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.DBus.Properties", + mUPowerInterface = new QDBusInterface("org.freedesktop.UPower", + "/org/freedesktop/UPower", + "org.freedesktop.UPower", QDBusConnection::systemBus(), this); - if (! connect(mUPowerInterface, SIGNAL(Changed()), this, SLOT(uPowerChange()))) - { - qDebug() << "Could not connect to org.freedesktop.UPower.changed(), connecting to org.freedesktop.DBus.Properties.PropertiesChanged(..) instead"; - QDBusConnection::systemBus().connect("org.freedesktop.UPower", - "/org/freedesktop/UPower", - "org.freedesktop.DBus.Properties", - "PropertiesChanged", - this, - SLOT(uPowerChange())); - } - mIsClosed = mUPowerPropertiesInterface->property("LidIsClosed").toBool(); + mUPowerPropertiesInterface = new QDBusInterface("org.freedesktop.UPower", + "/org/freedesktop/UPower", + "org.freedesktop.DBus.Properties", + QDBusConnection::systemBus(), this); + + if (!QDBusConnection::systemBus().connect("org.freedesktop.UPower", + "/org/freedesktop/UPower", + "org.freedesktop.DBus.Properties", + "PropertiesChanged", + this, + SLOT(uPowerChange()))) + qDebug() << "Could not connect to org.freedesktop.DBus.Properties.PropertiesChanged()"; + + mIsClosed = mUPowerPropertiesInterface->property("LidIsClosed").toBool(); } bool Lid::haveLid() @@ -62,7 +65,6 @@ bool Lid::onBattery() return mUPowerInterface->property("OnBattery").toBool(); } - void Lid::uPowerChange() { bool newIsClosed = mUPowerInterface->property("LidIsClosed").toBool(); diff --git a/src/lidwatcher.h b/src/lidwatcher.h index e6c21a9..c7fdef3 100644 --- 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; }; diff --git a/src/main.cpp b/src/main.cpp index c03669a..bfaf024 100644 --- 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 diff --git a/src/powermanagementd.h b/src/powermanagementd.h index 2209061..ce1c397 100644 --- a/src/powermanagementd.h +++ b/src/powermanagementd.h @@ -1,9 +1,10 @@ /* - * File: powermanagementd.h - * Author: Christian Surlykke - * - * Created on 9. februar 2014, 16:15 - */ +* Copyright (c) 2014 Christian Surlykke +* +* This file is part of the LXQt project. +* It is distributed under the LGPL 2.1 or later license. +* Please refer to the LICENSE file for a copy of the license. +*/ #ifndef POWERMANAGEMENTD_H #define POWERMANAGEMENTD_H @@ -36,7 +37,7 @@ private: IdlenessWatcher* mIdlenesswatcherd; PowerManagementSettings mSettings; - LxQt::Notification mNotification; + LXQt::Notification mNotification; }; #endif /* POWERMANAGEMENTD_H */ diff --git a/src/translations/lxqt-powermanagement.ts b/src/translations/lxqt-powermanagement.ts index 2566687..5716619 100644 --- a/src/translations/lxqt-powermanagement.ts +++ b/src/translations/lxqt-powermanagement.ts @@ -2,165 +2,213 @@ - Battery + BatteryHelper - - Charging + + Empty - + Discharging - - Empty + + Fully charged - - Fully charged + + Charging + + + + + Lithium ion + + + + + Lithium polymer + + + + + Lithium iron phosphate - - Pending charge + + Lead acid - - Pending discharge + + Nickel cadmium - + + Nickel metal hydride + + + + Unknown - - - BatteryInfo - - Power Management + + Personal Digital Assistant's battery - - Battery info + + Uninterruptible Power Supply's battery - - Energy Now: + + Primary battery - - Updated: + + Mouse battery - - Technology: + + Keyboard battery - - Model: + + Keyboard and mouse's battery - - Energy rate: + + Camera battery - - Voltage: + + Phone battery - - Energy Full, Design: + + Monitor battery - - Energy Full: + + Unknown battery + + + BatteryInfoDialog - + + Dialog + + + + + Battery Info + + + + + BatteryInfoFrame + + + Power Management + + + + + Temperature: + + + + + Type: + + + + State: - - Lithium ion + + Energy Full Design: - - Lithium polymer + + Energy Full: - - Lithium iron phosphate + + Energy Now: - - Lead acid + + Energy rate: - - Nickel cadmium + + Technology: - - Nickel metal hydride + + Voltage: - - Unknown + + Vendor: BatteryWatcher - + No battery! - + LXQt could not find data about any battery - monitoring disabled - + Power low! - + Suspending in %1 seconds - + Hibernating in %1 seconds - + Shutting down in %1 seconds @@ -169,7 +217,7 @@ IdlenessWatcher - LxQt Idleness watcher failed to start + LXQt Idleness watcher failed to start @@ -178,27 +226,27 @@ - + The X11 Screensaver extension is not usable - + Configure... - + ERROR: Screen unlocked - + Locking program "%1" exited with error code %2 - + Locking program "%1" crashed with error code %2 @@ -206,18 +254,18 @@ PowerManagementd - + Power Management - + You are running LXQt Power Management for the first time. You can configure it from settings... - + Configure... @@ -225,34 +273,39 @@ You can configure it from settings... TrayIcon - + Configure - - + + About - + Disable icon - - discharging + + <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> + + + + + LXQt Power Management info - - charging + + The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> - - <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> + + Configure now diff --git a/src/translations/lxqt-powermanagement_el.ts b/src/translations/lxqt-powermanagement_el.ts new file mode 100644 index 0000000..97253c0 --- /dev/null +++ b/src/translations/lxqt-powermanagement_el.ts @@ -0,0 +1,432 @@ + + + + + Battery + + Charging + Φόρτιση + + + Discharging + Αποφόρτιση + + + Empty + Άδεια + + + Fully charged + Γεμάτη + + + Pending charge + Φορτίζεται + + + Pending discharge + Αποφορτίζεται + + + Unknown + Άγνωστο + + + + BatteryHelper + + + Empty + Άδεια + + + + Discharging + Αποφόρτιση + + + + Fully charged + Γεμάτη + + + + Charging + Φόρτιση + + + + Lithium ion + Ιόντων λιθίου + + + + Lithium polymer + Πολυμερούς λιθίου + + + + Lithium iron phosphate + Λίθιου Φωσφορικού άλατος σιδήρου + + + + Lead acid + Μολύβδου οξέος + + + + Nickel cadmium + Νικελίου καδμίου + + + + Nickel metal hydride + Υβριδική νικελίου μετάλλου + + + + Unknown + + + + + Personal Digital Assistant's battery + + + + + Uninterruptible Power Supply's battery + + + + + Primary battery + + + + + Mouse battery + + + + + Keyboard battery + + + + + Keyboard and mouse's battery + + + + + Camera battery + + + + + Phone battery + + + + + Monitor battery + + + + + Unknown battery + + + + + BatteryInfo + + Power Management + Διαχείριση ενέργειας + + + Battery info + Πληροφορίες της μπαταρίας + + + Energy Now: + Η τρέχουσα ενέργεια: + + + Updated: + Ενημερωμένη: + + + Technology: + Τεχνολογία: + + + Model: + Μοντέλο: + + + Energy rate: + Ρυθμός ενέργειας: + + + Voltage: + Τάση: + + + Energy Full, Design: + Πλήρης ενέργεια, σχεδιασμός: + + + Energy Full: + Πλήρης ενέργεια: + + + State: + Κατάσταση: + + + Lithium ion + Ιόντων λιθίου + + + Lithium polymer + Πολυμερούς λιθίου + + + Lithium iron phosphate + Λίθιου Φωσφορικού άλατος σιδήρου + + + Lead acid + Μολύβδου οξέος + + + Nickel cadmium + Νικελίου καδμίου + + + Nickel metal hydride + Υβριδική νικελίου μετάλλου + + + Unknown + Άγνωστη + + + + BatteryInfoDialog + + + Dialog + + + + + Battery Info + + + + + BatteryInfoFrame + + + Power Management + Διαχείριση ενέργειας + + + + Temperature: + + + + + Type: + + + + + State: + Κατάσταση: + + + + Energy Full Design: + + + + + Energy Full: + Πλήρης ενέργεια: + + + + Energy Now: + Η τρέχουσα ενέργεια: + + + + Energy rate: + Ρυθμός ενέργειας: + + + + Technology: + Τεχνολογία: + + + + Voltage: + Τάση: + + + + Vendor: + + + + + BatteryWatcher + + + No battery! + Καμιά μπαταρία! + + + + LXQt could not find data about any battery - monitoring disabled + Το LXQT δεν μπόρεσε να βρει δεδομένα για οποιαδήποτε μπαταρία - η εποπτεία απενεργοποιήθηκε + + + + Power low! + Η ενέργεια είναι χαμηλή! + + + + Suspending in %1 seconds + Αναστολή σε %1 δευτερόλεπτα + + + + Hibernating in %1 seconds + Νάρκωση σε %1 δευτερόλεπτα + + + + Shutting down in %1 seconds + Τερματισμός σε %1 δευτερόλεπτα + + + + IdlenessWatcher + + + LXQt Idleness watcher failed to start + Η εκκίνηση του επόπτη αδράνειας του LXQt απέτυχε + + + + D-Bus interface org.freedesktop.ScreenSaver is already registered + Η διεπαφή του D-Bus org.freedesktop.ScreenSaver έχει καταχωρηθεί ήδη + + + + The X11 Screensaver extension is not usable + Η επέκταση της προστασίας οθόνης X11 δεν μπορεί να χρησιμοποιηθεί + + + + Configure... + Διαμόρφωση... + + + + ERROR: Screen unlocked + ΣΦΑΛΜΑ: Οθόνη ξεκλείδωτη + + + + Locking program "%1" exited with error code %2 + Το πρόγραμμα κλειδώματος «%1» τερματίστηκε με τον κωδικό σφάλματος %2 + + + + Locking program "%1" crashed with error code %2 + Το πρόγραμμα κλειδώματος «%1» κατέρρευσε με τον κωδικό σφάλματος %2 + + + + PowerManagementd + + + Power Management + Διαχείριση ενέργειας + + + + You are running LXQt Power Management for the first time. +You can configure it from settings... + Εκτελείτε την διαχείριση ενέργειας του LXQt για πρώτη φορά. +Μπορείτε να την διαμορφώσετε από τις ρυθμίσεις... + + + + + Configure... + Διαμόρφωση... + + + + TrayIcon + + + Configure + Διαμόρφωση + + + + + About + Σχετικά + + + + Disable icon + Απενεργοποίηση του εικονιδίου + + + + <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> + + + + + LXQt Power Management info + + + + + The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> + + + + + Configure now + + + + discharging + αποφορτίζεται + + + charging + φορτίζεται + + + <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> + <p> <b>Διαχείριση ενέργειας του LXQt</b><br/> - Διαχείριση της ενέργειας για το γραφικό περιβάλλον LXQt</p><p> Συγγραφείς:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - και άλλοι από τα έργα Razor και LXQt</p><p> Πνευματικά δικαιώματα &copy; 2012-2014</p> + + + diff --git a/src/translations/lxqt-powermanagement_hu.ts b/src/translations/lxqt-powermanagement_hu.ts index 329b4cc..d487fac 100644 --- a/src/translations/lxqt-powermanagement_hu.ts +++ b/src/translations/lxqt-powermanagement_hu.ts @@ -1,166 +1,320 @@ - + Battery - Charging - Töltés + Töltés - Discharging - Kisütés + Kisütés - Empty - Üres + Üres - Fully charged - Teletöltve + Teletöltve - Pending charge - Tölthetőség + Tölthetőség - Pending discharge - Kisüthetőség + Kisüthetőség - Unknown - Ismeretlen + Ismeretlen + + + + BatteryHelper + + + Empty + Üres + + + + Discharging + Kisütés + + + + Fully charged + Teletöltve + + + + Charging + Töltés + + + + Lithium ion + Lítium ion + + + + Lithium polymer + Lítium polimer + + + + Lithium iron phosphate + Lítium vasfoszfát + + + + Lead acid + Savas ólom + + + + Nickel cadmium + Nikkel kadmium + + + + Nickel metal hydride + Nikkel fémhidrid + + + + Unknown + Ismeretlen + + + + Personal Digital Assistant's battery + + + + + Uninterruptible Power Supply's battery + + + + + Primary battery + + + + + Mouse battery + + + + + Keyboard battery + + + + + Keyboard and mouse's battery + + + + + Camera battery + + + + + Phone battery + + + + + Monitor battery + + + + + Unknown battery + BatteryInfo - Power Management - Energiakezelés + Energiakezelés - Battery info - Akkumulátor információ + Akkumulátor információ - Energy Now: - Állapot: + Állapot: - Updated: - Frissítve: + Frissítve: - Technology: - Technológia: + Technológia: - Model: - Modell: + Modell: - Energy rate: - Energiaállapot: + Energiaállapot: - Voltage: - Feszültség: + Feszültség: - Energy Full, Design: - Névleges kapacitás: + Névleges kapacitás: - Energy Full: - Teljes kapacitás: + Teljes kapacitás: - State: - Állapot: + Állapot: - Lithium ion - Lítium ion + Lítium ion - Lithium polymer - Lítium polimer + Lítium polimer - Lithium iron phosphate - Lítium vasfoszfát + Lítium vasfoszfát - Lead acid - Savas ólom + Savas ólom - Nickel cadmium - Nikkel kadmium + Nikkel kadmium - Nickel metal hydride - Nikkel fémhidrid + Nikkel fémhidrid - Unknown - Ismeretlen + Ismeretlen + + + + BatteryInfoDialog + + + Dialog + + + + + Battery Info + + + + + BatteryInfoFrame + + + Power Management + Energiakezelés + + + + Temperature: + + + + + Type: + + + + + State: + Állapot: + + + + Energy Full Design: + + + + + Energy Full: + Teljes kapacitás: + + + + Energy Now: + Állapot: + + + + Energy rate: + Energiaállapot: + + + + Technology: + Technológia: + + + + Voltage: + Feszültség: + + + + Vendor: + BatteryWatcher - + No battery! Nincs akku! - + LXQt could not find data about any battery - monitoring disabled Az LXQt nem ismert fel akkut - figyelés tiltva - + Power low! Alacsony feszültség! - + Suspending in %1 seconds %1 másodperc múlva készülség - + Hibernating in %1 seconds %1 másodperc múlva mélykészenlét - + Shutting down in %1 seconds %1 másodperc múlva kikapcsolás @@ -169,7 +323,7 @@ IdlenessWatcher - LxQt Idleness watcher failed to start + LXQt Idleness watcher failed to start Az LXQt tétlenség figyelő indítása sikertelen @@ -178,27 +332,27 @@ A D-Bus interface org.freedesktop.ScreenSaver imár regisztrálva van. - + The X11 Screensaver extension is not usable Az X11 képernyővédő bővítmény használhatatlan - + Configure... Beállítás... - + ERROR: Screen unlocked HIBA: A képernyő nem zárolt - + Locking program "%1" exited with error code %2 A"%1" program %2 hibakóddal kilépett - + Locking program "%1" crashed with error code %2 A"%1" program %2 hibakóddal összeomlott @@ -206,19 +360,19 @@ PowerManagementd - + Power Management Energiakezelés - + You are running LXQt Power Management for the first time. You can configure it from settings... Az LXQt energiakezelő első alkalommal fut. A beállításokban konfigurálható... - + Configure... Beállítás... @@ -226,35 +380,52 @@ A beállításokban konfigurálható... TrayIcon - + Configure Beállítás - - + + About Rólunk - + Disable icon Ikon tiltása - + + <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> + + + + + LXQt Power Management info + + + + + The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> + + + + + Configure now + + + discharging - kisütés + kisütés - charging - töltés + töltés - <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - <p> <b>LXQt energiakezelő</b><br/> - Energiakezelő az LXQt asztal részére</p><p> Szerzők:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - és még többen a Razor és LXQt fejlesztőiből.</p><p> Copyright &copy; 2012-2014</p> + <p> <b>LXQt energiakezelő</b><br/> - Energiakezelő az LXQt asztal részére</p><p> Szerzők:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - és még többen a Razor és LXQt fejlesztőiből.</p><p> Copyright &copy; 2012-2014</p> diff --git a/src/translations/lxqt-powermanagement_ja.ts b/src/translations/lxqt-powermanagement_ja.ts index f845b05..d89dfdb 100644 --- a/src/translations/lxqt-powermanagement_ja.ts +++ b/src/translations/lxqt-powermanagement_ja.ts @@ -4,163 +4,317 @@ Battery - Charging - 充電中 + 充電中 - Discharging - 放電中 + 放電中 - Empty - 空 + 空 - Fully charged - 満充電 + 満充電 - Pending charge - 充電中断中 + 充電中断中 - Pending discharge - 放電中断中 + 放電中断中 - Unknown - 不明 + 不明 + + + + BatteryHelper + + + Empty + 空 + + + + Discharging + 放電中 + + + + Fully charged + 満充電 + + + + Charging + 充電中 + + + + Lithium ion + リチウムイオン + + + + Lithium polymer + リチウムポリマー + + + + Lithium iron phosphate + リン酸鉄リチウム + + + + Lead acid + 鉛蓄電池 + + + + Nickel cadmium + ニッカド + + + + Nickel metal hydride + ニッケル水素 + + + + Unknown + 不明 + + + + Personal Digital Assistant's battery + + + + + Uninterruptible Power Supply's battery + + + + + Primary battery + + + + + Mouse battery + + + + + Keyboard battery + + + + + Keyboard and mouse's battery + + + + + Camera battery + + + + + Phone battery + + + + + Monitor battery + + + + + Unknown battery + BatteryInfo - Power Management - 電源管理 + 電源管理 - Battery info - バッテリー情報 + バッテリー情報 - Energy Now: - 現在の容量: + 現在の容量: - Updated: - 更新: + 更新: - Technology: - 技術: + 技術: - Model: - 型式: + 型式: - Energy rate: - エネルギー率: + エネルギー率: - Voltage: - 電圧: + 電圧: - Energy Full, Design: - 満エネルギー、デザイン: + 満エネルギー、デザイン: - Energy Full: - 満エネルギー: + 満エネルギー: - State: - 状態: + 状態: - Lithium ion - リチウムイオン + リチウムイオン - Lithium polymer - リチウムポリマー + リチウムポリマー - Lithium iron phosphate - リン酸鉄リチウム + リン酸鉄リチウム - Lead acid - 鉛蓄電池 + 鉛蓄電池 - Nickel cadmium - ニッカド + ニッカド - Nickel metal hydride - ニッケル水素 + ニッケル水素 - Unknown - 不明 + 不明 + + + + BatteryInfoDialog + + + Dialog + + + + + Battery Info + + + + + BatteryInfoFrame + + + Power Management + 電源管理 + + + + Temperature: + + + + + Type: + + + + + State: + 状態: + + + + Energy Full Design: + + + + + Energy Full: + 満エネルギー: + + + + Energy Now: + 現在の容量: + + + + Energy rate: + エネルギー率: + + + + Technology: + 技術: + + + + Voltage: + 電圧: + + + + Vendor: + BatteryWatcher - + No battery! バッテリーがありません! - + LXQt could not find data about any battery - monitoring disabled バッテリーのデーターを見つけられませんので、監視機能は無効です - + Power low! 電源が少なくなっています! - + Suspending in %1 seconds %1秒でサスペンドに入ります - + Hibernating in %1 seconds %1秒でハイバネートに入ります - + Shutting down in %1 seconds %1秒でシャットダウンします @@ -169,7 +323,7 @@ IdlenessWatcher - LxQt Idleness watcher failed to start + LXQt Idleness watcher failed to start LXQtのアイドル状態監視は始動に失敗しました @@ -178,27 +332,27 @@ D-Busインターフェース org.freedesktop.ScreenSaver が既に登録されています - + The X11 Screensaver extension is not usable X11スクリーンセーバー拡張を使えません - + Configure... 設定する - + ERROR: Screen unlocked エラー: スクリーンのロックが解除されました - + Locking program "%1" exited with error code %2 ロック用プログラム "%1" は、エラーコード %2 により終了しました - + Locking program "%1" crashed with error code %2 ロック用プログラム "%1" は、エラーコード %2 によりクラッシュしました @@ -206,18 +360,18 @@ PowerManagementd - + Power Management 電源管理 - + You are running LXQt Power Management for the first time. You can configure it from settings... LXQt電源管理は初めて実行されましたので、設定を行ってください - + Configure... 設定する @@ -225,35 +379,52 @@ You can configure it from settings... TrayIcon - + Configure 設定 - - + + About 情報 - + Disable icon アイコンを無効 - + + <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> + + + + + LXQt Power Management info + + + + + The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> + + + + + Configure now + + + discharging - 放電中 + 放電中 - charging - 充電中 + 充電中 - <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - <p> <b>LXQt Powermanagement</b><br/> - LXQtデスクトップ環境の電源管理</p><p> 作者:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - その他 Razor-qtおよびLXQtプロジェクトのメンバー</p><p> Copyright &copy; 2012-2014</p> + <p> <b>LXQt Powermanagement</b><br/> - LXQtデスクトップ環境の電源管理</p><p> 作者:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - その他 Razor-qtおよびLXQtプロジェクトのメンバー</p><p> Copyright &copy; 2012-2014</p> diff --git a/src/translations/lxqt-powermanagement_pl_PL.ts b/src/translations/lxqt-powermanagement_pl_PL.ts index 46202ec..1f0d673 100644 --- a/src/translations/lxqt-powermanagement_pl_PL.ts +++ b/src/translations/lxqt-powermanagement_pl_PL.ts @@ -4,163 +4,253 @@ Battery - Charging - Ładowanie + Ładowanie - Discharging - Rozładowywanie + Rozładowywanie - Empty - Pusta + Pusta - Fully charged - W pełni naładowana + W pełni naładowana - - Pending charge + Unknown + Nieznana + + + + BatteryHelper + + + Empty + Pusta + + + + Discharging + Rozładowywanie + + + + Fully charged + W pełni naładowana + + + + Charging + Ładowanie + + + + Lithium ion + + + + + Lithium polymer - - Pending discharge + + Lithium iron phosphate - + + Lead acid + + + + + Nickel cadmium + + + + + Nickel metal hydride + + + + Unknown - Nieznana + Nieznana - - - BatteryInfo - - Power Management + + Personal Digital Assistant's battery - - Battery info - Informacje o baterii + + Uninterruptible Power Supply's battery + - - Energy Now: + + Primary battery - - Updated: + + Mouse battery - + + Keyboard battery + + + + + Keyboard and mouse's battery + + + + + Camera battery + + + + + Phone battery + + + + + Monitor battery + + + + + Unknown battery + + + + + BatteryInfo + + Battery info + Informacje o baterii + + Technology: - Technologia: + Technologia: - Model: - Model: + Model: - - Energy rate: + Unknown + Nieznana + + + + BatteryInfoDialog + + + Dialog - - Voltage: + + Battery Info + + + BatteryInfoFrame - - Energy Full, Design: + + Power Management + Zarządzanie zasilaniem + + + + Temperature: - - Energy Full: + + Type: - + State: - - Lithium ion + + Energy Full Design: - - Lithium polymer + + Energy Full: - - Lithium iron phosphate + + Energy Now: - - Lead acid + + Energy rate: - - Nickel cadmium - + + Technology: + Technologia: - - Nickel metal hydride + + Voltage: - - Unknown - Nieznana + + Vendor: + BatteryWatcher - + No battery! Brak baterii! - + LXQt could not find data about any battery - monitoring disabled LXQt nie znalazł danych o żadnej baterii - monitorowanie wyłączone - + Power low! Niski poziom zasilania! - + Suspending in %1 seconds Wstrzymanie nastąpi w ciągu %1 sekund - + Hibernating in %1 seconds Hibernacja nastąpi w ciągu %1 sekund - + Shutting down in %1 seconds Wyłączenie systemu nastąpi w ciągu %1 sekund @@ -169,7 +259,7 @@ IdlenessWatcher - LxQt Idleness watcher failed to start + LXQt Idleness watcher failed to start @@ -178,27 +268,27 @@ - + The X11 Screensaver extension is not usable - + Configure... Konfiguruj... - + ERROR: Screen unlocked BŁĄD: Ekran odblokowany - + Locking program "%1" exited with error code %2 - + Locking program "%1" crashed with error code %2 @@ -206,19 +296,19 @@ PowerManagementd - + Power Management Zarządzanie zasilaniem - + You are running LXQt Power Management for the first time. You can configure it from settings... Uruchamiasz zarządzanie energią LXQt po raz pierwszy. Możesz skonfiguroweć jego ustawienia... - + Configure... Konfiguruj... @@ -226,35 +316,52 @@ Możesz skonfiguroweć jego ustawienia... TrayIcon - + Configure Konfiguruj - - + + About Info - + Disable icon Wyłącz ikonę - + + <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> + + + + + LXQt Power Management info + + + + + The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> + + + + + Configure now + + + discharging - rozładowywanie + rozładowywanie - charging - ładowanie + ładowanie - <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - <p> <b>LXQt Zarządzanie Energią</b><br/> - Zarządzanie energią dla środowiska LXQt</p><p> Autorzy:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - i inni z projektów Razor oraz LXQt</p><p> Copyright &copy; 2012-2014</p> + <p> <b>LXQt Zarządzanie Energią</b><br/> - Zarządzanie energią dla środowiska LXQt</p><p> Autorzy:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - i inni z projektów Razor oraz LXQt</p><p> Copyright &copy; 2012-2014</p> diff --git a/src/translations/lxqt-powermanagement_pt.ts b/src/translations/lxqt-powermanagement_pt.ts index 33e8a49..b9d3c87 100644 --- a/src/translations/lxqt-powermanagement_pt.ts +++ b/src/translations/lxqt-powermanagement_pt.ts @@ -1,166 +1,320 @@ - + Battery - Charging - A carregar + A carregar - Discharging - A descarregar + A descarregar - Empty - Vazia + Vazia - Fully charged - Totalmente carregada + Totalmente carregada - Pending charge - Por carregar + Por carregar - Pending discharge - Por descarregar + Por descarregar - Unknown - Desconhecido + Desconhecido + + + + BatteryHelper + + + Empty + Vazia + + + + Discharging + A descarregar + + + + Fully charged + Totalmente carregada + + + + Charging + A carregar + + + + Lithium ion + Ião de lítio + + + + Lithium polymer + Polímero de lítio + + + + Lithium iron phosphate + Fosfato de Ferro-Lítio + + + + Lead acid + Ácido de chumbo + + + + Nickel cadmium + Níquel-Cádmio + + + + Nickel metal hydride + Níquel-Hidreto Metálico + + + + Unknown + Desconhecido + + + + Personal Digital Assistant's battery + + + + + Uninterruptible Power Supply's battery + + + + + Primary battery + + + + + Mouse battery + + + + + Keyboard battery + + + + + Keyboard and mouse's battery + + + + + Camera battery + + + + + Phone battery + + + + + Monitor battery + + + + + Unknown battery + BatteryInfo - Power Management - Gestão de energia + Gestão de energia - Battery info - Informações da bateria + Informações da bateria - Energy Now: - Energia atual: + Energia atual: - Updated: - Atualização: + Atualização: - Technology: - Tecnologia: + Tecnologia: - Model: - Modelo: + Modelo: - Energy rate: - Taxa de energia: + Taxa de energia: - Voltage: - Tensão: + Tensão: - Energy Full, Design: - Energia máxima teórica: + Energia máxima teórica: - Energy Full: - Energia máxima: + Energia máxima: - State: - Estado: + Estado: - Lithium ion - Ião de lítio + Ião de lítio - Lithium polymer - Polímero de lítio + Polímero de lítio - Lithium iron phosphate - Fosfato de Ferro-Lítio + Fosfato de Ferro-Lítio - Lead acid - Ácido de chumbo + Ácido de chumbo - Nickel cadmium - Níquel-Cádmio + Níquel-Cádmio - Nickel metal hydride - Níquel-Hidreto Metálico + Níquel-Hidreto Metálico - Unknown - Desconhecido + Desconhecido + + + + BatteryInfoDialog + + + Dialog + + + + + Battery Info + + + + + BatteryInfoFrame + + + Power Management + Gestão de energia + + + + Temperature: + + + + + Type: + + + + + State: + Estado: + + + + Energy Full Design: + + + + + Energy Full: + Energia máxima: + + + + Energy Now: + Energia atual: + + + + Energy rate: + Taxa de energia: + + + + Technology: + Tecnologia: + + + + Voltage: + Tensão: + + + + Vendor: + BatteryWatcher - + No battery! Nenhuma bateria! - + LXQt could not find data about any battery - monitoring disabled - O LxQt não consegui encontrar qualquer bateria e a monitorização foi desativada + O LXQt não consegui encontrar qualquer bateria e a monitorização foi desativada - + Power low! Energia baixa! - + Suspending in %1 seconds Suspensão dentro de %1 segundos - + Hibernating in %1 seconds Hibernação dentro de %1 segundos - + Shutting down in %1 seconds A desligar dentro de %1 segundos @@ -169,7 +323,7 @@ IdlenessWatcher - LxQt Idleness watcher failed to start + LXQt Idleness watcher failed to start O monitorizador de inatividade não foi iniciado @@ -178,27 +332,27 @@ A interface D-Bus org.freedesktop.ScreenSaver já está registada - + The X11 Screensaver extension is not usable A extensão X 11 Screensaver não pode ser utilizada - + Configure... Configurar... - + ERROR: Screen unlocked Erro: ecrã não bloqueado - + Locking program "%1" exited with error code %2 O bloqueio do programa "%1" terminou com o erro "%2" - + Locking program "%1" crashed with error code %2 O bloqueio do programa "%1" crashou com o erro "%2" @@ -206,19 +360,19 @@ PowerManagementd - + Power Management Gestão de energia - + You are running LXQt Power Management for the first time. You can configure it from settings... - Está a executar a gestão de energia do LxQt pela primeira vez. + Está a executar a gestão de energia do LXQt pela primeira vez. Pode configurar as opções nas definições... - + Configure... Configurar... @@ -226,35 +380,52 @@ Pode configurar as opções nas definições... TrayIcon - + Configure Configurar - - + + About Sobre - + Disable icon Desativar ícone - + + <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> + + + + + LXQt Power Management info + + + + + The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> + + + + + Configure now + + + discharging - a descarregar + a descarregar - charging - a carregar + a carregar - <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - <p> <b>Gestor de energia do LxQt</b><br/>Gestão de energia para o ambiente de trabalho LxQt</p><p> Autores:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - e outros colaboradores dos projetos Razor e LxQt</p><p> Direitos de autor &copy; 2012-2015</p> + <p> <b>Gestor de energia do LXQt</b><br/>Gestão de energia para o ambiente de trabalho LXQt</p><p> Autores:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - e outros colaboradores dos projetos Razor e LXQt</p><p> Direitos de autor &copy; 2012-2015</p> diff --git a/src/translations/lxqt-powermanagement_ru.ts b/src/translations/lxqt-powermanagement_ru.ts index 04145a8..8c469c9 100644 --- a/src/translations/lxqt-powermanagement_ru.ts +++ b/src/translations/lxqt-powermanagement_ru.ts @@ -4,163 +4,313 @@ Battery - Charging - Заряжается + Заряжается - Discharging - Разряжается + Разряжается - Empty - Пустая + Пустая - Fully charged - Полностью заряжена + Полностью заряжена - Pending charge - Ожидает заряда + Ожидает заряда - Pending discharge - Ожидает разряда + Ожидает разряда - Unknown - Неизвестно + Неизвестно + + + + BatteryHelper + + + Empty + Пустая + + + + Discharging + Разряжается + + + + Fully charged + Полностью заряжена + + + + Charging + Заряжается + + + + Lithium ion + Литий-ионная + + + + Lithium polymer + Литий-полимерная + + + + Lithium iron phosphate + Литий-железо-фосфатная + + + + Lead acid + Свинцово-кислотная + + + + Nickel cadmium + Никель-кадмиевая + + + + Nickel metal hydride + Никель-металл-гидридная + + + + Unknown + Неизвестно + + + + Personal Digital Assistant's battery + + + + + Uninterruptible Power Supply's battery + + + + + Primary battery + + + + + Mouse battery + + + + + Keyboard battery + + + + + Keyboard and mouse's battery + + + + + Camera battery + + + + + Phone battery + + + + + Monitor battery + + + + + Unknown battery + BatteryInfo - Power Management - Управление энергопотреблением + Управление энергопотреблением - Battery info - Информация о батарее + Информация о батарее - Energy Now: - Заряд сейчас: + Заряд сейчас: - Updated: - Обновлено: + Обновлено: - Technology: - Технология: + Технология: - Model: - Модель: + Модель: - Energy rate: - Мощность тока: + Мощность тока: - Voltage: - Напряжение: + Напряжение: - Energy Full, Design: - Максимальный заряд: - - - - Energy Full: - + Максимальный заряд: - State: - Состояние: + Состояние: - Lithium ion - Литий-ионная + Литий-ионная - Lithium polymer - Литий-полимерная + Литий-полимерная - Lithium iron phosphate - Литий-железо-фосфатная + Литий-железо-фосфатная - Lead acid - Свинцово-кислотная + Свинцово-кислотная - Nickel cadmium - Никель-кадмиевая + Никель-кадмиевая - Nickel metal hydride - Никель-металл-гидридная + Никель-металл-гидридная - Unknown - Неизвестно + Неизвестно + + + + BatteryInfoDialog + + + Dialog + + + + + Battery Info + + + + + BatteryInfoFrame + + + Power Management + Управление энергопотреблением + + + + Temperature: + + + + + Type: + + + + + State: + Состояние: + + + + Energy Full Design: + + + + + Energy Full: + + + + + Energy Now: + Заряд сейчас: + + + + Energy rate: + Мощность тока: + + + + Technology: + Технология: + + + + Voltage: + Напряжение: + + + + Vendor: + BatteryWatcher - + No battery! Нет батареи! - + LXQt could not find data about any battery - monitoring disabled LXQt не смог найти информацию о какой-либо батарее - наблюдение отменено - + Power low! Низкий заряд! - + Suspending in %1 seconds Ждущий режим через %1 секунд - + Hibernating in %1 seconds Спящий режим через %1 секунд - + Shutting down in %1 seconds Выключение компьютера через %1 секунд @@ -169,8 +319,8 @@ IdlenessWatcher - LxQt Idleness watcher failed to start - Не удалось запустить наблюдение за простоем LxQt + LXQt Idleness watcher failed to start + Не удалось запустить наблюдение за простоем LXQt @@ -178,27 +328,27 @@ Интерфейс D-Bus org.freedesktop.ScreenSaver уже зарегистрирован - + The X11 Screensaver extension is not usable Расширение X11 Скринсейвер непригодно для использования - + Configure... Настроить… - + ERROR: Screen unlocked ОШИБКА: экран разблокирован - + Locking program "%1" exited with error code %2 Программа блокировки экрана "%1" вышла с кодом ошибки %2 - + Locking program "%1" crashed with error code %2 Программа блокировки экрана "%1" упала с кодом ошибки %2 @@ -206,19 +356,19 @@ PowerManagementd - + Power Management Управление энергопотреблением - + You are running LXQt Power Management for the first time. You can configure it from settings... Вы запускаете управление энергопотреблением LXQt впервые. Вы можете сконфигурировать его в настройках… - + Configure... Настроить… @@ -226,35 +376,52 @@ You can configure it from settings... TrayIcon - discharging - разряжается + разряжается - charging - заряжается + заряжается - - + + About О программе - + Configure Настроить - + Disable icon Не показывать значок - + + <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> + + + + + LXQt Power Management info + + + + + The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> + + + + + Configure now + + + <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - <p> <b>Управление энергопотреблением LXQt</b><br/> - Управление энергопотреблением для окружения рабочего стола LXQt</p><p> Авторы:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - и другие из проектов Razor и LXQt</p><p> Copyright &copy; 2012-2014</p> + <p> <b>Управление энергопотреблением LXQt</b><br/> - Управление энергопотреблением для окружения рабочего стола LXQt</p><p> Авторы:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - и другие из проектов Razor и LXQt</p><p> Copyright &copy; 2012-2014</p> diff --git a/src/translations/lxqt-powermanagement_ru_RU.ts b/src/translations/lxqt-powermanagement_ru_RU.ts index f151278..2ea24ce 100644 --- a/src/translations/lxqt-powermanagement_ru_RU.ts +++ b/src/translations/lxqt-powermanagement_ru_RU.ts @@ -4,163 +4,313 @@ Battery - Charging - Заряжается + Заряжается - Discharging - Разряжается + Разряжается - Empty - Пустая + Пустая - Fully charged - Полностью заряжена + Полностью заряжена - Pending charge - Ожидает заряда + Ожидает заряда - Pending discharge - Ожидает разряда + Ожидает разряда - Unknown - Неизвестно + Неизвестно + + + + BatteryHelper + + + Empty + Пустая + + + + Discharging + Разряжается + + + + Fully charged + Полностью заряжена + + + + Charging + Заряжается + + + + Lithium ion + Литий-ионная + + + + Lithium polymer + Литий-полимерная + + + + Lithium iron phosphate + Литий-железо-фосфатная + + + + Lead acid + Свинцово-кислотная + + + + Nickel cadmium + Никель-кадмиевая + + + + Nickel metal hydride + Никель-металл-гидридная + + + + Unknown + Неизвестно + + + + Personal Digital Assistant's battery + + + + + Uninterruptible Power Supply's battery + + + + + Primary battery + + + + + Mouse battery + + + + + Keyboard battery + + + + + Keyboard and mouse's battery + + + + + Camera battery + + + + + Phone battery + + + + + Monitor battery + + + + + Unknown battery + BatteryInfo - Power Management - Управление энергопотреблением + Управление энергопотреблением - Battery info - Информация о батарее + Информация о батарее - Energy Now: - Заряд сейчас: + Заряд сейчас: - Updated: - Обновлено: + Обновлено: - Technology: - Технология: + Технология: - Model: - Модель: + Модель: - Energy rate: - Мощность тока: + Мощность тока: - Voltage: - Напряжение: + Напряжение: - Energy Full, Design: - Максимальный заряд: - - - - Energy Full: - + Максимальный заряд: - State: - Состояние: + Состояние: - Lithium ion - Литий-ионная + Литий-ионная - Lithium polymer - Литий-полимерная + Литий-полимерная - Lithium iron phosphate - Литий-железо-фосфатная + Литий-железо-фосфатная - Lead acid - Свинцово-кислотная + Свинцово-кислотная - Nickel cadmium - Никель-кадмиевая + Никель-кадмиевая - Nickel metal hydride - Никель-металл-гидридная + Никель-металл-гидридная - Unknown - Неизвестно + Неизвестно + + + + BatteryInfoDialog + + + Dialog + + + + + Battery Info + + + + + BatteryInfoFrame + + + Power Management + Управление энергопотреблением + + + + Temperature: + + + + + Type: + + + + + State: + Состояние: + + + + Energy Full Design: + + + + + Energy Full: + + + + + Energy Now: + Заряд сейчас: + + + + Energy rate: + Мощность тока: + + + + Technology: + Технология: + + + + Voltage: + Напряжение: + + + + Vendor: + BatteryWatcher - + No battery! Нет батареи! - + LXQt could not find data about any battery - monitoring disabled LXQt не смог найти информацию о какой-либо батарее - наблюдение отменено - + Power low! Низкий заряд! - + Suspending in %1 seconds Ждущий режим через %1 секунд - + Hibernating in %1 seconds Спящий режим через %1 секунд - + Shutting down in %1 seconds Выключение компьютера через %1 секунд @@ -169,8 +319,8 @@ IdlenessWatcher - LxQt Idleness watcher failed to start - Не удалось запустить наблюдение за простоем LxQt + LXQt Idleness watcher failed to start + Не удалось запустить наблюдение за простоем LXQt @@ -178,27 +328,27 @@ Интерфейс D-Bus org.freedesktop.ScreenSaver уже зарегистрирован - + The X11 Screensaver extension is not usable Расширение X11 Скринсейвер непригодно для использования - + Configure... Настроить… - + ERROR: Screen unlocked ОШИБКА: экран разблокирован - + Locking program "%1" exited with error code %2 Программа блокировки экрана "%1" вышла с кодом ошибки %2 - + Locking program "%1" crashed with error code %2 Программа блокировки экрана "%1" упала с кодом ошибки %2 @@ -206,19 +356,19 @@ PowerManagementd - + Power Management Управление энергопотреблением - + You are running LXQt Power Management for the first time. You can configure it from settings... Вы запускаете управление энергопотреблением LXQt впервые. Вы можете сконфигурировать его в настройках… - + Configure... Настроить… @@ -226,35 +376,52 @@ You can configure it from settings... TrayIcon - discharging - разряжается + разряжается - charging - заряжается + заряжается - - + + About О программе - + Configure Настроить - + Disable icon Не показывать значок - + + <p> <b>LXQt Power Management</b><br/> - Power Management for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> + + + + + LXQt Power Management info + + + + + The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i> + + + + + Configure now + + + <p> <b>LXQt Powermanagement</b><br/> - Powermanagement for the LXQt Desktop Environment</p><p> Authors:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - and others from the Razor and LXQt projects</p><p> Copyright &copy; 2012-2014</p> - <p> <b>Управление энергопотреблением LXQt</b><br/> - Управление энергопотреблением для окружения рабочего стола LXQt</p><p> Авторы:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - и другие из проектов Razor и LXQt</p><p> Copyright &copy; 2012-2014</p> + <p> <b>Управление энергопотреблением LXQt</b><br/> - Управление энергопотреблением для окружения рабочего стола LXQt</p><p> Авторы:<br/> &nbsp; Christian Surlykke, Alec Moskvin<br/> &nbsp; - и другие из проектов Razor и LXQt</p><p> Copyright &copy; 2012-2014</p> diff --git a/src/trayicon.cpp b/src/trayicon.cpp index 3c96049..8bb5885 100644 --- a/src/trayicon.cpp +++ b/src/trayicon.cpp @@ -38,6 +38,7 @@ #include "trayicon.h" #include "batteryhelper.h" #include "../config/powermanagementsettings.h" +#include TrayIcon::TrayIcon(Solid::Battery *battery, QObject *parent) : QSystemTrayIcon(parent), @@ -107,6 +108,15 @@ void TrayIcon::onAboutTriggered() void TrayIcon::onDisableIconTriggered() { + auto notification = new LXQt::Notification{tr("LXQt Power Management info"), nullptr}; + notification->setBody(tr("The LXQt Power Management tray icon can be (re)enabled in lxqt-config-powermanagement")); + notification->setIcon("preferences-system-power-management"); + notification->setActions({tr("Configure now")}); + notification->setUrgencyHint(LXQt::Notification::UrgencyLow); + connect(notification, &LXQt::Notification::actionActivated, [notification] { notification->close(); QProcess::startDetached("lxqt-config-powermanagement"); }); + connect(notification, &LXQt::Notification::notificationClosed, notification, &QObject::deleteLater); + notification->update(); + PowerManagementSettings().setShowIcon(false); } diff --git a/src/watcher.cpp b/src/watcher.cpp index 217399e..cf9b632 100644 --- 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(); } diff --git a/src/watcher.h b/src/watcher.h index 1cb58c0..73a6226 100644 --- a/src/watcher.h +++ b/src/watcher.h @@ -1,3 +1,11 @@ +/* +* Copyright (c) 2014,2015 Christian Surlykke, Paulo Lieuthier +* +* This file is part of the LXQt project. +* It is distributed under the LGPL 2.1 or later license. +* Please refer to the LICENSE file for a copy of the license. +*/ + #ifndef WATCHER_H #define WATCHER_H @@ -21,8 +29,8 @@ signals: void done(); private: - LxQt::Power mPower; - LxQt::ScreenSaver mScreenSaver; + LXQt::Power mPower; + LXQt::ScreenSaver mScreenSaver; QEventLoop mLoop; };