From cfc3356da2e00580cd6032594783ccdfa929ce12 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Tue, 19 Jul 2016 00:02:21 +0200 Subject: [PATCH] Cherry-picking upstream version 0.10.96~11-g2bf985c. --- .gitignore | 3 - AUTHORS | 4 +- config/CMakeLists.txt | 10 + .../lxqt-config-powermanagement.ts | 217 --------- .../lxqt-config-powermanagement_de.desktop | 3 + .../lxqt-config-powermanagement_el.ts | 229 ---------- .../lxqt-config-powermanagement_hu.ts | 229 ---------- .../lxqt-config-powermanagement_it.ts | 229 ---------- .../lxqt-config-powermanagement_ja.ts | 229 ---------- .../lxqt-config-powermanagement_pl_PL.ts | 229 ---------- .../lxqt-config-powermanagement_pt.ts | 229 ---------- .../lxqt-config-powermanagement_ru.ts | 229 ---------- .../lxqt-config-powermanagement_ru_RU.desktop | 3 - .../lxqt-config-powermanagement_ru_RU.ts | 229 ---------- debian/changelog | 5 +- src/CMakeLists.txt | 10 + src/batterywatcher.cpp | 6 +- src/translations/lxqt-powermanagement.ts | 312 ------------- src/translations/lxqt-powermanagement_el.ts | 432 ------------------ src/translations/lxqt-powermanagement_hu.ts | 431 ----------------- src/translations/lxqt-powermanagement_ja.ts | 430 ----------------- .../lxqt-powermanagement_pl_PL.ts | 367 --------------- src/translations/lxqt-powermanagement_pt.ts | 431 ----------------- src/translations/lxqt-powermanagement_ru.ts | 427 ----------------- .../lxqt-powermanagement_ru_RU.ts | 427 ----------------- src/watcher.cpp | 2 - src/watcher.h | 1 - 27 files changed, 31 insertions(+), 5322 deletions(-) delete mode 100644 .gitignore delete mode 100644 config/translations/lxqt-config-powermanagement.ts create mode 100644 config/translations/lxqt-config-powermanagement_de.desktop delete mode 100644 config/translations/lxqt-config-powermanagement_el.ts delete mode 100644 config/translations/lxqt-config-powermanagement_hu.ts delete mode 100644 config/translations/lxqt-config-powermanagement_it.ts delete mode 100644 config/translations/lxqt-config-powermanagement_ja.ts delete mode 100644 config/translations/lxqt-config-powermanagement_pl_PL.ts delete mode 100644 config/translations/lxqt-config-powermanagement_pt.ts delete mode 100644 config/translations/lxqt-config-powermanagement_ru.ts delete mode 100644 config/translations/lxqt-config-powermanagement_ru_RU.desktop delete mode 100644 config/translations/lxqt-config-powermanagement_ru_RU.ts delete mode 100644 src/translations/lxqt-powermanagement.ts delete mode 100644 src/translations/lxqt-powermanagement_el.ts delete mode 100644 src/translations/lxqt-powermanagement_hu.ts delete mode 100644 src/translations/lxqt-powermanagement_ja.ts delete mode 100644 src/translations/lxqt-powermanagement_pl_PL.ts delete mode 100644 src/translations/lxqt-powermanagement_pt.ts delete mode 100644 src/translations/lxqt-powermanagement_ru.ts delete mode 100644 src/translations/lxqt-powermanagement_ru_RU.ts diff --git a/.gitignore b/.gitignore deleted file mode 100644 index da140d9..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -build -nbproject -*kdev4* diff --git a/AUTHORS b/AUTHORS index fcaabf9..96b08f3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,7 +2,7 @@ Upstream Authors: LXQt team: http://lxqt.org Copyright: - Copyright (c) 2013-2014 LXQt team + Copyright (c) 2013-2016 LXQt team -License: GPL-2 and LGPL-2.1+ +License: LGPL-2.1+ The full text of the licenses can be found in the 'COPYING' file. diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 6a557ef..616618d 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -36,6 +36,16 @@ lxqt_translate_ts(QM_FILES ${UI_FILES} INSTALL_DIR ${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME} + PULL_TRANSLATIONS + ${PULL_TRANSLATIONS} + CLEAN_TRANSLATIONS + ${CLEAN_TRANSLATIONS} + TRANSLATIONS_REPO + ${TRANSLATIONS_REPO} + TRANSLATIONS_REFSPEC + ${TRANSLATIONS_REFSPEC} + REPO_SUBDIR + "lxqt-powermanagement/${PROJECT_NAME}" ) lxqt_app_translation_loader(config-powermanagement_QM_LOADER ${PROJECT_NAME}) diff --git a/config/translations/lxqt-config-powermanagement.ts b/config/translations/lxqt-config-powermanagement.ts deleted file mode 100644 index 0272723..0000000 --- a/config/translations/lxqt-config-powermanagement.ts +++ /dev/null @@ -1,217 +0,0 @@ - - - - - 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 - - - - - When &using external monitor - - - - - MainWindow - - - Power Management Settings - - - - - Battery - - - - - Lid - - - - - Idle - - - - - QObject - - - Nothing - - - - - Lock screen - - - - - Suspend - - - - - Hibernate - - - - - Shutdown - - - - diff --git a/config/translations/lxqt-config-powermanagement_de.desktop b/config/translations/lxqt-config-powermanagement_de.desktop new file mode 100644 index 0000000..4357f9d --- /dev/null +++ b/config/translations/lxqt-config-powermanagement_de.desktop @@ -0,0 +1,3 @@ +Name[de]=Energieverwaltung +GenericName[de]=Einstellungen der Energieverwaltung +Comment[de]=Verschiedene Einstellungen zur Energieverwaltung wie Batterie- oder Leerlaufüberwachung diff --git a/config/translations/lxqt-config-powermanagement_el.ts b/config/translations/lxqt-config-powermanagement_el.ts deleted file mode 100644 index 79c19d8..0000000 --- a/config/translations/lxqt-config-powermanagement_el.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - 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 deleted file mode 100644 index c70c814..0000000 --- a/config/translations/lxqt-config-powermanagement_hu.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - 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 - - - Form - Ű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 - - - - LidWatcherSettings - - - Form - Űrlap - - - - Enable &Lid Watcher - 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 - - - - MainWindow - - LXQt Powermanagement Configuration - LXQt energiafelügyelet beállítás - - - - Power Management Settings - - - - - Battery - Akkumulátor - - - - Lid - Fedél - - - - Idle - - - - idle - Tétlenség - - - - QObject - - - Nothing - Semmi - - - - Lock screen - Képernyőzár - - - - Suspend - Készenlét - - - - Hibernate - Alvás - - - - Shutdown - Kikapcsolás - - - diff --git a/config/translations/lxqt-config-powermanagement_it.ts b/config/translations/lxqt-config-powermanagement_it.ts deleted file mode 100644 index 468c8d6..0000000 --- a/config/translations/lxqt-config-powermanagement_it.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - 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 - - - Form - - - - - Enab&le Idleness Watcher - &Attiva monitor attività sistema - - - - When idle then: - Quando inattivo: - - - - Idle time: - Tempo di inattività: - - - - minutes - minuti - - - - seconds - secondi - - - - LidWatcherSettings - - - Form - - - - - Enable &Lid Watcher - &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 - - - - MainWindow - - LXQt Powermanagement Configuration - Configurazione gestione energetica di LXQt - - - - Power Management Settings - - - - - Battery - Batteria - - - - Lid - Coperchio - - - - Idle - - - - idle - Inattività - - - - QObject - - - Nothing - Nessuna azione - - - - Lock screen - Blocca schermo - - - - Suspend - Sospendi - - - - Hibernate - Iberna - - - - Shutdown - Spegni - - - diff --git a/config/translations/lxqt-config-powermanagement_ja.ts b/config/translations/lxqt-config-powermanagement_ja.ts deleted file mode 100644 index dc39fe4..0000000 --- a/config/translations/lxqt-config-powermanagement_ja.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - バッテリーの監視設定 - - - - 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 - - - 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_pl_PL.ts b/config/translations/lxqt-config-powermanagement_pl_PL.ts deleted file mode 100644 index 50c4eab..0000000 --- a/config/translations/lxqt-config-powermanagement_pl_PL.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - 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 - - - Form - Form - - - - Enab&le Idleness Watcher - W&łącz monitorowanie bezczynności - - - - When idle then: - Gdy bezczynny: - - - - Idle time: - Czas bezczynności: - - - - minutes - min - - - - seconds - sek - - - - LidWatcherSettings - - - Form - Form - - - - Enable &Lid Watcher - 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 - - - - MainWindow - - LXQt Powermanagement Configuration - LXQt Konfiguracja zarządzania energią - - - - Power Management Settings - - - - - Battery - Bateria - - - - Lid - Pokrywa - - - - Idle - - - - idle - Bezczynność - - - - QObject - - - Nothing - Brak reakcji - - - - Lock screen - Zablokuj ekran - - - - Suspend - Wstrzymaj - - - - Hibernate - Hibernuj - - - - Shutdown - Wyłącz - - - diff --git a/config/translations/lxqt-config-powermanagement_pt.ts b/config/translations/lxqt-config-powermanagement_pt.ts deleted file mode 100644 index bb4bbc9..0000000 --- a/config/translations/lxqt-config-powermanagement_pt.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - BatteryWatcherSettings - - - Battery Watcher Settings - 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 - - - Form - 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 - - - - LidWatcherSettings - - - Form - Formulário - - - - Enable &Lid Watcher - 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 - - - - MainWindow - - LXQt Powermanagement Configuration - Configuração do gestor de energia do LXQt - - - - Power Management Settings - - - - - Battery - Bateria - - - - Lid - Tampa - - - - Idle - - - - idle - inatividade - - - - QObject - - - Nothing - Nada fazer - - - - Lock screen - Bloquear ecrã - - - - Suspend - Suspender - - - - Hibernate - Hibernar - - - - Shutdown - Desligar - - - diff --git a/config/translations/lxqt-config-powermanagement_ru.ts b/config/translations/lxqt-config-powermanagement_ru.ts deleted file mode 100644 index ce1ab3a..0000000 --- a/config/translations/lxqt-config-powermanagement_ru.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - 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 - От сети - - - - When &using external monitor - При использовании внешнего монитора - - - On 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_ru_RU.desktop b/config/translations/lxqt-config-powermanagement_ru_RU.desktop deleted file mode 100644 index 24ab6c4..0000000 --- a/config/translations/lxqt-config-powermanagement_ru_RU.desktop +++ /dev/null @@ -1,3 +0,0 @@ -# Translations -GenericName[ru_RU]=Настройки управления энергопотреблением -Name[ru_RU]=Управление энергопотреблением \ No newline at end of file diff --git a/config/translations/lxqt-config-powermanagement_ru_RU.ts b/config/translations/lxqt-config-powermanagement_ru_RU.ts deleted file mode 100644 index d6087f1..0000000 --- a/config/translations/lxqt-config-powermanagement_ru_RU.ts +++ /dev/null @@ -1,229 +0,0 @@ - - - - - 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 - От сети - - - - When &using external monitor - При использовании внешнего монитора - - - On Ac - От сети - - - - MainWindow - - LXQt Powermanagement Configuration - Настройка энергопотребления LXQt - - - - Power Management Settings - - - - - Battery - Батарея - - - - Lid - Крышка - - - - Idle - - - - idle - бездействие - - - - QObject - - - Nothing - Ничего - - - - Lock screen - Блокирвать экран - - - - Suspend - Ждущий режим - - - - Hibernate - Спящий режим - - - - Shutdown - Выключить компьютер - - - diff --git a/debian/changelog b/debian/changelog index 7f8b0a2..8a866e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -lxqt-powermanagement (0.10.0-5) experimental; urgency=medium +lxqt-powermanagement (0.10.96~11-g2bf985c-1) experimental; urgency=medium + * Cherry-picking upstream version 0.10.96~11-g2bf985c. * Preparing the upcoming release, switch to experimental * Added new build dependendies: - gcc (>= 4:6) @@ -12,7 +13,7 @@ lxqt-powermanagement (0.10.0-5) experimental; urgency=medium * Set CMAKE_BUILD_TYPE=RelWithDebInfo * Exported LC_ALL=C.UTF-8, make builds reproducible - -- Alf Gaida Mon, 18 Jul 2016 23:58:20 +0200 + -- Alf Gaida Tue, 19 Jul 2016 00:02:00 +0200 lxqt-powermanagement (0.10.0-4) unstable; urgency=medium diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4a819f1..35e1170 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,6 +41,16 @@ lxqt_translate_ts(QM_FILES ${UI_FILES} INSTALL_DIR ${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME} + PULL_TRANSLATIONS + ${PULL_TRANSLATIONS} + CLEAN_TRANSLATIONS + ${CLEAN_TRANSLATIONS} + TRANSLATIONS_REPO + ${TRANSLATIONS_REPO} + TRANSLATIONS_REFSPEC + ${TRANSLATIONS_REFSPEC} + REPO_SUBDIR + "lxqt-powermanagement/${PROJECT_NAME}" ) lxqt_app_translation_loader(lxqt-powermanagement_QM_LOADER ${PROJECT_NAME}) diff --git a/src/batterywatcher.cpp b/src/batterywatcher.cpp index 3ed56f3..59c46f6 100644 --- a/src/batterywatcher.cpp +++ b/src/batterywatcher.cpp @@ -122,13 +122,13 @@ void BatteryWatcher::batteryChanged() switch (mSettings.getPowerLowAction()) { case LXQt::Power::PowerSuspend: - notification->setBody(tr("Suspending in %1 seconds").arg(secondsToAction)); + notification->setBody(tr("Suspending in %n second(s)", nullptr, secondsToAction).arg(secondsToAction)); break; case LXQt::Power::PowerHibernate: - notification->setBody(tr("Hibernating in %1 seconds").arg(secondsToAction)); + notification->setBody(tr("Hibernating in %n second(s)", nullptr, secondsToAction).arg(secondsToAction)); break; case LXQt::Power::PowerShutdown: - notification->setBody(tr("Shutting down in %1 seconds").arg(secondsToAction)); + notification->setBody(tr("Shutting down in %n second(s)", nullptr, secondsToAction).arg(secondsToAction)); break; } diff --git a/src/translations/lxqt-powermanagement.ts b/src/translations/lxqt-powermanagement.ts deleted file mode 100644 index 5716619..0000000 --- a/src/translations/lxqt-powermanagement.ts +++ /dev/null @@ -1,312 +0,0 @@ - - - - - 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 - - - - - 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 - - - - - Hibernating in %1 seconds - - - - - Shutting down in %1 seconds - - - - - IdlenessWatcher - - - LXQt Idleness watcher failed to start - - - - - D-Bus interface org.freedesktop.ScreenSaver is already registered - - - - - 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 - - - - - PowerManagementd - - - Power Management - - - - - You are running LXQt Power Management for the first time. -You can configure it from settings... - - - - - 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 - - - - diff --git a/src/translations/lxqt-powermanagement_el.ts b/src/translations/lxqt-powermanagement_el.ts deleted file mode 100644 index 97253c0..0000000 --- a/src/translations/lxqt-powermanagement_el.ts +++ /dev/null @@ -1,432 +0,0 @@ - - - - - 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 deleted file mode 100644 index d487fac..0000000 --- a/src/translations/lxqt-powermanagement_hu.ts +++ /dev/null @@ -1,431 +0,0 @@ - - - - - Battery - - Charging - Töltés - - - Discharging - Kisütés - - - Empty - Üres - - - Fully charged - Teletöltve - - - Pending charge - Tölthetőség - - - Pending discharge - Kisüthetőség - - - Unknown - 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 - - - Battery info - Akkumulátor információ - - - Energy Now: - Állapot: - - - Updated: - Frissítve: - - - Technology: - Technológia: - - - Model: - Modell: - - - Energy rate: - Energiaállapot: - - - Voltage: - Feszültség: - - - Energy Full, Design: - Névleges kapacitás: - - - Energy Full: - Teljes kapacitás: - - - State: - Állapot: - - - 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 - - - - 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 - - - - IdlenessWatcher - - - LXQt Idleness watcher failed to start - Az LXQt tétlenség figyelő indítása sikertelen - - - - D-Bus interface org.freedesktop.ScreenSaver is already registered - 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 - - - - 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... - - - - 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 - - - charging - 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> - - - diff --git a/src/translations/lxqt-powermanagement_ja.ts b/src/translations/lxqt-powermanagement_ja.ts deleted file mode 100644 index d89dfdb..0000000 --- a/src/translations/lxqt-powermanagement_ja.ts +++ /dev/null @@ -1,430 +0,0 @@ - - - - - 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秒でシャットダウンします - - - - 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 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 deleted file mode 100644 index 1f0d673..0000000 --- a/src/translations/lxqt-powermanagement_pl_PL.ts +++ /dev/null @@ -1,367 +0,0 @@ - - - - - Battery - - Charging - Ładowanie - - - Discharging - Rozładowywanie - - - Empty - Pusta - - - Fully charged - W pełni naładowana - - - Unknown - Nieznana - - - - BatteryHelper - - - Empty - Pusta - - - - Discharging - Rozładowywanie - - - - Fully charged - W pełni naładowana - - - - Charging - Ładowanie - - - - Lithium ion - - - - - Lithium polymer - - - - - Lithium iron phosphate - - - - - Lead acid - - - - - Nickel cadmium - - - - - Nickel metal hydride - - - - - Unknown - Nieznana - - - - 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 - - Battery info - Informacje o baterii - - - Technology: - Technologia: - - - Model: - Model: - - - Unknown - Nieznana - - - - BatteryInfoDialog - - - Dialog - - - - - Battery Info - - - - - BatteryInfoFrame - - - Power Management - Zarządzanie zasilaniem - - - - Temperature: - - - - - Type: - - - - - State: - - - - - Energy Full Design: - - - - - Energy Full: - - - - - Energy Now: - - - - - Energy rate: - - - - - Technology: - Technologia: - - - - Voltage: - - - - - 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 - - - - IdlenessWatcher - - - LXQt Idleness watcher failed to start - - - - - D-Bus interface org.freedesktop.ScreenSaver is already registered - - - - - 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 - - - - - 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... - - - - 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 - - - charging - ł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> - - - diff --git a/src/translations/lxqt-powermanagement_pt.ts b/src/translations/lxqt-powermanagement_pt.ts deleted file mode 100644 index b9d3c87..0000000 --- a/src/translations/lxqt-powermanagement_pt.ts +++ /dev/null @@ -1,431 +0,0 @@ - - - - - Battery - - Charging - A carregar - - - Discharging - A descarregar - - - Empty - Vazia - - - Fully charged - Totalmente carregada - - - Pending charge - Por carregar - - - Pending discharge - Por descarregar - - - Unknown - 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 - - - Battery info - Informações da bateria - - - Energy Now: - Energia atual: - - - Updated: - Atualização: - - - Technology: - Tecnologia: - - - Model: - Modelo: - - - Energy rate: - Taxa de energia: - - - Voltage: - Tensão: - - - Energy Full, Design: - Energia máxima teórica: - - - Energy Full: - Energia máxima: - - - State: - Estado: - - - 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 - - - - 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 - - - - 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 - - - - IdlenessWatcher - - - LXQt Idleness watcher failed to start - O monitorizador de inatividade não foi iniciado - - - - D-Bus interface org.freedesktop.ScreenSaver is already registered - 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" - - - - 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. -Pode configurar as opções nas definições... - - - - Configure... - Configurar... - - - - 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 - - - charging - 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> - - - diff --git a/src/translations/lxqt-powermanagement_ru.ts b/src/translations/lxqt-powermanagement_ru.ts deleted file mode 100644 index 8c469c9..0000000 --- a/src/translations/lxqt-powermanagement_ru.ts +++ /dev/null @@ -1,427 +0,0 @@ - - - - - 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: - Максимальный заряд: - - - 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 - - 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> - - - diff --git a/src/translations/lxqt-powermanagement_ru_RU.ts b/src/translations/lxqt-powermanagement_ru_RU.ts deleted file mode 100644 index 2ea24ce..0000000 --- a/src/translations/lxqt-powermanagement_ru_RU.ts +++ /dev/null @@ -1,427 +0,0 @@ - - - - - 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: - Максимальный заряд: - - - 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 - - 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> - - - diff --git a/src/watcher.cpp b/src/watcher.cpp index cf9b632..1fd5cd7 100644 --- a/src/watcher.cpp +++ b/src/watcher.cpp @@ -31,7 +31,6 @@ Watcher::Watcher(QObject *parent) : QObject(parent), mScreenSaver(this) { - connect(&mScreenSaver, SIGNAL(done()), &mLoop, SLOT(quit())); } Watcher::~Watcher() @@ -44,7 +43,6 @@ void Watcher::doAction(int action) if (action == -2) { mScreenSaver.lockScreen(); - mLoop.exec(); } else if (action >= 0) mPower.doAction((LXQt::Power::Action) action); diff --git a/src/watcher.h b/src/watcher.h index 73a6226..0bcdfe3 100644 --- a/src/watcher.h +++ b/src/watcher.h @@ -31,7 +31,6 @@ signals: private: LXQt::Power mPower; LXQt::ScreenSaver mScreenSaver; - QEventLoop mLoop; }; #endif // WATCHER_H