diff -Nru kshutdown-4.0/ChangeLog kshutdown-4.2/ChangeLog --- kshutdown-4.0/ChangeLog 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/ChangeLog 2017-10-16 13:21:59.000000000 +0000 @@ -1,8 +1,178 @@ + Previous Versions and Screenshots: https://kshutdown.sourceforge.io/releases/ - See also changes for 3.3 and 3.99 for the complete list - of new features since the previous stable version (3.2)... - http://kshutdown.sourceforge.net/releases/ +2017-10-16 4.2 + +* Fixed: Password on Cancel bypasses the Action setting (bug #33) +* Statistics: Added Ctrl+Shift+S shortcut +* Updated the Polish translation + +Linux: + +* Fixed: Suspend only works the second time (bug #34) +* Fixed missing Ctrl+Q shortcut in some Desktop Environments +* Fixed: Show application main window if KShutdown is already running +* When Selected Application Exit trigger: + - Fixed combo box selection of root and non-own processes + - Fixed root and non-own processes exit detection + +Source: + +* Removed semi-private KDevelop project files +* Updated links and args in tools/*.sh scripts + + +2017-08-24 4.1.1 Beta + +Linux: + +* NEW: Show standard KShutdown actions in the launcher/taskbar context menu (KF5 build only). + This works with Plasma, Unity, GNOME, and other DEs that support "Desktop Actions". + +Plasma: + +* Fixed blurry system tray icon (Breeze theme) +* Removed the standard "Restore" and "Quit" actions from the status icon menu. + Add "Quit KShutdown" instead which is less annoying (no confirmation message) + and more consistent with the rest of the application. +* Experimental: Show progress bar in taskbar (disabled in this release) + +Xfce: + +* Show status notifier (aka system tray) icon (KF5 build only) +* NEW: Enable "Logout" action. In previous versions the action could break the already fragile Xfce session system. + If the problem still exists and Xfce is starting w/o window manager: + 1. Exit Xfce + 2. Remove ~/.cache/sessions + +GNOME: + +* Logout Action: Fixed session manager "freeze" in GNOME-based Desktop Environments +* Drop GNOME 2 support (existing features should continue to work in KShutdown 4.x as before) + +Windows: + +* Installer: Remove "License Agreement" because GNU GPL is not an EULA +* Nicer system tray icon +* Add KShutdown logo icon to the kshutdown.exe file + +Unity: + +* Show system tray/notification icon + NOTE: may not work 100% correctly due to Qt or Unity issues; + also may not work correctly in older Unity versions +* Fixed: Never hide the main window completely because there is no way to unhide it in Unity +* Show menu bar again + NOTE: global menu bar may not work correctly in older Unity versions +* Experimental: Show progress bar in taskbar (disabled in this release) + +Openbox: + +* Fixed Logout action +* Fixed Openbox detection + +System Tray: + +* Fixed: Always show main window on system tray icon click (even if it was minimized) +* Remove leading/duplicated "KShutdown" text from the tool tip text +* CHANGED: Linux: Now the "Black and White System Tray Icon" option is available only if "Use System Icon Theme" is unselected +* Removed small overlay icons (were barely visible anyway) + +Preferences: + +* Always show both OK and Cancel buttons in GTK-based Desktop Environments +* CHANGED: System Settings button (formerly "Related KDE Settings..."): + - New icon + - Visible only if running under Plasma and compiled using KDE Frameworks + - Updated list of visible control panel modules + +Misc.: + +* CHANGED: Main Window: Do not focus OK button on startup to avoid accidental action activation via Enter key +* Print values of DESKTOP_SESSION and XDG_CURRENT_DESKTOP environment variables on startup +* Updated README.html file +* Added some menu bar key shortcuts +* Various minor cleanups and updates + +Setup.sh: + +* Run make with "-j2" options for faster compilation +* Show proper error if "dialog" program is missing +* Improve run/installation instructions +* Select "kshutdown-kf5" or "kshutdown-qt5" by default (instead of Qt 4-based builds) +* Mark "kshutdown-kde4" and "kshutdown-qt4" as obsolete +* Include "kshutdown-qt5" and "kshutdown-qt4-win32" in menu + +Setup-kf5.sh: + +* Fixed: "(...) bootentry.h: No such file or directory" fatal error if compiling from symbolic link directory + +Setup-qt5.sh: + +* Fixed: Explain how to fix: + qmake: could not exec '/usr/lib/x86_64-linux-gnu/qt4/bin/qmake': No such file or directory + +Setup-kde4.sh: + +* Removed auto installation using kdesu + +Source: + +* CHANGED: Move ./tools/VERSION to the top-level directory (./VERSION) +* CHANGED: Add "release date" to the ./VERSION file +* Cleanup *.h header includes +* Removed ./tools/flint++.sh +* Updated ./tools/clang-tidy.sh and ./tools/scan-build.sh +* Minor code cleanups + + +2017-04-17 4.1 Beta + +* Better tool tips in menus (requires Qt 5.1+) (feature-request #21) +* Removed ambiguous "Build" text from version info. + yyyy-MM-DD string now refers to the official release date rather than + build/compilation date. +* Nicer font in About|License tab +* Update Portuguese translation (thanks to Américo Monteiro) +* Better icon in confirmation message box +* UI: Use pixel metrics instead of hardcoded values +* Fixed: Process List: Do not truncate command names with spaces +* Update links to use encrypted https://kshutdown.sourceforge.io/ + instead of http://kshutdown.sourceforge.net/ + +Command Line + +* --ui-menu: show confirmation box only if --confirm option is set +* --version: Print correct Qt version + +Linux: + +* NEW: Added "Use System Icon Theme" option (bug #27) +* Fixed: Disable broken global/appmenu +* Various system tray related fixes (bug #27) +* Qt 5 Build: Fixed double "KShutdown" text in window title + +Source: + +* Qt Build/cmake: Install "kshutdown.png" icons (bug #29) +* Use install(TARGETS) to install the kshutdown binary + (patch #6 by Raphael Kubo da Costa) +* Added ./tools/clang-tidy.sh script +* cmake: Auto generate compile commands (used by clang-tidy) +* Fix compilation error with Qt4 (bug #30) +* Qt Build/cmake: Include missing translations and application icons +* Auto show warnings reported by POFileChecker while building language + translations using ./tools/i18n.sh (need optional gettext-lint package) +* Modernize code: + - 0 -> nullptr + - Use " = default" destructors + - Use "auto" +* Minor code cleanup +* Minor docs update + +Windows: + +* Update Qt libraries to version 4.8.7 2016-08-30 4.0 @@ -874,4 +1044,4 @@ 2003/10/27 0.1.0 Beta -// svn log -r 825:HEAD|xsel -i -b && kwrite ChangeLog +// svn log -r 878:HEAD|xsel -i -b && kwrite ChangeLog diff -Nru kshutdown-4.0/CMakeLists.txt kshutdown-4.2/CMakeLists.txt --- kshutdown-4.0/CMakeLists.txt 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/CMakeLists.txt 2017-10-16 13:21:59.000000000 +0000 @@ -6,9 +6,12 @@ cmake_minimum_required(VERSION 2.4.0) endif() +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + add_definitions(-std=c++0x -Wextra -Wpedantic -Wswitch-enum) if(KS_PURE_QT) +# TODO: https://cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F find_package(Qt5 REQUIRED Widgets DBus) add_definitions(${Qt5Widgets_DEFINITIONS} ${Qt5DBus_DEFINITIONS}) include_directories(${Qt5Widgets_INCLUDES} ${Qt5DBus_INCLUDES}) diff -Nru kshutdown-4.0/debian/changelog kshutdown-4.2/debian/changelog --- kshutdown-4.0/debian/changelog 2016-09-01 18:54:00.000000000 +0000 +++ kshutdown-4.2/debian/changelog 2018-01-13 12:32:07.000000000 +0000 @@ -1,3 +1,11 @@ +kshutdown (4.2-1) unstable; urgency=low + + * New upstream release + * Using KDE 5 build (Closes: #874989) + * Portuguese patch has been accepted upstream + + -- Eike Sat, 13 Jan 2018 13:32:07 +0100 + kshutdown (4.0-1) unstable; urgency=low * New upstream release (Closes: #836901) diff -Nru kshutdown-4.0/debian/compat kshutdown-4.2/debian/compat --- kshutdown-4.0/debian/compat 2016-09-01 18:54:00.000000000 +0000 +++ kshutdown-4.2/debian/compat 2018-01-13 12:32:07.000000000 +0000 @@ -1 +1 @@ -9 \ No newline at end of file +9 diff -Nru kshutdown-4.0/debian/control kshutdown-4.2/debian/control --- kshutdown-4.0/debian/control 2016-09-01 18:54:00.000000000 +0000 +++ kshutdown-4.2/debian/control 2018-01-13 12:32:07.000000000 +0000 @@ -2,11 +2,7 @@ Section: kde Priority: optional Maintainer: Eike Sauer -Uploaders: Romain Beauxis -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 9), - dpkg-dev (>= 1.16.1), - cmake, - kdelibs5-dev, pkg-kde-tools +Build-Depends: cmake, debhelper (>=9), extra-cmake-modules, libkf5config-dev, libkf5configwidgets-dev, libkf5plasma-dev, libkf5globalaccel-dev, libkf5idletime-dev, libkf5notifications-dev, libkf5notifyconfig-dev Standards-Version: 3.9.8 Homepage: http://kshutdown.sourceforge.net/ diff -Nru kshutdown-4.0/debian/dirs kshutdown-4.2/debian/dirs --- kshutdown-4.0/debian/dirs 2016-09-01 18:54:00.000000000 +0000 +++ kshutdown-4.2/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/bin -usr/share/apps/kconf_update diff -Nru kshutdown-4.0/debian/docs kshutdown-4.2/debian/docs --- kshutdown-4.0/debian/docs 2016-09-01 18:54:00.000000000 +0000 +++ kshutdown-4.2/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -README.html -TODO diff -Nru kshutdown-4.0/debian/kshutdown.1 kshutdown-4.2/debian/kshutdown.1 --- kshutdown-4.0/debian/kshutdown.1 2016-09-01 18:54:00.000000000 +0000 +++ kshutdown-4.2/debian/kshutdown.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,115 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KSHUTDOWN 1 "avril 14, 2005" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -kshutdown \- A Shut Down Utility for KDE -.SH SYNOPSIS -.B kshutdown -.RI [ Qt-options ] -.RI [ KDE-options ] -.RI [ options ] -.RI time -.SH DESCRIPTION -This manual page was written for the Debian distribution -because the original program does not have a manual page. -.PP -This manual page documents briefly the -.B kshutdown -utility. -.PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. -.SH OPTIONS -A summary of options is included below. - -.TP -Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-kde -Show KDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options - -.TP -Options: -.TP -.B \-s, \-\-shutdown - Turn off computer -.TP -.B \-h, \-\-halt -Turn off computer -.TP -.B \-r, \-\-reboot -Restart computer -.TP -.B \-k, \-\-lock -Lock session -.TP -.B \-l, \-\-logout -End current session -.TP -.B \-w, \-\-wizard -Wizard -.TP -.B \-\-standard -Show standard logout dialog -.TP -.B \-c, \-\-cancel -Cancel an active action -.TP -.B \-\-init -Don't show window at startup -.TP -.B \-\-test -Enable test mode -.TP -.B \-\-default -Disable test mode - -.TP -Arguments: -.TP -.B time -Time; Examples: 01:30 - absolute time (HH:MM); 10 - number of minutes to wait from now -.SH AUTHOR -kshutdown was written by Konrad Twardowski . -.PP -This manual page was written by Romain Beauxis , -for the Debian project Permission is granted to copy, distribute and/or -modify this document under the terms of the GNU General Public -License, Version 2 any later version published by the Free Software Foundation. - diff -Nru kshutdown-4.0/debian/patches/portuguese-translations-4.0.patch kshutdown-4.2/debian/patches/portuguese-translations-4.0.patch --- kshutdown-4.0/debian/patches/portuguese-translations-4.0.patch 2016-09-01 18:54:00.000000000 +0000 +++ kshutdown-4.2/debian/patches/portuguese-translations-4.0.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,416 +0,0 @@ -Description: Update of portuguese translation -Author: Américo Monteiro , 2010, 2013 -Forwarded: Yes ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/po/pt.po -+++ b/po/pt.po -@@ -1,21 +1,21 @@ --# Translation of kshutdown messages to Portuguese -+# Translation of kshutdown messages to european Portuguese - # Copyright (C) 2010 the kshutdown's copyright holder - # This file is distributed under the same license as the kshutdown package. - # --# Américo Monteiro , 2010. -+# Américo Monteiro , 2010, 2013. - msgid "" - msgstr "" --"Project-Id-Version: kshutdown 2.0~beta8-1\n" -+"Project-Id-Version: kshutdown 3.0-1\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2016-08-30 22:01+0200\n" --"PO-Revision-Date: 2010-02-03 21:09+0000\n" --"Last-Translator: Américo Monteiro \n" -+"PO-Revision-Date: 2013-11-28 23:54+0000\n" -+"Last-Translator: Américo Monteiro \n" - "Language-Team: Portuguese \n" - "Language: pt\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"X-Generator: Lokalize 1.0\n" -+"X-Generator: Lokalize 1.4\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - - #: src/actions/bootentry.cpp:35 -@@ -46,7 +46,7 @@ msgstr "Extras" - - #: src/actions/extras.cpp:193 - msgid "File not found: %0" --msgstr "" -+msgstr "Ficheiro não encontrado: %0" - - #: src/actions/extras.cpp:257 - msgid "Empty" -@@ -85,7 +85,7 @@ msgstr "Adicionar ou Remover Comandos" - #: src/actions/extras.cpp:455 - #, fuzzy - msgid "Help" --msgstr "&Ajuda" -+msgstr "Ajuda" - - #: src/actions/lock.cpp:249 - msgid "Lock Screen" -@@ -109,7 +109,7 @@ msgstr "" - - #: src/bookmarks.cpp:87 - msgid "&Bookmarks" --msgstr "" -+msgstr "&Favoritos" - - #: src/bookmarks.cpp:214 - msgid "Add Bookmark" -@@ -129,15 +129,15 @@ msgstr "" - - #: src/bookmarks.cpp:286 - msgid "Add: %0" --msgstr "" -+msgstr "Adicionar: %0" - - #: src/bookmarks.cpp:291 - msgid "Remove: %0" --msgstr "" -+msgstr "Remover: %0" - - #: src/kshutdown.cpp:141 - msgid "Disabled by Administrator" --msgstr "" -+msgstr "Desactivado pelo Administrador" - - #: src/kshutdown.cpp:170 - msgid "Are you sure?" -@@ -162,7 +162,7 @@ msgstr "" - #: src/kshutdown.cpp:543 - #, fuzzy - msgid "selected time: %0" --msgstr "Tempo inválido: %0" -+msgstr "tempo seleccionado: %0" - - #: src/kshutdown.cpp:554 src/kshutdown.cpp:631 - msgid "Invalid date/time" -@@ -174,7 +174,7 @@ msgstr "Em Data/Hora" - - #: src/kshutdown.cpp:620 - msgid "Enter date and time" --msgstr "" -+msgstr "Inserir data e hora" - - #: src/kshutdown.cpp:651 src/mainwindow.cpp:865 - msgid "No Delay" -@@ -186,7 +186,7 @@ msgstr "Tempo A Partir de Agora (HH:MM)" - - #: src/kshutdown.cpp:689 - msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" --msgstr "" -+msgstr "Inserir atraso em formato \"HH:MM\" (Hora:Minuto)" - - #: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 - msgid "Hibernate Computer" -@@ -204,7 +204,7 @@ msgstr "" - - #: src/kshutdown.cpp:942 - msgid "Sleep" --msgstr "" -+msgstr "Adormecer" - - #: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 - msgid "Suspend Computer" -@@ -217,11 +217,11 @@ msgstr "Incapaz de suspender o computado - #: src/kshutdown.cpp:953 - #, fuzzy - msgid "Enter in a low-power state mode." --msgstr "Entrar num estado de pouca energia." -+msgstr "Entrar num estado de baixa energia." - - #: src/kshutdown.cpp:1504 - msgid "Log Off" --msgstr "" -+msgstr "Log Off" - - #: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 - msgid "Logout" -@@ -235,15 +235,15 @@ msgstr "Desligar o Computador" - #: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 - #, fuzzy - msgid "A graphical shutdown utility" --msgstr "Um utilitário avançado de encerramento" -+msgstr "Um utilitário de encerramento gráfico" - - #: src/main.cpp:225 src/main.cpp:240 - msgid "Maintainer" --msgstr "" -+msgstr "Responsável" - - #: src/main.cpp:226 src/main.cpp:241 - msgid "Thanks To All!" --msgstr "" -+msgstr "Obrigado a Todos!" - - #: src/main.cpp:231 src/progressbar.cpp:119 - msgid "KShutdown" -@@ -264,7 +264,7 @@ msgstr "" - - #: src/main.cpp:282 src/main.cpp:345 - msgid "Test Action (does nothing)" --msgstr "" -+msgstr "Testa Acção (não faz nada)" - - #: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 - msgid "" -@@ -272,6 +272,8 @@ msgid "" - "--logout --inactivity 90 - automatically logout after 90 minutes of user " - "inactivity" - msgstr "" -+"Detectar inactividade do utilizador. Exemplo --logout --inactivity 90 - " -+"termina sessão automaticamente após 90 minutos de inactividade do utilizador" - - #: src/main.cpp:296 - msgid "Show this help" -@@ -280,16 +282,16 @@ msgstr "" - #: src/main.cpp:297 src/main.cpp:362 - #, fuzzy - msgid "Cancel an active action" --msgstr "Seleccionar uma &acção" -+msgstr "Cancela uma acção activa" - - #: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 - #, fuzzy - msgid "Confirm command line action" --msgstr "Confirmar Acção" -+msgstr "Confirmar acção de linha de comandos" - - #: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 - msgid "Hide main window and system tray icon" --msgstr "" -+msgstr "Esconder a janela principal e o ícone da bandeja do sistema" - - #: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 - msgid "Do not show main window on startup" -@@ -332,14 +334,16 @@ msgid "" - "More Info...\n" - "http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" - msgstr "" -+"Mais informação...\n" -+"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" - - #: src/mainwindow.cpp:104 - msgid "Actions" --msgstr "" -+msgstr "Acções" - - #: src/mainwindow.cpp:133 - msgid "Miscellaneous" --msgstr "" -+msgstr "Vários" - - #: src/mainwindow.cpp:155 - msgid "Run in \"portable\" mode" -@@ -347,11 +351,11 @@ msgstr "" - - #: src/mainwindow.cpp:158 - msgid "Optional parameter" --msgstr "" -+msgstr "Parâmetro opcional" - - #: src/mainwindow.cpp:176 - msgid "Command Line Options" --msgstr "" -+msgstr "Opções de Linha de Comandos" - - #: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 - msgid "Invalid time: %0" -@@ -359,7 +363,7 @@ msgstr "Tempo inválido: %0" - - #: src/mainwindow.cpp:258 - msgid "Action: %0" --msgstr "" -+msgstr "Acção: %0" - - #: src/mainwindow.cpp:261 src/mainwindow.cpp:285 - msgid "Remaining time: %0" -@@ -394,7 +398,7 @@ msgstr "KShutdown" - - #: src/mainwindow.cpp:863 - msgid "A&ction" --msgstr "" -+msgstr "A&cção" - - #: src/mainwindow.cpp:889 - msgid "&Tools" -@@ -423,12 +427,12 @@ msgstr "Seleccionar uma &acção" - #: src/mainwindow.cpp:980 - #, fuzzy - msgid "Do not save session / Force shutdown" --msgstr "Não salvar a sessão" -+msgstr "Não salvar a sessão / Forçar o encerramento" - - #: src/mainwindow.cpp:985 - #, fuzzy - msgid "Se&lect a time/event" --msgstr "S&eleccionar uma hora" -+msgstr "Se&leccionar uma hora/evento" - - #: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 - #: src/progressbar.cpp:230 -@@ -471,24 +475,24 @@ msgstr "" - - #: src/password.cpp:45 - msgid "Enter New Password" --msgstr "" -+msgstr "Inserir Nova Palavra Passe" - - #: src/password.cpp:74 - msgid "Password:" --msgstr "" -+msgstr "Palavra Passe:" - - #: src/password.cpp:75 - msgid "Confirm Password:" --msgstr "" -+msgstr "Confirmar Palavra Passe:" - - #: src/password.cpp:117 - msgid "Enter password to perform action: %0" --msgstr "" -+msgstr "Inserir palavra passe para executar acção: %0" - - #: src/password.cpp:152 - #, fuzzy - msgid "Invalid password" --msgstr "Comando \"Extras\" inválido" -+msgstr "Palavra passe inválida" - - #: src/password.cpp:197 - #, c-format -@@ -497,15 +501,15 @@ msgstr "" - - #: src/password.cpp:202 - msgid "Confirmation password is different" --msgstr "" -+msgstr "A palavra passe de confirmação é diferente" - - #: src/password.cpp:242 - msgid "Enable Password Protection" --msgstr "" -+msgstr "Activar Protecção de Palavra Passe" - - #: src/password.cpp:258 - msgid "Password Protected Actions:" --msgstr "" -+msgstr "Acções Protegidas por Palavra Passe:" - - #: src/password.cpp:264 - msgid "Settings (recommended)" -@@ -513,7 +517,7 @@ msgstr "" - - #: src/password.cpp:281 - msgid "See Also: %0" --msgstr "" -+msgstr "Veja Também: %0" - - #: src/preferences.cpp:45 - msgid "General" -@@ -521,7 +525,7 @@ msgstr "Geral" - - #: src/preferences.cpp:46 - msgid "System Tray" --msgstr "" -+msgstr "Bandeja do Sistema" - - #: src/preferences.cpp:49 - msgid "Password" -@@ -545,15 +549,15 @@ msgstr "Definições Relacionadas com o - - #: src/preferences.cpp:174 - msgid "Enable System Tray Icon" --msgstr "" -+msgstr "Activar o Ícone da Bandeja do Sistema" - - #: src/preferences.cpp:182 - msgid "Quit instead of minimizing to System Tray Icon" --msgstr "" -+msgstr "Terminar em vez de minimizar para o ícone da Bandeja do Sistema" - - #: src/preferences.cpp:193 - msgid "Black and White System Tray Icon" --msgstr "" -+msgstr "Ícone da Bandeja do Sistema a Preto e Branco" - - #: src/progressbar.cpp:125 - msgid "Hide" -@@ -561,7 +565,7 @@ msgstr "Esconder" - - #: src/progressbar.cpp:126 - msgid "Set Color..." --msgstr "" -+msgstr "Definir Cor..." - - #: src/progressbar.cpp:131 - msgid "Position" -@@ -577,23 +581,23 @@ msgstr "Fundo" - - #: src/progressbar.cpp:141 - msgid "Size" --msgstr "" -+msgstr "Tamanho" - - #: src/progressbar.cpp:147 - msgid "Small" --msgstr "" -+msgstr "Pequeno" - - #: src/progressbar.cpp:150 - msgid "Normal" --msgstr "" -+msgstr "Normal" - - #: src/progressbar.cpp:153 - msgid "Medium" --msgstr "" -+msgstr "Médio" - - #: src/progressbar.cpp:156 - msgid "Large" --msgstr "" -+msgstr "Grande" - - #: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 - msgid "Error" -@@ -602,7 +606,7 @@ msgstr "Erro" - #: src/pureqt.h:98 src/pureqt.h:134 - #, fuzzy - msgid "Information" --msgstr "Confirmar Acção" -+msgstr "Informação" - - #: src/stats.cpp:33 - msgid "Please Wait..." -@@ -610,22 +614,26 @@ msgstr "" - - #: src/triggers/idlemonitor.cpp:47 - msgid "On User Inactivity (HH:MM)" --msgstr "" -+msgstr "Em Inactividade do Utilizador (HH:MM)" - - #: src/triggers/idlemonitor.cpp:78 - msgid "" - "Use this trigger to detect user inactivity\n" - "(example: no mouse clicks)." - msgstr "" -+"Usar este 'gatilho' para detectar inactividade do utilizador (exemplo: " -+"nenhuns cliques do rato)." - - #: src/triggers/idlemonitor.cpp:87 - #, fuzzy - msgid "Unknown" --msgstr "Erro desconhecido" -+msgstr "Desconhecido" - - #: src/triggers/idlemonitor.cpp:132 - msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" - msgstr "" -+"Insira o máximo de inactividade do utilizador no formato (HH:MM) " -+"(Horas:Minutos)" - - #: src/triggers/processmonitor.cpp:106 - msgid "When selected application exit" diff -Nru kshutdown-4.0/debian/patches/series kshutdown-4.2/debian/patches/series --- kshutdown-4.0/debian/patches/series 2016-09-01 18:54:00.000000000 +0000 +++ kshutdown-4.2/debian/patches/series 2018-01-13 12:32:07.000000000 +0000 @@ -1 +1 @@ -portuguese-translations-4.0.patch +# You must remove unused comment lines for the released package. diff -Nru kshutdown-4.0/debian/README.Debian kshutdown-4.2/debian/README.Debian --- kshutdown-4.0/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 +++ kshutdown-4.2/debian/README.Debian 2018-01-13 12:32:07.000000000 +0000 @@ -0,0 +1,8 @@ +kshutdown for Debian + +Please edit this to provide information specific to +this kshutdown Debian package. + + (Automatically generated by debmake Version 4.2.9) + + -- Eike Wed, 24 Jan 2018 19:00:54 +0100 diff -Nru kshutdown-4.0/debian/rules kshutdown-4.2/debian/rules --- kshutdown-4.0/debian/rules 2016-09-01 18:54:00.000000000 +0000 +++ kshutdown-4.2/debian/rules 2018-01-13 12:32:07.000000000 +0000 @@ -1,16 +1,13 @@ #!/usr/bin/make -f +# You must remove unused comment lines for the released package. +#export DH_VERBOSE = 1 +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk +%: + dh $@ -# In order to regenerate 'debian/control' : -# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean -# Then check manually if everything's ok - -DEB_INSTALL_MANPAGES_kshutdown := debian/kshutdown.1 - -binary-install/kshutdown:: - # Remove empty directories - find $(CURDIR)/debian/kshutdown -type d -empty -delete +override_dh_auto_configure: + dh_auto_configure -- \ + -DKS_KF5=true diff -Nru kshutdown-4.0/debian/watch kshutdown-4.2/debian/watch --- kshutdown-4.0/debian/watch 2016-09-01 18:54:00.000000000 +0000 +++ kshutdown-4.2/debian/watch 2018-01-13 12:32:07.000000000 +0000 @@ -1,4 +1,3 @@ -# Compulsory line, this is a version 3 file version=3 http://sf.net/kshutdown/kshutdown-source-(.\..).zip debian uupdate diff -Nru kshutdown-4.0/.kdev4/kshutdown.kdev4 kshutdown-4.2/.kdev4/kshutdown.kdev4 --- kshutdown-4.0/.kdev4/kshutdown.kdev4 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/.kdev4/kshutdown.kdev4 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -[Buildset] -BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x12\x00K\x00S\x00h\x00u\x00t\x00d\x00o\x00w\x00n) - -[CMake] -BuildDirs[$e]=$HOME/Documents/src/kshutdown/trunk/kshutdown2/build.tmp -CMakeDir=/usr/share/cmake-2.8/Modules -Current CMake Binary=file:///usr/bin/cmake -CurrentBuildDir=file:///home/kdt/Documents/src/kshutdown/trunk/kshutdown2/build.tmp -CurrentBuildType=Release -CurrentInstallDir=file:///usr -ProjectRootRelative=./ - -[Launch] -Launch Configurations=Launch Configuration 0 - -[Launch][Launch Configuration 0] -Configured Launch Modes=execute -Configured Launchers=nativeAppLauncher -Name=New Native Application Configuration -Type=Native Application - -[Launch][Launch Configuration 0][Data] -Arguments= -Debugger Shell= -Dependencies=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x00) -Dependency Action=Build -Display Demangle Names=true -Display Static Members=false -EnvironmentGroup=default -Executable=file:///home/kdt/ks/build.tmp/src/kshutdown -GDB Path= -Remote GDB Config Script= -Remote GDB Run Script= -Remote GDB Shell Script= -Try Setting Breakpoints On Loading Libraries=true -Working Directory= -isExecutable=true - -[MakeBuilder] -Install As Root=true -Number Of Jobs=1 -Su Command=1 - -[Project] -VersionControlSupport=kdevsubversion diff -Nru kshutdown-4.0/kshutdown.kdev4 kshutdown-4.2/kshutdown.kdev4 --- kshutdown-4.0/kshutdown.kdev4 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/kshutdown.kdev4 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -[Project] -Manager=KDevCMakeManager -Name=KShutdown diff -Nru kshutdown-4.0/kshutdown.nsh kshutdown-4.2/kshutdown.nsh --- kshutdown-4.0/kshutdown.nsh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/kshutdown.nsh 2017-10-16 13:21:59.000000000 +0000 @@ -1,3 +1,3 @@ # Generated by ./tools/make-version.sh, do not modify! -!define APP_FILE_VERSION "4.0" -!define APP_FULL_VERSION "4.0" +!define APP_FILE_VERSION "4.2" +!define APP_FULL_VERSION "4.2" diff -Nru kshutdown-4.0/kshutdown.nsi kshutdown-4.2/kshutdown.nsi --- kshutdown-4.0/kshutdown.nsi 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/kshutdown.nsi 2017-10-16 13:21:59.000000000 +0000 @@ -14,8 +14,9 @@ !define MUI_ABORTWARNING !define MUI_COMPONENTSPAGE_NODESC -!define MUI_LICENSEPAGE_TEXT_TOP "tl;dr http://tldrlegal.com/l/gpl2" -!insertmacro MUI_PAGE_LICENSE "LICENSE" +# GNU GPL is not an EULA +#!define MUI_LICENSEPAGE_TEXT_TOP "tl;dr http://tldrlegal.com/l/gpl2" +#!insertmacro MUI_PAGE_LICENSE "LICENSE" !insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY @@ -39,8 +40,8 @@ WriteRegDWORD HKLM "${APP_UNINSTALL_REG}" "NoRepair" 1 WriteRegStr HKLM "${APP_UNINSTALL_REG}" "Publisher" "Konrad Twardowski" WriteRegStr HKLM "${APP_UNINSTALL_REG}" "UninstallString" '"$INSTDIR\uninstall.exe"' - WriteRegStr HKLM "${APP_UNINSTALL_REG}" "URLInfoAbout" "http://kshutdown.sourceforge.net/" - WriteRegStr HKLM "${APP_UNINSTALL_REG}" "URLUpdateInfo" "http://kshutdown.sourceforge.net/download.html" + WriteRegStr HKLM "${APP_UNINSTALL_REG}" "URLInfoAbout" "https://kshutdown.sourceforge.io/" + WriteRegStr HKLM "${APP_UNINSTALL_REG}" "URLUpdateInfo" "https://kshutdown.sourceforge.io/download.html" File src\images\kshutdown.ico File /oname=kshutdown.exe src\release\kshutdown-qt.exe @@ -48,8 +49,8 @@ File C:\mingw32\bin\libgcc_s_dw2-1.dll File C:\mingw32\bin\libstdc++-6.dll File C:\mingw32\bin\libwinpthread-1.dll - File C:\Qt\4.8.6\bin\QtCore4.dll - File C:\Qt\4.8.6\bin\QtGui4.dll + File C:\Qt\4.8.7\bin\QtCore4.dll + File C:\Qt\4.8.7\bin\QtGui4.dll SetShellVarContext all CreateShortCut "$SMPROGRAMS\KShutdown.lnk" "$INSTDIR\kshutdown.exe" "" "$INSTDIR\kshutdown.ico" diff -Nru kshutdown-4.0/po/ar.po kshutdown-4.2/po/ar.po --- kshutdown-4.0/po/ar.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/ar.po 2017-10-16 13:21:59.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kshutdown\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2007-07-07 17:44+0000\n" "Last-Translator: Youssef Chahibi \n" "Language-Team: \n" @@ -18,305 +18,302 @@ "X-Poedit-SourceCharset: utf-8\n" "X-Generator: KBabel 1.11.4\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "إعادة إقلاع الحاسوب" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "خطأ" + +#: src/actions/extras.cpp:83 #, fuzzy msgid "Invalid \"Extras\" command" msgstr "ادخل أمر" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "" -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 #, fuzzy msgid "Extras" msgstr "الإضافيات" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "اختر أمر..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 #, fuzzy msgid "Use context menu to add/edit/remove actions." msgstr "استخدم قائمة السياق لإضافة/تحرير/إزالة وصلات" -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 #, fuzzy msgid "Use Context Menu to create a new link to application (action)" msgstr "استخدم قائمة السياق لإنشاء وصلة جديدة للتطبيق" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "استخدم إنشئ مجلد|جديد... لإنشاء قائمة فرعية جديدة" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 #, fuzzy msgid "Use Properties to change icon, name, or command" msgstr "استخدم خصائص لتغيير أيقونة, اسم, أو تعليق" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 #, fuzzy msgid "Add or Remove Commands" msgstr "أضف/أزل وصلات" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 #, fuzzy msgid "Help" msgstr "&مساعدة" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "قفل الجلسة" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "اختبر" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 #, fuzzy msgid "Confirm Action" msgstr "تاكيد" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "إزل وصلة" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 #, fuzzy msgid "Disabled by Administrator" msgstr "معطل بواسطة المدير." -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 #, fuzzy msgid "Action not available: %0" msgstr "الإجراء فشل! (%1)" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 #, fuzzy msgid "Unknown error" msgstr "مجهول" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 #, fuzzy msgid "not recommended" msgstr "نفّذ أمر" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 #, fuzzy msgid "selected time: %0" msgstr "الوقت المختار." -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 #, fuzzy msgid "Invalid date/time" msgstr "التاريخ/الوقت المختار: %1" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "عند الوقت/التاريخ" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 #, fuzzy msgid "Enter date and time" msgstr "ادخل التاريخ والوقت." -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "بدون تأخير" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "الوقت من الآن (HH:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 #, fuzzy msgid "Hibernate Computer" msgstr "إعادة إقلاع الحاسوب" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 #, fuzzy msgid "Cannot hibernate computer" msgstr "إعادة إقلاع الحاسوب" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 #, fuzzy msgid "Suspend Computer" msgstr "إغلاق الحاسوب" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 #, fuzzy msgid "Cannot suspend computer" msgstr "إغلاق الحاسوب" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "" -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "تسجيل خروج" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "إغلاق الحاسوب" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 #, fuzzy msgid "KShutdown" msgstr "KShutDown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "اقفل الشاشة" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " "inactivity" msgstr "" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "إلغي الإجراء النشط" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "تأكيد إجراء خط الأمر" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 #, fuzzy msgid "Do not show main window on startup" msgstr "لا تظهر النافذة عند بدء التشغيل" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -326,162 +323,162 @@ msgstr "" "الوقت; أمثلة: 01:30 - الوقت الفاصل (HH:MM); 10 - عدد الدقائق للانتظار من الآن" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "إجراءات" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 #, fuzzy msgid "Other Options:" msgstr "خيارات" -#: src/main.cpp:378 +#: src/main.cpp:381 #, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "إجراءات" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 #, fuzzy msgid "Command Line Options" msgstr "الأمر قبل الإجراء" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 #, fuzzy msgid "Invalid time: %0" msgstr "وقت غير صالح: %1" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 #, fuzzy msgid "Action: %0" msgstr "إجراء" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 #, fuzzy msgid "Remaining time: %0" msgstr "الوقت المتبقي." -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 #, fuzzy msgid "Cancel" msgstr "إ&لغي" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 #, fuzzy msgid "KShutdown has been minimized" msgstr "KShutDown تم تصغيره" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "KShutDown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 #, fuzzy msgid "A&ction" msgstr "إجراء" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "إحصائيات" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&مساعدة" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "اختر الإجراء لكي ينجز" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 #, fuzzy msgid "Se&lect a time/event" msgstr "ا&ختر وقت" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "شريط العملية" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 #, fuzzy msgid "Cancel: %0" msgstr "إ&لغي" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "تاكيد" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 #, fuzzy msgid "" "Are you sure you want to enable this option?\n" @@ -491,71 +488,71 @@ "هل تريد حقا إنهاء باستعمال KILL البرنامج
%1?

شتضيع بذلك كل " "البيانات غير المحفوظة!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "" -#: src/password.cpp:152 +#: src/password.cpp:151 #, fuzzy msgid "Invalid password" msgstr "ادخل أمر" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "" -#: src/password.cpp:264 +#: src/password.cpp:263 #, fuzzy msgid "Settings (recommended)" msgstr "نفّذ أمر" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "عام" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 #, fuzzy msgid "System Tray" msgstr "أظهر أيقونة صينية النظام" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "" @@ -563,122 +560,119 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "تعيينات كيدي المرتبطة..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 #, fuzzy msgid "Enable System Tray Icon" msgstr "أظهر أيقونة صينية النظام" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 #, fuzzy msgid "Black and White System Tray Icon" msgstr "أظهر أيقونة صينية النظام" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "خطأ" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 #, fuzzy msgid "Information" msgstr "معلومات أكثر" -#: src/stats.cpp:33 +#: src/stats.cpp:31 #, fuzzy msgid "Please Wait..." msgstr "من فضلك انتظر..." -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 #, fuzzy msgid "Unknown" msgstr "مجهول" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "عند خروج التطبيق المختار" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "قائمة العمليات قيد التشغيل" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "إنعاش" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 #, fuzzy msgid "Waiting for \"%0\"" msgstr "انتظار لـ \"%1\"" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#, fuzzy -#~ msgid "Error: %0" -#~ msgstr "خطأ" - #~ msgid "" #~ "Could not logout properly.\n" #~ "The session manager cannot be contacted." @@ -938,6 +932,9 @@ #~ msgid "After Login" #~ msgstr "بعد الدخول" +#~ msgid "Lock screen" +#~ msgstr "اقفل الشاشة" + #~ msgid "Before Logout" #~ msgstr "قبل الخروج" diff -Nru kshutdown-4.0/po/bg.po kshutdown-4.2/po/bg.po --- kshutdown-4.0/po/bg.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/bg.po 2017-10-16 13:21:59.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kshutdown\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2007-05-05 11:15+0000\n" "Last-Translator: Zlatko Popov \n" "Language-Team: Bulgarian \n" @@ -16,308 +16,305 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Рестартиране на компютъра" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Грешка" + +#: src/actions/extras.cpp:83 #, fuzzy msgid "Invalid \"Extras\" command" msgstr "Въведете команда." -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "" -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 #, fuzzy msgid "Extras" msgstr "Други" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Избор на команда..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 #, fuzzy msgid "Use context menu to add/edit/remove actions." msgstr "" "Използване на контекстното меню за добавяне/редактиране/премахване на връзки." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 #, fuzzy msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Използвайте контекстното меню за създаване на нова връзка към програма" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "" "Използвайте Създаване на нова|директория... за създаване на подменю" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 #, fuzzy msgid "Use Properties to change icon, name, or command" msgstr "Използвайте Настройки за смяна на иконата, името или коментара" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 #, fuzzy msgid "Add or Remove Commands" msgstr "Добавяне/Премахване на връзки" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 #, fuzzy msgid "Help" msgstr "&Помощ" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Заключване на екрана" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "Проба" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 #, fuzzy msgid "Confirm Action" msgstr "Потвърждение" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Премахване на връзка" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 #, fuzzy msgid "Disabled by Administrator" msgstr "Изключено от администратора." -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 #, fuzzy msgid "Action not available: %0" msgstr "Действието беше неуспешно! (%1)" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 #, fuzzy msgid "Unknown error" msgstr "Неизвестно" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 #, fuzzy msgid "not recommended" msgstr "Изпълнение на команда" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 #, fuzzy msgid "selected time: %0" msgstr "Изберете време." -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 #, fuzzy msgid "Invalid date/time" msgstr "Избрана дата/време: %1" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "На дата/време" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 #, fuzzy msgid "Enter date and time" msgstr "Въведете дата." -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Без забавяне" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Време от сега (ЧЧ:ММ)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 #, fuzzy msgid "Hibernate Computer" msgstr "Рестартиране на компютъра" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 #, fuzzy msgid "Cannot hibernate computer" msgstr "Рестартиране на компютъра" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 #, fuzzy msgid "Suspend Computer" msgstr "Изключване на компютъра" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 #, fuzzy msgid "Cannot suspend computer" msgstr "Изключване на компютъра" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "" -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Изход" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Изключване на компютъра" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 #, fuzzy msgid "KShutdown" msgstr "KShutDown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Заключване на екрана" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " "inactivity" msgstr "" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Отмяна на действие" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Потвърждение на действие" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 #, fuzzy msgid "Do not show main window on startup" msgstr "Без показване на прозореца при стартиране" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -328,162 +325,162 @@ "Време; Например: 01:30 - абсолютно време (ЧЧ:ММ); 10 - минути за изчакване " "от сега" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Действия" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 #, fuzzy msgid "Other Options:" msgstr "Опции" -#: src/main.cpp:378 +#: src/main.cpp:381 #, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Действия" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 #, fuzzy msgid "Command Line Options" msgstr "Команда преди действие" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 #, fuzzy msgid "Invalid time: %0" msgstr "Невалидно време: %1" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 #, fuzzy msgid "Action: %0" msgstr "Действие" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 #, fuzzy msgid "Remaining time: %0" msgstr "Оставащо време." -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 #, fuzzy msgid "Cancel" msgstr "&Отмяна" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 #, fuzzy msgid "KShutdown has been minimized" msgstr "KShutDown е минимизирана" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "KShutDown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 #, fuzzy msgid "A&ction" msgstr "Действие" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "Статистика" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Помощ" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "Избор на действие за изпълнение" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 #, fuzzy msgid "Se&lect a time/event" msgstr "И&збор на време" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Лента за състоянието" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 #, fuzzy msgid "Cancel: %0" msgstr "&Отмяна" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Потвърждение" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 #, fuzzy msgid "" "Are you sure you want to enable this option?\n" @@ -493,71 +490,71 @@ "Сигурни ли сте, че искате да убиете
%1?

Незаписаните данни " "ще бъдат загубени!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "" -#: src/password.cpp:152 +#: src/password.cpp:151 #, fuzzy msgid "Invalid password" msgstr "Въведете команда." -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "" -#: src/password.cpp:264 +#: src/password.cpp:263 #, fuzzy msgid "Settings (recommended)" msgstr "Изпълнение на команда" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Основни" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 #, fuzzy msgid "System Tray" msgstr "Показване на икона в системния панел" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "" @@ -565,122 +562,119 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Други настройки на KDE..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 #, fuzzy msgid "Enable System Tray Icon" msgstr "Показване на икона в системния панел" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 #, fuzzy msgid "Black and White System Tray Icon" msgstr "Показване на икона в системния панел" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Грешка" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 #, fuzzy msgid "Information" msgstr "Повече информация" -#: src/stats.cpp:33 +#: src/stats.cpp:31 #, fuzzy msgid "Please Wait..." msgstr "Моля, изчакайте..." -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 #, fuzzy msgid "Unknown" msgstr "Неизвестно" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "При изход от програма" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Списък с активни процеси" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Презареждане" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 #, fuzzy msgid "Waiting for \"%0\"" msgstr "Изчакване за \"%1\"" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#, fuzzy -#~ msgid "Error: %0" -#~ msgstr "Грешка" - #~ msgid "" #~ "Could not logout properly.\n" #~ "The session manager cannot be contacted." @@ -941,6 +935,9 @@ #~ msgid "After Login" #~ msgstr "След влизане" +#~ msgid "Lock screen" +#~ msgstr "Заключване на екрана" + #~ msgid "Before Logout" #~ msgstr "Преди изход" diff -Nru kshutdown-4.0/po/cs.po kshutdown-4.2/po/cs.po --- kshutdown-4.0/po/cs.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/cs.po 2017-10-16 13:21:59.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: cs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2016-05-01 13:01+0200\n" "Last-Translator: Pavel Fric \n" "Language-Team: Czech \n" @@ -22,182 +22,183 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "Výchozí systém" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Restartovat počítač" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Chyba" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Neplatný příkaz \"Další\"" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Nelze provést příkaz \"Další\"" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "Vyberte, prosím, příkaz Další
z nabídky výše." -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Další" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "Soubor nenalezen: %0" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "Prázdný" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Vybrat příkaz..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Použijte související nabídku pro přidání/úpravu/odstranění odkazů." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Použijte související nabídku k vytvoření nového odkazu na program" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "Použijte Vytvořit nový|Složka... k vytvoření nové podnabídky" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Použijte Vlastnosti pro změnu ikony, názvu nebo příkazu" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "Neukazovat tuto zprávu znovu" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "Přidat nebo odstranit příkazy" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "Nápověda" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Uzamknout obrazovku" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "Ukázat zprávu (žádné vypnutí)" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "Test" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "Zadejte zprávu" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "Text:" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "&Záložky" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "Přidat záložku" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "Přidat" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Potvrdit činnost" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "Název:" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "Přidat: %0" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 msgid "Remove: %0" msgstr "Odstranit: %0" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "Zakázáno správcem" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Jste si jistý?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Činnost nedostupná: %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Nepodporovaná činnost: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Neznámá chyba" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "Nedoporučeno" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 msgid "selected time: %0" msgstr "Zvolený čas: %0" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "Neplatné datum/čas" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "Datum/Čas" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "Zadejte datum a čas" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Žádná prodleva" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Čas od teď (HH:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Zadat zpoždění ve formátu \"HH:MM\" (hodina:minuta)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Hibernovat počítač" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Počítač nelze hibernovat" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." @@ -205,69 +206,65 @@ "Uložit obsah RAM na disk,\n" "potom vypnout počítač." -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "Uspat" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Uspat počítač" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Počítač nelze uspat" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "Zahájit režim nízkého odběru energie." -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "Odhlásit se" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Odhlásit se" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Vypnout počítač" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "Program na vypínání" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "Správce" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "Díky všem!" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "KShutdown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "Konrad Twardowski" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Uzamknout obrazovku" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" "Spustit spustitelný soubor (příklad: zkratku pro plochu nebo shellový skript)" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "Vyzkoušet odkaz (nedělá nic)" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " @@ -277,35 +274,35 @@ "--logout --inactivity 90 - automaticky se odhlásit po 90 minutách " "uživatelovy nečinnosti" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "Ukázat tuto nápovědu" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Zrušit běžící činnost" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Potvrdit činnost příkazového řádku" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "Skrýt hlavní okno a ikonu v oznamovací oblasti panelu" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Nezobrazovat hlavní okno při spuštění" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "Seznam změn" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "Ukázat vlastní vyskakovací nabídku místo hlavního okna" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 msgid "" "Activate countdown. Examples:\n" "13:37 (HH:MM) or \"1:37 PM\" - absolute time\n" @@ -317,151 +314,151 @@ "10 - nebo 10m - počet minut od teď;\n" "2h - dvě hodiny" -#: src/main.cpp:319 +#: src/main.cpp:322 msgid "Actions:" msgstr "Činnosti:" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "Spouštěče:" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "Jiné volby:" -#: src/main.cpp:378 -#, c-format +#: src/main.cpp:381 +#, fuzzy, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" "Více informací...\n" "http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Činnosti" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "Různé" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "Spustit v \"přenositelném\" režimu" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "Volitelný parametr" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "Volby pro příkazový řádek" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "Neplatný čas: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "Činnost: %0\n" "Language-Team: Danish \n" @@ -17,252 +17,249 @@ "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Genstart computeren" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Fejl" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Ugyldig \"Ekstra\"-kommando" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Kan ikke køre \"Ekstra\"-kommando" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "Vælg en Ekstra-kommando
fra menuen overfor." -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Ekstra" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "Fil ikke fundet: %0" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Vælg en kommando..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Brug kontekstmenuen til at tilføje/fjerne/redigere handlinger." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Brug kontekstmenuen til at oprette et nyt link til program (handling)" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "Brug Opret ny|Mappe... til at oprette en ny undermenu" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Brug Egenskaber til at skifte ikon, navn eller kommando" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 #, fuzzy msgid "Do not show this message again" msgstr "Gem ikke sessionen" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "Tilføj eller fjern kommandoer" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 #, fuzzy msgid "Help" msgstr "&Hjælp" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Lås skærmen" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Bekræft handling" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 msgid "Remove: %0" msgstr "" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "Deaktiveret af administrator" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Er du sikker?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Handling ikke tilgængelig: %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Ikke understøttet handling: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Ukendt fejl" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 msgid "selected time: %0" msgstr "valgt tid: %0" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "Ugyldig dato/tid" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "På dato/tidspunkt" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "Angiv dato og tidspunkt" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Ingen forsinkelse" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Tid fra nu (TT:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Angiv forsinkelse i \"TT:MM\"-format (time:minut)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Sæt computeren i dvale" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Kan ikke sætte computeren i dvale" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "Slumre" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Suspendér computeren" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Kan ikke suspendere computeren" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "Gå til en tilstand med lavt strømforbrug." -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "Log af" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Log ud" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Sluk computeren" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 #, fuzzy msgid "A graphical shutdown utility" msgstr "Et avanceret nedlukningsværktøj" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "KShutdown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Lås skærmen" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "Kør kørbar fil (eksempel: Desktop-genvej eller skal-script)" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "Testhandling (gør intet)" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 #, fuzzy msgid "" "Detect user inactivity. Example:\n" @@ -272,35 +269,35 @@ "Detektér inaktiv bruger. Eksempel: --logout --inactivity 90 - log " "automatisk ud efter 90 minutter med inaktiv bruger" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Annullér en aktiv handling" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Bekræft kommandolinje-handling" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "Skjul hovedvinduet og statusikonet" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Vis ikke hovedvinduet ved opstart" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -311,154 +308,154 @@ "Aktivér nedtælling. Eksempler: 13:37 - absolut tid (TT:MM), 10 - antal " "minutter fra nu" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Handlinger" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "" -#: src/main.cpp:378 +#: src/main.cpp:381 #, fuzzy, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" "Mere info...\n" "http://sourceforge.net/apps/mediawiki/kshutdown/index.php?title=Command_Line" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Handlinger" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "Diverse" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "Valgfrit parameter" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "Kommandolinje-tilvalg" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "Ugyldig tid: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "Handling: %0" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Tilbageværende tid: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "O.k." -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "Annullér" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "KShutdown er stadig aktiv!" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "KShutdown er blevet minimeret" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "KShutdown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" msgstr "Ha&ndling" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Indstillinger" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Hjælp" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "Om" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 msgid "Select an &action" msgstr "Vælg en h&andling" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 #, fuzzy msgid "Do not save session / Force shutdown" msgstr "Gem ikke sessionen" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 msgid "Se&lect a time/event" msgstr "&Vælg tid/hændelse" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Fremgangslinje" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "Klik for at aktivere/annullere den valgte handling" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "Annullér: %0" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "Om Qt" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Bekræft" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -468,69 +465,69 @@ "\n" "Data i alle ikke-gemte dokumenter vil gå tabt!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "Angiv ny adgangskode" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "Adgangskode:" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "Bekræft adgangskode:" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "Angiv adgangskode for at udføre handling: %0" -#: src/password.cpp:152 +#: src/password.cpp:151 msgid "Invalid password" msgstr "Ugyldig adgangskode" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "Bekræftelsesadgangskoden er en anden" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "Aktivér adgangskodebeskyttelse" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "Adgangskodebeskyttede handlinger:" -#: src/password.cpp:264 +#: src/password.cpp:263 msgid "Settings (recommended)" msgstr "" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "Se også: %0" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Generelt" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 #, fuzzy msgid "Password" msgstr "Adgangskode:" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Lås skærmen før dvale" @@ -538,80 +535,81 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Relaterede KDE-indstillinger..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 #, fuzzy msgid "Enable System Tray Icon" msgstr "Sort-hvid statusområdeikon" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "Sort-hvid statusområdeikon" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Skjul" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Position" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Øverst" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Nederst" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Fejl" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 msgid "Information" msgstr "Information" -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "" -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "Ved brugeraktivitet (TT:MM)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 #, fuzzy msgid "" "Use this trigger to detect user inactivity\n" @@ -620,47 +618,38 @@ "Brug denne udløser til at detektere brugeraktivitet (eksempel: ingen " "museklik)." -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 msgid "Unknown" msgstr "Ukendt" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" "Angiv en maksimal brugerinaktivitet i \"TT:MM\"-format (Timer:Minutter)" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Når valgt program afslutter" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Liste over den kørende proces" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Genopfrisk" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Venter på \"%0\"" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#~ msgid "The password will be saved as SHA-1 hash." -#~ msgstr "Adgangskoden vil blive gemt som en SHA-1-hash." - -#~ msgid "Short password can be easily cracked." -#~ msgstr "En kort adgangskode kan nemt brydes." - #~ msgid "Error: %0" #~ msgstr "Fejl: %0" -#~ msgid "Error, exit code: %0" -#~ msgstr "Fejl, afslutningskode: %0" - #~ msgid "Action: %0" #~ msgstr "Handling: %0" @@ -684,6 +673,9 @@ #~ "lukke ned, og senere starte op og starte alle de programmer der kørte.

Kilde: http://en.wikipedia.org/wiki/Hibernate_(OS_feature)

" +#~ msgid "Lock screen" +#~ msgstr "Lås skærmen" + #~ msgid "Select Action (no delay)" #~ msgstr "Vælg handling (ingen forsinkelse)" @@ -696,6 +688,15 @@ #~ msgid "&Settings" #~ msgstr "&Indstillinger" +#~ msgid "The password will be saved as SHA-1 hash." +#~ msgstr "Adgangskoden vil blive gemt som en SHA-1-hash." + +#~ msgid "Short password can be easily cracked." +#~ msgstr "En kort adgangskode kan nemt brydes." + +#~ msgid "Error, exit code: %0" +#~ msgstr "Fejl, afslutningskode: %0" + #~ msgid "" #~ "Could not logout properly.\n" #~ "The KDE Session Manager cannot be contacted." diff -Nru kshutdown-4.0/po/de.po kshutdown-4.2/po/de.po --- kshutdown-4.0/po/de.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/de.po 2017-10-16 13:21:59.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2016-08-08 19:44+0100\n" "Last-Translator: Vinzenz Vietzke \n" "Language-Team: German \n" @@ -19,297 +19,294 @@ "X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Rechner neustarten" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Fehler" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Ungültiger „Extras“-Befehl" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Kann \"Extras\"-Befehl nicht ausführen" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "" -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Extras" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Befehl auswählen..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Benutze das Kontextmenü um Verweise hinzuzufügen/editieren/entfernen" -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Benutze das Kontextmenü um einen neuen Verweis zu einem Programm " "anzulegen" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "Benutze Neu | Verzeichnis... um ein Untermenü zu erstellen" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "" "Benutze Eigenschaften um das Symbol, den Namen oder Kommentar zu " "ändern" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 #, fuzzy msgid "Do not show this message again" msgstr "Sitzung nicht sichern" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 #, fuzzy msgid "Add or Remove Commands" msgstr "Befehle hinzufügen/entfernen" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 #, fuzzy msgid "Help" msgstr "&Hilfe" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Bildschirm sperren" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "Test" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Aktion Bestätigen" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Verknüpfung entfernen" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 #, fuzzy msgid "Disabled by Administrator" msgstr "Diese Seite wurde vom Administrator gesperrt." -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Aktion nicht verfügbar: %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Nicht unterstützte Aktion: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Unbekannter Fehler" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 #, fuzzy msgid "not recommended" msgstr "Befehl ausführen" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 #, fuzzy msgid "selected time: %0" msgstr "Ausgewählte Zeit:" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 #, fuzzy msgid "Invalid date/time" msgstr "Ausgewählte(s) Datum/Zeit: %1" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "Datum/Zeit" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 #, fuzzy msgid "Enter date and time" msgstr "Datum und Zeit eingeben:" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Keine Verzögerung" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Zeit ab jetzt (SS:MM):" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Rechner in Tiefschlaf versetzen" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Kann Rechner nicht in den Ruhezustand versetzen" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Rechner in Ruhezustand versetzen" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Kann Rechner nicht in den Ruhezustand versetzen" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "" -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Abmelden" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Rechner ausschalten" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 #, fuzzy msgid "A graphical shutdown utility" msgstr "Ein fortgeschrittenes Herunterfahr-Programm" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "KShutdown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Bildschirm sperren" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " "inactivity" msgstr "" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Eine laufende Aktion stoppen" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Befehlszeilenaktion bestätigen" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Fenster beim Start nicht anzeigen" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -320,160 +317,160 @@ "Zeit; Beispiele: 01:30 absolute Zeit im Format (SS:MM); 10 - Anzahl der " "Minuten die ab jetzt vergehen sollen bis eine Aktion ausgeführt wird" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Aktionen" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 #, fuzzy msgid "Other Options:" msgstr "Optionen" -#: src/main.cpp:378 +#: src/main.cpp:381 #, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Aktionen" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 #, fuzzy msgid "Command Line Options" msgstr "Befehl vor Aktion" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 #, fuzzy msgid "Invalid time: %0" msgstr "Ungültige Zeitangabe: %1" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 #, fuzzy msgid "Action: %0" msgstr "Aktion" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Verbleibende Zeit: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "OK" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "&Abbrechen" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "KShutdown ist noch immer aktiv" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "KShutdown wurde minimiert" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "KShutdown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 #, fuzzy msgid "A&ction" msgstr "Aktion" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "Statistiken" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Einstellungen" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Hilfe" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "Über" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 msgid "Select an &action" msgstr "Wählen Sie eine &Aktion" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 #, fuzzy msgid "Do not save session / Force shutdown" msgstr "Sitzung nicht sichern" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 #, fuzzy msgid "Se&lect a time/event" msgstr "Zeit auswähl&en" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Fortschrittsbalken" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 #, fuzzy msgid "Click to activate/cancel the selected action" msgstr "Klicke um die gewählte Aktion zu aktivieren/abzubrechen" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 #, fuzzy msgid "Cancel: %0" msgstr "&Abbrechen" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "Über Qt" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Bestätigen" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -482,71 +479,71 @@ "Sind Sie sicher, dass Sie diese Option aktivieren wollen? Alle " "ungespeicherten Daten würden verloren gehen!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "" -#: src/password.cpp:152 +#: src/password.cpp:151 #, fuzzy msgid "Invalid password" msgstr "Ungültiger „Extras“-Befehl" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "" -#: src/password.cpp:264 +#: src/password.cpp:263 #, fuzzy msgid "Settings (recommended)" msgstr "Befehl ausführen" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Allgemein" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 #, fuzzy msgid "System Tray" msgstr "Symbol in Systembereich anzeigen" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Bildschirm vor Ruhezustand sperren" @@ -554,114 +551,115 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "KDE-Einstellungen" -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 #, fuzzy msgid "Enable System Tray Icon" msgstr "Symbol in Systembereich anzeigen" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 #, fuzzy msgid "Black and White System Tray Icon" msgstr "Symbol in Systembereich anzeigen" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Verstecken" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Position" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Oben" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Unten" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Fehler" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 #, fuzzy msgid "Information" msgstr "Mehr Informationen" -#: src/stats.cpp:33 +#: src/stats.cpp:31 #, fuzzy msgid "Please Wait..." msgstr "Bitte warten..." -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 #, fuzzy msgid "Unknown" msgstr "Unbekannter Fehler" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Wenn die ausgewählte Anwendung beendet ist" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Liste der laufenden Prozesse" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Aktualisieren" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Warte auf \"%0\"" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" @@ -675,6 +673,9 @@ #~ "Abmeldevorgang konnte nicht korrekt ausgeführt werden.\n" #~ "Es konnte keine Verbindung zur Sitzungsverwaltung hergestellt werden." +#~ msgid "Lock screen" +#~ msgstr "Bildschirm sperren" + #~ msgid "Theme" #~ msgstr "Thema" diff -Nru kshutdown-4.0/po/el.po kshutdown-4.2/po/el.po --- kshutdown-4.0/po/el.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/el.po 2017-10-16 13:21:59.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: el.new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2006-08-03 11:55+0300\n" "Last-Translator: Spiros Georgaras \n" "Language-Team: Greek \n" @@ -16,313 +16,310 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.2\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Επανεκκίνηση υπολογιστή" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Σφάλμα" + +#: src/actions/extras.cpp:83 #, fuzzy msgid "Invalid \"Extras\" command" msgstr "Δώστε μία εντολή." -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "" -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 #, fuzzy msgid "Extras" msgstr "Επιπρόσθετα" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Επιλογή εντολής..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 #, fuzzy msgid "Use context menu to add/edit/remove actions." msgstr "" "Χρησιμοποιήστε το σχετικό μενού για να προσθέσετε/επεξεργαστείτε/αφαιρέσετε " "δεσμούς." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 #, fuzzy msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Χρησιμοποιήστε το σχετικό μενού για να δημιουργήσετε ένα νέο δεσμό σε " "εφαρμογή" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "" "Χρησιμοποιήστε το Δημιουργία νέου/Φάκελος... για να δημιουργήσετε ένα " "νέο υπομενού" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 #, fuzzy msgid "Use Properties to change icon, name, or command" msgstr "" "Χρησιμοποιήστε τις Ιδιότητες για να αλλάξετε το εικονίδιο, το όνομα ή " "το σχόλιο" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 #, fuzzy msgid "Add or Remove Commands" msgstr "Προσθήκη/Αφαίρεση δεσμών" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 #, fuzzy msgid "Help" msgstr "&Βοήθεια" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Κλείδωμα οθόνης" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "Δοκιμή" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 #, fuzzy msgid "Confirm Action" msgstr "Επιβεβαίωση" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Αφαίρεση δεσμού" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 #, fuzzy msgid "Disabled by Administrator" msgstr "Απενεργοποιήθηκε από το Διαχειριστή." -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 #, fuzzy msgid "Action not available: %0" msgstr "Η ενέργεια απέτυχε! (%1)" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 #, fuzzy msgid "Unknown error" msgstr "Άγνωστο" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 #, fuzzy msgid "not recommended" msgstr "Εκτέλεση εντολής" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 #, fuzzy msgid "selected time: %0" msgstr "Επιλεγμένος χρόνος." -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 #, fuzzy msgid "Invalid date/time" msgstr "Επιλεγμένη ημερομηνία/ώρα: %1" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "Την ημερομηνία/ώρα" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 #, fuzzy msgid "Enter date and time" msgstr "Δώστε ημερομηνία και ώρα." -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Χωρίς καθυστέρηση" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Ώρα από τώρα (ΩΩ:ΛΛ)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 #, fuzzy msgid "Hibernate Computer" msgstr "Επανεκκίνηση υπολογιστή" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 #, fuzzy msgid "Cannot hibernate computer" msgstr "Επανεκκίνηση υπολογιστή" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 #, fuzzy msgid "Suspend Computer" msgstr "Κλείσιμο υπολογιστή" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 #, fuzzy msgid "Cannot suspend computer" msgstr "Κλείσιμο υπολογιστή" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "" -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Αποσύνδεση" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Κλείσιμο υπολογιστή" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 #, fuzzy msgid "KShutdown" msgstr "KShutDown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Κλείδωμα οθόνης" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " "inactivity" msgstr "" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Ακύρωση μίας ενεργής ενέργειας" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Επιβεβαίωση της ενέργειας" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 #, fuzzy msgid "Do not show main window on startup" msgstr "Να μην εμφανίζεται το παράθυρο στην εκκίνηση" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -333,162 +330,162 @@ "Ώρα. Παραδείγματα: 01:30 - απολυτή5η ώρα (ΩΩ:ΛΛ)· 10 - ο αριθμός των λεπτών " "καθυστέρησης από τώρα" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Ενέργειες" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 #, fuzzy msgid "Other Options:" msgstr "Επιλογές" -#: src/main.cpp:378 +#: src/main.cpp:381 #, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Ενέργειες" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 #, fuzzy msgid "Command Line Options" msgstr "Εντολή προ της ενέργειας" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 #, fuzzy msgid "Invalid time: %0" msgstr "Μη έγκυρος χρόνος: %1" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 #, fuzzy msgid "Action: %0" msgstr "Ενέργεια" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 #, fuzzy msgid "Remaining time: %0" msgstr "Υπολειπόμενος χρόνος" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 #, fuzzy msgid "Cancel" msgstr "&Ακύρωση" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 #, fuzzy msgid "KShutdown has been minimized" msgstr "Το KShutDown ελαχιστοποιήθηκε" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "KShutDown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 #, fuzzy msgid "A&ction" msgstr "Ενέργεια" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "Στατιστικά" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Βοήθεια" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "Επιλογή &ενέργειας για εκτέλεση" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 #, fuzzy msgid "Se&lect a time/event" msgstr "Επιλογή &χρόνου" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Γραμμή προόδου" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 #, fuzzy msgid "Cancel: %0" msgstr "&Ακύρωση" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Επιβεβαίωση" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 #, fuzzy msgid "" "Are you sure you want to enable this option?\n" @@ -498,71 +495,71 @@ "Είστε σίγουροι ότι θέλετε να ΣΚΟΤΩΣΕΤΕ το
%1;

Όλα τα μη " "αποθηκευμένα δεδομένα θα χαθούν!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "" -#: src/password.cpp:152 +#: src/password.cpp:151 #, fuzzy msgid "Invalid password" msgstr "Δώστε μία εντολή." -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "" -#: src/password.cpp:264 +#: src/password.cpp:263 #, fuzzy msgid "Settings (recommended)" msgstr "Εκτέλεση εντολής" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Γενικά" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 #, fuzzy msgid "System Tray" msgstr "Εμφάνιση του εικονιδίου πλαισίου συστήματος" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "" @@ -570,122 +567,119 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Σχετικές ρυθμίσεις του KDE..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 #, fuzzy msgid "Enable System Tray Icon" msgstr "Εμφάνιση του εικονιδίου πλαισίου συστήματος" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 #, fuzzy msgid "Black and White System Tray Icon" msgstr "Εμφάνιση του εικονιδίου πλαισίου συστήματος" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Σφάλμα" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 #, fuzzy msgid "Information" msgstr "Περισσότερες πληροφορίες" -#: src/stats.cpp:33 +#: src/stats.cpp:31 #, fuzzy msgid "Please Wait..." msgstr "Παρακαλώ περιμένετε..." -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 #, fuzzy msgid "Unknown" msgstr "Άγνωστο" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Όταν τερματίσει η επιλεγμένη εφαρμογή" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Λίστα εκτελούμενων διεργασιών" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Ανανέωση" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 #, fuzzy msgid "Waiting for \"%0\"" msgstr "Αναμονή για το \"%1\"" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#, fuzzy -#~ msgid "Error: %0" -#~ msgstr "Σφάλμα" - #~ msgid "" #~ "Could not logout properly.\n" #~ "The session manager cannot be contacted." @@ -950,6 +944,9 @@ #~ msgid "After Login" #~ msgstr "Μετά τη σύνδεση" +#~ msgid "Lock screen" +#~ msgstr "Κλείδωμα οθόνης" + #~ msgid "Before Logout" #~ msgstr "Πριν την αποσύνδεση" diff -Nru kshutdown-4.0/po/es.po kshutdown-4.2/po/es.po --- kshutdown-4.0/po/es.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/es.po 2017-10-16 13:21:59.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2013-09-28 02:22+0200\n" "Last-Translator: moray33\n" "Language-Team: Spanish \n" @@ -17,253 +17,250 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Reiniciar el equipo" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Error" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Orden «Extras» no válida" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "No se puede ejecutar la orden «Extras»" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "Por favor, seleccione un comando de Extras
del menú superior." -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Extras" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "Archivo no encontrado: %0" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Seleccione una orden..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Use el menú contextual para añadir/editar/eliminar acciones." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Use el menú contextual para crear un nuevo enlace a una aplicación " "(acción)" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "Use Crear nuevo|carpeta... para crear un nuevo submenú" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Use Propiedades para cambiar el icono, nombre, u orden" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "Añadir o Eliminar..." -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "Ayuda" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Bloquear la Pantalla" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "&Marcadores" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 #, fuzzy msgid "Add Bookmark" msgstr "&Marcadores" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 #, fuzzy msgid "Add" msgstr "Añadir: %0" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Confirmar la acción" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "Añadir: %0" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 msgid "Remove: %0" msgstr "Eliminar: %0" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "Desactivado por el Administrador" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "¿Está seguro?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Acción no disponible: %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Acción no admitida: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Error desconocido" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 msgid "selected time: %0" msgstr "hora seleccionada: %0" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "Fecha/hora inválida" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "En la fecha/hora" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "Introduzca fecha y hora" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Sin retardo" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Tiempo a partir de ahora (HH:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Introduzca retrado en formato \"HH:MM\" (Hora:Minuto)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Hibernar el equipo" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "No es posible hibernar el equipo" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "Dormir" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Suspender el equipo" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "No es posible suspender el equipo" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "Entrar en modo de estado de bajo consumo." -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "Cerrar sesión" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Cerrar la sesión" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Apagar el equipo" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "Una utilidad de apagado del sistema" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "Mantenedor" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "¡Gracias a Todos!" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "KShutdown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "Konrad Twardowski" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Bloquear pantalla" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" "Ejecutar archivo ejecutable (ejemplo: atajo de Escritorio o Script de shell)" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "Probar Acción (no hace nada)" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 #, fuzzy msgid "" "Detect user inactivity. Example:\n" @@ -273,35 +270,35 @@ "Detectar inactividad del usuario. Ejemplo: --cerrar sesión --inactividad 90 -" "automáticamente cerrar sesión tras 90 minutos de inactividad del usuario" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Cancelar una acción activa" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Confirmar acción de línea de comandos" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "Ocultar ventana principal e icono de bandeja del sistema" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "No mostrar ventana principal al inicio" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -312,154 +309,154 @@ "Activar cuenta atrás. Ejemplos: 13:37 - tiempo absoluto (HH:MM), 10 - número " "de minutos a partir de ahora" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Acciones" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "" -#: src/main.cpp:378 -#, c-format +#: src/main.cpp:381 +#, fuzzy, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" "Más Información...\n" "http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Acciones" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "Miscelánea" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "Parámetros opcionales" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "Opciones de Línea de Comandos" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "Hora inválida: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "Acción: %0" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Tiempo restante: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "Aceptar" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "Cancelar" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "¡KShutdown todavía está activo!" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "KShutdown ha sido minimizado" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "KShutdown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" msgstr "A&cción" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Preferencias" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "A&yuda" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "Acerca de" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "Selec&cionar una acción" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "No guardar sesión / Forzar apagado" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 msgid "Se&lect a time/event" msgstr "Se&leccionar una hora/evento" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Barra de progreso" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "Click para activar/cancelar la opción seleccionada" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "Cancelar: %0" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "Acerca de Qt" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Confirmar" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -469,69 +466,69 @@ "\n" "Se perderán los datos que haya en los documentos no guardados." -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "Introduzca Nueva Contraseña" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "Contraseña:" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "Confirmar Contraseña:" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "Introduzca contraseña para realizar la acción: %0" -#: src/password.cpp:152 +#: src/password.cpp:151 msgid "Invalid password" msgstr "Contraseña inválida" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "La confirmación de la contraseña es diferente" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "Habilitar Protección por Contraseña" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "Acciones Protegidas por Contraseña:" -#: src/password.cpp:264 +#: src/password.cpp:263 msgid "Settings (recommended)" msgstr "" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "Ver También: %0" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "General" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "Bandeja de Sistema" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 #, fuzzy msgid "Password" msgstr "Contraseña:" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Bloquear la pantalla antes de hibernar" @@ -539,79 +536,80 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Ajustes de KDE relacionados..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 msgid "Enable System Tray Icon" msgstr "Habilitar Icono en la Bandeja del Sistema" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "Salir en lugar de minimizar al Icono en la Bandeja del Sistema" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "Icono en la Bandeja del Sistema en Blanco y Negro" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Ocultar" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "Establecer Color..." -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Posición" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Arriba" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Abajo" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "Tamaño" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "Pequeño" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "Normal" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "Mediano" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "Grande" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Error" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 msgid "Information" msgstr "Información" -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "" -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "En Inactividad del Usuario (HH:MM)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 #, fuzzy msgid "" "Use this trigger to detect user inactivity\n" @@ -620,48 +618,36 @@ "Usar este disparador para detectar inactividad del usuario (ejemplo: no " "clicks del ratón)." -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 msgid "Unknown" msgstr "Desconocido" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" "Entroduzca un tiempo máximo de inactividad en formato \"HH:MM\" (Horas:" "Minutos)" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Cuando se salga de la aplicación seleccionada" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Lista de los procesos en ejecución" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Actualizar" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Esperando a «%0»" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#~ msgid "The password will be saved as SHA-1 hash." -#~ msgstr "La contraseña se guardará como SHA-1 hash." - -#~ msgid "Short password can be easily cracked." -#~ msgstr "Una contraseña corta puede ser fácilmente crackeada." - -#~ msgid "Error: %0" -#~ msgstr "Error: %0" - -#~ msgid "Error, exit code: %0" -#~ msgstr "Error, código de salida: %0" - #~ msgid "" #~ "

Hibernate (or Suspend-to-Disk) is a feature of many computer operating " #~ "systems where the contents of RAM are written to non-volatile storage " @@ -683,6 +669,9 @@ #~ "luego encender, e iniciar todos los programas que se estaban ejecutando.

Fuente: http://en.wikipedia.org/wiki/Hibernate_(OS_feature)

" +#~ msgid "Lock screen" +#~ msgstr "Bloquear pantalla" + #~ msgid "Quit" #~ msgstr "Salir" @@ -691,3 +680,15 @@ #~ msgid "&Settings" #~ msgstr "Ajuste&s" + +#~ msgid "The password will be saved as SHA-1 hash." +#~ msgstr "La contraseña se guardará como SHA-1 hash." + +#~ msgid "Short password can be easily cracked." +#~ msgstr "Una contraseña corta puede ser fácilmente crackeada." + +#~ msgid "Error: %0" +#~ msgstr "Error: %0" + +#~ msgid "Error, exit code: %0" +#~ msgstr "Error, código de salida: %0" diff -Nru kshutdown-4.0/po/fr.po kshutdown-4.2/po/fr.po --- kshutdown-4.0/po/fr.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/fr.po 2017-10-16 13:21:59.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: Kshutdown\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2008-12-08 22:31+0100\n" "Last-Translator: Guillaume Millet \n" "Language-Team: French <>\n" @@ -17,300 +17,297 @@ "X-Generator: Lokalize 0.2\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Redémarrer l'ordinateur" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Erreur" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Commande \"Extras\" invalide" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Impossible d'exécuter la commande \"Extras\"" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "" -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 #, fuzzy msgid "Extras" msgstr "Extras..." -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Sélectionner une commande..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Utiliser le menu contextuel pour ajouter/éditer/supprimer des actions." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Utiliser le Menu Contextuel pour créer un nouveau lien vers une " "application" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "" "Utiliser Créer un nouveau|Dossier... pour créer un nouveau sous-menu" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "" "Utiliser Propriétés pour changer l'icône, le nom, ou la commande" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 #, fuzzy msgid "Do not show this message again" msgstr "Ne pas enregistrer la session" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 #, fuzzy msgid "Add or Remove Commands" msgstr "Ajouter/Supprimer des commandes..." -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 #, fuzzy msgid "Help" msgstr "&Aide" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Verrouiller l'écran" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "Tester" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Confirmer l'action" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Supprimer un lien" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 #, fuzzy msgid "Disabled by Administrator" msgstr "Désactivé par l'administrateur." -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Êtes-vous sûr ?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Action indisponible : %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Action non supportée : %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Erreur Inconnue" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 #, fuzzy msgid "not recommended" msgstr "Exécuter la commande" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 #, fuzzy msgid "selected time: %0" msgstr "Heure sélectionnée" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 #, fuzzy msgid "Invalid date/time" msgstr "Date/heure sélectionnée: %1" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "À Date/Heure" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 #, fuzzy msgid "Enter date and time" msgstr "Entrer date et heure" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Sans delai" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Temps à partir de maintenant (HH:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Hiberner l'ordinateur" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Impossible d'hiberner l'ordinateur" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Mettre en veille l'ordinateur" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Impossible de mettre en veille l'ordinateur" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "" -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Déconnexion" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Éteindre l'ordinateur" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 #, fuzzy msgid "KShutdown" msgstr "KShutDown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Verrouiller l'écran" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " "inactivity" msgstr "" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Annuler une action active" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 #, fuzzy msgid "Confirm command line action" msgstr "Commande avant l'action" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 #, fuzzy msgid "Do not show main window on startup" msgstr "Ne pas afficher la fenêtre au démarrage" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 msgid "" "Activate countdown. Examples:\n" "13:37 (HH:MM) or \"1:37 PM\" - absolute time\n" @@ -318,161 +315,161 @@ "2h - two hours" msgstr "" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Actions" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 #, fuzzy msgid "Other Options:" msgstr "Options" -#: src/main.cpp:378 +#: src/main.cpp:381 #, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Actions" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 #, fuzzy msgid "Command Line Options" msgstr "Commande avant l'action" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 #, fuzzy msgid "Invalid time: %0" msgstr "Heure invalide: %1" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 #, fuzzy msgid "Action: %0" msgstr "Action" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Temps restant : %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 #, fuzzy msgid "Cancel" msgstr "Annuler" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "KShutdown est encore actif !" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "KShutdown a été minimisé" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "KShutDown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 #, fuzzy msgid "A&ction" msgstr "Action" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "Statistiques" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Préférences" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Aide" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "À propos de" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 msgid "Select an &action" msgstr "Sélectionner une &action" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 #, fuzzy msgid "Do not save session / Force shutdown" msgstr "Ne pas enregistrer la session" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 #, fuzzy msgid "Se&lect a time/event" msgstr "Sélectionner une &heure" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Barre de progression" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 #, fuzzy msgid "Click to activate/cancel the selected action" msgstr "Cliquer pour activer/annuler l'action sélectionné" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 #, fuzzy msgid "Cancel: %0" msgstr "Annuler" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "À propos de Qt" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Confirmer" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -481,71 +478,71 @@ "Êtes-vous certain de vouloir activer cette option ? Toutes les données non " "enregistrées seront perdues !" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "" -#: src/password.cpp:152 +#: src/password.cpp:151 #, fuzzy msgid "Invalid password" msgstr "Commande \"Extras\" invalide" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "" -#: src/password.cpp:264 +#: src/password.cpp:263 #, fuzzy msgid "Settings (recommended)" msgstr "Exécuter la commande" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Général" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 #, fuzzy msgid "System Tray" msgstr "Afficher l'icône de notification" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Vérouiller l'écran avant d'hiberner" @@ -553,123 +550,118 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." -msgstr "" +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." +msgstr "Paramètres" -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 #, fuzzy msgid "Enable System Tray Icon" msgstr "Afficher l'icône de notification" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 #, fuzzy msgid "Black and White System Tray Icon" msgstr "Afficher l'icône de notification" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Cacher" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Position" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Haut" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Bas" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Erreur" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 #, fuzzy msgid "Information" msgstr "Plus d'information" -#: src/stats.cpp:33 +#: src/stats.cpp:31 #, fuzzy msgid "Please Wait..." msgstr "Patientez..." -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 #, fuzzy msgid "Unknown" msgstr "Erreur Inconnue" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Lorsque l'application sélectionnée est fermée" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Liste des processus en cours d'exécution" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Actualiser" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Attente de \"%0\"" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#~ msgid "Error: %0" -#~ msgstr "Erreur : %0" - -#~ msgid "Error, exit code: %0" -#~ msgstr "Erreur, code de sortie : %0" - #~ msgid "" #~ "Could not logout properly.\n" #~ "The session manager cannot be contacted." @@ -692,6 +684,12 @@ #~ msgid "Refresh the list of processes" #~ msgstr "Actualiser la liste des processus" +#~ msgid "Error: %0" +#~ msgstr "Erreur : %0" + +#~ msgid "Error, exit code: %0" +#~ msgstr "Erreur, code de sortie : %0" + #~ msgid "Command: %1" #~ msgstr "Commande: %1" @@ -890,9 +888,6 @@ #~ msgid "Message" #~ msgstr "Message" -#~ msgid "Settings" -#~ msgstr "Paramètres" - #~ msgid "Edit..." #~ msgstr "Éditer..." @@ -908,6 +903,9 @@ #~ msgid "Advanced" #~ msgstr "Avancé" +#~ msgid "Lock screen" +#~ msgstr "Verrouiller l'écran" + #~ msgid "Before Logout" #~ msgstr "Avant la déconnexion" diff -Nru kshutdown-4.0/po/hu.po kshutdown-4.2/po/hu.po --- kshutdown-4.0/po/hu.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/hu.po 2017-10-16 13:21:59.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2004-10-25 16:23+0100\n" "Last-Translator: Kroly Barcza (VectoR) \n" "Language-Team: Hungarian \n" @@ -16,317 +16,313 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "A számítógép ú&jraindítása" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "" + +#: src/actions/extras.cpp:83 #, fuzzy msgid "Invalid \"Extras\" command" msgstr "Késleltetés megadása másodpercben" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "" -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Extrák" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 #, fuzzy msgid "Select a command..." msgstr "Késleltetés megadása másodpercben" -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 #, fuzzy msgid "Use context menu to add/edit/remove actions." msgstr "Kontext menü használta a linkek hozzáadás/szerkesztés/eltávolításához" -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 #, fuzzy msgid "Use Context Menu to create a new link to application (action)" msgstr "Alkalmazás link létrehozásához használjon Kontext Menüt" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "" "Új főmenü létrehozásához használjad az Új létrehozása|Könyvtár...-at" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 #, fuzzy msgid "Use Properties to change icon, name, or command" msgstr "" "Ikon, név vagy megjegyzés változtatásához használja a Beállításokat" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 #, fuzzy msgid "Add or Remove Commands" msgstr "Link e<ávolítása" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 #, fuzzy msgid "Lock Screen" msgstr "Képernyő&zár" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "Próba" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 #, fuzzy msgid "Enter a message" msgstr "Dátum megadása" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 #, fuzzy msgid "Text:" msgstr "Szövegszín:" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 #, fuzzy msgid "Confirm Action" msgstr "&megerősítés" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 #, fuzzy msgid "Name:" msgstr "Név" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Eltá&volítás" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 #, fuzzy msgid "Disabled by Administrator" msgstr "Kikapcsolva az adminisztrátor által." -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Biztosan ezt szeretnéd?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 #, fuzzy msgid "Action not available: %0" msgstr "Sikertelen Művelet! ( %1)" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 #, fuzzy msgid "Unsupported action: %0" msgstr "Érvénytelen művelet: %1" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 #, fuzzy msgid "Unknown error" msgstr "Ismeretlen" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 #, fuzzy msgid "not recommended" msgstr "Parancs f&uttatása:" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 #, fuzzy msgid "selected time: %0" msgstr "Kiválasztott Dátum/idő: %1" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 #, fuzzy msgid "Invalid date/time" msgstr "Dát&um/idő:" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "Dátum/idő" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 #, fuzzy msgid "Enter date and time" msgstr "Dátum és idő megadása:" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 #, fuzzy msgid "No Delay" msgstr "Nincs késleltetés" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 #, fuzzy msgid "Time From Now (HH:MM)" msgstr "Ettől az időponttól kezdve [ÓÓ:PP]" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 #, fuzzy msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Késleltetés megadása percekben." -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 #, fuzzy msgid "Hibernate Computer" msgstr "A számítógép ú&jraindítása" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 #, fuzzy msgid "Cannot hibernate computer" msgstr "A számítógép ú&jraindítása" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 #, fuzzy msgid "Suspend Computer" msgstr "A számítógép &kikapcsolása" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 #, fuzzy msgid "Cannot suspend computer" msgstr "A számítógép &kikapcsolása" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "" -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Kijelentkezés" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "A számítógép &kikapcsolása" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "Karbantartó" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 #, fuzzy msgid "KShutdown" msgstr "KShutDown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -#, fuzzy -msgid "Lock screen" -msgstr "Képernyő&zár" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " "inactivity" msgstr "" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Egy aktív feladat megszakítása" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 #, fuzzy msgid "Confirm command line action" msgstr "Egy aktív feladat megszakítása" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 #, fuzzy msgid "Do not show main window on startup" msgstr "A főablak ne jelenjen meg induláskor" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 #, fuzzy msgid "A list of modifications" msgstr "&megerősítés" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -337,235 +333,235 @@ "Idő; Például: 01:30 - abszolút idő (ÓÓ:PP); 10 - szám hogy hány percet " "várjon most" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Mű&veletek" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 #, fuzzy msgid "Other Options:" msgstr "Mű&veletek" -#: src/main.cpp:378 +#: src/main.cpp:381 #, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 #, fuzzy msgid "Actions" msgstr "Mű&veletek" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 #, fuzzy msgid "Command Line Options" msgstr "Egy aktív feladat megszakítása" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 #, fuzzy msgid "Invalid time: %0" msgstr "Érvénytelen idő: %1" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 #, fuzzy msgid "Action: %0" msgstr "Művelet" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 #, fuzzy msgid "Remaining time: %0" msgstr "Érvénytelen idő: %1" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 #, fuzzy msgid "Cancel" msgstr "Parancs: %1" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 #, fuzzy msgid "KShutdown has been minimized" msgstr "KShutDown" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "KShutDown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 #, fuzzy msgid "A&ction" msgstr "Művelet" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "Statisztika" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "Kiválasztott Dátum/idő: %1" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 #, fuzzy msgid "Se&lect a time/event" msgstr "Kiválasztott Dátum/idő: %1" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 #, fuzzy msgid "Click to activate/cancel the selected action" msgstr "kiválasztott idő: %1" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 #, fuzzy msgid "Cancel: %0" msgstr "Parancs: %1" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 #, fuzzy msgid "Confirm" msgstr "&megerősítés" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" "Data in all unsaved documents will be lost!" msgstr "" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "" -#: src/password.cpp:152 +#: src/password.cpp:151 #, fuzzy msgid "Invalid password" msgstr "Késleltetés megadása másodpercben" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "" -#: src/password.cpp:264 +#: src/password.cpp:263 #, fuzzy msgid "Settings (recommended)" msgstr "Műveletek megerősítése (ajánlott)" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Általános" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "" @@ -573,118 +569,118 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 +#: src/preferences.cpp:162 #, fuzzy -msgid "Related KDE Settings..." +msgid "System Settings..." msgstr "KDE beállítások" -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 msgid "Enable System Tray Icon" msgstr "" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 #, fuzzy msgid "Set Color..." msgstr "Szövegszín:" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 #, fuzzy msgid "Position" msgstr "Leírás" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 #, fuzzy msgid "Top" msgstr "Tipp" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 #, fuzzy msgid "Information" msgstr "B&eállítás..." -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "" -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 #, fuzzy msgid "On User Inactivity (HH:MM)" msgstr "Id&ő (ÓÓ:PP)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 #, fuzzy msgid "Unknown" msgstr "Ismeretlen" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 #, fuzzy msgid "When selected application exit" msgstr "Végre akarod hajtani a kiválasztott feladatot?" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 #, fuzzy msgid "Refresh" msgstr "Fris&sítés" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" @@ -936,6 +932,10 @@ #~ msgstr "&Bejelentkezéskor" #, fuzzy +#~ msgid "Lock screen" +#~ msgstr "Képernyő&zár" + +#, fuzzy #~ msgid "Before Logout" #~ msgstr "Kijelentkezés" diff -Nru kshutdown-4.0/po/it.po kshutdown-4.2/po/it.po --- kshutdown-4.0/po/it.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/it.po 2017-10-16 13:21:59.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2012-01-30 08:32-0000\n" "Last-Translator: netcelli \n" "Language-Team: italiano \n" @@ -24,255 +24,252 @@ "X-Poedit-Country: ITALY\n" "X-Poedit-SourceCharset: utf-8\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Riavvia computer" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Errore" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Comandi \"Extra\" non validi" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Impossibile seguire il comando \"extra\"" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "Seleziona un comando Extra
dal menu sopra." -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Extra" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "File non trovato: %0" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Seleziona un comando..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Usa il menu contestuale per aggiungere/modificare/rimuovere le azioni." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Usa il menu contestuale per creare un nuovo collegamento " "all'applicazione (azione)" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "Usa Crea Nuovo|Cartella... per creare un nuovo sottomenu" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Usa Proprietà per cambiare l'icona, il nome, o i comandi" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 #, fuzzy msgid "Do not show this message again" msgstr "Non salvare la sessione" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "Aggiungi o rimuovi comandi" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 #, fuzzy msgid "Help" msgstr "&Aiuto" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Blocca schermo" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "Prova" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Conferma azione" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Rimuovi collegamento" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "Disabilitato dall'amministratore" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Sei sicuro?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Azione non disponibile: %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Azione non supportata: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Errore sconosciuto" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 #, fuzzy msgid "not recommended" msgstr "Raccomandati" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 msgid "selected time: %0" msgstr "tempo selezionato: %0" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "Data/tempo non valido" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "In Data/Orario" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "Indica orario e data" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Nessun Ritardo" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Tempo apartire da ora (HH:MM):" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Inserisci il ritardo nel formato \"OO:MM\" (Ora:Minuti)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Iberna computer" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Impossibile ibernare il computer" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Sospendi computer" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Impossibile sospendere il computer" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "Entrare in una modalità a basso consumo." -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "Esci" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Termina sessione" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Spegni computer" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 #, fuzzy msgid "A graphical shutdown utility" msgstr "Un utility avanzata per lo spegnimento" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "KShutdown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Blocca schermo" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "Avvia file eseguibili (esempio: file Desktop o script della Shell)" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "Prova azione (non esegue l'azione)" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 #, fuzzy msgid "" "Detect user inactivity. Example:\n" @@ -282,35 +279,35 @@ "Individua l'inattività dell'utente. Esempio: --logout --inactivity 90 - " "termina automaticamente la sessione dopo 90 minuti di inattività" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Annulla un'azione attiva" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Conferma il comando" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "Nascondi la finestra principale e l'icona nella vassoio di sistema" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Non mostrare la finestra principale all'avvio" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -321,154 +318,154 @@ "Attiva conto alla rovescia. Esempio: 13:37 - orario (OO:MM), 10 - numero di " "minuti a partire da ora" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Azioni" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "" -#: src/main.cpp:378 +#: src/main.cpp:381 #, fuzzy, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" "Maggiori informazioni...\n" "http://sourceforge.net/apps/mediawiki/kshutdown/index.php?title=Command_Line" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Azioni" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "Varie" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "Parametri opzionali" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "Opzioni linea di comando" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "Tempo non valido: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "Azione: %0" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Tempo restante: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "OK" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "Annulla" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "KShutdown è ancora attivo!" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "KShutDown è stato ridotto ad icona nel vassoio di sistema" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "KShutdown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" msgstr "&Azione" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "Statistiche" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Preferenze" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Aiuto" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "Informazioni" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 msgid "Select an &action" msgstr "Seleziona un'&azione" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 #, fuzzy msgid "Do not save session / Force shutdown" msgstr "Non salvare la sessione" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 msgid "Se&lect a time/event" msgstr "Se&leziona un'orario/tempo" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Barra di avanzamento" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "Clicca per attivare/annullare l'azione selezionata" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "Annulla: %0" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "Informazioni su Qt" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Conferma" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -478,70 +475,70 @@ "\n" "Tutti i dati nei documenti non salvati verranno persi!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "Inserisci una nuova password" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "Password:" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "Conferma Password:" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "Inserisci la password per eseguire l'azione: %0" -#: src/password.cpp:152 +#: src/password.cpp:151 msgid "Invalid password" msgstr "Password non valida" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "La password di conferma è diversa" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "Attiva la protezione con password" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "Azioni sulla protezione con password:" -#: src/password.cpp:264 +#: src/password.cpp:263 #, fuzzy msgid "Settings (recommended)" msgstr "Raccomandati" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "Vedi anche: %0" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Generale" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 #, fuzzy msgid "Password" msgstr "Password:" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Blocca lo schermo prima di ibernare" @@ -549,81 +546,82 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Impostazioni di KDE correlate..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 #, fuzzy msgid "Enable System Tray Icon" msgstr "Icona nel vassoio di sistema nera e bianca" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "Icona nel vassoio di sistema nera e bianca" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Nascondi" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Posizione" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Alto" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Basso" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Errore" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 msgid "Information" msgstr "Informazioni" -#: src/stats.cpp:33 +#: src/stats.cpp:31 #, fuzzy msgid "Please Wait..." msgstr "Attendi..." -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "In base all'attività utente (OO:MM)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 #, fuzzy msgid "" "Use this trigger to detect user inactivity\n" @@ -632,48 +630,39 @@ "Utilizzare questo trigger per rilevare inattività dell'utente (esempio: " "nessun click del mouse)." -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 msgid "Unknown" msgstr "Sconosciuto" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" "Inserisci la massima durata dell'inattività dell'utente nel formato \"OO:MM" "\" (Ore:Minuti)" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Quando termina l'applicazione selezionata" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Mostra la lista dei processi" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Aggiorna" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Attendi per \"%0\"" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#~ msgid "The password will be saved as SHA-1 hash." -#~ msgstr "La password sarà salvata come hash SHA-1." - -#~ msgid "Short password can be easily cracked." -#~ msgstr "Le password brevi possono essere facilmente violate." - #~ msgid "Error: %0" #~ msgstr "Errore: %0" -#~ msgid "Error, exit code: %0" -#~ msgstr "Errore, codice di sucita: %0" - #~ msgid "Action: %0" #~ msgstr "Azione: %0" @@ -699,6 +688,9 @@ #~ "programmi che erano in esecuzione

Fonte tradotta

. http://en." #~ "wikipedia.org/wiki/Hibernate_ (OS_feature)" +#~ msgid "Lock screen" +#~ msgstr "Blocca schermo" + #~ msgid "Select Action (no delay)" #~ msgstr "Seleziona l'azione (nessun ritardo)" @@ -711,6 +703,15 @@ #~ msgid "&Settings" #~ msgstr "&Impostazioni" +#~ msgid "The password will be saved as SHA-1 hash." +#~ msgstr "La password sarà salvata come hash SHA-1." + +#~ msgid "Short password can be easily cracked." +#~ msgstr "Le password brevi possono essere facilmente violate." + +#~ msgid "Error, exit code: %0" +#~ msgstr "Errore, codice di sucita: %0" + #, fuzzy #~ msgid "" #~ "Could not logout properly.\n" diff -Nru kshutdown-4.0/po/nb.po kshutdown-4.2/po/nb.po --- kshutdown-4.0/po/nb.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/nb.po 2017-10-16 13:21:59.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: kshutdown 2.0beta6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2008-12-08 00:53+0100\n" "Last-Translator: Eirik Johansen Bjørgan \n" "Language-Team: Norwegian Bokmaal\n" @@ -12,293 +12,289 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Start på nytt" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Feil" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Ugyldige \"Ekstra\" kommando" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Kan ikke kjøre \"Ekstra\" kommando" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "" -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 #, fuzzy msgid "Extras" msgstr "Ekstra" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Velg en kommando..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Bruk innholdsmenyen for å legge til/endre/fjerne handlinger" -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Bruk handlingsmenyen for å lage en ny lenke til program(handling)" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "Bruk Lag Ny|Mappe... for å lage en ny undermeny" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Bruk Egenskaper for å endre ikon, navn eller kommando" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 #, fuzzy msgid "Do not show this message again" msgstr "Ikke lagre økt" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 #, fuzzy msgid "Add or Remove Commands" msgstr "Legg til/Fjern Kommandoer..." -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 #, fuzzy msgid "Help" msgstr "&Hjelp" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Lås skjerm" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Godkjenn handling" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 msgid "Remove: %0" msgstr "" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Er du sikker?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Handling ikke tilgjengelig: %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Handlingen er ikke støttet: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Ukjent feil" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 #, fuzzy msgid "selected time: %0" msgstr "&Velg tid" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "På Dato/Tid" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Ingen utsettelse" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Tid fra nå (TT:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Dvalemodus" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Kan ikke gå inn i dvalemodus" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Hvilemodus" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Kan ikke gå inn i hvilemodus" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "" -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Logg ut" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Slå av" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 #, fuzzy msgid "A graphical shutdown utility" msgstr "Et avansert verktøy for avstengelse" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "KShutdown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -#, fuzzy -msgid "Lock screen" -msgstr "Lås skjerm" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " "inactivity" msgstr "" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 #, fuzzy msgid "Cancel an active action" msgstr "Velg en &handling" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 #, fuzzy msgid "Confirm command line action" msgstr "Godkjenn handling" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Ikke vis hovedvinduet ved oppstart" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 msgid "" "Activate countdown. Examples:\n" "13:37 (HH:MM) or \"1:37 PM\" - absolute time\n" @@ -306,155 +302,155 @@ "2h - two hours" msgstr "" -#: src/main.cpp:319 +#: src/main.cpp:322 msgid "Actions:" msgstr "" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "" -#: src/main.cpp:378 +#: src/main.cpp:381 #, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 #, fuzzy msgid "Invalid time: %0" msgstr "Gjenstående tid: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Gjenstående tid: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "Greit" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "Avbryt" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "KShutdown kjører fortsatt!" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "KShutdown har blitt minimert" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "KShutdown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" msgstr "" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Egenskaper" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Hjelp" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "Om" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 msgid "Select an &action" msgstr "Velg en &handling" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 #, fuzzy msgid "Do not save session / Force shutdown" msgstr "Ikke lagre økt" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 #, fuzzy msgid "Se&lect a time/event" msgstr "&Velg tid" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Fremdriftsindikator" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 #, fuzzy msgid "Click to activate/cancel the selected action" msgstr "Klikk for å aktivere/avbryte den valge handlingen" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 #, fuzzy msgid "Cancel: %0" msgstr "Avbryt" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "Om Qt" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Godkjenn" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -464,69 +460,69 @@ "\n" "Informasjon i alle ulagrede dokumenter vil gå tapt!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "" -#: src/password.cpp:152 +#: src/password.cpp:151 #, fuzzy msgid "Invalid password" msgstr "Ugyldige \"Ekstra\" kommando" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "" -#: src/password.cpp:264 +#: src/password.cpp:263 msgid "Settings (recommended)" msgstr "" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Generelt" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Lås skjerm før Dvale" @@ -534,120 +530,115 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Relaterte KDE innstillinger" -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 msgid "Enable System Tray Icon" msgstr "" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Gjem" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Posisjon" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Topp" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Bunn" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Feil" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 #, fuzzy msgid "Information" msgstr "Godkjenn handling" -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "" -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 #, fuzzy msgid "Unknown" msgstr "Ukjent feil" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Når valgt program avsluttes" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Liste over kjørende prosseser" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Gjenles" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Venter på \"%0\"" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#~ msgid "Error: %0" -#~ msgstr "Feil: %0" - -#~ msgid "Error, exit code: %0" -#~ msgstr "Feil, avsluttes med kode: %0" - #~ msgid "Extras..." #~ msgstr "Ekstra..." @@ -658,6 +649,10 @@ #~ "Kan ikke logge ut.\n" #~ "Kan ikke få kontakt med øktbehandleren." +#, fuzzy +#~ msgid "Lock screen" +#~ msgstr "Lås skjerm" + #~ msgid "Theme" #~ msgstr "Tema" @@ -675,3 +670,9 @@ #~ msgid "Refresh the list of processes" #~ msgstr "Gjenles listen over prosseser" + +#~ msgid "Error: %0" +#~ msgstr "Feil: %0" + +#~ msgid "Error, exit code: %0" +#~ msgstr "Feil, avsluttes med kode: %0" diff -Nru kshutdown-4.0/po/nl.po kshutdown-4.2/po/nl.po --- kshutdown-4.0/po/nl.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/nl.po 2017-10-16 13:21:59.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2004-04-21 22:47+0000\n" "Last-Translator: Bram Schoenmakers \n" "Language-Team: Nederlands \n" @@ -19,311 +19,306 @@ "X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/actions/bootentry.cpp:35 -#, fuzzy -msgid "Default System" -msgstr "Systeem uitschakelen" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "" + +#: src/actions/extras.cpp:83 #, fuzzy msgid "Invalid \"Extras\" command" msgstr "Geef vertraging op in seconden." -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "" -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 #, fuzzy msgid "Extras" msgstr "E&xtra's..." -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 #, fuzzy msgid "File not found: %0" msgstr "Bestand %1 niet gevonden." -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 #, fuzzy msgid "Select a command..." msgstr "Geef vertraging op in seconden." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "" -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 #, fuzzy msgid "Add or Remove Commands" msgstr "&Verwijderen" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 #, fuzzy msgid "Lock Screen" msgstr "Scherm &vergrendelen" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "Test" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 #, fuzzy msgid "Enter a message" msgstr "Voer datum in." -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 #, fuzzy msgid "Text:" msgstr "Test" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 #, fuzzy msgid "Confirm Action" msgstr "Actie &bevestigen" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 #, fuzzy msgid "Name:" msgstr "Naam" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "&Verwijderen" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 #, fuzzy msgid "Disabled by Administrator" msgstr "Deze pagina is uitgeschakeld door de beheerder." -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Weet u het zeker?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 #, fuzzy msgid "Action not available: %0" msgstr "Actie mislukt! (%1)" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 #, fuzzy msgid "Unknown error" msgstr "Onbekend" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 #, fuzzy msgid "not recommended" msgstr "Commando:" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 #, fuzzy msgid "selected time: %0" msgstr "Kies het vertragingstype." -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 #, fuzzy msgid "Invalid date/time" msgstr "Op datum/tijd" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "Op datum/tijd" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 #, fuzzy msgid "Enter date and time" msgstr "Voer datum in." -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 #, fuzzy msgid "No Delay" msgstr "&Onmiddelijke actie" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 #, fuzzy msgid "Time From Now (HH:MM)" msgstr "Vanaf dit tijdstip (UU:MM):" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 #, fuzzy msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Geef vertraging op in minuten." -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "" -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Afmelden" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "Onderhouder" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 #, fuzzy msgid "KShutdown" msgstr "Uitschakelen" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -#, fuzzy -msgid "Lock screen" -msgstr "Scherm vergrendelen" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " "inactivity" msgstr "" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 #, fuzzy msgid "Cancel an active action" msgstr "Gestarte actie annuleren" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 #, fuzzy msgid "Confirm command line action" msgstr "Gestarte actie annuleren" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 #, fuzzy msgid "Do not show main window on startup" msgstr "Venster bij opstarten verbergen (wordt gebruikt door DCOP-clients)" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 #, fuzzy msgid "A list of modifications" msgstr "Actie &bevestigen" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 msgid "" "Activate countdown. Examples:\n" "13:37 (HH:MM) or \"1:37 PM\" - absolute time\n" @@ -331,234 +326,234 @@ "2h - two hours" msgstr "" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Acties" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 #, fuzzy msgid "Other Options:" msgstr "Acties" -#: src/main.cpp:378 +#: src/main.cpp:381 #, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 #, fuzzy msgid "Actions" msgstr "Acties" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 #, fuzzy msgid "Command Line Options" msgstr "Gestarte actie annuleren" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 #, fuzzy msgid "Action: %0" msgstr "Actie" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 #, fuzzy msgid "Cancel" msgstr "Commando:" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 #, fuzzy msgid "KShutdown has been minimized" msgstr "Uitschakelen" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "Uitschakelen" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 #, fuzzy msgid "A&ction" msgstr "Actie" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 #, fuzzy msgid "Statistics" msgstr "&Statistieken" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "Kies het vertragingstype." -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 #, fuzzy msgid "Se&lect a time/event" msgstr "Kies het vertragingstype." -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 #, fuzzy msgid "Cancel: %0" msgstr "Commando:" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 #, fuzzy msgid "Confirm" msgstr "Actie &bevestigen" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" "Data in all unsaved documents will be lost!" msgstr "" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "" -#: src/password.cpp:152 +#: src/password.cpp:151 #, fuzzy msgid "Invalid password" msgstr "Geef vertraging op in seconden." -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "" -#: src/password.cpp:264 +#: src/password.cpp:263 #, fuzzy msgid "Settings (recommended)" msgstr "Actie &bevestigen" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Algemeen" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 #, fuzzy msgid "System Tray" msgstr "MSystemTray" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "" @@ -566,118 +561,118 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 +#: src/preferences.cpp:162 #, fuzzy -msgid "Related KDE Settings..." -msgstr "Instellingen" +msgid "System Settings..." +msgstr "Afmeldinstellingen..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 #, fuzzy msgid "Enable System Tray Icon" msgstr "MSystemTray" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 #, fuzzy msgid "Black and White System Tray Icon" msgstr "MSystemTray" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 #, fuzzy msgid "Position" msgstr "Geen omschrijving" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 #, fuzzy msgid "Top" msgstr "Tip:" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 #, fuzzy msgid "Information" msgstr "&Instellen..." -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "" -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 #, fuzzy msgid "On User Inactivity (HH:MM)" msgstr "&Tijd (UU:MM):" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 #, fuzzy msgid "Unknown" msgstr "Onbekend" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 #, fuzzy msgid "Refresh" msgstr "&Vernieuwen" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" @@ -889,6 +884,10 @@ #~ msgstr "&Bewerken..." #, fuzzy +#~ msgid "Lock screen" +#~ msgstr "Scherm vergrendelen" + +#, fuzzy #~ msgid "Before Logout" #~ msgstr "&Uitloggen" @@ -896,6 +895,10 @@ #~ msgstr "Commando:" #, fuzzy +#~ msgid "Related KDE Settings..." +#~ msgstr "Instellingen" + +#, fuzzy #~ msgid "Show KShutDown Themes" #~ msgstr "Schakelt het systeem uit." @@ -1243,9 +1246,6 @@ #~ msgid "Enter delay in seconds, minutes, or hours:" #~ msgstr "Geef vertraging op in seconden." -#~ msgid "Logo&ut Settings..." -#~ msgstr "Afmeldinstellingen..." - #~ msgid "Stat&istics" #~ msgstr "&Statistieken" @@ -1261,6 +1261,9 @@ #~ msgid "&Reboot" #~ msgstr "&Herstarten" +#~ msgid "Halt system" +#~ msgstr "Systeem uitschakelen" + #~ msgid "Reboot system" #~ msgstr "Systeem herstarten" diff -Nru kshutdown-4.0/po/pl.po kshutdown-4.2/po/pl.po --- kshutdown-4.0/po/pl.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/pl.po 2017-10-16 13:21:59.000000000 +0000 @@ -2,199 +2,200 @@ # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # -# Konrad Twardowski , 2011, 2012, 2013, 2014, 2016. +# Konrad Twardowski , 2011, 2012, 2013, 2014, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" -"PO-Revision-Date: 2016-08-19 14:21+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" +"PO-Revision-Date: 2017-10-15 11:21+0100\n" "Last-Translator: Konrad Twardowski \n" "Language-Team: Polish <>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "Domyślny system" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Uruchom ponownie" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Błąd" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Nieprawidłowe polecenie \"Extra\"" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Nie można uruchomić polecenia \"Extra\"" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "Proszę wybrać polecenie \"Extra\"
z powyższego menu." -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Extra" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "Nie znaleziono pliku: %0" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "Pusty" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Wybierz polecenie..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Użyj menu kontekstowego, aby dodać/edytować/usunąć akcje." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Użyj Menu Kontekstowego, aby utworzyć nowy skrót do programu (akcję)" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "Użyj Utwórz nowe|Katalog..., aby utworzyć nowe podmenu" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Użyj Właściwości, aby zmienić ikonę, nazwę, lub polecenie" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "Nie pokazuj więcej tego komunikatu" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "Dodaj lub usuń polecenia" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "Pomoc" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Zablokuj ekran" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "Wyświetl komunikat (bez zamykania)" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "Test" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "Wpisz komunikat" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "Tekst:" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "&Zakładki" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "Dodaj zakładkę" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "Dodaj" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Potwierdź akcję" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "Nazwa:" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "Dodaj: %0" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 msgid "Remove: %0" msgstr "Usuń: %0" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "Wyłączone przez Administratora" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Jesteś pewien/pewna?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Akcja niedostępna: %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Nieobsługiwana akcja: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Nieznany błąd" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "niezalecane" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 msgid "selected time: %0" msgstr "wybrany czas: %0" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "Nieprawidłowa data/godzina" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "O dacie/godzinie" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "Wprowadź datę i godzinę" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Brak opóźnienia" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Czas od teraz (GG:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Wprowadź opóźnienie w formacie \"GG:MM\" (Godzina:Minuta)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Hibernuj komputer" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Nie można zahibernować komputera" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." @@ -202,68 +203,64 @@ "Zapisz zawartość pamięci RAM na dysku,\n" "a następnie wyłącz komputer." -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "Uśpij" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Wstrzymaj komputer" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Nie można wstrzymać komputera" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "Wejdź w tryb niskiego poboru energii." -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "Wyloguj" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Wyloguj" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Wyłącz komputer" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "Graficzne narzędzie do zamykania systemu" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "Opiekun" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "Podziękowania dla wszystkich!" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "KShutdown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "Konrad Twardowski" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Zablokuj ekran" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "Uruchom plik wykonywalny (przykład: skrót Pulpitu lub skrypt powłoki)" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "Testuj akcję (nic nie robi)" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " @@ -273,35 +270,35 @@ "--logout --inactivity 90 - wyloguj automatycznie po 90 minutach braku " "aktywności użytkownika" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "Pokaż tę pomoc" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Anuluj aktywną akcję" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Potwierdź opcję linii poleceń" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "Ukryj główne okno oraz ikonę tacki systemowej" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Nie pokazuj głównego okna przy uruchamianiu" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "Lista modyfikacji" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "Pokaż własne menu zamiast okna głównego" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 msgid "" "Activate countdown. Examples:\n" "13:37 (HH:MM) or \"1:37 PM\" - absolute time\n" @@ -313,151 +310,151 @@ "10 lub 10m - liczba minut od teraz\n" "2h - dwie godziny" -#: src/main.cpp:319 +#: src/main.cpp:322 msgid "Actions:" msgstr "Akcje:" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "Wyzwalacze:" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "Pozostałe opcje:" -#: src/main.cpp:378 +#: src/main.cpp:381 #, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" "Więcej informacji...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Akcje" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "Różne" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "Uruchom w trybie \"przenośnym (portable)\"" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "Opcjonalny parametr" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "Opcje linii poleceń" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "Nieprawidłowy czas: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "Akcja: %0" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Pozostały czas: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "OK" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "Naciśnij %0, aby aktywować KShutdown" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "Anuluj" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "KShutdown jest nadal aktywny!" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "KShutdown został zminimalizowany" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 msgid "Quit KShutdown" msgstr "Zakończ KShutdown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" msgstr "A&kcja" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "&Narzędzia" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "Statystyka" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Preferencje" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "Pomo&c" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "O programie" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 msgid "Select an &action" msgstr "Wy&bierz akcję" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "Nie zapisuj sesji / Wymuś zamykanie" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 msgid "Se&lect a time/event" msgstr "&Wybierz czas/zdarzenie" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Pasek postępu" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "Kliknij, aby aktywować/anulować wybraną akcję" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "Anuluj: %0" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "Co nowego?" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "O Qt" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "Licencja" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Potwierdź" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -467,68 +464,68 @@ "\n" "Dane we wszystkich niezapisanych dokumentach zostaną utracone!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "Wprowadź nowe hasło" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "Hasło:" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "Potwierdź hasło:" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "Wprowadź hasło, aby wykonać akcję: %0" -#: src/password.cpp:152 +#: src/password.cpp:151 msgid "Invalid password" msgstr "Nieprawidłowe hasło" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "Hasło jest za krótkie (musi mieć %0 znaków lub więcej)" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "Hasło potwierdzające jest inne" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "Włącz ochronę hasłem" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "Akcje chronione hasłem:" -#: src/password.cpp:264 +#: src/password.cpp:263 msgid "Settings (recommended)" msgstr "Ustawienia (zalecane)" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "Zobacz również: %0" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Ogólne" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "Tacka systemowa" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "Hasło" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "Pokaż niewielki pasek postępu na górze/dole ekranu." -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Zablokuj ekran przed hibernacją" @@ -536,79 +533,79 @@ msgid "Custom Lock Screen Command:" msgstr "Własne polecenie blokady ekranu:" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." -msgstr "Powiązane ustawienia KDE..." +#: src/preferences.cpp:162 +msgid "System Settings..." +msgstr "Ustawienia Systemowe..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 msgid "Enable System Tray Icon" msgstr "Włącz ikonę tacki systemowej" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "Zakończ zamiast minimalizować do tacki systemowej" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "Użyj systemowy styl ikon" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "Czarno-biała ikona tacki systemowej" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Ukryj" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "Ustaw kolor..." -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Pozycja" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Górny" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Dolny" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "Rozmiar" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "Mały" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "Normalny" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "Średni" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "Duży" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Błąd" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 msgid "Information" msgstr "Informacja" -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "Proszę czekać..." -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "Przy braku aktywności użytkownika (GG:MM)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." @@ -616,32 +613,32 @@ "Użyj tego wyzwalacza, aby wykryć brak aktywności użytkownika\n" "(przykład: brak kliknięć myszą)." -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 msgid "Unknown" msgstr "Nieznany" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" "Wprowadź maksymalną wartość dla braku aktywności użytkownika w formacie GG:" "MM (Godziny:Minuty)" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Gdy wybrana aplikacja zakończy się" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Lista działających procesów" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Odśwież" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Czekanie na \"%0\"" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "Proces lub okno nie istnieje: %0" diff -Nru kshutdown-4.0/po/pt_BR.po kshutdown-4.2/po/pt_BR.po --- kshutdown-4.0/po/pt_BR.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/pt_BR.po 2017-10-16 13:21:59.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2013-02-25 18:32-0300\n" "Last-Translator: Phantom X \n" "Language-Team: Brazilian Portuguese <>\n" @@ -23,253 +23,250 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Reiniciar o Computador" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Erro" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Comando \"Extras\" inválido" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Impossível executar comando \"Extras\"" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "Por favor selecione um comando Extras
do menu acima." -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "Arquivo não encontrado: %0" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Selecione um comando..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Use o menu de contexto para adicionar/editar/remover ações." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Use Menu de Contexto para criar um novo atalho para aplicação (ação)" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "Use Criar Nova|Pasta... para criar um novo submenu" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Use Propriedades para trocar o ícone, nome, ou comando" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "Adicionar/Remover Comandos" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "Ajuda" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Bloquear Tela" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "&Favoritos" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 #, fuzzy msgid "Add Bookmark" msgstr "Adicionar Favorito: %0" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Confirmar Ação" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 #, fuzzy msgid "Add: %0" msgstr "Adicionar Favorito: %0" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Remover Favorito: %0" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "Desabilitado pelo Administrador" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Você tem certeza?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Ação não disponível: (%0)" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Ação não suportada: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Erro desconhecido" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 msgid "selected time: %0" msgstr "tempo selecionado: %0" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "Data/Hora inválida" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "Para Data/Hora" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "Insira hora e data" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Não Atrasar" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Tempo a partir de agora (HH:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Insira o atraso no formato \"HH:MM\" (Hora:Minuto)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Hibernar o Computador" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Impossível hibernar o computador" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "Dormir" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Suspender o Computador" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Impossível suspender o computador" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "Entrar em um estado de baixo consumo." -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "Encerrar sessão" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Encerrar sessão" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Desligar o Computador" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "Um utilitário gráfico para desligamento" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "Mantenedor" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "Agradecimentos a Todos!" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Bloquear tela" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" "Executar um arquivo executável (exemplo: Atalho Desktop ou script Shell)" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "Testar Ação (não faz nada)" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 #, fuzzy msgid "" "Detect user inactivity. Example:\n" @@ -279,35 +276,35 @@ "Detectar inatividade do usuário. Exemplo: --logout --inactivity 90 - " "encerrar a sessão após 90 minutos de inatividade do usuário " -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Cancelar uma ação ativa" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Confirmar ação de linha de comando" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "Ocultar janela principal e ícone na área de notificação" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Não mostrar janela para iniciar" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -318,153 +315,153 @@ "Ativar contagem regressiva. Exemplos: 13:37 - tempo absoluto (HH:MM); 10 - " "número de minutos a partir de agora" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Açőes" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "" -#: src/main.cpp:378 -#, c-format +#: src/main.cpp:381 +#, fuzzy, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" "Mais Info...\n" "http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Açőes" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "Miscelânea" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "Parâmetro opcional" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "Opções de Linha de Comando" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "Tempo inválido: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "Ação: %0" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Tempo restante: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "Cancelar" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "KShutdown ainda está ativo!" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "O KShutdown foi minimizado" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 msgid "Quit KShutdown" msgstr "" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" msgstr "A&ção" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Preferências" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "A&juda" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "Sobre" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "Selecione uma &ação" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "Não salvar a sessão / Forçar desligamento" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 msgid "Se&lect a time/event" msgstr "Se&lecione um tempo/evento" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Barra de Progresso" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "Clique para ativar/cancelar a ação selecionada" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "Cancelar: %0" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "Sobre o Qt" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Confirmar" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -474,69 +471,69 @@ "\n" "Todos os dados não salvos serão perdidos!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "Insira Nova Senha:" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "Senha:" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "Confirmar Senha:" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "Indira a senha para realizar a ação: %0" -#: src/password.cpp:152 +#: src/password.cpp:151 msgid "Invalid password" msgstr "Senha inválida" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "A senha de confirmação é diferente" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "Habilitar Proteção por Senha" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "Ações Protegidas por Senha:" -#: src/password.cpp:264 +#: src/password.cpp:263 msgid "Settings (recommended)" msgstr "" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "Veja Também: %0" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Geral" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "Área de Notificação" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 #, fuzzy msgid "Password" msgstr "Senha:" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Bloquear Tela Antes de Hibernar" @@ -544,79 +541,80 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Preferências Relacionadas ao KDE..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 msgid "Enable System Tray Icon" msgstr "Habilitar Ícone na Área de Notificação" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "Sair em vez de minimizar para a Área de Notificação" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "Ícone na Área de Notificação Preto e Branco" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Ocultar" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "Configurar Cor..." -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Posição" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Topo" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Fundo" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "Tamanho" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "Pequeno" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "Médio" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "Grande" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Erro" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 msgid "Information" msgstr "Informação" -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "" -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "Na Inatividade do Usuário (HH:MM)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 #, fuzzy msgid "" "Use this trigger to detect user inactivity\n" @@ -625,47 +623,35 @@ "Use este gatilho para detectar inatividade do usuário (exemplo: nenhum " "clique de mouse)." -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 msgid "Unknown" msgstr "Desconhecido" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" "Insira a inatividade do usuário máxima no formato \"HH:MM\" (Hora:Minutos)" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Quando a açăo selecionada terminar" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Lista de processos executando" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Atualizar" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Esperando por \"%0\"" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#~ msgid "The password will be saved as SHA-1 hash." -#~ msgstr "A senha será salva como hash SHA-1." - -#~ msgid "Short password can be easily cracked." -#~ msgstr "Senha curta pode ser facilmente quebrada." - -#~ msgid "Error: %0" -#~ msgstr "Erro: %0" - -#~ msgid "Error, exit code: %0" -#~ msgstr "Erro, código de saída: %0" - #~ msgid "" #~ "

Hibernate (or Suspend-to-Disk) is a feature of many computer operating " #~ "systems where the contents of RAM are written to non-volatile storage " @@ -687,6 +673,9 @@ #~ "iniciar todo os programas que estavam em execução.

Fonte (em " #~ "Inglês): http://en.wikipedia.org/wiki/Hibernate_(OS_feature)

" +#~ msgid "Lock screen" +#~ msgstr "Bloquear tela" + #~ msgid "Quit" #~ msgstr "Sair" @@ -696,6 +685,18 @@ #~ msgid "&Settings" #~ msgstr "&Preferências" +#~ msgid "The password will be saved as SHA-1 hash." +#~ msgstr "A senha será salva como hash SHA-1." + +#~ msgid "Short password can be easily cracked." +#~ msgstr "Senha curta pode ser facilmente quebrada." + +#~ msgid "Error: %0" +#~ msgstr "Erro: %0" + +#~ msgid "Error, exit code: %0" +#~ msgstr "Erro, código de saída: %0" + #~ msgid "Suspend Computer (Sleep)" #~ msgstr "Suspender o Computador (Dormir)" diff -Nru kshutdown-4.0/po/pt.po kshutdown-4.2/po/pt.po --- kshutdown-4.0/po/pt.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/pt.po 2017-10-16 13:21:59.000000000 +0000 @@ -1,309 +1,308 @@ -# Translation of kshutdown messages to Portuguese +# Translation of kshutdown messages to european Portuguese # Copyright (C) 2010 the kshutdown's copyright holder # This file is distributed under the same license as the kshutdown package. # -# Américo Monteiro , 2010. +# Américo Monteiro , 2010, 2013. msgid "" msgstr "" -"Project-Id-Version: kshutdown 2.0~beta8-1\n" +"Project-Id-Version: kshutdown 3.0-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" -"PO-Revision-Date: 2010-02-03 21:09+0000\n" -"Last-Translator: Américo Monteiro \n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" +"PO-Revision-Date: 2013-11-28 23:54+0000\n" +"Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Reiniciar o Computador" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Erro" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Comando \"Extras\" inválido" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Incapaz de executar comando \"Extras\"" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "Por favor seleccione um comando Extras
do menu em cima." -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Extras" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" -msgstr "" +msgstr "Ficheiro não encontrado: %0" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Seleccionar um comando..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Use o menu de contexto para adicionar/remover acções." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Use Menu de Contexto para criar uma nova ligação a aplicação (acção)" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "Use Criar Nova|Pasta... para criar um novo sub-menu" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Use Propriedades para alterar o ícone, nome, ou comando" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 #, fuzzy msgid "Do not show this message again" msgstr "Não salvar a sessão" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "Adicionar ou Remover Comandos" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 #, fuzzy msgid "Help" -msgstr "&Ajuda" +msgstr "Ajuda" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Trancar Ecrã" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" -msgstr "" +msgstr "&Favoritos" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Confirmar Acção" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" -msgstr "" +msgstr "Adicionar: %0" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 msgid "Remove: %0" -msgstr "" +msgstr "Remover: %0" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" -msgstr "" +msgstr "Desactivado pelo Administrador" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Tem certeza?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Acção não disponível: %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Acção não suportada: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Erro desconhecido" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 #, fuzzy msgid "selected time: %0" -msgstr "Tempo inválido: %0" +msgstr "tempo seleccionado: %0" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "Data/hora inválida" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "Em Data/Hora" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" -msgstr "" +msgstr "Inserir data e hora" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Nenhum Atraso" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Tempo A Partir de Agora (HH:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" -msgstr "" +msgstr "Inserir atraso em formato \"HH:MM\" (Hora:Minuto)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Hibernar o Computador" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Incapaz de hibernar o computador" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" -msgstr "" +msgstr "Adormecer" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Suspender o Computador" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Incapaz de suspender o computador" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 #, fuzzy msgid "Enter in a low-power state mode." -msgstr "Entrar num estado de pouca energia." +msgstr "Entrar num estado de baixa energia." -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" -msgstr "" +msgstr "Log Off" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Terminar Sessão" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Desligar o Computador" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 #, fuzzy msgid "A graphical shutdown utility" -msgstr "Um utilitário avançado de encerramento" +msgstr "Um utilitário de encerramento gráfico" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" -msgstr "" +msgstr "Responsável" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" -msgstr "" +msgstr "Obrigado a Todos!" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "KShutdown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Trancar o Ecrã" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" "Correr ficheiro executável (exemplo: atalho do Desktop ou script Shell)" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" -msgstr "" +msgstr "Testa Acção (não faz nada)" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " "inactivity" msgstr "" +"Detectar inactividade do utilizador. Exemplo --logout --inactivity 90 - " +"termina sessão automaticamente após 90 minutos de inactividade do utilizador" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 #, fuzzy msgid "Cancel an active action" -msgstr "Seleccionar uma &acção" +msgstr "Cancela uma acção activa" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 #, fuzzy msgid "Confirm command line action" -msgstr "Confirmar Acção" +msgstr "Confirmar acção de linha de comandos" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" -msgstr "" +msgstr "Esconder a janela principal e o ícone da bandeja do sistema" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Não mostrar a janela principal no arranque" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -314,152 +313,154 @@ "Activar contagem decrescente. Exemplos: 13:37 - hora absoluta (HH:MM), 10 - " "número de minutos a partir de agora" -#: src/main.cpp:319 +#: src/main.cpp:322 msgid "Actions:" msgstr "" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "" -#: src/main.cpp:378 -#, c-format +#: src/main.cpp:381 +#, fuzzy, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" +"Mais informação...\n" +"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" -msgstr "" +msgstr "Acções" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" -msgstr "" +msgstr "Vários" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" -msgstr "" +msgstr "Parâmetro opcional" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" -msgstr "" +msgstr "Opções de Linha de Comandos" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "Tempo inválido: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" -msgstr "" +msgstr "Acção: %0" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Tempo remanescente: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "OK" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "Cancelar" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "KShutdown ainda está activo!" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "KShutdown foi minimizado" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "KShutdown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" -msgstr "" +msgstr "A&cção" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Preferências" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Ajuda" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "Acerca de" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 msgid "Select an &action" msgstr "Seleccionar uma &acção" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 #, fuzzy msgid "Do not save session / Force shutdown" -msgstr "Não salvar a sessão" +msgstr "Não salvar a sessão / Forçar o encerramento" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 #, fuzzy msgid "Se&lect a time/event" -msgstr "S&eleccionar uma hora" +msgstr "Se&leccionar uma hora/evento" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Barra de Progresso" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "Clique para activar/cancelar a acção seleccionada" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "Cancelar: %0" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "Acerca do Qt" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Confirmar" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -469,69 +470,69 @@ "\n" "Os dados de todos os documentos não salvados serão perdidos!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" -msgstr "" +msgstr "Inserir Nova Palavra Passe" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" -msgstr "" +msgstr "Palavra Passe:" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" -msgstr "" +msgstr "Confirmar Palavra Passe:" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" -msgstr "" +msgstr "Inserir palavra passe para executar acção: %0" -#: src/password.cpp:152 +#: src/password.cpp:151 #, fuzzy msgid "Invalid password" -msgstr "Comando \"Extras\" inválido" +msgstr "Palavra passe inválida" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" -msgstr "" +msgstr "A palavra passe de confirmação é diferente" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" -msgstr "" +msgstr "Activar Protecção de Palavra Passe" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" -msgstr "" +msgstr "Acções Protegidas por Palavra Passe:" -#: src/password.cpp:264 +#: src/password.cpp:263 msgid "Settings (recommended)" msgstr "" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" -msgstr "" +msgstr "Veja Também: %0" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Geral" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" -msgstr "" +msgstr "Bandeja do Sistema" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Trancar o Ecrã Antes de Hibernar" @@ -539,114 +540,122 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Definições Relacionadas com o KDE..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 msgid "Enable System Tray Icon" -msgstr "" +msgstr "Activar o Ícone da Bandeja do Sistema" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" +msgstr "Terminar em vez de minimizar para o ícone da Bandeja do Sistema" + +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" -msgstr "" +msgstr "Ícone da Bandeja do Sistema a Preto e Branco" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Esconder" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." -msgstr "" +msgstr "Definir Cor..." -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Posição" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Topo" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Fundo" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" -msgstr "" +msgstr "Tamanho" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" -msgstr "" +msgstr "Pequeno" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" -msgstr "" +msgstr "Normal" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" -msgstr "" +msgstr "Médio" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" -msgstr "" - -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Erro" +msgstr "Grande" -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 #, fuzzy msgid "Information" -msgstr "Confirmar Acção" +msgstr "Informação" -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "" -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" -msgstr "" +msgstr "Em Inactividade do Utilizador (HH:MM)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "" +"Usar este 'gatilho' para detectar inactividade do utilizador (exemplo: " +"nenhuns cliques do rato)." -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 #, fuzzy msgid "Unknown" -msgstr "Erro desconhecido" +msgstr "Desconhecido" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" +"Insira o máximo de inactividade do utilizador no formato (HH:MM) (Horas:" +"Minutos)" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Quando a aplicação seleccionada terminar" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Lista de processos em funcionamento" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Refrescar" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "À espera por \"%0\"" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" +#~ msgid "Lock screen" +#~ msgstr "Trancar o Ecrã" + #~ msgid "Error: %0" #~ msgstr "Erro: %0" diff -Nru kshutdown-4.0/po/ru.po kshutdown-4.2/po/ru.po --- kshutdown-4.0/po/ru.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/ru.po 2017-10-16 13:21:59.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2016-05-21 04:37+0400\n" "Last-Translator: Victor Ryzhykh \n" "Language-Team: Russian \n" @@ -21,185 +21,186 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "Системный по умолчанию" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Перезагрузить компьютер" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Ошибка" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Недопустимая «дополнительная» команда" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Не удалось выполнить «дополнительную» команду" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "Выберите дополнительную команду
из меню выше." -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Дополнительно" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "Файл не найден: %0" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "Пусто" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Выбрать команду..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "" "Используйте контекстное меню для добавления/редактирования или удаления " "действий." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Используйте Контекстное меню для создания новой ссылки на приложение " "(действие)" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "Используйте Создать|Папку... для создания подменю" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Используйте Настройки для смены значка, имени или команды" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "Не показывать больше это сообщение" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "Добавить или удалить команды" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "Помощь" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Заблокировать экран" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "Показать сообщение (не выключать)" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "Проверка" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "Введите сообщение" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "Текст:" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "&Закладки" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "Добавить закладку" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "Добавить" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Подтвердить действие" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "Имя:" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "Добавить: %0" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 msgid "Remove: %0" msgstr "Удалить: %0" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "Отключено администратором" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Вы уверены ?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Действие недоступно: %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Неправильное действие: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Неизвестная ошибка" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "Не рекомендуется" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 msgid "selected time: %0" msgstr "выбранное время: %0" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "Недопустимые дата или время " -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "В Дату/Время" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "Введите время и дату" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Без задержки" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Текущее время (ЧЧ:ММ)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Введите задержку «ЧЧ:ММ» в формате (часы:минуты)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Перевести в спящий режим" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Не удалось перевести в спящий режим" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." @@ -207,69 +208,65 @@ "Сохранить содержимое оперативной памяти на диск,\n" "а затем выключить компьютер." -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "Ждущий режим" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Перевести в ждущий режим" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Не удалось перевести в ждущий режим" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "Войти в энергосберегающий режим." -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "Выход" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Завершить сеанс" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Выключить компьютер" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "Графическая утилита для выключения компьютера" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "Сопровождающий" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "Благодарности всем!" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "KShutDown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "Konrad Twardowski" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Заблокировать экран" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" "Запустить исполняемый файл (например, ярлык на рабочем столе или скрипт)" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "Проверка действия (эмуляция)" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " @@ -279,35 +276,35 @@ "--logout --inactivity 90 - автоматический выход после 90 минут отсутствия " "активности пользователя" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "Показать эту справку" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Отменить активное задание" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Подтвердить действие командной строки" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "Спрятать окно программы и значок в системный лоток" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Не показывать окно при запуске системы" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "Список изменений" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "Показывать собственное всплывающее меню вместо главного окна" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 msgid "" "Activate countdown. Examples:\n" "13:37 (HH:MM) or \"1:37 PM\" - absolute time\n" @@ -319,151 +316,151 @@ "10 или 10m - через количество минут\n" "2h - два часа" -#: src/main.cpp:319 +#: src/main.cpp:322 msgid "Actions:" msgstr "Действия:" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "Триггеры:" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "Другие параметры:" -#: src/main.cpp:378 -#, c-format +#: src/main.cpp:381 +#, fuzzy, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" "Дополнительная информация...\n" "http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Действия" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "Разное" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "Запустить в «портативном» режиме" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "Необязательный параметр" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "Параметры командной строки" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "Неверное время: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "Действие: %0" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Оставшееся время: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "ОК" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "Нажмите %0 чтобы активировать KShutdown" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "Отмена" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "KShutdown активен!" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "KShutDown будет переведен в системный лоток" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 msgid "Quit KShutdown" msgstr "Выход" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" msgstr "&Действие" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "&Инструменты" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "Статистика" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Настройки" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Помощь" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "О программе" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 msgid "Select an &action" msgstr "Выбрать &действие" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "Не сохранять сессию / выключить принудительно" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 msgid "Se&lect a time/event" msgstr "В&ыбрать время/событие" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Шкала времени" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "Нажмите для активизации или отмены действия" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "Отмена: %0" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "Что нового?" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "О библиотеке QT" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "Лицензия" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Подтвердить" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -473,68 +470,68 @@ "\n" "Несохранённые документы будут утеряны!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "Введите новый пароль" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "Пароль:" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "Подтверждение пароля:" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "Введите пароль для выполнения действия: %0" -#: src/password.cpp:152 +#: src/password.cpp:151 msgid "Invalid password" msgstr "Неверный пароль" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "Пароль слишком короткий (нужно %0 или более символов)" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "Подтверждение пароля отличается" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "Включить защиту паролем" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "Защищенные паролем действия:" -#: src/password.cpp:264 +#: src/password.cpp:263 msgid "Settings (recommended)" msgstr "Настройки (рекомендуется)" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "См. также: %0" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Общее" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "Системный лоток" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "Пароль" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "Показывать индикатор выполнения в верхней / нижней части экрана." -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Заблокировать экран при переходе в спящий режим" @@ -542,79 +539,80 @@ msgid "Custom Lock Screen Command:" msgstr "Собственная команда блокирования экрана:" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Соответствующие настройки KDE..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 msgid "Enable System Tray Icon" msgstr "Значок в системном лотке" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "Выход вместо минимизации в системный лоток" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "Черно-белый значок в системном лотке" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Спрятать" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "Выбрать цвет..." -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Позиция" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Вверху" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Внизу" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "Размер" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "Маленький" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "Обычный" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "Средний" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "Большой" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Ошибка" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 msgid "Information" msgstr "Сведения" -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "Подождите..." -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "Отсутствие активности пользователя (ЧЧ:ММ)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." @@ -622,36 +620,42 @@ "Использовать этот переключатель для определения активности пользователя\n" "(например: нет щелчков мыши)." -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 msgid "Unknown" msgstr "Неизвестный" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" "Ввести время отсутствия активности пользователя в формате «ЧЧ:ММ» (часы:" "минуты)" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Когда выбранное приложение закончит работу" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Список запущенных процессов" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Обновить" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Ждать «%0»" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "Процесс или окно не существует: %0" +#~ msgid "Default System" +#~ msgstr "Системный по умолчанию" + +#~ msgid "Lock screen" +#~ msgstr "Заблокировать экран" + #~ msgid "" #~ "Activate countdown. Examples:\n" #~ "13:37 - absolute time (HH:MM)\n" diff -Nru kshutdown-4.0/po/sk.po kshutdown-4.2/po/sk.po --- kshutdown-4.0/po/sk.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/sk.po 2017-10-16 13:21:59.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: sk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2010-09-17 23:37+0200\n" "Last-Translator: Slavko \n" "Language-Team: Slovak \n" @@ -19,293 +19,290 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Reštartovať počítač" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Chyba" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Neplatný príkaz \"Extra\"" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Nemožno vykonať \"Extra\" príkaz" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "Prosím vyberte Extra príkaz
z menu nižšie." -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Extra" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Vyberte príkaz..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Na pridanie/úpravu/odstránenie akcií použite kontextovú ponuku." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Na vytvorenie nového odkazu k aplikácií (akciu) použite Kontextovú " "ponuku" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "Na vytvorenie novej ponuky použite Vytvoriť Nový|Priečinok..." -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Na zmenu ikony, názvu, alebo príkazu použite Vlastnosti" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 #, fuzzy msgid "Do not show this message again" msgstr "Neukladať reláciu" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "Pridať/Odstrániť príkazy" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 #, fuzzy msgid "Help" msgstr "&Pomocník" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Zamknúť obrazovku" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "Test" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Potvrdiť akciu" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Odstrániť odkaz" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 #, fuzzy msgid "Disabled by Administrator" msgstr "Zablokované správcom." -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Ste si istý?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Akcia nedostupná: (%0)" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Nepodporovaná akcia: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Neznáma chyba" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 #, fuzzy msgid "not recommended" msgstr "Spustiť príkaz" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 #, fuzzy msgid "selected time: %0" msgstr "Zvolený čas." -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "Neplatný dátum/čas" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "O dátum/čas" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "Zadajte dátum a čas" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Bez čakania" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Od teraz za (HH:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Zadajte dobu čakania vo formáte \"HH:MM\" (Hodiny:Minúty)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Hibernovať počítač" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Nemožno hibernovať počítač" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Suspendovať počítač" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Nemožno suspendovať počítač" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 #, fuzzy msgid "Enter in a low-power state mode." msgstr "Prejsť do režimu nízkej spotreby" -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Odhlásiť sa" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Vypnúť počítač" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 #, fuzzy msgid "A graphical shutdown utility" msgstr "Pokročilý nástroj vypnutia" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "KShutDown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Zamknúť obrazovku" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "Spustiť súbor (napríklad: súbor desktop alebo skript shellu)" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " "inactivity" msgstr "" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Zrušiť bežiacu akciu" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Potvrdiť akciu na príkazovom riadku" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Nezobrazovať pri spustení okno aplikácie" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -316,156 +313,156 @@ "Aktivovať počítadlo, Príklady: 13:37 – absolútny čas (HH:MM); 10 – počet " "minút čakania" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Akcie" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 #, fuzzy msgid "Other Options:" msgstr "Voľby" -#: src/main.cpp:378 +#: src/main.cpp:381 #, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Akcie" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "Voliteľný parameter" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "Voľby príkazového riadku" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "Neplatný čas: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 #, fuzzy msgid "Action: %0" msgstr "Akcia" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Zostávajúci čas: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "OK" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "&Zrušiť" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "KShutdown je stále aktívny!" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "KShutDown bol minimalizovaný" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "KShutDown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 #, fuzzy msgid "A&ction" msgstr "Akcia" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "Štatistika" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Predvoľby" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Pomocník" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "O programe..." -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 msgid "Select an &action" msgstr "Vyberte &akciu" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 #, fuzzy msgid "Do not save session / Force shutdown" msgstr "Neukladať reláciu" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 #, fuzzy msgid "Se&lect a time/event" msgstr "&Vyberte čas/udalosť" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Ukazovateľ priebehu" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "Kliknutím aktivujte/zrušte zvolenú akciu" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "Zrušiť: %0" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "O Qt..." -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Potvrdiť" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -475,71 +472,71 @@ "\n" "Všetky neuložené dáta budu stratené!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "" -#: src/password.cpp:152 +#: src/password.cpp:151 #, fuzzy msgid "Invalid password" msgstr "Neplatný príkaz \"Extra\"" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "" -#: src/password.cpp:264 +#: src/password.cpp:263 #, fuzzy msgid "Settings (recommended)" msgstr "Spustiť príkaz" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Všeobecné" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 #, fuzzy msgid "System Tray" msgstr "Zobrazovať ikonu v oznamovacej oblasti" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Zamknúť obrazovku pred hibernáciou " @@ -547,125 +544,120 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Príslušné nastavenia KDE..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 #, fuzzy msgid "Enable System Tray Icon" msgstr "Zobrazovať ikonu v oznamovacej oblasti" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 #, fuzzy msgid "Black and White System Tray Icon" msgstr "Zobrazovať ikonu v oznamovacej oblasti" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Skryť" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Pozícia" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Hore" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Dole" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Chyba" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 #, fuzzy msgid "Information" msgstr "Viac informácií" -#: src/stats.cpp:33 +#: src/stats.cpp:31 #, fuzzy msgid "Please Wait..." msgstr "Prosím čakajte..." -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "Pri neaktivite používateľa (HH:MM)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 #, fuzzy msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "Zisťovať neaktivitu používateľa pomocou (príklad: bez klikania myšou)." -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 msgid "Unknown" msgstr "Neznáme" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 #, fuzzy msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" "Zadajte dobu používateľskej neaktivity vo formáte \"HH:MM\" (Hodiny:Minúty)" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Keď vybraná aplikácia skončí" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Zoznam bežiacich procesov" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Obnoviť" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Čakanie na \"%0\"" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#~ msgid "Error: %0" -#~ msgstr "Chyba: %0" - -#~ msgid "Error, exit code: %0" -#~ msgstr "Chyba, návratový kód: %0" - #~ msgid "" #~ "

Hibernate (or Suspend-to-Disk) is a feature of many computer operating " #~ "systems where the contents of RAM are written to non-volatile storage " @@ -697,6 +689,9 @@ #~ "Nebolo možné sa korektne odhlásiť.\n" #~ "Nepodarilo sa kontaktovať správcu sedenia." +#~ msgid "Lock screen" +#~ msgstr "Zamknúť obrazovku" + #~ msgid "&File" #~ msgstr "&Súbor" @@ -709,6 +704,12 @@ #~ msgid "Refresh the list of processes" #~ msgstr "Obnoviť zoznam procesov" +#~ msgid "Error: %0" +#~ msgstr "Chyba: %0" + +#~ msgid "Error, exit code: %0" +#~ msgstr "Chyba, návratový kód: %0" + #~ msgid "Command: %1" #~ msgstr "Príkaz: %1" diff -Nru kshutdown-4.0/po/sr@ijekavianlatin.po kshutdown-4.2/po/sr@ijekavianlatin.po --- kshutdown-4.0/po/sr@ijekavianlatin.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/sr@ijekavianlatin.po 2017-10-16 13:21:59.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kshutdown\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2010-08-07 18:44+0200\n" "Last-Translator: Mladen Pejaković \n" "Language-Team: Serbian \n" @@ -19,255 +19,252 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Ponovo pokreni računar" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Greška" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Nepravilna naredba iz „Dodataka“" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Ne mogu izvršiti naredbu iz „Dodataka“" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "Izaberite komandu iz Dodataka
sa menija iznad." -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Dodatno" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "Fajl nije nađen: %0" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Izaberite naredbu..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Koristite kontekstni meni da biste dodali/uredili/uklonili radnje." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Koristite Kontekstni meni da biste napravili novi link do aplikacije " "(radnju)" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "" "Koristite Napravi novo|Fascikla... da biste napravili novi podmeni" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Koristite Osobine da biste promijenili ikonu, ime ili naredbu" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "Dodaj ili ukloni naredbe" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "Pomoć" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Zaključaj ekran" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "&Obilježivači" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 #, fuzzy msgid "Add Bookmark" msgstr "Dodaj obilježivač: %0" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Potvrdi radnju" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 #, fuzzy msgid "Add: %0" msgstr "Dodaj obilježivač: %0" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Ukloni obilježivač: %0" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "Onemogućio administrator" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Da li ste sigurni?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Radnja nije dostupna: %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Nepodržana radnja: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Nepoznata greška" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 msgid "selected time: %0" msgstr "izabrano vrijeme: %0" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "Nepravilan datum/vrijeme" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "Na datum/vrijeme" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "Unesite datum i vrijeme" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Bez kašnjenja" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Vrijeme od sad (SS:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Kašnjenje u formatu „SS:MM“ (Sati:Minute)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Hiberniraj računar" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Ne mogu da hiberniram računar" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "Na spavanje" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Suspenduj računar" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Ne mogu da suspendujem računar" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "Uđi u režim čuvanja energije." -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "Odjavi se" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Odjavi" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Ugasi računar" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "Napredna alatka za gašenje" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "Održavalac" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "Hvala svima!" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "K-Gašenje" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "Konrad Tvardovski (Konrad Twardowski)" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Zaključaj ekran" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" "Pokreni izvršni fajl (primjer: prečica radne površi ili skripta školjke)" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "Probna radnja (ne radi ništa)" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 #, fuzzy msgid "" "Detect user inactivity. Example:\n" @@ -277,35 +274,35 @@ "Otkriva neaktivnost korisnika. Na primjer: --logout --inactivity 90 - " "automatically odjava nakon 90 minuta neaktivnosti korisnika" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Poništi aktivnu radnju" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Potvrdi komandno-linijsku radnju" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "Sakrij glavni prozor i ikonicu sistemske palete" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Ne prikazuj glavni prozor pri pokretanju" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -316,154 +313,154 @@ "Pokreni odbrojavanje. Primjeri: 13:37 - apsolutno vrijeme (HH:MM), 10 - broj " "minuta počevši od sada" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Radnje" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "" -#: src/main.cpp:378 -#, c-format +#: src/main.cpp:381 +#, fuzzy, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" "Više informacija...\n" "http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Radnje" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "Razno" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "Dodatni parametar" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "Komandno-linijske opcije" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "Nepravilno vrijeme: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "Radnja: %0" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Preostalo vrijeme: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "U redu" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "Odustani" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "K-Gašenje je i dalje aktivno!" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "K-Gašenje je minimizovano" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "K-Gašenje" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" msgstr "&Radnja" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Podešavanja" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Pomoć" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "O" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "Izaberite r&adnju" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "Ne čuvaj sesiju/prisili gašenje" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 msgid "Se&lect a time/event" msgstr "I&zaberite vrijeme/događaj" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Linija napretka" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "Kliknite da aktivirate/prekinete označenu radnju" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "Odustani: %0" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "O Qt-u" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Potvrda" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -473,69 +470,69 @@ "\n" "Podaci svih nesačuvanih dokumenata će biti izgubljeni!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "Unesite novu lozinku" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "Lozinka:" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "Potvrdi lozinku:" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "Unesite lozinku da biste izvršili radnju: %0" -#: src/password.cpp:152 +#: src/password.cpp:151 msgid "Invalid password" msgstr "Nepravilna lozinka" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "Lozinke se ne poklapaju" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "Omogući zaštitu lozinkom" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "Radnje zaštićene lozinkama:" -#: src/password.cpp:264 +#: src/password.cpp:263 msgid "Settings (recommended)" msgstr "" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "Pogledajte takođe: %0" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Opšte" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "Sistemska kaseta" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 #, fuzzy msgid "Password" msgstr "Lozinka:" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Zaključaj ekran prije hibernacije" @@ -543,79 +540,80 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Slična KDE Podešavanja..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 msgid "Enable System Tray Icon" msgstr "Omogući ikonu sistemske kasete" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "Napusti umjesto spuštanja u sistemsku kasetu" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "Crno bijela ikonica sistemske palete" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Sakrij" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "Postavi boju..." -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Mjesto" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Vrh" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Dno" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "Veličina" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "Mala" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "Normalna" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "Srednja" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "Velika" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Greška" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 msgid "Information" msgstr "Informacija" -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "" -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "Pri neaktivnosti korisnika (SS:MM)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 #, fuzzy msgid "" "Use this trigger to detect user inactivity\n" @@ -624,46 +622,34 @@ "Koristi ovaj okidač za otkrivanje neaktivnosti (na primjer: nema aktivnosti " "miša)" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 msgid "Unknown" msgstr "Nepoznato" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "Unesite najdužu neaktivnost korisnika u formatu „SS:MM“ (Sati:Minute)" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Dok se izabrana aplikacija ne zatvori" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Spisak pokrenutih procesa" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Osvježi" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Čekam na „%0“" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#~ msgid "The password will be saved as SHA-1 hash." -#~ msgstr "Lozinka će biti sačuvana kao SHA-1 haš." - -#~ msgid "Short password can be easily cracked." -#~ msgstr "Kratke lozinke lako mogu biti provaljene." - -#~ msgid "Error: %0" -#~ msgstr "Greška: %0" - -#~ msgid "Error, exit code: %0" -#~ msgstr "Greška, izlazni kôd: %0" - #~ msgid "" #~ "

Hibernate (or Suspend-to-Disk) is a feature of many computer operating " #~ "systems where the contents of RAM are written to non-volatile storage " @@ -685,6 +671,9 @@ #~ "programa koji su bili pokrenuti.

Izvor: http://en.wikipedia.org/" #~ "wiki/Hibernate_(OS_feature)

" +#~ msgid "Lock screen" +#~ msgstr "Zaključaj ekran" + #~ msgid "Quit" #~ msgstr "Napusti" @@ -694,6 +683,18 @@ #~ msgid "&Settings" #~ msgstr "&Podešavanje" +#~ msgid "The password will be saved as SHA-1 hash." +#~ msgstr "Lozinka će biti sačuvana kao SHA-1 haš." + +#~ msgid "Short password can be easily cracked." +#~ msgstr "Kratke lozinke lako mogu biti provaljene." + +#~ msgid "Error: %0" +#~ msgstr "Greška: %0" + +#~ msgid "Error, exit code: %0" +#~ msgstr "Greška, izlazni kôd: %0" + #~ msgid "Action: %0" #~ msgstr "Radnja: %0" diff -Nru kshutdown-4.0/po/sr@ijekavian.po kshutdown-4.2/po/sr@ijekavian.po --- kshutdown-4.0/po/sr@ijekavian.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/sr@ijekavian.po 2017-10-16 13:21:59.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kshutdown\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2010-08-07 18:44+0200\n" "Last-Translator: Mladen Pejaković \n" "Language-Team: Serbian \n" @@ -19,255 +19,252 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Поново покрени рачунар" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Грешка" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Неправилна наредба из „Додатака“" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Не могу извршити наредбу из „Додатака“" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "Изаберите команду из Додатака
са менија изнад." -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Додатно" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "Фајл није нађен: %0" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Изаберите наредбу..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Користите контекстни мени да бисте додали/уредили/уклонили радње." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Користите Контекстни мени да бисте направили нови линк до апликације " "(радњу)" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "" "Користите Направи ново|Фасцикла... да бисте направили нови подмени" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Користите Особине да бисте промијенили икону, име или наредбу" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "Додај или уклони наредбе" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "Помоћ" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Закључај екран" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "&Обиљеживачи" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 #, fuzzy msgid "Add Bookmark" msgstr "Додај обиљеживач: %0" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Потврди радњу" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 #, fuzzy msgid "Add: %0" msgstr "Додај обиљеживач: %0" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Уклони обиљеживач: %0" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "Онемогућио администратор" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Да ли сте сигурни?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Радња није доступна: %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Неподржана радња: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Непозната грешка" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 msgid "selected time: %0" msgstr "изабрано вријеме: %0" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "Неправилан датум/вријеме" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "На датум/вријеме" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "Унесите датум и вријеме" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Без кашњења" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Вријеме од сад (СС:ММ)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Кашњење у формату „СС:ММ“ (Сати:Минуте)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Хибернирај рачунар" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Не могу да хибернирам рачунар" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "На спавање" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Суспендуј рачунар" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Не могу да суспендујем рачунар" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "Уђи у режим чувања енергије." -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "Одјави се" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Одјави" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Угаси рачунар" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "Напредна алатка за гашење" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "Одржавалац" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "Хвала свима!" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "К-Гашење" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "Конрад Твардовски (Konrad Twardowski)" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Закључај екран" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" "Покрени извршни фајл (примјер: пречица радне површи или скрипта шкољке)" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "Пробна радња (не ради ништа)" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 #, fuzzy msgid "" "Detect user inactivity. Example:\n" @@ -277,35 +274,35 @@ "Открива неактивност корисника. На примјер: --logout --inactivity 90 - " "automatically одјава након 90 минута неактивности корисника" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Поништи активну радњу" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Потврди командно-линијску радњу" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "Сакриј главни прозор и иконицу системске палете" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Не приказуј главни прозор при покретању" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -316,154 +313,154 @@ "Покрени одбројавање. Примјери: 13:37 - апсолутно вријеме (HH:MM), 10 - број " "минута почевши од сада" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Радње" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "" -#: src/main.cpp:378 -#, c-format +#: src/main.cpp:381 +#, fuzzy, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" "Више информација...\n" "http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Радње" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "Разно" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "Додатни параметар" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "Командно-линијске опције" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "Неправилно вријеме: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "Радња: %0" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Преостало вријеме: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "У реду" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "Одустани" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "К-Гашење је и даље активно!" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "К-Гашење је минимизовано" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "К-Гашење" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" msgstr "&Радња" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Подешавања" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Помоћ" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "О" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "Изаберите р&адњу" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "Не чувај сесију/присили гашење" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 msgid "Se&lect a time/event" msgstr "И&заберите вријеме/догађај" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Линија напретка" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "Кликните да активирате/прекинете означену радњу" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "Одустани: %0" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "О Qt-у" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Потврда" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -473,69 +470,69 @@ "\n" "Подаци свих несачуваних докумената ће бити изгубљени!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "Унесите нову лозинку" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "Лозинка:" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "Потврди лозинку:" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "Унесите лозинку да бисте извршили радњу: %0" -#: src/password.cpp:152 +#: src/password.cpp:151 msgid "Invalid password" msgstr "Неправилна лозинка" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "Лозинке се не поклапају" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "Омогући заштиту лозинком" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "Радње заштићене лозинкама:" -#: src/password.cpp:264 +#: src/password.cpp:263 msgid "Settings (recommended)" msgstr "" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "Погледајте такође: %0" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Опште" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "Системска касета" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 #, fuzzy msgid "Password" msgstr "Лозинка:" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Закључај екран прије хибернације" @@ -543,79 +540,80 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Слична КДЕ Подешавања..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 msgid "Enable System Tray Icon" msgstr "Омогући икону системске касете" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "Напусти умјесто спуштања у системску касету" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "Црно бијела икона системске касете" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Сакриј" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "Постави боју..." -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Мјесто" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Врх" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Дно" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "Величина" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "Мала" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "Нормална" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "Средња" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "Велика" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Грешка" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 msgid "Information" msgstr "Информација" -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "" -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "При неактивности корисника (СС:ММ)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 #, fuzzy msgid "" "Use this trigger to detect user inactivity\n" @@ -624,46 +622,34 @@ "Користи овај окидач за откривање неактивности (на примјер: нема активности " "миша)" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 msgid "Unknown" msgstr "Непознато" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "Унесите најдужу неактивност корисника у формату „СС:ММ“ (Сати:Минуте)" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Док се изабрана апликација не затвори" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Списак покренутих процеса" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Освјежи" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Чекам на „%0“" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#~ msgid "The password will be saved as SHA-1 hash." -#~ msgstr "Лозинка ће бити сачувана као СХА-1 хаш." - -#~ msgid "Short password can be easily cracked." -#~ msgstr "Кратке лозинке лако могу бити проваљене." - -#~ msgid "Error: %0" -#~ msgstr "Грешка: %0" - -#~ msgid "Error, exit code: %0" -#~ msgstr "Грешка, излазни кôд: %0" - #~ msgid "" #~ "

Hibernate (or Suspend-to-Disk) is a feature of many computer operating " #~ "systems where the contents of RAM are written to non-volatile storage " @@ -685,6 +671,9 @@ #~ "били покренути.

Извор: http://en.wikipedia.org/wiki/" #~ "Hibernate_(OS_feature)

" +#~ msgid "Lock screen" +#~ msgstr "Закључај екран" + #~ msgid "Quit" #~ msgstr "Напусти" @@ -694,6 +683,18 @@ #~ msgid "&Settings" #~ msgstr "&Подешавање" +#~ msgid "The password will be saved as SHA-1 hash." +#~ msgstr "Лозинка ће бити сачувана као СХА-1 хаш." + +#~ msgid "Short password can be easily cracked." +#~ msgstr "Кратке лозинке лако могу бити проваљене." + +#~ msgid "Error: %0" +#~ msgstr "Грешка: %0" + +#~ msgid "Error, exit code: %0" +#~ msgstr "Грешка, излазни кôд: %0" + #~ msgid "Action: %0" #~ msgstr "Радња: %0" diff -Nru kshutdown-4.0/po/sr@latin.po kshutdown-4.2/po/sr@latin.po --- kshutdown-4.0/po/sr@latin.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/sr@latin.po 2017-10-16 13:21:59.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kshutdown\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2010-08-07 18:37+0200\n" "Last-Translator: Mladen Pejaković \n" "Language-Team: Serbian \n" @@ -19,255 +19,252 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Ponovo pokreni računar" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Greška" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Nepravilna naredba iz „Dodataka“" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Ne mogu izvršiti naredbu iz „Dodataka“" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "Izaberite komandu iz Dodataka
sa menija iznad." -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Dodatno" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "Fajl nije nađen: %0" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Izaberite naredbu..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Koristite kontekstni meni da biste dodali/uredili/uklonili radnje." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Koristite Kontekstni meni da biste napravili novi link do aplikacije " "(radnju)" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "" "Koristite Napravi novo|Fascikla... da biste napravili novi podmeni" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Koristite Osobine da biste promenili ikonu, ime ili naredbu" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "Dodaj ili ukloni naredbe" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "Pomoć" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Zaključaj ekran" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "&Obeleživači" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 #, fuzzy msgid "Add Bookmark" msgstr "Dodaj obeleživač: %0" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Potvrdi radnju" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 #, fuzzy msgid "Add: %0" msgstr "Dodaj obeleživač: %0" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Ukloni obeleživač: %0" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "Onemogućio administrator" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Da li ste sigurni?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Radnja nije dostupna: %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Nepodržana radnja: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Nepoznata greška" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 msgid "selected time: %0" msgstr "izabrano vreme: %0" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "Nepravilan datum/vreme" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "Na datum/vreme" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "Unesite datum i vreme" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Bez kašnjenja" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Vreme od sad (SS:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Kašnjenje u formatu „SS:MM“ (Sati:Minute)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Hiberniraj računar" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Ne mogu da hiberniram računar" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "Na spavanje" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Suspenduj računar" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Ne mogu da suspendujem računar" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "Uđi u režim čuvanja energije." -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "Odjavi se" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Odjavi" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Ugasi računar" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "Napredna alatka za gašenje" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "Održavalac" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "Hvala svima!" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "K-Gašenje" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "Konrad Tvardovski (Konrad Twardowski)" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Zaključaj ekran" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" "Pokreni izvršni fajl (primer: prečica radne površi ili skripta školjke)" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "Probna radnja (ne radi ništa)" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 #, fuzzy msgid "" "Detect user inactivity. Example:\n" @@ -277,35 +274,35 @@ "Otkriva neaktivnost korisnika. Na primer: --logout --inactivity 90 - " "automatically odjava nakon 90 minuta neaktivnosti korisnika" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Poništi aktivnu radnju" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Potvrdi komandno-linijsku radnju" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "Sakrij glavni prozor i ikonicu sistemske palete" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Ne prikazuj glavni prozor pri pokretanju" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -316,154 +313,154 @@ "Pokreni odbrojavanje. Primeri: 13:37 - apsolutno vreme (HH:MM), 10 - broj " "minuta počevši od sada" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Radnje" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "" -#: src/main.cpp:378 -#, c-format +#: src/main.cpp:381 +#, fuzzy, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" "Više informacija...\n" "http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Radnje" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "Razno" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "Dodatni parametar" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "Komandno-linijske opcije" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "Nepravilno vreme: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "Radnja: %0" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Preostalo vreme: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "U redu" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "Odustani" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "K-Gašenje je i dalje aktivno!" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "K-Gašenje je minimizovano" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "K-Gašenje" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" msgstr "&Radnja" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Podešavanja" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Pomoć" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "O" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "Izaberite r&adnju" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "Ne čuvaj sesiju/prisili gašenje" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 msgid "Se&lect a time/event" msgstr "I&zaberite vreme/događaj" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Linija napretka" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "Kliknite da aktivirate/prekinete označenu radnju" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "Odustani: %0" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "O Qt-u" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Potvrda" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -473,69 +470,69 @@ "\n" "Podaci svih nesačuvanih dokumenata će biti izgubljeni!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "Unesite novu lozinku" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "Lozinka:" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "Potvrdi lozinku:" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "Unesite lozinku da biste izvršili radnju: %0" -#: src/password.cpp:152 +#: src/password.cpp:151 msgid "Invalid password" msgstr "Nepravilna lozinka" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "Lozinke se ne poklapaju" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "Omogući zaštitu lozinkom" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "Radnje zaštićene lozinkama:" -#: src/password.cpp:264 +#: src/password.cpp:263 msgid "Settings (recommended)" msgstr "" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "Pogledajte takođe: %0" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Opšte" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "Sistemska kaseta" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 #, fuzzy msgid "Password" msgstr "Lozinka:" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Zaključaj ekran pre hibernacije" @@ -543,79 +540,80 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Slična KDE Podešavanja..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 msgid "Enable System Tray Icon" msgstr "Omogući ikonu sistemske kasete" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "Napusti umesto spuštanja u sistemsku kasetu" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "Crno bela ikonica sistemske palete" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Sakrij" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "Postavi boju..." -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Mesto" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Vrh" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Dno" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "Veličina" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "Mala" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "Normalna" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "Srednja" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "Velika" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Greška" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 msgid "Information" msgstr "Informacija" -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "" -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "Pri neaktivnosti korisnika (SS:MM)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 #, fuzzy msgid "" "Use this trigger to detect user inactivity\n" @@ -624,46 +622,34 @@ "Koristi ovaj okidač za otkrivanje neaktivnosti (na primer: nema aktivnosti " "miša)" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 msgid "Unknown" msgstr "Nepoznato" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "Unesite najdužu neaktivnost korisnika u formatu „SS:MM“ (Sati:Minute)" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Dok se izabrana aplikacija ne zatvori" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Spisak pokrenutih procesa" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Osveži" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Čekam na „%0“" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#~ msgid "The password will be saved as SHA-1 hash." -#~ msgstr "Lozinka će biti sačuvana kao SHA-1 haš." - -#~ msgid "Short password can be easily cracked." -#~ msgstr "Kratke lozinke lako mogu biti provaljene." - -#~ msgid "Error: %0" -#~ msgstr "Greška: %0" - -#~ msgid "Error, exit code: %0" -#~ msgstr "Greška, izlazni kôd: %0" - #~ msgid "" #~ "

Hibernate (or Suspend-to-Disk) is a feature of many computer operating " #~ "systems where the contents of RAM are written to non-volatile storage " @@ -685,6 +671,9 @@ #~ "programa koji su bili pokrenuti.

Izvor: http://en.wikipedia.org/" #~ "wiki/Hibernate_(OS_feature)

" +#~ msgid "Lock screen" +#~ msgstr "Zaključaj ekran" + #~ msgid "Quit" #~ msgstr "Napusti" @@ -694,6 +683,18 @@ #~ msgid "&Settings" #~ msgstr "&Podešavanje" +#~ msgid "The password will be saved as SHA-1 hash." +#~ msgstr "Lozinka će biti sačuvana kao SHA-1 haš." + +#~ msgid "Short password can be easily cracked." +#~ msgstr "Kratke lozinke lako mogu biti provaljene." + +#~ msgid "Error: %0" +#~ msgstr "Greška: %0" + +#~ msgid "Error, exit code: %0" +#~ msgstr "Greška, izlazni kôd: %0" + #~ msgid "Action: %0" #~ msgstr "Radnja: %0" diff -Nru kshutdown-4.0/po/sr.po kshutdown-4.2/po/sr.po --- kshutdown-4.0/po/sr.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/sr.po 2017-10-16 13:21:59.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kshutdown\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2010-08-07 18:37+0200\n" "Last-Translator: Mladen Pejaković \n" "Language-Team: Serbian \n" @@ -19,254 +19,251 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Поново покрени рачунар" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "Грешка" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "Неправилна наредба из „Додатака“" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "Не могу извршити наредбу из „Додатака“" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "Изаберите команду из Додатака
са менија изнад." -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Додатно" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "Фајл није нађен: %0" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Изаберите наредбу..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "Користите контекстни мени да бисте додали/уредили/уклонили радње." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" "Користите Контекстни мени да бисте направили нови линк до апликације " "(радњу)" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "" "Користите Направи ново|Фасцикла... да бисте направили нови подмени" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "Користите Особине да бисте променили икону, име или наредбу" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "Додај или уклони наредбе" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "Помоћ" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Закључај екран" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "&Обележивачи" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 #, fuzzy msgid "Add Bookmark" msgstr "Додај обележивач: %0" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "Потврди радњу" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 #, fuzzy msgid "Add: %0" msgstr "Додај обележивач: %0" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Уклони обележивач: %0" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "Онемогућио администратор" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Да ли сте сигурни?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "Радња није доступна: %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "Неподржана радња: %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "Непозната грешка" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 msgid "selected time: %0" msgstr "изабрано време: %0" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "Неправилан датум/време" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "На датум/време" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "Унесите датум и време" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Без кашњења" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Време од сад (СС:ММ)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Кашњење у формату „СС:ММ“ (Сати:Минуте)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "Хибернирај рачунар" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "Не могу да хибернирам рачунар" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "На спавање" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "Суспендуј рачунар" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "Не могу да суспендујем рачунар" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "Уђи у режим чувања енергије." -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "Одјави се" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Одјави" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Угаси рачунар" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "Напредна алатка за гашење" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "Одржавалац" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "Хвала свима!" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "К-Гашење" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "Конрад Твардовски (Konrad Twardowski)" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Закључај екран" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "Покрени извршни фајл (пример: пречица радне површи или скрипта шкољке)" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "Пробна радња (не ради ништа)" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 #, fuzzy msgid "" "Detect user inactivity. Example:\n" @@ -276,35 +273,35 @@ "Открива неактивност корисника. На пример: --logout --inactivity 90 - " "automatically одјава након 90 минута неактивности корисника" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Поништи активну радњу" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Потврди командно-линијску радњу" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "Сакриј главни прозор и иконицу системске палете" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "Не приказуј главни прозор при покретању" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -315,154 +312,154 @@ "Покрени одбројавање. Примери: 13:37 - апсолутно време (HH:MM), 10 - број " "минута почевши од сада" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Радње" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "" -#: src/main.cpp:378 -#, c-format +#: src/main.cpp:381 +#, fuzzy, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" "Више информација...\n" "http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Радње" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "Разно" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "Додатни параметар" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "Командно-линијске опције" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "Неправилно време: %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "Радња: %0" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "Преостало време: %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "У реду" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "Одустани" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "К-Гашење је и даље активно!" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "К-Гашење је минимизовано" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "К-Гашење" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" msgstr "&Радња" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "Подешавања" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "&Помоћ" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "О" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "Изаберите р&адњу" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "Не чувај сесију/присили гашење" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 msgid "Se&lect a time/event" msgstr "И&заберите време/догађај" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "Линија напретка" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "Кликните да активирате/прекинете означену радњу" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "Одустани: %0" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "О Qt-у" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Потврда" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -472,69 +469,69 @@ "\n" "Подаци свих несачуваних докумената ће бити изгубљени!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "Унесите нову лозинку" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "Лозинка:" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "Потврди лозинку:" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "Унесите лозинку да бисте извршили радњу: %0" -#: src/password.cpp:152 +#: src/password.cpp:151 msgid "Invalid password" msgstr "Неправилна лозинка" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "Лозинке се не поклапају" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "Омогући заштиту лозинком" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "Радње заштићене лозинкама:" -#: src/password.cpp:264 +#: src/password.cpp:263 msgid "Settings (recommended)" msgstr "" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "Погледајте такође: %0" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Опште" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "Системска касета" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 #, fuzzy msgid "Password" msgstr "Лозинка:" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "Закључај екран пре хибернације" @@ -542,79 +539,80 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Слична КДЕ Подешавања..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 msgid "Enable System Tray Icon" msgstr "Омогући икону системске касете" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "Напусти уместо спуштања у системску касету" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "Црно бела икона системске касете" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Сакриј" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "Постави боју..." -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "Место" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "Врх" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "Дно" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "Величина" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "Мала" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "Нормална" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "Средња" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "Велика" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "Грешка" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 msgid "Information" msgstr "Информација" -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "" -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "При неактивности корисника (СС:ММ)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 #, fuzzy msgid "" "Use this trigger to detect user inactivity\n" @@ -623,46 +621,34 @@ "Користи овај окидач за откривање неактивности (на пример: нема активности " "миша)" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 msgid "Unknown" msgstr "Непознато" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "Унесите најдужу неактивност корисника у формату „СС:ММ“ (Сати:Минуте)" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Док се изабрана апликација не затвори" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Списак покренутих процеса" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Освежи" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "Чекам на „%0“" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#~ msgid "The password will be saved as SHA-1 hash." -#~ msgstr "Лозинка ће бити сачувана као СХА-1 хаш." - -#~ msgid "Short password can be easily cracked." -#~ msgstr "Кратке лозинке лако могу бити проваљене." - -#~ msgid "Error: %0" -#~ msgstr "Грешка: %0" - -#~ msgid "Error, exit code: %0" -#~ msgstr "Грешка, излазни кôд: %0" - #~ msgid "" #~ "

Hibernate (or Suspend-to-Disk) is a feature of many computer operating " #~ "systems where the contents of RAM are written to non-volatile storage " @@ -684,6 +670,9 @@ #~ "били покренути.

Извор: http://en.wikipedia.org/wiki/" #~ "Hibernate_(OS_feature)

" +#~ msgid "Lock screen" +#~ msgstr "Закључај екран" + #~ msgid "Quit" #~ msgstr "Напусти" @@ -693,6 +682,18 @@ #~ msgid "&Settings" #~ msgstr "&Подешавање" +#~ msgid "The password will be saved as SHA-1 hash." +#~ msgstr "Лозинка ће бити сачувана као СХА-1 хаш." + +#~ msgid "Short password can be easily cracked." +#~ msgstr "Кратке лозинке лако могу бити проваљене." + +#~ msgid "Error: %0" +#~ msgstr "Грешка: %0" + +#~ msgid "Error, exit code: %0" +#~ msgstr "Грешка, излазни кôд: %0" + #~ msgid "Action: %0" #~ msgstr "Радња: %0" diff -Nru kshutdown-4.0/po/sv.po kshutdown-4.2/po/sv.po --- kshutdown-4.0/po/sv.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/sv.po 2017-10-16 13:21:59.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kshutdown 0.6.0-4 kshutdown\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2005-11-17 21:26+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -18,309 +18,306 @@ "X-Poedit-Language: sv\n" "X-Poedit-Country: sv\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Starta om datorn" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "" + +#: src/actions/extras.cpp:83 #, fuzzy msgid "Invalid \"Extras\" command" msgstr "Ange ett kommando." -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "" -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "Extra" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Välj ett kommando..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 #, fuzzy msgid "Use context menu to add/edit/remove actions." msgstr "Använd kontextmenyn för att lägga till/redigera/ta bort länkar." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 #, fuzzy msgid "Use Context Menu to create a new link to application (action)" msgstr "Använd Kontextmenyn för att skapa nya länkar till applikationen" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "Använd Skapa Ny|Mapp... för att skapa en ny undermeny" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 #, fuzzy msgid "Use Properties to change icon, name, or command" msgstr "Använd Egenskaper för att ändra ikon, namn eller kommentar" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 #, fuzzy msgid "Add or Remove Commands" msgstr "Lägg till/Ta bort länkar" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 #, fuzzy msgid "Lock Screen" msgstr "Lås skärmen" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "Test" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 #, fuzzy msgid "Enter a message" msgstr "Ange datum" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 #, fuzzy msgid "Confirm Action" msgstr "Bekräfta" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 #, fuzzy msgid "Name:" msgstr "Namn" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Ta bort" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 #, fuzzy msgid "Disabled by Administrator" msgstr "Avstängd av administratören." -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "Är du säker?" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 #, fuzzy msgid "Action not available: %0" msgstr "Åtgärd misslyckades! (%1)" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 #, fuzzy msgid "Unsupported action: %0" msgstr "Ogiltig åtgärd: %1" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 #, fuzzy msgid "Unknown error" msgstr "Okänd" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 #, fuzzy msgid "not recommended" msgstr "Kör kommando" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 #, fuzzy msgid "selected time: %0" msgstr "Vald tid." -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 #, fuzzy msgid "Invalid date/time" msgstr "Den &datum/tid" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "Den datum/tid" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 #, fuzzy msgid "Enter date and time" msgstr "Ange tid och datum." -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Ingen fördröjning" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Tid från och med nu (HH:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 #, fuzzy msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "Ange fördröjning i minuter." -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 #, fuzzy msgid "Hibernate Computer" msgstr "Starta om datorn" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 #, fuzzy msgid "Cannot hibernate computer" msgstr "Starta om datorn" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 #, fuzzy msgid "Suspend Computer" msgstr "Stäng av datorn" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 #, fuzzy msgid "Cannot suspend computer" msgstr "Stäng av datorn" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "" -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Logga ut" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Stäng av datorn" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "Ansvarig" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 #, fuzzy msgid "KShutdown" msgstr "KShutDown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Lås skärmen" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " "inactivity" msgstr "" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Avbryt en aktiv åtgärd" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Bekräfta kommandoradsåtgärd" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 #, fuzzy msgid "Do not show main window on startup" msgstr "Visa inte fönster vid uppstart" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 #, fuzzy msgid "A list of modifications" msgstr "Notifieringar" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -331,162 +328,162 @@ "Tid; Exempel: 01:30 - absolut tid (TT:MM); 10 - antal minuter att vänta från " "och med nu" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Åtgärder" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 #, fuzzy msgid "Other Options:" msgstr "Åtgärder" -#: src/main.cpp:378 +#: src/main.cpp:381 #, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Åtgärder" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 #, fuzzy msgid "Command Line Options" msgstr "Kommando före åtgärd" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 #, fuzzy msgid "Invalid time: %0" msgstr "Ogiltig tid: %1" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 #, fuzzy msgid "Action: %0" msgstr "Åtgärd" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 #, fuzzy msgid "Remaining time: %0" msgstr "Återstående tid." -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 #, fuzzy msgid "Cancel" msgstr "Kommando: %1" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 #, fuzzy msgid "KShutdown has been minimized" msgstr "KShutDown-menyn" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "Kör KShutDown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 #, fuzzy msgid "A&ction" msgstr "Åtgärd" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "Statistik" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "Välj en åtgärd att genomför&a" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 #, fuzzy msgid "Se&lect a time/event" msgstr "Välj &en tid" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 #, fuzzy msgid "Cancel: %0" msgstr "Kommando: %1" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Bekräfta" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 #, fuzzy msgid "" "Are you sure you want to enable this option?\n" @@ -496,71 +493,71 @@ "Är du säker att du vill DÖDA
%1?

All osparad data kommer " "att förloras!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "" -#: src/password.cpp:152 +#: src/password.cpp:151 #, fuzzy msgid "Invalid password" msgstr "Ange ett kommando." -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "" -#: src/password.cpp:264 +#: src/password.cpp:263 #, fuzzy msgid "Settings (recommended)" msgstr "Bekräfta åtgärd (&rekommenderat)" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Allmänt" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 #, fuzzy msgid "System Tray" msgstr "MSystemTray" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "" @@ -568,116 +565,117 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "Relaterade KDE-inställningar..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 #, fuzzy msgid "Enable System Tray Icon" msgstr "Visa systempanelsikonen" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 #, fuzzy msgid "Black and White System Tray Icon" msgstr "Visa systempanelsikonen" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 #, fuzzy msgid "Position" msgstr "Beskrivning" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 #, fuzzy msgid "Information" msgstr "Mer information" -#: src/stats.cpp:33 +#: src/stats.cpp:31 #, fuzzy msgid "Please Wait..." msgstr "Var god vänta..." -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 #, fuzzy msgid "Unknown" msgstr "Okänd" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "När valda applikationen avslutas" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Uppdatera" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 #, fuzzy msgid "Waiting for \"%0\"" msgstr "Väntar på \"%1\"" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" @@ -949,6 +947,9 @@ #~ msgid "After Login" #~ msgstr "Efter inloggning" +#~ msgid "Lock screen" +#~ msgstr "Lås skärmen" + #~ msgid "Before Logout" #~ msgstr "Före utloggning" diff -Nru kshutdown-4.0/po/TEMPLATE.pot kshutdown-4.2/po/TEMPLATE.pot --- kshutdown-4.0/po/TEMPLATE.pot 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/TEMPLATE.pot 2017-10-16 13:21:59.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,283 +17,280 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 +msgid "Restart Computer" msgstr "" -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 -msgid "Restart Computer" +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" msgstr "" -#: src/actions/extras.cpp:79 +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "" -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "" -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "" -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 msgid "Remove: %0" msgstr "" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 msgid "selected time: %0" msgstr "" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "" -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " "inactivity" msgstr "" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 msgid "" "Activate countdown. Examples:\n" "13:37 (HH:MM) or \"1:37 PM\" - absolute time\n" @@ -301,217 +298,217 @@ "2h - two hours" msgstr "" -#: src/main.cpp:319 +#: src/main.cpp:322 msgid "Actions:" msgstr "" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "" -#: src/main.cpp:378 +#: src/main.cpp:381 #, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 msgid "Quit KShutdown" msgstr "" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" msgstr "" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 msgid "Select an &action" msgstr "" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 msgid "Se&lect a time/event" msgstr "" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" "Data in all unsaved documents will be lost!" msgstr "" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "" -#: src/password.cpp:152 +#: src/password.cpp:151 msgid "Invalid password" msgstr "" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "" -#: src/password.cpp:264 +#: src/password.cpp:263 msgid "Settings (recommended)" msgstr "" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "" @@ -519,108 +516,108 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +msgid "System Settings..." msgstr "" -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 msgid "Enable System Tray Icon" msgstr "" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 msgid "Information" msgstr "" -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "" -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 msgid "Unknown" msgstr "" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" diff -Nru kshutdown-4.0/po/tr.po kshutdown-4.2/po/tr.po --- kshutdown-4.0/po/tr.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/tr.po 2017-10-16 13:21:59.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: tr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2007-08-27 21:57+0300\n" "Last-Translator: Eren Türkay \n" "Language-Team: \n" @@ -19,304 +19,301 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "Bilgisayarı Yeniden Başlat" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "" + +#: src/actions/extras.cpp:83 #, fuzzy msgid "Invalid \"Extras\" command" msgstr "Komut girin." -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 #, fuzzy msgid "Cannot execute \"Extras\" command" msgstr "\"Ek\" komut çalıştır (.desktop dosyası)" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "" -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 #, fuzzy msgid "Extras" msgstr "Diğer" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "Komut seçin..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 #, fuzzy msgid "Use context menu to add/edit/remove actions." msgstr "Kısayol ekle/çıkar için sağ tık menüsünü kullanın." -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 #, fuzzy msgid "Use Context Menu to create a new link to application (action)" msgstr "Yeni kısayol oluşturmak için Sağ tık menüsünü kullanın." -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "Yeni alt menü oluşturmak için Yeni oluştur|Dizin... kullanın" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 #, fuzzy msgid "Use Properties to change icon, name, or command" msgstr "İsmi, uyarıyı ya da simgeyi değiştirmek için Ayarlar'ı kullanın" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 #, fuzzy msgid "Add or Remove Commands" msgstr "Linkleri Ekle/Kaldır" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "Ekranı Kilitle" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "Deneme" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 msgid "Add Bookmark" msgstr "" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 msgid "Add" msgstr "" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 #, fuzzy msgid "Confirm Action" msgstr "Onayla" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 #, fuzzy msgid "Remove: %0" msgstr "Kısayol Sil" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 #, fuzzy msgid "Disabled by Administrator" msgstr "Yönetici tarafından devre dışı bırakıldı." -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 #, fuzzy msgid "Action not available: %0" msgstr "Eylem başarısız! (%1)" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 #, fuzzy msgid "Unknown error" msgstr "Bilinmeyen" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 #, fuzzy msgid "not recommended" msgstr "Önerilen" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 #, fuzzy msgid "selected time: %0" msgstr "Belirlenen süre." -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 #, fuzzy msgid "Invalid date/time" msgstr "Belirlenen tarih/saat: %1" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "Tarih/saat" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 #, fuzzy msgid "Enter date and time" msgstr "Tarih ve saat girin." -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "Bekleme Yok" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "Şu andan itibaren (SA:DK) " -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 #, fuzzy msgid "Hibernate Computer" msgstr "Bilgisayarı Yeniden Başlat" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 #, fuzzy msgid "Cannot hibernate computer" msgstr "Bilgisayarı Yeniden Başlat" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 #, fuzzy msgid "Suspend Computer" msgstr "Bilgisayarı Kapat" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 #, fuzzy msgid "Cannot suspend computer" msgstr "Bilgisayarı Kapat" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "" -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "Çıkış" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "Bilgisayarı Kapat" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "Ekranı kilitle" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 msgid "" "Detect user inactivity. Example:\n" "--logout --inactivity 90 - automatically logout after 90 minutes of user " "inactivity" msgstr "" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "Etkin işlemi iptal et" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "Komut satırı eylemini onayla" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 #, fuzzy msgid "Do not show main window on startup" msgstr "Başlangıçta pencereyi gösterme" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -327,160 +324,160 @@ "Zaman örnekleri: 01:30 - tam zaman (SA:DK); 10 - şu andan itibaren " "beklenecek dakika" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "Eylemler" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "" -#: src/main.cpp:378 +#: src/main.cpp:381 #, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "Eylemler" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 #, fuzzy msgid "Command Line Options" msgstr "İşlemden önce komut çalıştır" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 #, fuzzy msgid "Invalid time: %0" msgstr "Geçersiz zaman: %1" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 #, fuzzy msgid "Action: %0" msgstr "Eylem" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 #, fuzzy msgid "Remaining time: %0" msgstr "Kalan zaman." -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 #, fuzzy msgid "Cancel" msgstr "İ&ptal" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 #, fuzzy msgid "KShutdown has been minimized" msgstr "KShutDown sistem çekmecesine küçültüldü" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 msgid "Quit KShutdown" msgstr "" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 #, fuzzy msgid "A&ction" msgstr "Eylem" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "İstatistikler" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "&Gerçekleştirilecek eylemi seçin" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 #, fuzzy msgid "Se&lect a time/event" msgstr "&Zaman seçin" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "İşlem Çubuğu" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 #, fuzzy msgid "Cancel: %0" msgstr "İ&ptal" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "Onayla" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 #, fuzzy msgid "" "Are you sure you want to enable this option?\n" @@ -490,71 +487,71 @@ "%1
sürecini ÖLDÜRMEK istediğinizden emin misiniz?" "

Kaydedilmemiş tüm veriler silinecek!" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "" -#: src/password.cpp:152 +#: src/password.cpp:151 #, fuzzy msgid "Invalid password" msgstr "Komut girin." -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "" -#: src/password.cpp:264 +#: src/password.cpp:263 #, fuzzy msgid "Settings (recommended)" msgstr "Önerilen" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "Genel" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 #, fuzzy msgid "System Tray" msgstr "Sistem Çekmecesi Simgesini Göster" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "" @@ -562,115 +559,116 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "İlgili KDE Ayarları..." -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 #, fuzzy msgid "Enable System Tray Icon" msgstr "Sistem Çekmecesi Simgesini Göster" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 #, fuzzy msgid "Black and White System Tray Icon" msgstr "Sistem Çekmecesi Simgesini Göster" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "Gizle" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 #, fuzzy msgid "Information" msgstr "Daha fazla bilgi" -#: src/stats.cpp:33 +#: src/stats.cpp:31 #, fuzzy msgid "Please Wait..." msgstr "Lütfen bekleyin..." -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 #, fuzzy msgid "Unknown" msgstr "Bilinmeyen" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "Belirtilen uygulama kapanınca" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "Çalışan süreçler listesi" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "Yenile" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 #, fuzzy msgid "Waiting for \"%0\"" msgstr "\"%1\" bekleniyor" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" @@ -930,6 +928,9 @@ #~ msgid "After Login" #~ msgstr "Oturum açıldıktan sonra" +#~ msgid "Lock screen" +#~ msgstr "Ekranı kilitle" + #~ msgid "Before Logout" #~ msgstr "Oturum kapanmadan önce" diff -Nru kshutdown-4.0/po/zh_CN.po kshutdown-4.2/po/zh_CN.po --- kshutdown-4.0/po/zh_CN.po 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/po/zh_CN.po 2017-10-16 13:21:59.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kshutdown 3.0beta8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 22:01+0200\n" +"POT-Creation-Date: 2017-10-16 15:21+0200\n" "PO-Revision-Date: 2013-06-23 23:30+0800\n" "Last-Translator: xStone \n" "Language-Team: \n" @@ -17,252 +17,249 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/actions/bootentry.cpp:35 -msgid "Default System" -msgstr "" - -#: src/actions/bootentry.cpp:109 src/kshutdown.cpp:1528 src/main.cpp:268 -#: src/main.cpp:328 +#: src/actions/bootentry.cpp:158 src/kshutdown.cpp:1547 src/main.cpp:271 +#: src/main.cpp:331 msgid "Restart Computer" msgstr "重启计算机" -#: src/actions/extras.cpp:79 +#: src/actions/bootentry.cpp:164 src/pureqt.h:93 src/pureqt.h:129 +#: src/triggers/processmonitor.cpp:391 +msgid "Error" +msgstr "错误" + +#: src/actions/extras.cpp:83 msgid "Invalid \"Extras\" command" msgstr "无效的 其他 动作" -#: src/actions/extras.cpp:94 src/actions/extras.cpp:102 -#: src/actions/extras.cpp:139 +#: src/actions/extras.cpp:98 src/actions/extras.cpp:106 +#: src/actions/extras.cpp:143 msgid "Cannot execute \"Extras\" command" msgstr "无法执行 其他 动作" -#: src/actions/extras.cpp:156 +#: src/actions/extras.cpp:160 msgid "Please select an Extras command
from the menu above." msgstr "请从上述菜单中选择一个 其他 动作" -#: src/actions/extras.cpp:173 +#: src/actions/extras.cpp:177 msgid "Extras" msgstr "其他" -#: src/actions/extras.cpp:193 +#: src/actions/extras.cpp:197 msgid "File not found: %0" msgstr "文件不存在： %0" -#: src/actions/extras.cpp:257 +#: src/actions/extras.cpp:270 msgid "Empty" msgstr "" -#: src/actions/extras.cpp:350 +#: src/actions/extras.cpp:363 msgid "Select a command..." msgstr "请选择一个动作..." -#: src/actions/extras.cpp:372 +#: src/actions/extras.cpp:385 msgid "Use context menu to add/edit/remove actions." msgstr "使用 上下文菜单 添加/编辑/移除动作或子菜单" -#: src/actions/extras.cpp:374 +#: src/actions/extras.cpp:387 msgid "Use Context Menu to create a new link to application (action)" msgstr "使用 上下文菜单 创建指向应用程序的快捷方式，以添加动作" -#: src/actions/extras.cpp:376 +#: src/actions/extras.cpp:389 msgid "Use Create New|Folder... to create a new submenu" msgstr "使用 上下文菜单 创建文件夹，以添加子菜单" -#: src/actions/extras.cpp:377 +#: src/actions/extras.cpp:390 msgid "Use Properties to change icon, name, or command" msgstr "" "选中预编辑的快捷方式或文件夹，使用 上下文菜单 编辑其属性，以更改图标、" "名称、应用程序等" -#: src/actions/extras.cpp:398 +#: src/actions/extras.cpp:411 msgid "Do not show this message again" msgstr "" -#: src/actions/extras.cpp:447 +#: src/actions/extras.cpp:460 msgid "Add or Remove Commands" msgstr "添加或移除动作" -#: src/actions/extras.cpp:455 +#: src/actions/extras.cpp:468 msgid "Help" msgstr "帮助" -#: src/actions/lock.cpp:249 +#: src/actions/lock.cpp:248 src/main.cpp:276 src/main.cpp:340 msgid "Lock Screen" msgstr "锁定屏幕" -#: src/actions/test.cpp:28 +#: src/actions/test.cpp:30 msgid "Show Message (no shutdown)" msgstr "" -#: src/actions/test.cpp:33 +#: src/actions/test.cpp:35 msgid "Test" msgstr "" -#: src/actions/test.cpp:35 +#: src/actions/test.cpp:37 msgid "Enter a message" msgstr "" -#: src/actions/test.cpp:53 +#: src/actions/test.cpp:55 msgid "Text:" msgstr "" -#: src/bookmarks.cpp:87 +#: src/bookmarks.cpp:93 msgid "&Bookmarks" msgstr "书签(&B)" -#: src/bookmarks.cpp:214 +#: src/bookmarks.cpp:222 #, fuzzy msgid "Add Bookmark" msgstr "书签(&B)" -#: src/bookmarks.cpp:215 +#: src/bookmarks.cpp:223 #, fuzzy msgid "Add" msgstr "添加： %0" -#: src/bookmarks.cpp:222 src/kshutdown.cpp:171 src/preferences.cpp:121 +#: src/bookmarks.cpp:230 src/kshutdown.cpp:170 src/preferences.cpp:118 msgid "Confirm Action" msgstr "确认对话框" -#: src/bookmarks.cpp:228 +#: src/bookmarks.cpp:236 msgid "Name:" msgstr "" -#: src/bookmarks.cpp:286 +#: src/bookmarks.cpp:296 msgid "Add: %0" msgstr "添加： %0" -#: src/bookmarks.cpp:291 +#: src/bookmarks.cpp:301 msgid "Remove: %0" msgstr "移除： %0" -#: src/kshutdown.cpp:141 +#: src/kshutdown.cpp:140 msgid "Disabled by Administrator" msgstr "已被系统管理员停用" -#: src/kshutdown.cpp:170 +#: src/kshutdown.cpp:169 msgid "Are you sure?" msgstr "您确定嘛？" -#: src/kshutdown.cpp:216 +#: src/kshutdown.cpp:220 msgid "Action not available: %0" msgstr "动作不可用： %0" -#: src/kshutdown.cpp:292 src/mainwindow.cpp:405 +#: src/kshutdown.cpp:306 src/mainwindow.cpp:414 msgid "Unsupported action: %0" msgstr "不支持的动作： %0" -#: src/kshutdown.cpp:306 src/kshutdown.cpp:316 +#: src/kshutdown.cpp:320 src/kshutdown.cpp:330 msgid "Unknown error" msgstr "未知错误" -#: src/kshutdown.cpp:540 +#: src/kshutdown.cpp:556 msgid "not recommended" msgstr "" -#: src/kshutdown.cpp:543 +#: src/kshutdown.cpp:559 msgid "selected time: %0" msgstr "触发动作的时间点： %0" -#: src/kshutdown.cpp:554 src/kshutdown.cpp:631 +#: src/kshutdown.cpp:570 src/kshutdown.cpp:647 msgid "Invalid date/time" msgstr "无效的日期和时间" -#: src/kshutdown.cpp:563 +#: src/kshutdown.cpp:579 msgid "At Date/Time" msgstr "在选择的日期和时间" -#: src/kshutdown.cpp:620 +#: src/kshutdown.cpp:636 msgid "Enter date and time" msgstr "请输入日期和时间" -#: src/kshutdown.cpp:651 src/mainwindow.cpp:865 +#: src/kshutdown.cpp:667 src/mainwindow.cpp:894 msgid "No Delay" msgstr "立即执行" -#: src/kshutdown.cpp:661 +#: src/kshutdown.cpp:677 msgid "Time From Now (HH:MM)" msgstr "从现在开始后(HH:MM)" -#: src/kshutdown.cpp:689 +#: src/kshutdown.cpp:705 msgid "Enter delay in \"HH:MM\" format (Hour:Minute)" msgstr "请输入延迟时长，格式为HH:MM(Hour:Minute)" -#: src/kshutdown.cpp:925 src/main.cpp:270 src/main.cpp:331 +#: src/kshutdown.cpp:959 src/main.cpp:273 src/main.cpp:334 msgid "Hibernate Computer" msgstr "休眠计算机" -#: src/kshutdown.cpp:928 +#: src/kshutdown.cpp:962 msgid "Cannot hibernate computer" msgstr "无法休眠计算机" -#: src/kshutdown.cpp:932 +#: src/kshutdown.cpp:966 msgid "" "Save the contents of RAM to disk\n" "then turn off the computer." msgstr "" -#: src/kshutdown.cpp:942 +#: src/kshutdown.cpp:976 msgid "Sleep" msgstr "睡眠计算机" -#: src/kshutdown.cpp:944 src/main.cpp:271 src/main.cpp:334 +#: src/kshutdown.cpp:978 src/main.cpp:274 src/main.cpp:337 msgid "Suspend Computer" msgstr "睡眠计算机" -#: src/kshutdown.cpp:949 +#: src/kshutdown.cpp:983 msgid "Cannot suspend computer" msgstr "无法睡眠计算机" -#: src/kshutdown.cpp:953 +#: src/kshutdown.cpp:987 msgid "Enter in a low-power state mode." msgstr "" -#: src/kshutdown.cpp:1504 +#: src/kshutdown.cpp:1529 msgid "Log Off" msgstr "注销" -#: src/kshutdown.cpp:1506 src/main.cpp:274 src/main.cpp:340 +#: src/kshutdown.cpp:1531 src/main.cpp:277 src/main.cpp:343 msgid "Logout" msgstr "注销" -#: src/kshutdown.cpp:1581 src/main.cpp:266 src/main.cpp:267 src/main.cpp:322 -#: src/main.cpp:325 +#: src/kshutdown.cpp:1600 src/main.cpp:269 src/main.cpp:270 src/main.cpp:325 +#: src/main.cpp:328 msgid "Turn Off Computer" msgstr "关闭计算机" -#: src/main.cpp:223 src/main.cpp:238 src/mainwindow.cpp:1227 +#: src/main.cpp:226 src/main.cpp:241 src/mainwindow.cpp:1262 msgid "A graphical shutdown utility" msgstr "定时关机工具" -#: src/main.cpp:225 src/main.cpp:240 +#: src/main.cpp:228 src/main.cpp:243 msgid "Maintainer" msgstr "维护者" -#: src/main.cpp:226 src/main.cpp:241 +#: src/main.cpp:229 src/main.cpp:244 msgid "Thanks To All!" msgstr "感谢所有人" -#: src/main.cpp:231 src/progressbar.cpp:119 +#: src/main.cpp:234 src/progressbar.cpp:184 msgid "KShutdown" msgstr "KShutdown" -#: src/main.cpp:240 +#: src/main.cpp:243 msgid "Konrad Twardowski" msgstr "Konrad Twardowski" -#: src/main.cpp:273 src/main.cpp:337 -msgid "Lock screen" -msgstr "锁定屏幕" - -#: src/main.cpp:278 src/main.cpp:343 +#: src/main.cpp:281 src/main.cpp:346 msgid "Run executable file (example: Desktop shortcut or Shell script)" msgstr "运行可执行文件，比如桌面快捷方式、Shell脚本等" -#: src/main.cpp:282 src/main.cpp:345 +#: src/main.cpp:285 src/main.cpp:348 msgid "Test Action (does nothing)" msgstr "测试(不做任何事)" -#: src/main.cpp:289 src/main.cpp:355 src/mainwindow.cpp:138 +#: src/main.cpp:292 src/main.cpp:358 src/mainwindow.cpp:130 #, fuzzy msgid "" "Detect user inactivity. Example:\n" @@ -272,35 +269,35 @@ "检测用户不活跃状态，示例： --logout --inactivity 90 - 当用户处于不活跃状态90" "分钟后自动注销" -#: src/main.cpp:296 +#: src/main.cpp:299 msgid "Show this help" msgstr "" -#: src/main.cpp:297 src/main.cpp:362 +#: src/main.cpp:300 src/main.cpp:365 msgid "Cancel an active action" msgstr "取消一个活跃动作" -#: src/main.cpp:298 src/main.cpp:363 src/mainwindow.cpp:144 +#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:136 msgid "Confirm command line action" msgstr "对当前动作进行确认" -#: src/main.cpp:299 src/main.cpp:364 src/mainwindow.cpp:146 +#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:138 msgid "Hide main window and system tray icon" msgstr "启动时隐藏主窗口和系统托盘" -#: src/main.cpp:300 src/main.cpp:365 src/mainwindow.cpp:148 +#: src/main.cpp:303 src/main.cpp:368 src/mainwindow.cpp:140 msgid "Do not show main window on startup" msgstr "启动时隐藏主窗口" -#: src/main.cpp:301 src/main.cpp:366 src/mainwindow.cpp:150 +#: src/main.cpp:304 src/main.cpp:369 src/mainwindow.cpp:142 msgid "A list of modifications" msgstr "" -#: src/main.cpp:302 src/main.cpp:367 src/mainwindow.cpp:152 +#: src/main.cpp:305 src/main.cpp:370 src/mainwindow.cpp:144 msgid "Show custom popup menu instead of main window" msgstr "" -#: src/main.cpp:306 src/main.cpp:371 src/mainwindow.cpp:160 +#: src/main.cpp:309 src/main.cpp:374 src/mainwindow.cpp:152 #, fuzzy msgid "" "Activate countdown. Examples:\n" @@ -309,154 +306,154 @@ "2h - two hours" msgstr "倒计时时长，示例： 13:37 - 绝对时间(HH:MM)，10 - 从现在开始后的分钟数" -#: src/main.cpp:319 +#: src/main.cpp:322 #, fuzzy msgid "Actions:" msgstr "动作" -#: src/main.cpp:349 +#: src/main.cpp:352 msgid "Triggers:" msgstr "" -#: src/main.cpp:360 +#: src/main.cpp:363 msgid "Other Options:" msgstr "" -#: src/main.cpp:378 -#, c-format +#: src/main.cpp:381 +#, fuzzy, c-format msgid "" "More Info...\n" -"http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" +"https://sourceforge.net/p/kshutdown/wiki/Command%20Line/" msgstr "" "更多信息，请参考\n" "http://sourceforge.net/p/kshutdown/wiki/Command%20Line/" -#: src/mainwindow.cpp:104 +#: src/mainwindow.cpp:96 msgid "Actions" msgstr "动作" -#: src/mainwindow.cpp:133 +#: src/mainwindow.cpp:125 msgid "Miscellaneous" msgstr "杂项" -#: src/mainwindow.cpp:155 +#: src/mainwindow.cpp:147 msgid "Run in \"portable\" mode" msgstr "" -#: src/mainwindow.cpp:158 +#: src/mainwindow.cpp:150 msgid "Optional parameter" msgstr "可选参数" -#: src/mainwindow.cpp:176 +#: src/mainwindow.cpp:168 msgid "Command Line Options" msgstr "命令行选项" -#: src/mainwindow.cpp:223 src/mainwindow.cpp:1410 +#: src/mainwindow.cpp:215 src/mainwindow.cpp:1446 msgid "Invalid time: %0" msgstr "无效的时间： %0" -#: src/mainwindow.cpp:258 +#: src/mainwindow.cpp:250 msgid "Action: %0" msgstr "动作： %0" -#: src/mainwindow.cpp:261 src/mainwindow.cpp:285 +#: src/mainwindow.cpp:253 src/mainwindow.cpp:277 msgid "Remaining time: %0" msgstr "剩余时长： %0" -#: src/mainwindow.cpp:273 src/mainwindow.cpp:1132 src/mainwindow.cpp:1151 +#: src/mainwindow.cpp:265 src/mainwindow.cpp:1167 src/mainwindow.cpp:1186 msgid "OK" msgstr "确定" -#: src/mainwindow.cpp:277 +#: src/mainwindow.cpp:269 #, c-format msgid "Press %0 to activate KShutdown" msgstr "" -#: src/mainwindow.cpp:452 src/mainwindow.cpp:1127 src/mainwindow.cpp:1146 -#: src/mainwindow.cpp:1166 src/password.cpp:274 +#: src/mainwindow.cpp:465 src/mainwindow.cpp:1162 src/mainwindow.cpp:1181 +#: src/mainwindow.cpp:1201 src/password.cpp:273 msgid "Cancel" msgstr "取消" -#: src/mainwindow.cpp:635 +#: src/mainwindow.cpp:652 msgid "KShutdown is still active!" msgstr "KShutdown 仍处于活跃状态！" -#: src/mainwindow.cpp:641 +#: src/mainwindow.cpp:658 msgid "KShutdown has been minimized" msgstr "KShutdown 已最小化至系统托盘" -#: src/mainwindow.cpp:796 src/mainwindow.cpp:1193 src/password.cpp:275 +#: src/mainwindow.cpp:819 src/mainwindow.cpp:1228 src/password.cpp:274 #, fuzzy msgid "Quit KShutdown" msgstr "KShutdown" -#: src/mainwindow.cpp:863 +#: src/mainwindow.cpp:887 msgid "A&ction" msgstr "动作(&C)" -#: src/mainwindow.cpp:889 +#: src/mainwindow.cpp:919 msgid "&Tools" msgstr "" -#: src/mainwindow.cpp:892 src/stats.cpp:27 +#: src/mainwindow.cpp:923 src/stats.cpp:25 msgid "Statistics" msgstr "" -#: src/mainwindow.cpp:897 src/password.cpp:163 src/preferences.cpp:33 +#: src/mainwindow.cpp:930 src/password.cpp:162 src/preferences.cpp:31 msgid "Preferences" msgstr "首选项" -#: src/mainwindow.cpp:940 +#: src/mainwindow.cpp:975 msgid "&Help" msgstr "帮助(&H)" -#: src/mainwindow.cpp:941 src/mainwindow.cpp:1282 src/mainwindow.cpp:1289 +#: src/mainwindow.cpp:976 src/mainwindow.cpp:1316 src/mainwindow.cpp:1323 msgid "About" msgstr "关于" -#: src/mainwindow.cpp:968 +#: src/mainwindow.cpp:997 #, fuzzy msgid "Select an &action" msgstr "选择动作(&T)" -#: src/mainwindow.cpp:980 +#: src/mainwindow.cpp:1009 msgid "Do not save session / Force shutdown" msgstr "不保存当前会话" -#: src/mainwindow.cpp:985 +#: src/mainwindow.cpp:1014 msgid "Se&lect a time/event" msgstr "选择时间点或事件(&L)" -#: src/mainwindow.cpp:1094 src/preferences.cpp:125 src/progressbar.cpp:113 -#: src/progressbar.cpp:230 +#: src/mainwindow.cpp:1129 src/preferences.cpp:122 src/progressbar.cpp:178 +#: src/progressbar.cpp:299 msgid "Progress Bar" msgstr "进度条" -#: src/mainwindow.cpp:1154 +#: src/mainwindow.cpp:1189 msgid "Click to activate/cancel the selected action" msgstr "单击以激活或取消当前动作" -#: src/mainwindow.cpp:1162 +#: src/mainwindow.cpp:1197 msgid "Cancel: %0" msgstr "取消： %0" -#: src/mainwindow.cpp:1230 +#: src/mainwindow.cpp:1265 msgid "What's New?" msgstr "" -#: src/mainwindow.cpp:1268 +#: src/mainwindow.cpp:1302 msgid "About Qt" msgstr "关于 Qt" -#: src/mainwindow.cpp:1290 +#: src/mainwindow.cpp:1324 msgid "License" msgstr "" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "Confirm" msgstr "确认" -#: src/mainwindow.cpp:1390 +#: src/mainwindow.cpp:1426 msgid "" "Are you sure you want to enable this option?\n" "\n" @@ -466,68 +463,68 @@ "\n" "注意，此选项可能会使所有未被保存的文档数据丢失！" -#: src/password.cpp:45 +#: src/password.cpp:44 msgid "Enter New Password" msgstr "" -#: src/password.cpp:74 +#: src/password.cpp:73 msgid "Password:" msgstr "" -#: src/password.cpp:75 +#: src/password.cpp:74 msgid "Confirm Password:" msgstr "" -#: src/password.cpp:117 +#: src/password.cpp:116 msgid "Enter password to perform action: %0" msgstr "" -#: src/password.cpp:152 +#: src/password.cpp:151 msgid "Invalid password" msgstr "" -#: src/password.cpp:197 +#: src/password.cpp:196 #, c-format msgid "Password is too short (need %0 characters or more)" msgstr "" -#: src/password.cpp:202 +#: src/password.cpp:201 msgid "Confirmation password is different" msgstr "" -#: src/password.cpp:242 +#: src/password.cpp:241 msgid "Enable Password Protection" msgstr "" -#: src/password.cpp:258 +#: src/password.cpp:257 msgid "Password Protected Actions:" msgstr "" -#: src/password.cpp:264 +#: src/password.cpp:263 msgid "Settings (recommended)" msgstr "" -#: src/password.cpp:281 +#: src/password.cpp:280 msgid "See Also: %0" msgstr "" -#: src/preferences.cpp:45 +#: src/preferences.cpp:43 msgid "General" msgstr "常规" -#: src/preferences.cpp:46 +#: src/preferences.cpp:44 msgid "System Tray" msgstr "系统托盘" -#: src/preferences.cpp:49 +#: src/preferences.cpp:47 msgid "Password" msgstr "" -#: src/preferences.cpp:127 +#: src/preferences.cpp:124 msgid "Show a small progress bar on top/bottom of the screen." msgstr "" -#: src/preferences.cpp:131 +#: src/preferences.cpp:130 msgid "Lock Screen Before Hibernate" msgstr "休眠前锁定屏幕" @@ -535,118 +532,116 @@ msgid "Custom Lock Screen Command:" msgstr "" -#: src/preferences.cpp:161 -msgid "Related KDE Settings..." +#: src/preferences.cpp:162 +#, fuzzy +msgid "System Settings..." msgstr "KDE 相关设置" -#: src/preferences.cpp:174 +#: src/preferences.cpp:176 msgid "Enable System Tray Icon" msgstr "启用系统托盘" -#: src/preferences.cpp:182 +#: src/preferences.cpp:184 msgid "Quit instead of minimizing to System Tray Icon" msgstr "直接退出，而非最小化至系统托盘" -#: src/preferences.cpp:193 +#: src/preferences.cpp:198 +msgid "Use System Icon Theme" +msgstr "" + +#: src/preferences.cpp:204 msgid "Black and White System Tray Icon" msgstr "使用黑白色的系统托盘图标" -#: src/progressbar.cpp:125 +#: src/progressbar.cpp:190 msgid "Hide" msgstr "隐藏" -#: src/progressbar.cpp:126 +#: src/progressbar.cpp:191 msgid "Set Color..." msgstr "设置颜色" -#: src/progressbar.cpp:131 +#: src/progressbar.cpp:196 msgid "Position" msgstr "位置" -#: src/progressbar.cpp:135 +#: src/progressbar.cpp:200 msgid "Top" msgstr "顶部" -#: src/progressbar.cpp:138 +#: src/progressbar.cpp:203 msgid "Bottom" msgstr "底部" -#: src/progressbar.cpp:141 +#: src/progressbar.cpp:206 msgid "Size" msgstr "宽度" -#: src/progressbar.cpp:147 +#: src/progressbar.cpp:212 msgid "Small" msgstr "较小" -#: src/progressbar.cpp:150 +#: src/progressbar.cpp:215 msgid "Normal" msgstr "普通" -#: src/progressbar.cpp:153 +#: src/progressbar.cpp:218 msgid "Medium" msgstr "中等" -#: src/progressbar.cpp:156 +#: src/progressbar.cpp:221 msgid "Large" msgstr "较大" -#: src/pureqt.h:96 src/pureqt.h:132 src/triggers/processmonitor.cpp:358 -msgid "Error" -msgstr "错误" - -#: src/pureqt.h:98 src/pureqt.h:134 +#: src/pureqt.h:95 src/pureqt.h:131 msgid "Information" msgstr "信息" -#: src/stats.cpp:33 +#: src/stats.cpp:31 msgid "Please Wait..." msgstr "" -#: src/triggers/idlemonitor.cpp:47 +#: src/triggers/idlemonitor.cpp:41 msgid "On User Inactivity (HH:MM)" msgstr "从用户处于不活跃状态后(HH:MM)" -#: src/triggers/idlemonitor.cpp:78 +#: src/triggers/idlemonitor.cpp:72 #, fuzzy msgid "" "Use this trigger to detect user inactivity\n" "(example: no mouse clicks)." msgstr "检测用户不活跃状态，比如无鼠标点击事件" -#: src/triggers/idlemonitor.cpp:87 +#: src/triggers/idlemonitor.cpp:81 msgid "Unknown" msgstr "未知" -#: src/triggers/idlemonitor.cpp:132 +#: src/triggers/idlemonitor.cpp:126 msgid "Enter a maximum user inactivity in \"HH:MM\" format (Hours:Minutes)" msgstr "请输入用户处于不活跃状态后的最大时长，格式为HH:MM(Hour:Minute)" -#: src/triggers/processmonitor.cpp:106 +#: src/triggers/processmonitor.cpp:93 msgid "When selected application exit" msgstr "当选择的应用程序退出时" -#: src/triggers/processmonitor.cpp:139 +#: src/triggers/processmonitor.cpp:126 msgid "List of the running processes" msgstr "当前运行中的应用程序列表" -#: src/triggers/processmonitor.cpp:145 +#: src/triggers/processmonitor.cpp:132 msgid "Refresh" msgstr "刷新" -#: src/triggers/processmonitor.cpp:330 +#: src/triggers/processmonitor.cpp:363 msgid "Waiting for \"%0\"" msgstr "等待应用程序 %0 退出" -#: src/triggers/processmonitor.cpp:335 +#: src/triggers/processmonitor.cpp:368 msgid "Process or Window does not exist: %0" msgstr "" -#~ msgid "Error: %0" -#~ msgstr "错误： %0" - -#~ msgid "Error, exit code: %0" -#~ msgstr "错误，退出代码： %0" +#~ msgid "Lock screen" +#~ msgstr "锁定屏幕" #~ msgid "Quit" #~ msgstr "退出" @@ -656,3 +651,9 @@ #~ msgid "&Settings" #~ msgstr "设置(&S)" + +#~ msgid "Error: %0" +#~ msgstr "错误： %0" + +#~ msgid "Error, exit code: %0" +#~ msgstr "错误，退出代码： %0" diff -Nru kshutdown-4.0/README.html kshutdown-4.2/README.html --- kshutdown-4.0/README.html 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/README.html 2017-10-16 13:21:59.000000000 +0000 @@ -43,11 +43,6 @@ background-color: #EEEEEE; font-weight: bold; } - - td.build del:after { - color: darkgray; - content: " (deprecated)"; - } td.file_list { vertical-align: top; @@ -87,6 +82,11 @@ background-color: #D6E7FF; } + td.obsolete:after { + color: darkgray; + content: " (obsolete)"; + } + td.ok { background-color: #D8E8C2; text-align: center; @@ -135,8 +135,8 @@

A graphical shutdown utility for Linux and Windows

© Konrad Twardowski

-Visit KShutdown Home Page and -Wiki for more info. +Visit KShutdown Home Page and +Wiki for more info.

Table of Contents

@@ -148,10 +148,10 @@
  • Qt Build @ Haiku
  • Common Compilation Errors
  • Supported Functions/Platforms
    • -
  • Issues
    • +
  • Issues/FAQ
  • - Credits | - Support | + Credits | + Support | License (GPL)
    • @@ -330,7 +330,7 @@

    Compilation & Installation

      -
    1. Additional requirements: installed "kdelibs-dev" package, CMake 2.4, and Gettext Utilities
      2. +
    2. Additional requirements: installed "kdelibs-dev" package, CMake, and Gettext Utilities
    3. To compile and install KShutdown run: ./Setup-kde4.sh
    4. To change the installation directory (prefix) run: ./Setup-kde4.sh "/your/prefix/dir"
    5. Clang support (an alternative C++ compiler): @@ -378,12 +378,12 @@
    -

    Using CMake instead of QMake (experimental, Patch #4)

    +

    Using CMake instead of QMake (experimental, Patch #4)

    1. mkdir build-qt5.tmp (use separated "build-qt5.tmp" directory to avoid mess in source tree)
    2. cd build-qt5.tmp
    3. cmake -DKS_PURE_QT=true -DCMAKE_INSTALL_PREFIX=/usr ..
      4. -
    4. make && ./src/kshutdown
      5. +
    5. make && ./src/kshutdown-qt

    Using an alternate Qt version (Qt 5.x example)

    @@ -395,11 +395,11 @@

    Qt Build @ Windows

    -

    Note: You can download a binary (already compiled) KShutdown version for Windows.

    +

    Note: You can download a binary (already compiled) KShutdown version for Windows.

    Minimal Requirements (for compilation)

      -
    1. Qt 4.8.x (qt-opensource-windows-x86-mingw*.exe, minGW, LGPL version)
      2. +
    2. Qt 4.8.x (qt-opensource-windows-x86-mingw*.exe, minGW, LGPL version)
      1. When asked about MinGW (Minimalist GNU for Windows) click download link and unpack archive into C:\mingw32
      2. Continue Qt installation
        3. @@ -428,7 +428,7 @@

        Compilation

        1. Download and install Qt for Haiku
          2. -
        2. Download and unpack KShutdown source
          3. +
        3. Download and unpack KShutdown source
        4. Open terminal with KShutdown source: cd src
        5. Change the default C++ compiler to GCC 4: setgcc gcc4
        6. Create Makefiles: qmake
          7. @@ -506,6 +506,7 @@ CLIFunction available via Command Line (example: kshutdown --lock) 1 D-Bus commands should work with GDM, KDM, LightDM, and other Display Managers 2 systemd (org.freedesktop.login1 D-Bus interface) is supported since KShutdown 3.2 +3 some features may work @@ -513,7 +514,7 @@ -KDE 4 (KDE Build) +KDE 4 (KDE Build) OK OK OK @@ -526,7 +527,7 @@ -Plasma 5 (KF5 Build) +Plasma 5 (KF5 Build) OK OK OK @@ -539,7 +540,7 @@ -Windows XP/Vista/7/8/10 +Windows XP/Vista/7/8/10 OK OK OK @@ -558,19 +559,14 @@ OK OK OK -FIXME +Test Test OK, no CLI TODO -LXQt -TODO - - - -KDE 4 (Qt Build) +KDE 4 (Qt Build) OK OK OK @@ -583,7 +579,7 @@ -Plasma 5 (Qt Build) +Plasma 5 (Qt Build) Test Test Test @@ -609,7 +605,7 @@ -Trinity +Trinity Test Test Test @@ -661,7 +657,7 @@ -LXQt +LXQt Test Test Test @@ -674,7 +670,7 @@ -LXDE +LXDE OK OK OK @@ -687,7 +683,7 @@ -Razor-qt +Razor-qt OK OK OK @@ -726,15 +722,9 @@ -GNOME 2 -Test (?) -TODO - - - Openbox -TODO (?) -OK +TODO (?)3 +OK TODO (?) @@ -744,8 +734,13 @@ +GNOME 2 +Unsupported3 + + + KDE 3 -TODO (?); KShutDown 1.0.x exists but it's outdated and not supported... +Unsupported3 (use old KShutDown 1.0.x instead) @@ -753,11 +748,11 @@ -

          Issues

          +

          Issues/FAQ

          Linux: Hibernate/Suspend does not work

          If your Linux distribution supports systemd then try to install KShutdown 3.2+; otherwise install "upower" package.

          -

          As a workaround you can try to create a custom action +

          As a workaround you can try to create a custom action with a systemctl command.

          Linux: Turn Off Computer/Restart Computer does not work

          @@ -773,6 +768,12 @@ You can disable it in KShutdown settings.

          +

          Linux: Various system tray icon issues

          +

          Depending on desktop environment, KShutdown may sometimes fail to display the system tray icon correctly.

          + +

          Windows XP: No system tray icon

          +

          Sometimes the system tray icon may disappear randomly. Press Ctrl+Shift+Esc, end kshutdown.exe process, and restart KShutdown.

          +

          KShutdown 1.0.x

          Some configuration and command line options in KShutdown 2.x+ may be not fully compatible with the old KShutdown 1.0.x.

          diff -Nru kshutdown-4.0/Setup-kde4.sh kshutdown-4.2/Setup-kde4.sh --- kshutdown-4.0/Setup-kde4.sh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/Setup-kde4.sh 2017-10-16 13:21:59.000000000 +0000 @@ -13,7 +13,7 @@ PREFIX=/usr/local echo "WARNING: \"kde4-config\" not found; using default installation prefix: $PREFIX" else - PREFIX=`$KDE4_CONFIG --prefix` + PREFIX=$($KDE4_CONFIG --prefix) if [ -z "$PREFIX" ]; then PREFIX=/usr/local fi @@ -36,23 +36,6 @@ echo "INFO: Build type : $BUILD_TYPE" cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX="$PREFIX" .. -make -if [ -n "$KDE4_CONFIG" ]; then - KDESU="`$KDE4_CONFIG --path libexec`kdesu" - if [ -x "$KDESU" ]; then - echo "INFO: Installing KShutdown..." - if ! "$KDESU" -n -t -c "make install"; then - echo "INFO: Skipping installation" - fi - else - echo "INFO: Skipping installation" - fi -else - echo - echo "TIP: Run \"make install\" to install KShutdown" - echo " (may require administrator privileges). Examples:" - echo " cd build.tmp; sudo make install (Ubuntu, etc.)" - echo " cd build.tmp; su -c \"make install\" (Fedora, etc.)" -fi +make -j2 popd diff -Nru kshutdown-4.0/Setup-kf5.sh kshutdown-4.2/Setup-kf5.sh --- kshutdown-4.0/Setup-kf5.sh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/Setup-kf5.sh 2017-10-16 13:21:59.000000000 +0000 @@ -13,7 +13,7 @@ PREFIX=/usr/local echo "WARNING: \"kf5-config\" not found; using default installation prefix: $PREFIX" else - PREFIX=`$KF5_CONFIG --prefix` + PREFIX=$($KF5_CONFIG --prefix) if [ -z "$PREFIX" ]; then PREFIX=/usr/local fi @@ -30,18 +30,13 @@ rm -fR "$BUILD_DIR" mkdir -p "$BUILD_DIR" -pushd "$BUILD_DIR" +# HACK: use realpath, because automoc cannot find bootentry.h if KShutdown is compiled from a symlinked directory (?) +pushd "$(realpath $BUILD_DIR)" echo "INFO: Installation prefix: $PREFIX" echo "INFO: Build type : $BUILD_TYPE" cmake -DKS_KF5=true -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX="$PREFIX" .. -make - -echo -echo "TIP: Run \"make install\" to install KShutdown" -echo " (may require administrator privileges). Examples:" -echo " cd build.tmp; sudo make install (Ubuntu, etc.)" -echo " cd build.tmp; su -c \"make install\" (Fedora, etc.)" +make -j2 popd diff -Nru kshutdown-4.0/Setup-qt4.bat kshutdown-4.2/Setup-qt4.bat --- kshutdown-4.0/Setup-qt4.bat 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/Setup-qt4.bat 2017-10-16 13:21:59.000000000 +0000 @@ -1,4 +1,4 @@ -set KS_QT_BIN="C:\Qt\4.8.6\bin" +set KS_QT_BIN="C:\Qt\4.8.7\bin" call %KS_QT_BIN%\qtvars.bat cd src @@ -7,7 +7,7 @@ echo DEFINES += KS_PORTABLE>portable.pri qmake -config release mingw32-make.exe clean -mingw32-make.exe +mingw32-make.exe -j2 if not %errorlevel% == 0 goto quit mkdir ..\kshutdown-portable copy release\kshutdown-qt.exe ..\kshutdown-portable\kshutdown.exe @@ -21,14 +21,14 @@ rem normal version qmake -config release mingw32-make.exe clean -mingw32-make.exe +mingw32-make.exe -j2 if not %errorlevel% == 0 goto quit cd .. -"C:\Program Files\NSIS\makensis.exe" kshutdown.nsi +"%ProgramFiles%\NSIS\makensis.exe" kshutdown.nsi if not %errorlevel% == 0 goto quit -kshutdown-4.0-win32.exe +kshutdown-4.2-win32.exe :skip_normal copy README.html kshutdown-portable @@ -39,5 +39,5 @@ copy %KS_QT_BIN%\QtGui4.dll kshutdown-portable :quit - -echo "DONE" + +echo "DONE" diff -Nru kshutdown-4.0/Setup-qt4.sh kshutdown-4.2/Setup-qt4.sh --- kshutdown-4.0/Setup-qt4.sh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/Setup-qt4.sh 2017-10-16 13:21:59.000000000 +0000 @@ -9,30 +9,30 @@ pushd "src" -QMAKE=`which qmake-qt4` -if [ -z "$QMAKE" ]; then +if [ "$1" == "-qt5" ]; then QMAKE=qmake +else + QMAKE=$(which qmake-qt4) + if [ -z "$QMAKE" ]; then + QMAKE=qmake + fi fi set -e -ks_info "Configuring project..." -$QMAKE -config release +ks_info "Configuring..." +if [ "$1" == "-qt5" ]; then + echo "HINT: Install 'qt5-default' package if you see the following error:" + echo " qmake: could not exec '/usr/lib/x86_64-linux-gnu/qt4/bin/qmake': No such file or directory" + $QMAKE -config release +else + $QMAKE -config release +fi -ks_info "Cleaning project..." +ks_info "Cleaning..." make clean -ks_info "Compiling... This may take a few minutes ;)" -make +ks_info "Compiling..." +make -j2 popd - -ks_info "Compiled program can be found in \"$(pwd)/src\" directory (no installation required)" -echo "Application file:" -ls -lh src/kshutdown-qt - -echo -echo "TIP: Run \"make install\" to install KShutdown" -echo " (may require administrator privileges). Examples:" -echo " cd src; sudo make install (Ubuntu, etc.)" -echo " cd src; su -c \"make install\" (Fedora, etc.)" diff -Nru kshutdown-4.0/Setup-qt5.sh kshutdown-4.2/Setup-qt5.sh --- kshutdown-4.0/Setup-qt5.sh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/Setup-qt5.sh 2017-10-16 13:21:59.000000000 +0000 @@ -1,3 +1,3 @@ #!/bin/bash -./Setup-qt4.sh +./Setup-qt4.sh -qt5 diff -Nru kshutdown-4.0/Setup.sh kshutdown-4.2/Setup.sh --- kshutdown-4.0/Setup.sh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/Setup.sh 2017-10-16 13:21:59.000000000 +0000 @@ -1,7 +1,14 @@ #!/bin/bash +if [ ! -x "$(which dialog)" ]; then + echo "ERROR: This script requires 'dialog' package" + exit 1 +fi + +# TODO: autorun shellcheck on all scripts + default_item="" -kshutdown_full_version=`sed 2!d tools/VERSION` +kshutdown_full_version=$(sed 2!d VERSION) function doError() { @@ -11,56 +18,81 @@ exit 1 } +function doBuildError() +{ + doError "Build failed. See README.html for troubleshooting information." +} + function doCompile() { clear - if [ $1 == "kshutdown" ]; then - if ! ./Setup-kde4.sh; then - doError "Build failed. See README.html for troubleshooting information." + + if [ "$1" == "kshutdown-kde4" ]; then + if ./Setup-kde4.sh; then + doSuccess "build.tmp" "./build.tmp/src/kshutdown" + else + doBuildError + fi + elif [ "$1" == "kshutdown-kf5" ]; then + if ./Setup-kf5.sh; then + doSuccess "build.tmp" "./build.tmp/src/kshutdown" + else + doBuildError fi - elif [ $1 == "kshutdown-qt" ]; then + elif [ "$1" == "kshutdown-qt4" ]; then if ./Setup-qt4.sh; then -# TODO: common code - dialog --msgbox \ -"Compiled KShutdown program (\"kshutdown-qt\" file)\n -can be found in the \"${PWD}/src\" directory.\n -\n -Installation is not required.\n -However, you can run\n -\n -cd src; sudo make install (Ubuntu, etc.)\n -or\n -cd src; su -c \"make install\" (Fedora, etc.)\n -\n -to setup menu shortcut (Utilities section),\n -and copy \"kshutdown-qt\" to the \"/usr/bin\" directory." \ -0 0 + doSuccess "src" "./src/kshutdown-qt" else - doError "Build failed. See README.html for troubleshooting information." + doBuildError fi - elif [ $1 == "kshutdown-kf5" ]; then - if ! ./Setup-kf5.sh; then - doError "Build failed. See README.html for troubleshooting information." + elif [ "$1" == "kshutdown-qt5" ]; then + if ./Setup-qt5.sh; then + doSuccess "src" "./src/kshutdown-qt" + else + doBuildError + fi + elif [ "$1" == "kshutdown-qt4-win32" ]; then + if ./Setup-wine.sh; then + doSuccess "src" "./src/release/kshutdown-qt.exe" + else + doBuildError fi else doError "Unknown build type: $1" fi } +function doSuccess() +{ + local text="1. Run \"$2\" to launch KShutdown without installation.\n\n" + + text+="2. Run \"make install\" to install KShutdown.\n" + text+=" This will install program, menu shortcut (Utilities section), and icons.\n\n" + text+="Examples:\n" + text+="cd $1; sudo make install (Ubuntu)\n" + text+="cd $1; su -c \"make install\" (Fedora)\n\n" + text+="3. Run \"make uninstall\" to uninstall KShutdown.\n" + + dialog --msgbox "$text" 0 0 +} + function doQuit() { clear } -# TODO: $DESKTOP_SESSION == *plasma* (KF5) -if [[ $DESKTOP_SESSION == *kde* || $XDG_CURRENT_DESKTOP == *KDE* ]]; then - default_item="kshutdown" +# TEST: +#doSuccess "src" "./src/kshutdown-qt" +#doSuccess "build.tmp" "./build.tmp/src/kshutdown" +#exit + +if [[ $DESKTOP_SESSION == "plasma" || $DESKTOP_SESSION == *kde* || $XDG_CURRENT_DESKTOP == *KDE* ]]; then + default_item="kshutdown-kf5" else - default_item="kshutdown-qt" + default_item="kshutdown-qt5" fi -# TODO: update required libs info -out=`dialog \ +out=$(dialog \ --backtitle "KShutdown $kshutdown_full_version Setup" \ --default-item "$default_item" \ --ok-label "OK, compile!" \ @@ -71,11 +103,12 @@ --stdout \ --title "Select a KShutdown Build (see README.html for more details)" \ --menu "" 0 0 0 \ - "kshutdown" "A version for KDE 4 with additional features" "Required libraries: Qt 4.8+, KDE 4 libs" \ - "kshutdown-qt" "A lightweight version for non-KDE desktop environments" "Required libraries: Qt 4.8+ or Qt 5.x, no KDE 4 libs" \ - "kshutdown-kf5" "An universal version compiled using KDE Frameworks" "Required libraries: KDE Frameworks 5.x"` - + "kshutdown-kf5" "An universal version for KDE Plasma and other desktop environments" "Required libraries: KDE Frameworks 5.x (KF5)" \ + "kshutdown-qt5" "A lightweight version for non-KDE desktop environments" "Required libraries: Qt 5.x only" \ + "kshutdown-kde4" "A classic version for KDE 4 with additional features (obsolete)" "Required libraries: Qt 4.8+, KDE 4 libs" \ + "kshutdown-qt4" "A lightweight version for non-KDE desktop environments (obsolete)" "Required libraries: Qt 4.8+ only" \ + "kshutdown-qt4-win32" "A lightweight version for Windows" "Required libraries: Qt 4.8+ only; compiled in Wine") case $? in - 0) doCompile $out;; + 0) doCompile "$out";; *) doQuit;; esac diff -Nru kshutdown-4.0/Setup-wine.sh kshutdown-4.2/Setup-wine.sh --- kshutdown-4.0/Setup-wine.sh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/Setup-wine.sh 2017-10-16 13:21:59.000000000 +0000 @@ -1,10 +1,7 @@ #!/bin/bash -set -e - wineconsole Setup-qt4.bat -KS_FILE_VERSION=`sed 1!d tools/VERSION` +KS_FILE_VERSION=$(sed 1!d VERSION) rm -f kshutdown-portable/kshutdown.ini -#zip -r9 "kshutdown-portable-${KS_FILE_VERSION}-win32.zip" kshutdown-portable 7z a "kshutdown-portable-${KS_FILE_VERSION}-win32.7z" kshutdown-portable diff -Nru kshutdown-4.0/src/actions/bootentry.cpp kshutdown-4.2/src/actions/bootentry.cpp --- kshutdown-4.0/src/actions/bootentry.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/actions/bootentry.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -17,13 +17,13 @@ #include "bootentry.h" -#include -#include +#include // BootEntry // private: +QString BootEntry::m_problem = ""; QStringList BootEntry::m_list = QStringList(); // public: @@ -32,18 +32,44 @@ if (!m_list.isEmpty()) return m_list; - m_list += i18n("Default System"); + m_problem = ""; // reset + + QFile grubConfigFile("/boot/grub/grub.cfg"); + QFileInfo grubConfigFileInfo(grubConfigFile); + if (!grubConfigFileInfo.isReadable()) { +/* + m_problem += i18n("No permissions to read GRUB menu entries."); + m_problem += '\n'; + m_problem += grubConfigFile.fileName(); + m_problem += "\n\n"; + m_problem += i18n("Quick fix: %0").arg("sudo chmod 0604 grub.cfg"); +*/ + + return m_list; + } - QString grubConfigPath = "/boot/grub/grub.cfg"; - QFile grubConfigFile(grubConfigPath); if (grubConfigFile.open(QFile::ReadOnly)) { + bool inSubmenu = false; QTextStream text(&grubConfigFile); QString menuEntryID = "menuentry "; QString line; while (!(line = text.readLine()).isNull()) { +// FIXME: the parser assumes that the grub.cfg formatting is sane + if (inSubmenu && (line == "}")/* use non-simplified line */) { + inSubmenu = false; + + continue; // while + } + line = line.simplified(); - if (!line.startsWith(menuEntryID)) + if (!inSubmenu && line.startsWith("submenu ")) { + inSubmenu = true; + + continue; // while + } + + if (inSubmenu || !line.startsWith(menuEntryID)) continue; // while line = line.mid(menuEntryID.length()); @@ -69,13 +95,26 @@ line = line.mid(quoteStart, quoteEnd); else U_ERROR << "Error parsing menuentry: " << line U_END; - - U_DEBUG << line U_END; - m_list << line; + + if (line.contains("(memtest86+")) { + U_DEBUG << "Skipping Boot Entry: " << line U_END; + } + else { + U_DEBUG << "Adding Boot Entry: " << line U_END; + m_list << line; + } } } else { - U_ERROR << "Could not read GRUB menu entries: " << grubConfigPath U_END; + U_ERROR << "Could not read GRUB menu entries: " << grubConfigFile.fileName() U_END; + } + + if (m_list.isEmpty()) { +/* + m_problem += i18n("Could not find any boot entries."); + m_problem += '\n'; +*/ + m_problem += grubConfigFile.fileName(); } return m_list; @@ -86,9 +125,16 @@ // public: BootEntryAction::BootEntryAction(const QString &name) : - U_ACTION(0), + U_ACTION(nullptr), m_name(name) { setText(name); + connect(this, SIGNAL(triggered()), SLOT(onAction())); +} + +// private slots: + +void BootEntryAction::onAction() { + U_DEBUG << m_name U_END; } // BootEntryComboBox @@ -97,7 +143,10 @@ BootEntryComboBox::BootEntryComboBox() : U_COMBO_BOX() { + //setToolTip(i18n("Select an Operating System you want to use after restart")); view()->setAlternatingRowColors(true); + + //addItem('<' + i18n("Default") + '>'); addItems(BootEntry::getList()); } @@ -107,4 +156,24 @@ BootEntryMenu::BootEntryMenu(QWidget *parent) : U_MENU(i18n("Restart Computer"), parent) { + + QStringList entryList = BootEntry::getList(); // 1. + + if (!BootEntry::getProblem().isEmpty()) { // 2. + addAction( + U_STOCK_ICON("dialog-error"), i18n("Error"), + this, SLOT(onProblem()) + ); + } + else { + for (const QString &i : entryList) { + addAction(new BootEntryAction(i)); + } + } +} + +// private slots: + +void BootEntryMenu::onProblem() { + U_ERROR_MESSAGE(this, BootEntry::getProblem()); } diff -Nru kshutdown-4.0/src/actions/bootentry.h kshutdown-4.2/src/actions/bootentry.h --- kshutdown-4.0/src/actions/bootentry.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/actions/bootentry.h 2017-10-16 13:21:59.000000000 +0000 @@ -23,8 +23,10 @@ class BootEntry final: public QObject { public: static QStringList getList(); + static QString getProblem() { return m_problem; } private: Q_DISABLE_COPY(BootEntry) + static QString m_problem; static QStringList m_list; }; @@ -35,9 +37,11 @@ private: Q_DISABLE_COPY(BootEntryAction) QString m_name; +private slots: + void onAction(); }; -class BootEntryComboBox: public U_COMBO_BOX { +class BootEntryComboBox final: public U_COMBO_BOX { public: explicit BootEntryComboBox(); private: @@ -50,6 +54,8 @@ explicit BootEntryMenu(QWidget *parent); private: Q_DISABLE_COPY(BootEntryMenu) +private slots: + void onProblem(); }; #endif // KSHUTDOWN_BOOTENTRY_H diff -Nru kshutdown-4.0/src/actions/extras/system/kppp.desktop kshutdown-4.2/src/actions/extras/system/kppp.desktop --- kshutdown-4.0/src/actions/extras/system/kppp.desktop 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/actions/extras/system/kppp.desktop 2017-10-16 13:21:59.000000000 +0000 @@ -3,15 +3,13 @@ # Encoding: UTF-8 Exec=kppp -k Icon=kppp + Name=KPPP/KDE 4 (terminate an existing PPP connection) +Name[fr]=KPPP/KDE 4 (termine une connexion PPP existante) Name[pl]=KPPP/KDE 4 (przerwij trwające połączenie) Name[sr]=КППП/КДЕ 4 (прекини постојећу ППП везу) Name[sr@latin]=KPPP/KDE 4 (prekini postojeću PPP vezu) Name[sr@ijekavian]=КППП/КДЕ 4 (прекини постојећу ППП везу) Name[sr@ijekavianlatin]=KPPP/KDE 4 (prekini postojeću PPP vezu) -Name[fr]=KPPP/KDE 4 (termine une connexion PPP existante) -# TODO: please update and move to Name[xx] entry -#Comment[de]=Eine bestehende PPP Verbindung trennen -#Comment[el]=Τερματισμός μιας υπάρχουσας PPP σύνδεσης -#Comment[it]=Termina una connessione PPP esistente + Type=Application diff -Nru kshutdown-4.0/src/actions/extras.cpp kshutdown-4.2/src/actions/extras.cpp --- kshutdown-4.0/src/actions/extras.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/actions/extras.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,39 +15,43 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#include "extras.h" + +#include "../config.h" #include "../mainwindow.h" #include "../password.h" -#include "../pureqt.h" +#include "../utils.h" -#include #include #include #include -#include +#include #include -#ifdef KS_NATIVE_KDE - #include - #ifndef KS_KF5 - #include - #include - #include - #include - #endif // KS_KF5 -#endif // KS_NATIVE_KDE +#ifdef KS_KF5 + #include +#endif // KS_KF5 #ifdef KS_PURE_QT #include + #include #endif // KS_PURE_QT -#include "../utils.h" -#include "extras.h" +#ifdef KS_NATIVE_KDE + #include + #ifndef KS_KF5 + #include // #kde4 + #include // #kde4 + #include // #kde4 + #include // #kde4 + #endif // !KS_KF5 +#endif // KS_NATIVE_KDE // Extras // private -Extras *Extras::m_instance = 0; +Extras *Extras::m_instance = nullptr; // public @@ -56,7 +60,7 @@ void Extras::setStringOption(const QString &option) { m_command = option; if (m_command.isEmpty()) { - setCommandAction(0); + setCommandAction(nullptr); } else { QFileInfo fileInfo(m_command); @@ -113,7 +117,7 @@ QString exec = settings.value("Exec", "").toString(); //U_DEBUG << exec U_END; if (!exec.isEmpty()) { - QProcess *process = new QProcess(this); + auto *process = new QProcess(this); QString dir = settings.value("Path", "").toString(); //U_DEBUG << dir U_END; if (!dir.isEmpty()) @@ -172,7 +176,7 @@ Extras::Extras() : Action(i18n("Extras"), "rating", "extras"), m_command(QString::null), - m_menu(0) { + m_menu(nullptr) { setCanBookmark(true); setMenu(createMenu()); @@ -190,7 +194,7 @@ QString text = fileInfo.fileName(); if (!fileInfo.exists() || !fileInfo.isFile()) - return returnNull ? 0 : new CommandAction(U_STOCK_ICON("dialog-error"), i18n("File not found: %0").arg(text), this, fileInfo, ""); + return returnNull ? nullptr : new CommandAction(U_STOCK_ICON("dialog-error"), i18n("File not found: %0").arg(text), this, fileInfo, ""); QString statusTip = ""; @@ -217,7 +221,12 @@ U_MENU *Extras::createMenu() { m_menu = new U_MENU(); + connect(m_menu, SIGNAL(hovered(QAction *)), this, SLOT(onMenuHovered(QAction *))); + #if QT_VERSION >= 0x050100 + m_menu->setToolTipsVisible(true); + #endif // QT_VERSION + connect(m_menu, SIGNAL(aboutToShow()), this, SLOT(updateMenu())); return m_menu; @@ -247,12 +256,16 @@ else { dirMenu = new U_MENU(i.baseName()); } + connect(dirMenu, SIGNAL(hovered(QAction *)), this, SLOT(onMenuHovered(QAction *))); + #if QT_VERSION >= 0x050100 + dirMenu->setToolTipsVisible(true); + #endif // QT_VERSION createMenu(dirMenu, i.filePath()); // recursive scan if (dirMenu->isEmpty()) { - U_ACTION *emptyAction = new U_ACTION(dirMenu); + auto *emptyAction = new U_ACTION(dirMenu); emptyAction->setEnabled(false); emptyAction->setText('(' + i18n("Empty") + ')'); dirMenu->addAction(emptyAction); @@ -360,7 +373,7 @@ } void Extras::showHelp() { - QDesktopServices::openUrl(QUrl("http://sourceforge.net/p/kshutdown/wiki/Extras/")); + QDesktopServices::openUrl(QUrl("https://sourceforge.net/p/kshutdown/wiki/Extras/")); } void Extras::slotModify() { @@ -475,6 +488,9 @@ setIconVisibleInMenu(true); setStatusTip(statusTip); + #if QT_VERSION >= 0x050100 + setToolTip(statusTip); + #endif // QT_VERSION connect(this, SIGNAL(triggered()), SLOT(slotFire())); } diff -Nru kshutdown-4.0/src/actions/extras.h kshutdown-4.2/src/actions/extras.h --- kshutdown-4.0/src/actions/extras.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/actions/extras.h 2017-10-16 13:21:59.000000000 +0000 @@ -19,10 +19,10 @@ #ifndef KSHUTDOWN_EXTRAS_H #define KSHUTDOWN_EXTRAS_H -#include - #include "../kshutdown.h" +#include + class CommandAction; class Extras: public KShutdown::Action { diff -Nru kshutdown-4.0/src/actions/lock.cpp kshutdown-4.2/src/actions/lock.cpp --- kshutdown-4.0/src/actions/lock.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/actions/lock.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -16,6 +16,8 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "lock.h" + +#include "../config.h" #include "../utils.h" #ifdef Q_OS_WIN32 @@ -27,17 +29,13 @@ #include #endif // Q_OS_WIN32 -#ifdef KS_DBUS - #include -#endif // KS_DBUS - // LockAction // private -LockAction *LockAction::m_instance = 0; +LockAction *LockAction::m_instance = nullptr; #ifdef KS_DBUS -QDBusInterface *LockAction::m_qdbusInterface = 0; +QDBusInterface *LockAction::m_qdbusInterface = nullptr; #endif // KS_DBUS // public @@ -69,12 +67,14 @@ return true; } +// TODO: support org.freedesktop.DisplayManager Lock + // HACK: This is a workaround for "lazy" initial kscreensaver repaint. // Now the screen content is hidden immediately. - QWidget *blackScreen = 0; + QWidget *blackScreen = nullptr; if (Utils::isKDE()) { blackScreen = new QWidget( - 0, + nullptr, Qt::FramelessWindowHint | #if QT_VERSION >= 0x050000 Qt::NoDropShadowWindowHint | @@ -105,10 +105,9 @@ dbus->call("Lock"); QDBusError error = dbus->lastError(); #endif // KS_DBUS - - if (blackScreen) - delete blackScreen; - + + delete blackScreen; + #ifdef KS_DBUS if (error.type() == QDBusError::NoError) return true; @@ -135,7 +134,7 @@ } // try "gnome-screensaver-command" command -// TODO: test GNOME 2 + if (Utils::isGNOME()) { args.clear(); args << "--lock"; diff -Nru kshutdown-4.0/src/actions/lock.h kshutdown-4.2/src/actions/lock.h --- kshutdown-4.0/src/actions/lock.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/actions/lock.h 2017-10-16 13:21:59.000000000 +0000 @@ -20,10 +20,6 @@ #include "../kshutdown.h" -#ifdef KS_DBUS -class QDBusInterface; -#endif // KS_DBUS - class LockAction: public KShutdown::Action { public: virtual bool onAction() override; diff -Nru kshutdown-4.0/src/actions/test.cpp kshutdown-4.2/src/actions/test.cpp --- kshutdown-4.0/src/actions/test.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/actions/test.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -16,6 +16,8 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "test.h" + +#include "../config.h" #include "../utils.h" #include @@ -26,7 +28,7 @@ TestAction::TestAction() : Action(i18n("Show Message (no shutdown)"), "dialog-ok", "test"), - m_widget(0) { + m_widget(nullptr) { // TODO: sound beep diff -Nru kshutdown-4.0/src/bookmarks.cpp kshutdown-4.2/src/bookmarks.cpp --- kshutdown-4.0/src/bookmarks.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/bookmarks.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -16,13 +16,15 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "bookmarks.h" + +#include "config.h" #include "mainwindow.h" #include "password.h" #include "utils.h" -#include #include #include +#include // public: @@ -32,7 +34,7 @@ const QString &actionID, const QString &triggerID, const QString &actionOption, const QString &triggerOption ) - : U_ACTION(0), // no owner, because clear() will delete action + : U_ACTION(nullptr), // no owner, because clear() will delete action m_actionID(actionID), m_actionOption(actionOption), @@ -53,13 +55,17 @@ m_userText = !text.isEmpty() && (text != actionText); m_originalText = m_userText ? text : actionText; - if (m_userText) + if (m_userText) { setStatusTip(actionText); + #if QT_VERSION >= 0x050100 + setToolTip(actionText); + #endif // QT_VERSION + } setText(m_originalText); } -BookmarkAction::~BookmarkAction() { } +BookmarkAction::~BookmarkAction() = default; // private slots: @@ -85,15 +91,17 @@ BookmarksMenu::BookmarksMenu(QWidget *parent) : U_MENU(i18n("&Bookmarks"), parent), - m_list(0) + m_list(nullptr) { connect(this, SIGNAL(aboutToShow()), SLOT(onUpdateMenu())); - // HACK: workaround for connect(this, SIGNAL(hovered(QAction *)), SLOT(onMenuHovered(QAction *))); + #if QT_VERSION >= 0x050100 + setToolTipsVisible(true); + #endif // QT_VERSION } -BookmarksMenu::~BookmarksMenu() { } +BookmarksMenu::~BookmarksMenu() = default; QString BookmarksMenu::makeText(KShutdown::Action *action, KShutdown::Trigger *trigger, const QString &actionOption, const QString &triggerOption) const { QString text = ""; @@ -140,7 +148,7 @@ } } - return 0; + return nullptr; } QList *BookmarksMenu::list() { @@ -232,7 +240,7 @@ nameField->setFocus(); nameField->selectAll(); - if (dialog->exec()) { + if (dialog->exec() == UDialog::Accepted) { BookmarkAction *bookmark = new BookmarkAction( nameField->text().trimmed(), this, @@ -276,7 +284,9 @@ auto *action = mainWindow->getSelectedAction(); auto *trigger = mainWindow->getSelectedTrigger(); - U_ACTION *toggleBookmarkAction = new U_ACTION(this); + auto *toggleBookmarkAction = new U_ACTION(this); +// TODO: toggleBookmarkAction->setShortcut(QKeySequence("Ctrl+D")); need confirmation before remove or some sort of feedback + auto *bookmark = findBookmark(action, trigger); if (!bookmark) { toggleBookmarkAction->setEnabled(action->canBookmark() && trigger->canBookmark()); @@ -301,7 +311,7 @@ QString actionOption = action->getStringOption(); QString triggerOption = trigger->getStringOption(); - QActionGroup *group = new QActionGroup(this); + auto *group = new QActionGroup(this); foreach (BookmarkAction *i, *list()) { bool current = (action->id() == i->m_actionID) && (actionOption == i->m_actionOption) && diff -Nru kshutdown-4.0/src/CMakeLists.txt kshutdown-4.2/src/CMakeLists.txt --- kshutdown-4.0/src/CMakeLists.txt 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/CMakeLists.txt 2017-10-16 13:21:59.000000000 +0000 @@ -43,6 +43,7 @@ ) if(KS_PURE_QT) # TODO: add and test automoc + QT5_ADD_RESOURCES(qrc_kshutdown.cpp kshutdown.qrc) QT5_WRAP_CPP(kshutdown_MOC_SOURCES ${kshutdown_MOC_HEADERS}) elseif(KS_KF5) # automoc @@ -50,10 +51,16 @@ # automoc endif() -add_executable(kshutdown ${kshutdown_SRC} ${kshutdown_MOC_SOURCES}) +if(KS_PURE_QT) + add_executable(kshutdown ${kshutdown_SRC} ${kshutdown_MOC_SOURCES} qrc_kshutdown.cpp) +else() + add_executable(kshutdown ${kshutdown_SRC} ${kshutdown_MOC_SOURCES}) +endif() + include_directories(${CMAKE_CURRENT_BINARY_DIR}) if(KS_PURE_QT) + set_target_properties(kshutdown PROPERTIES OUTPUT_NAME kshutdown-qt) target_link_libraries(kshutdown ${Qt5Widgets_LIBRARIES} ${Qt5DBus_LIBRARIES}) elseif(KS_KF5) target_link_libraries(kshutdown Qt5::DBus Qt5::Widgets KF5::ConfigCore KF5::ConfigWidgets KF5::DBusAddons KF5::GlobalAccel KF5::I18n KF5::IdleTime KF5::Notifications KF5::NotifyConfig KF5::XmlGui) @@ -66,21 +73,20 @@ set(XDG_APPS_INSTALL_DIR ${DATA_INSTALL_DIR}/applications) install( - PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/kshutdown" + TARGETS kshutdown DESTINATION bin - RENAME kshutdown-qt ) install(FILES kshutdown-qt.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) elseif(KS_KF5) install( - PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/kshutdown" + TARGETS kshutdown DESTINATION bin ) install(FILES kshutdown.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES kshutdown.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR}) else() install( - PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/kshutdown" + TARGETS kshutdown DESTINATION bin ) install(FILES kshutdown.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff -Nru kshutdown-4.0/src/commandline.cpp kshutdown-4.2/src/commandline.cpp --- kshutdown-4.0/src/commandline.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/commandline.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,9 +15,8 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#include "pureqt.h" - #include "commandline.h" + #include "mainwindow.h" #include "utils.h" @@ -25,7 +24,7 @@ bool TimeOption::m_absolute = false; bool TimeOption::m_relative = false; -KShutdown::Action *TimeOption::m_action = 0; +KShutdown::Action *TimeOption::m_action = nullptr; QString TimeOption::m_option = QString::null; QTime TimeOption::m_time = QTime(); diff -Nru kshutdown-4.0/src/commandline.h kshutdown-4.2/src/commandline.h --- kshutdown-4.0/src/commandline.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/commandline.h 2017-10-16 13:21:59.000000000 +0000 @@ -20,8 +20,6 @@ #ifndef KSHUTDOWN_COMMANDLINE_H #define KSHUTDOWN_COMMANDLINE_H -#include - #include "kshutdown.h" class TimeOption final { diff -Nru kshutdown-4.0/src/config.cpp kshutdown-4.2/src/config.cpp --- kshutdown-4.0/src/config.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/config.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,24 +15,25 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#include "config.h" + #include "pureqt.h" +#include "utils.h" + +#ifdef KS_PURE_QT + #include +#endif // KS_PURE_QT #ifdef KS_KF5 #include #include #endif // KS_KF5 -#ifdef KS_PURE_QT - #include - #include -#endif // KS_PURE_QT - -#include "config.h" -#include "utils.h" +// Config // private -Config *Config::m_user = 0; +Config *Config::m_user = nullptr; // public @@ -41,7 +42,7 @@ #ifdef KS_PURE_QT if (m_engine) { delete m_engine; - m_engine = 0; + m_engine = nullptr; } #endif // KS_PURE_QT } @@ -108,22 +109,6 @@ write("Progress Bar", "Enabled", value); } -Qt::Alignment Config::progressBarAlignment() { - Config *config = user(); - config->beginGroup("Progress Bar"); - int result = config->read("Alignment", Qt::AlignTop).toInt(); - config->endGroup(); - - return (Qt::Alignment)result; -} - -void Config::setProgressBarAlignment(const Qt::Alignment value) { - Config *config = user(); - config->beginGroup("Progress Bar"); - config->write("Alignment", (int)value); - config->endGroup(); -} - bool Config::systemTrayIconEnabled() { #ifdef KS_KF5 return true; @@ -185,7 +170,7 @@ // private Config::Config() : - QObject(0) { + QObject(nullptr) { //U_DEBUG << "Config::Config()" U_END; @@ -204,3 +189,36 @@ m_engine = new QSettings(); #endif // KS_NATIVE_KDE } + +// Var + +// public + +void Var::sync() { + QVariant value = variant(); + + Config *config = Config::user(); + //U_DEBUG << "Sync var: " << m_group << " / " << m_key << " = " << value U_END; + + config->beginGroup(m_group); + config->write(m_key, value); + config->endGroup(); + + config->sync(); +} + +// private + +QVariant Var::variant() { + if (!m_lazyVariant.isValid()) { + Config *config = Config::user(); + + config->beginGroup(m_group); + m_lazyVariant = config->read(m_key, m_defaultVariant); + config->endGroup(); + + //U_DEBUG << "Read var: " << m_group << " / " << m_key << " = " << m_lazyVariant U_END; + } + + return m_lazyVariant; +} diff -Nru kshutdown-4.0/src/config.h kshutdown-4.2/src/config.h --- kshutdown-4.0/src/config.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/config.h 2017-10-16 13:21:59.000000000 +0000 @@ -20,11 +20,13 @@ #include "pureqt.h" +#ifdef KS_PURE_QT + #include +#endif // KS_PURE_QT + #ifdef KS_NATIVE_KDE #include -#else - class QSettings; -#endif +#endif // KS_NATIVE_KDE /** * A configuration reader/writer. @@ -54,9 +56,6 @@ static bool progressBarEnabled(); static void setProgressBarEnabled(const bool value); - static Qt::Alignment progressBarAlignment(); - static void setProgressBarAlignment(const Qt::Alignment value); - static bool systemTrayIconEnabled(); #ifndef KS_KF5 static void setSystemTrayIconEnabled(const bool value); @@ -95,4 +94,38 @@ explicit Config(); }; +class Var final { +public: + explicit Var(const QString &group, const QString &key, const int defaultValue) + : m_group(group), m_key(key), m_defaultVariant(defaultValue), m_lazyVariant(QVariant()) { } + explicit Var(const QString &group, const QString &key, const QColor &defaultValue) + : m_group(group), m_key(key), m_defaultVariant(defaultValue), m_lazyVariant(QVariant()) { } + + QColor getColor() { + return variant().value(); + } + + void set(const QColor &value) { + m_lazyVariant.setValue(value); + } + + QVariant getDefault() const { return m_defaultVariant; } + + int getInt() { + return variant().value(); + } + + void set(const int value) { + m_lazyVariant.setValue(value); + } + + void sync(); +private: + QString m_group; + QString m_key; + QVariant m_defaultVariant; + QVariant m_lazyVariant; + QVariant variant(); +}; + #endif // KSHUTDOWN_CONFIG_H Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_ar.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_ar.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_bg.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_bg.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_cs.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_cs.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_da.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_da.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_de.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_de.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_el.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_el.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_es.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_es.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_fr.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_fr.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_it.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_it.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_nb.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_nb.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_pl.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_pl.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_pt_BR.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_pt_BR.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_pt.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_pt.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_ru.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_ru.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_sk.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_sk.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_sr@ijekavianlatin.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_sr@ijekavianlatin.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_sr@ijekavian.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_sr@ijekavian.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_sr@latin.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_sr@latin.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_sr.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_sr.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_sv.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_sv.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_tr.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_tr.qm differ Binary files /tmp/tmp3XLNsy/zgmidZcQF0/kshutdown-4.0/src/i18n/kshutdown_zh_CN.qm and /tmp/tmp3XLNsy/QQMtkumZXB/kshutdown-4.2/src/i18n/kshutdown_zh_CN.qm differ diff -Nru kshutdown-4.0/src/images/CMakeLists.txt kshutdown-4.2/src/images/CMakeLists.txt --- kshutdown-4.0/src/images/CMakeLists.txt 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/images/CMakeLists.txt 2017-10-16 13:21:59.000000000 +0000 @@ -1,5 +1,10 @@ if(KS_PURE_QT) -# TODO: see src.pro + install(FILES hi16-app-kshutdown.png DESTINATION /usr/share/icons/hicolor/16x16/apps RENAME kshutdown.png) + install(FILES hi22-app-kshutdown.png DESTINATION /usr/share/icons/hicolor/22x22/apps RENAME kshutdown.png) + install(FILES hi32-app-kshutdown.png DESTINATION /usr/share/icons/hicolor/32x32/apps RENAME kshutdown.png) + install(FILES hi48-app-kshutdown.png DESTINATION /usr/share/icons/hicolor/48x48/apps RENAME kshutdown.png) + install(FILES hi64-app-kshutdown.png DESTINATION /usr/share/icons/hicolor/64x64/apps RENAME kshutdown.png) + install(FILES hi128-app-kshutdown.png DESTINATION /usr/share/icons/hicolor/128x128/apps RENAME kshutdown.png) elseif(KS_KF5) # FIXME: deprecated ecm_install_icons(${ICON_INSTALL_DIR}) diff -Nru kshutdown-4.0/src/infowidget.cpp kshutdown-4.2/src/infowidget.cpp --- kshutdown-4.0/src/infowidget.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/infowidget.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,20 +15,14 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#include "pureqt.h" +#include "infowidget.h" -#ifdef KS_NATIVE_KDE - #include -#endif // KS_NATIVE_KDE +#include "utils.h" #include #include -#include #include -#include "infowidget.h" -#include "utils.h" - // public InfoWidget::InfoWidget(QWidget *parent) : @@ -37,7 +31,7 @@ setObjectName("info-widget"); setVisible(false); - QHBoxLayout *mainLayout = new QHBoxLayout(this); + auto *mainLayout = new QHBoxLayout(this); #ifdef KS_NATIVE_KDE m_messageWidget = new KMessageWidget(this); @@ -69,7 +63,7 @@ #endif // KS_NATIVE_KDE } -InfoWidget::~InfoWidget() { } +InfoWidget::~InfoWidget() = default; void InfoWidget::setText(const QString &text, const Type type) { #ifdef KS_NATIVE_KDE @@ -145,11 +139,13 @@ #ifdef KS_PURE_QT #ifdef Q_OS_WIN32 void InfoWidget::setIcon(const QStyle::StandardPixmap standardIcon) { - m_icon->setPixmap(U_APP->style()->standardIcon(standardIcon).pixmap(24, 24)); + int size = U_APP->style()->pixelMetric(QStyle::PM_MessageBoxIconSize); + m_icon->setPixmap(U_APP->style()->standardIcon(standardIcon).pixmap(size, size)); } #else void InfoWidget::setIcon(const QString &iconName) { - m_icon->setPixmap(U_STOCK_ICON(iconName).pixmap(24, 24)); + int size = U_APP->style()->pixelMetric(QStyle::PM_MessageBoxIconSize); + m_icon->setPixmap(U_STOCK_ICON(iconName).pixmap(size, size)); } #endif // Q_OS_WIN32 #endif // KS_PURE_QT diff -Nru kshutdown-4.0/src/infowidget.h kshutdown-4.2/src/infowidget.h --- kshutdown-4.0/src/infowidget.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/infowidget.h 2017-10-16 13:21:59.000000000 +0000 @@ -18,14 +18,14 @@ #ifndef KSHUTDOWN_INFOWIDGET_H #define KSHUTDOWN_INFOWIDGET_H -#include -#ifdef Q_OS_WIN32 - #include -#endif // Q_OS_WIN32 +#include "pureqt.h" -class KMessageWidget; +#include +#include -class QLabel; +#ifdef KS_NATIVE_KDE + #include +#endif // KS_NATIVE_KDE class InfoWidget: public QFrame { Q_OBJECT diff -Nru kshutdown-4.0/src/kshutdown.cpp kshutdown-4.2/src/kshutdown.cpp --- kshutdown-4.0/src/kshutdown.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/kshutdown.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,54 +15,54 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#include "kshutdown.h" + +#include "config.h" +#include "log.h" +#include "mainwindow.h" +#include "password.h" +#include "progressbar.h" #include "pureqt.h" +#include "utils.h" +#include "actions/bootentry.h" +#include "actions/lock.h" + +#include +#include #ifdef KS_UNIX - #include - #include + #include // for ::kill + + #if QT_VERSION >= 0x050000 + #include + #else + #include // for ::sleep + #endif // QT_VERSION #endif // KS_UNIX -#include -#include #ifdef Q_OS_WIN32 #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif // WIN32_LEAN_AND_MEAN #include #include -#else - #include // for sleep #endif // Q_OS_WIN32 -#ifdef KS_DBUS - #include - #include -#endif // KS_DBUS - -#include "actions/bootentry.h" -#include "actions/lock.h" -#include "kshutdown.h" -#include "log.h" -#include "mainwindow.h" -#include "password.h" -#include "progressbar.h" -#include "utils.h" - using namespace KShutdown; bool Action::m_totalExit = false; #ifdef KS_DBUS -QDBusInterface *Action::m_loginInterface = 0; +QDBusInterface *Action::m_loginInterface = nullptr; -QDBusInterface *PowerAction::m_halDeviceInterface = 0; -QDBusInterface *PowerAction::m_halDeviceSystemPMInterface = 0; -QDBusInterface *PowerAction::m_upowerInterface = 0; +QDBusInterface *PowerAction::m_halDeviceInterface = nullptr; +QDBusInterface *PowerAction::m_halDeviceSystemPMInterface = nullptr; +QDBusInterface *PowerAction::m_upowerInterface = nullptr; bool StandardAction::m_kdeShutDownAvailable = false; -QDBusInterface *StandardAction::m_consoleKitInterface = 0; -QDBusInterface *StandardAction::m_kdeSessionInterface = 0; -QDBusInterface *StandardAction::m_lxqtSessionInterface = 0; -QDBusInterface *StandardAction::m_razorSessionInterface = 0; +QDBusInterface *StandardAction::m_consoleKitInterface = nullptr; +QDBusInterface *StandardAction::m_kdeSessionInterface = nullptr; +QDBusInterface *StandardAction::m_lxqtSessionInterface = nullptr; +QDBusInterface *StandardAction::m_razorSessionInterface = nullptr; #endif // KS_DBUS // Base @@ -79,11 +79,10 @@ m_canBookmark(false) { } -Base::~Base() { -} +Base::~Base() = default; QWidget *Base::getWidget() { - return 0; + return nullptr; } void Base::readConfig(Config *config) { @@ -125,7 +124,7 @@ // public Action::Action(const QString &text, const QString &iconName, const QString &id) : - U_ACTION(0), + U_ACTION(nullptr), Base(id), m_force(false), m_shouldStopTimer(true), @@ -176,7 +175,7 @@ if (mainWindow->isVisible()) parent = mainWindow; else - parent = 0; + parent = nullptr; QPointer message = new QMessageBox( QMessageBox::Warning, @@ -186,6 +185,11 @@ parent ); message->setDefaultButton(QMessageBox::Cancel); + if (!icon().isNull()) { + int size = U_APP->style()->pixelMetric(QStyle::PM_MessageBoxIconSize); + message->setIconPixmap(icon().pixmap(size, size)); + } + QAbstractButton *ok = message->button(QMessageBox::Ok); ok->setIcon(icon()); @@ -266,7 +270,17 @@ } #endif // KS_DBUS -bool Action::launch(const QString &program, const QStringList &args) { +bool Action::launch(const QString &program, const QStringList &args, const bool detached) { + if (detached) { + U_DEBUG << "Launching detached \"" << program << "\" with \"" << args << "\" arguments" U_END; + + // HACK: start detached to fix session manager hang in GNOME-based DEs + bool ok = QProcess::startDetached(program, args); + U_DEBUG << "Started OK: " << ok U_END; + + return ok; + } + U_DEBUG << "Launching \"" << program << "\" with \"" << args << "\" arguments" U_END; int exitCode = QProcess::execute(program, args); @@ -335,7 +349,11 @@ setShortcut(action->shortcut()); setStatusTip(action->statusTip()); setText(action->text()); - setToolTip(action->toolTip()); + #if QT_VERSION >= 0x050100 + // HACK: action->toolTip() is unusable in Qt + setToolTip(action->statusTip()); // for QMenu + #endif // QT_VERSION + connect(this, SIGNAL(triggered()), SLOT(slotFire())); } @@ -380,7 +398,7 @@ ); } -DateTimeEdit::~DateTimeEdit() { } +DateTimeEdit::~DateTimeEdit() = default; // private slots: @@ -409,10 +427,8 @@ } DateTimeTriggerBase::~DateTimeTriggerBase() { - if (m_edit) { - delete m_edit; - m_edit = 0; - } + delete m_edit; + m_edit = nullptr; } bool DateTimeTriggerBase::canActivateAction() { @@ -494,7 +510,7 @@ int secsTo = now.secsTo(m_endDateTime); ProgressBar *progressBar = MainWindow::self()->progressBar(); progressBar->setTotal(secsTo); - progressBar->setValue(0); + progressBar->setValue(-1); } } } @@ -755,6 +771,20 @@ "org.freedesktop.UPower", QDBusConnection::systemBus() ); + + if (!m_upowerInterface->isValid()) { + // HACK: wait for service start + // BUG: https://sourceforge.net/p/kshutdown/bugs/34/ + U_DEBUG << "UPower: Trying again..." U_END; + delete m_upowerInterface; + m_upowerInterface = new QDBusInterface( + "org.freedesktop.UPower", + "/org/freedesktop/UPower", + "org.freedesktop.UPower", + QDBusConnection::systemBus() + ); + } + if (m_upowerInterface->isValid()) U_DEBUG << "UPower backend found..." U_END; else @@ -784,7 +814,11 @@ LockAction::self()->activate(false); // HACK: wait for screensaver + #if QT_VERSION >= 0x050000 + QThread::sleep(1); + #else ::sleep(1); + #endif // QT_VERSION } QDBusInterface *login = getLoginInterface(); @@ -987,7 +1021,7 @@ QDBusReply reply = m_razorSessionInterface->call("canLogout"); if (!reply.isValid() || !reply.value()) { delete m_razorSessionInterface; - m_razorSessionInterface = 0; + m_razorSessionInterface = nullptr; disable("No Razor-qt session found"); } } @@ -1001,7 +1035,7 @@ QDBusReply reply = m_lxqtSessionInterface->call("canLogout"); if (!reply.isValid() || !reply.value()) { delete m_lxqtSessionInterface; - m_lxqtSessionInterface = 0; + m_lxqtSessionInterface = nullptr; disable("No LXQt session found"); } } @@ -1174,42 +1208,26 @@ QStringList args; args << "--logout"; args << "--no-prompt"; - if (launch("cinnamon-session-quit", args)) { - // HACK: session save issue? - U_APP->quit(); - + + if (launch("cinnamon-session-quit", args, true)) return true; - } } } // GNOME Shell, Unity -// FIXME: KDE build causes huge delay in session manager or something (?) else if (Utils::isGNOME() || Utils::isUnity()) { if (m_type == U_SHUTDOWN_TYPE_LOGOUT) { QStringList args; +// TODO: --force args << "--logout"; args << "--no-prompt"; - if (launch("gnome-session-quit", args)) { - // HACK: session save issue? - U_APP->quit(); - + + if (launch("gnome-session-quit", args, true)) return true; - } } } -/* TODO: GNOME 2 shutdown - if (Utils::isGNOME()) { - QStringList args; - args << "--kill"; - args << "--silent"; - if (launch("gnome-session-save", args)) - return true; - } -*/ - // LXDE else if (Utils::isLXDE()) { @@ -1249,18 +1267,8 @@ if (m_type == U_SHUTDOWN_TYPE_LOGOUT) { QStringList args; args << "--logout"; - if (launch("mate-session-save", args)) - return true; - } - } - - // Openbox - else if (Utils::isOpenbox()) { - if (m_type == U_SHUTDOWN_TYPE_LOGOUT) { - QStringList args; - args << "--exit"; - if (launch("openbox", args)) + if (launch("mate-session-save", args, true)) return true; } } @@ -1299,15 +1307,16 @@ // Xfce -/* FIXME: causes IO error in session manager (?) else if (Utils::isXfce()) { switch (m_type) { case U_SHUTDOWN_TYPE_LOGOUT: { QStringList args; args << "--logout"; - if (launch("xfce4-session-logout", args)) + + if (launch("xfce4-session-logout", args, true)) return true; } break; +/* case U_SHUTDOWN_TYPE_REBOOT: { QStringList args; args << "--reboot"; @@ -1324,9 +1333,9 @@ U_ERROR << "WTF? Unknown m_type: " << m_type U_END; return false; // do nothing +*/ } } -*/ // Enlightenment @@ -1362,7 +1371,23 @@ return true; } #endif // KS_DBUS - + + // Openbox + + // NOTE: Put this after m_kdeSessionInterface call + // because in case of Openbox/KDE session KShutdown + // will detect both Openbox and KDE at the same time. + // ISSUE: https://sourceforge.net/p/kshutdown/feature-requests/20/ + if (Utils::isOpenbox()) { + if (m_type == U_SHUTDOWN_TYPE_LOGOUT) { + QStringList args; + args << "--exit"; + + if (launch("openbox", args)) + return true; + } + } + // fallback to systemd/logind/ConsoleKit/HAL/whatever #ifdef KS_DBUS @@ -1512,12 +1537,6 @@ #ifdef Q_OS_HAIKU disable(""); #endif // Q_OS_HAIKU - - #ifdef KS_UNIX -// HACK: - if (Utils::isXfce()) - disable(""); - #endif // KS_UNIX } // RebootAction @@ -1526,7 +1545,7 @@ RebootAction::RebootAction() : StandardAction(i18n("Restart Computer"), QString::null, "reboot", U_SHUTDOWN_TYPE_REBOOT), - m_bootEntryComboBox(0) { + m_bootEntryComboBox(nullptr) { #ifdef KS_NATIVE_KDE /* HACK: crash on KDE 4.5.0 diff -Nru kshutdown-4.0/src/kshutdown.desktop kshutdown-4.2/src/kshutdown.desktop --- kshutdown-4.0/src/kshutdown.desktop 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/kshutdown.desktop 2017-10-16 13:21:59.000000000 +0000 @@ -9,14 +9,6 @@ Name[sr@ijekavianlatin]=K-Gašenje Comment=A graphical shutdown utility - -# TODO: Imported from KShutdown 1.0.x; please update and uncomment -#Comment[cs]=Vypínací utilita pro KDE -#Comment[de]=Erweitertes Herunterfahren für KDE -#Comment[el]=Ένα εργαλείο τερματισμού για το KDE -#Comment[fr]=Utilitaire de gestion d'arrêt pour KDE -#Comment[it]=Una utilit�KDE per lo spegnimento del sistema - Comment[pl]=Graficzne narzędzie do zamykania systemu Comment[sr]=Напредна алатка за гашење рачунара Comment[sr@latin]=Napredna alatka za gašenje računara @@ -25,11 +17,6 @@ # visible in the menu instead of "KShutdown" GenericName=System Shut Down Utility - -# TODO: Imported from KShutdown 1.0.x; please update and uncomment -#GenericName[cs]=Časované vypnutí -#GenericName[fr]=Gestionnaire d'arrêt du système - GenericName[pl]=Narzędzie do zamykania systemu GenericName[sr]=Алатка за гашење система GenericName[sr@latin]=Alatka za gašenje sistema @@ -48,3 +35,37 @@ # DOC: http://standards.freedesktop.org/menu-spec/latest/apa.html Categories=Utility;KDE;Qt;X-SuSE-DesktopUtility; StartupNotify=true + +Actions=Halt;Reboot;Hibernate;Suspend;Lock;Logout; + +# NOTE: The localized action names should match translations in ./po directory. + +[Desktop Action Halt] +Name=Turn Off Computer +Icon=system-shutdown +Exec=kshutdown --halt --confirm + +[Desktop Action Reboot] +Name=Restart Computer +Icon=system-reboot +Exec=kshutdown --reboot --confirm + +[Desktop Action Hibernate] +Name=Hibernate Computer +Icon=system-suspend-hibernate +Exec=kshutdown --hibernate --confirm + +[Desktop Action Suspend] +Name=Suspend Computer +Icon=system-suspend +Exec=kshutdown --suspend --confirm + +[Desktop Action Lock] +Name=Lock Screen +Icon=system-lock-screen +Exec=kshutdown --lock + +[Desktop Action Logout] +Name=Logout +Icon=system-log-out +Exec=kshutdown --logout --confirm diff -Nru kshutdown-4.0/src/kshutdown.h kshutdown-4.2/src/kshutdown.h --- kshutdown-4.0/src/kshutdown.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/kshutdown.h 2017-10-16 13:21:59.000000000 +0000 @@ -18,17 +18,23 @@ #ifndef KSHUTDOWN_KSHUTDOWN_H #define KSHUTDOWN_KSHUTDOWN_H -#include "pureqt.h" +#include "infowidget.h" + +#include + +#ifdef KS_DBUS + #include + #include +#endif // KS_DBUS #ifdef KS_UNIX + // HACK: fixes some compilation error (?) #include #endif // KS_UNIX -#include -#include - -#include "config.h" -#include "infowidget.h" +class BootEntryComboBox; +class Config; +class MainWindow; typedef int UShutdownType; // This is mapped to the values in kworkspace.h @@ -36,12 +42,6 @@ const UShutdownType U_SHUTDOWN_TYPE_REBOOT = 1; // KDE: ShutdownTypeReboot const UShutdownType U_SHUTDOWN_TYPE_HALT = 2; // KDE: ShutdownTypeHalt -class BootEntryComboBox; -class MainWindow; -#ifdef KS_DBUS -class QDBusInterface; -#endif // KS_DBUS - namespace KShutdown { const QString TIME_DISPLAY_FORMAT = "hh'h ':' 'mm'm'"; @@ -142,7 +142,7 @@ #ifdef KS_DBUS static QDBusInterface *getLoginInterface(); #endif // KS_DBUS - bool launch(const QString &program, const QStringList &args); + bool launch(const QString &program, const QStringList &args, const bool detached = false); bool unsupportedAction(); private: Q_DISABLE_COPY(Action) diff -Nru kshutdown-4.0/src/kshutdown-qt.desktop kshutdown-4.2/src/kshutdown-qt.desktop --- kshutdown-4.0/src/kshutdown-qt.desktop 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/kshutdown-qt.desktop 2017-10-16 13:21:59.000000000 +0000 @@ -2,22 +2,15 @@ Version=1.0 # Encoding=UTF-8 +# TODO: this file is obsolete and it will be removed in version 5.0 + Name=KShutdown/Qt -# TODO: add "/Qt" suffix Name[sr]=К-Гашење/Кјут Name[sr@latin]=K-Gašenje/Qt Name[sr@ijekavian]=К-Гашење/Кјут Name[sr@ijekavianlatin]=K-Gašenje/Qt Comment=A graphical shutdown utility - -# TODO: Imported from KShutdown 1.0.x; please update and uncomment -#Comment[cs]=Vypínací utilita pro KDE -#Comment[de]=Erweitertes Herunterfahren für KDE -#Comment[el]=Ένα εργαλείο τερματισμού για το KDE -#Comment[fr]=Utilitaire de gestion d'arrêt pour KDE -#Comment[it]=Una utilit�KDE per lo spegnimento del sistema - Comment[pl]=Graficzne narzędzie do zamykania systemu Comment[sr]=Напредна алатка за гашење рачунара Comment[sr@latin]=Napredna alatka za gašenje računara @@ -26,11 +19,6 @@ # visible in the menu instead of "KShutdown" GenericName=System Shut Down Utility - -# TODO: Imported from KShutdown 1.0.x; please update and uncomment -#GenericName[cs]=Časované vypnutí -#GenericName[fr]=Gestionnaire d'arrêt du système - GenericName[pl]=Narzędzie do zamykania systemu GenericName[sr]=Алатка за гашење рачунара GenericName[sr@latin]=Alatka za gašenje računara diff -Nru kshutdown-4.0/src/kshutdown.rc kshutdown-4.2/src/kshutdown.rc --- kshutdown-4.0/src/kshutdown.rc 1970-01-01 00:00:00.000000000 +0000 +++ kshutdown-4.2/src/kshutdown.rc 2017-10-16 13:21:59.000000000 +0000 @@ -0,0 +1 @@ +MAINICON ICON "images/kshutdown.ico" diff -Nru kshutdown-4.0/src/log.cpp kshutdown-4.2/src/log.cpp --- kshutdown-4.0/src/log.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/log.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,10 +15,10 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#include - #include "log.h" +#include + // private: QFile *Log::logFile = nullptr; diff -Nru kshutdown-4.0/src/main.cpp kshutdown-4.2/src/main.cpp --- kshutdown-4.0/src/main.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/main.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,27 +15,25 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#include "commandline.h" +#include "log.h" +#include "mainwindow.h" +#include "utils.h" +#include "version.h" + #ifdef KS_PURE_QT - #include #include - #include #include #else #include #ifdef KS_KF5 #include #else - #include - #include + #include // #kde4 + #include // #kde4 #endif // KS_KF5 #endif // KS_PURE_QT -#include "commandline.h" -#include "log.h" -#include "mainwindow.h" -#include "utils.h" -#include "version.h" - #if defined(KS_PURE_QT) && defined(KS_UNIX) #include #endif // defined(KS_PURE_QT) && defined(KS_UNIX) @@ -52,7 +50,7 @@ public: #if defined(KS_PURE_QT) || defined(KS_KF5) KShutdownApplication(int &argc, char **argv) - : QApplication(argc, argv, Utils::isGUI()) { + : QApplication(argc, argv) { } #endif // KS_PURE_QT @@ -70,7 +68,7 @@ } #endif // KS_NATIVE_KDE - bool commonStartup(const bool first) { + bool commonStartup(const bool first, const bool forceShow = false) { if (first) MainWindow::init(); @@ -83,7 +81,7 @@ bool useTimeOption = TimeOption::isValid() && TimeOption::action(); - if (!MainWindow::self()->maybeShow()) { + if (!MainWindow::self()->maybeShow(forceShow)) { quit(); return false; @@ -103,24 +101,29 @@ int main(int argc, char **argv) { #ifdef KS_PURE_QT // NOTE: run this before QApplication constructor + #ifdef KS_UNIX bool userStyle = false; + #endif // KS_UNIX if (argc > 1) { for (int i = 1; i < argc; i++) { QString arg(argv[i]); + #ifdef KS_UNIX if ((arg == "-style") || (arg == "--style")) { userStyle = true; break; // for - } - else if ((arg == "-version") || (arg == "--version")) { - QString text = "KShutdown " KS_FULL_VERSION " (Build: " KS_BUILD ")\n"; - text += "Qt " QT_VERSION_STR; + } else + #endif // KS_UNIX + if ((arg == "-version") || (arg == "--version")) { + QString text = "KShutdown " KS_FULL_VERSION " (" KS_RELEASE_DATE ")\n"; + text += "Qt "; + text += qVersion(); + text += " (compiled using " QT_VERSION_STR ")"; QTextStream out(stdout); out << text << endl; return 0; } - } } #endif // KS_PURE_QT @@ -133,7 +136,7 @@ Log::init(); #define KS_DEBUG_SYSTEM(f, d) \ - if (d) qDebug("kshutdown: " f ": %s", d ? "" : "not detected"); + if (d) qDebug("kshutdown: " f ": %s", (d) ? "" : "not detected"); bool e17 = Utils::isEnlightenment(); KS_DEBUG_SYSTEM("Enlightenment", e17); @@ -223,7 +226,7 @@ about.setShortDescription(i18n("A graphical shutdown utility")); about.addAuthor("Konrad Twardowski", i18n("Maintainer"), KS_EMAIL, KS_CONTACT); - about.addCredit(i18n("Thanks To All!"), QString(), QString(), "http://sourceforge.net/p/kshutdown/wiki/Credits/"); + about.addCredit(i18n("Thanks To All!"), QString(), QString(), "https://sourceforge.net/p/kshutdown/wiki/Credits/"); #else KAboutData about( "kshutdown", // app name - used in config file name etc. @@ -238,7 +241,7 @@ about.setShortDescription(ki18n("A graphical shutdown utility")); about.addAuthor(ki18n("Konrad Twardowski"), ki18n("Maintainer"), KS_EMAIL, KS_CONTACT); - about.addCredit(ki18n("Thanks To All!"), KLocalizedString(), QByteArray(), "http://sourceforge.net/p/kshutdown/wiki/Credits/"); + about.addCredit(ki18n("Thanks To All!"), KLocalizedString(), QByteArray(), "https://sourceforge.net/p/kshutdown/wiki/Credits/"); // NOTE: "kshutdown.sf.net" produces too long DBus names // (net.sf.kshutdown.kshutdown) @@ -256,7 +259,7 @@ //QApplication::setApplicationDescription(i18n("A graphical shutdown utility")); QApplication::setApplicationVersion(KS_FULL_VERSION); - QCommandLineParser *parser = new QCommandLineParser(); + auto *parser = new QCommandLineParser(); parser->setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); Utils::setParser(parser); @@ -270,7 +273,7 @@ parser->addOption(QCommandLineOption(QStringList() << "H" << "hibernate", i18n("Hibernate Computer"))); parser->addOption(QCommandLineOption(QStringList() << "S" << "suspend", i18n("Suspend Computer"))); - parser->addOption(QCommandLineOption(QStringList() << "k" << "lock", i18n("Lock screen"))); + parser->addOption(QCommandLineOption(QStringList() << "k" << "lock", i18n("Lock Screen"))); parser->addOption(QCommandLineOption(QStringList() << "l" << "logout", i18n("Logout"))); parser->addOption(QCommandLineOption( @@ -334,7 +337,7 @@ options.add("suspend", ki18n("Suspend Computer")); options.add("k"); - options.add("lock", ki18n("Lock screen")); + options.add("lock", ki18n("Lock Screen")); options.add("l"); options.add("logout", ki18n("Logout")); @@ -375,7 +378,7 @@ ) ); - options.add("", ki18n("More Info...\nhttp://sourceforge.net/p/kshutdown/wiki/Command%20Line/")); // krazy:exclude=i18ncheckarg + options.add("", ki18n("More Info...\nhttps://sourceforge.net/p/kshutdown/wiki/Command%20Line/")); // krazy:exclude=i18ncheckarg KCmdLineArgs::addCmdLineOptions(options); // BUG: --nofork option does not work like in KShutdown 1.0.x (?) @@ -397,14 +400,18 @@ KShutdownApplication program(argc, argv); QApplication::setOrganizationDomain("sf.net"); // do not modify + KDBusService *dbusService = new KDBusService(KDBusService::Unique | KDBusService::NoExitOnFailure); +// TODO: print message if KShutdown is already running +// qDebug("KShutdown is already running"); + QObject::connect(dbusService, &KDBusService::activateRequested, [=](const QStringList &arguments, const QString &cwd) { Q_UNUSED(cwd) - + parser->parse(arguments); - KShutdownApplication *p = dynamic_cast(U_APP); - p->commonStartup(false); + auto *p = dynamic_cast(U_APP); + p->commonStartup(false, true); if (Utils::isArg("cancel")) MainWindow::self()->setActive(false); diff -Nru kshutdown-4.0/src/mainwindow.cpp kshutdown-4.2/src/mainwindow.cpp --- kshutdown-4.0/src/mainwindow.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/mainwindow.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,57 +15,49 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#include "pureqt.h" +#include "mainwindow.h" + +#include "bookmarks.h" +#include "commandline.h" +#include "config.h" +#include "log.h" +#include "mod.h" +#include "password.h" +#include "preferences.h" +#include "progressbar.h" +#include "stats.h" +#include "usystemtray.h" +#include "utils.h" +#include "actions/extras.h" +#include "actions/lock.h" +#include "actions/test.h" +#include "triggers/idlemonitor.h" +#include "triggers/processmonitor.h" + +#ifdef KS_PURE_QT + #include "version.h" +#endif // KS_PURE_QT -#include #include -#include -#include #include +#include #include -#ifdef KS_DBUS - #include -#endif // KS_DBUS - -#ifdef KS_PURE_QT - #include "version.h" // for about() - - #include -#else - #include +#ifdef KS_NATIVE_KDE + #include // #kde4 #include #include #include #include - #include + #include // #kde4 #include -#endif // KS_PURE_QT +#endif // KS_NATIVE_KDE #ifdef KS_KF5 #include #endif // KS_KF5 -#include "actions/bootentry.h" -#include "actions/extras.h" -#include "actions/lock.h" -#include "actions/test.h" -#include "triggers/idlemonitor.h" -#include "triggers/processmonitor.h" -#include "bookmarks.h" -#include "commandline.h" -#include "infowidget.h" -#include "log.h" -#include "mainwindow.h" -#include "mod.h" -#include "password.h" -#include "preferences.h" -#include "progressbar.h" -#include "stats.h" -#include "usystemtray.h" -#include "utils.h" - -MainWindow *MainWindow::m_instance = 0; +MainWindow *MainWindow::m_instance = nullptr; QHash MainWindow::m_actionHash; QHash MainWindow::m_triggerHash; QList MainWindow::m_actionList; @@ -87,7 +79,7 @@ if (m_progressBar) { delete m_progressBar; - m_progressBar = 0; + m_progressBar = nullptr; } } @@ -165,14 +157,14 @@ "\n"; // HACK: non-clickable links in Oxygen Style - table += "http://sourceforge.net/p/kshutdown/wiki/Command%20Line/\n"; + table += "https://sourceforge.net/p/kshutdown/wiki/Command%20Line/\n"; table += ""; //U_DEBUG << table U_END; QMessageBox::information( // krazy:exclude=qclasses - 0, + nullptr, i18n("Command Line Options"), "" + table + @@ -185,7 +177,7 @@ TimeOption::init(); - Action *actionToActivate = 0; + Action *actionToActivate = nullptr; bool confirm = Utils::isArg("confirm"); foreach (Action *action, m_actionList) { if (action->isCommandLineArgSupported()) { @@ -226,7 +218,7 @@ } // execute action and quit now - if (actionToActivate->authorize(0)) + if (actionToActivate->authorize(nullptr)) actionToActivate->activate(false); return true; @@ -319,7 +311,7 @@ addTrigger(new ProcessMonitor()); #endif // KS_TRIGGER_PROCESS_MONITOR - IdleMonitor *idleMonitor = new IdleMonitor(); + auto *idleMonitor = new IdleMonitor(); if (idleMonitor->isSupported()) addTrigger(idleMonitor); else @@ -328,9 +320,11 @@ pluginConfig(true); // read } -bool MainWindow::maybeShow() { +bool MainWindow::maybeShow(const bool forceShow) { if (Utils::isArg("hide-ui")) { hide(); + +// FIXME: KStatusNotifierItem is always visible m_systemTray->setVisible(false); return true; @@ -340,8 +334,15 @@ if (!menuLayout.isEmpty()) { QStringList menuActions = menuLayout.split(':'); - U_MENU *menu = new U_MENU(); + auto *menu = new U_MENU(); + #if QT_VERSION < 0x050100 //connect(menu, SIGNAL(hovered(QAction *)), SLOT(onMenuHovered(QAction *))); + #else + connect(menu, SIGNAL(hovered(QAction *)), SLOT(onMenuHovered(QAction *))); + menu->setToolTipsVisible(true); + #endif // QT_VERSION + + bool confirm = Utils::isArg("confirm"); foreach (const QString &id, menuActions) { if (id == "-") { @@ -359,10 +360,15 @@ else { auto *action = m_actionHash[id]; // TODO: show confirmation dialog at cursor position (?) - if (action) - menu->addAction(new ConfirmAction(menu, action)); - else + if (action) { + if (confirm) + menu->addAction(new ConfirmAction(menu, action)); + else + menu->addAction(action); + } + else { U_DEBUG << "Unknown ui-menu element: " << id U_END; + } } } @@ -382,7 +388,10 @@ if (trayIconEnabled) m_systemTray->setVisible(true); - if (Utils::isArg("init") || U_APP->isSessionRestored()) { + if (forceShow) { + show(); + } + else if (Utils::isArg("init") || U_APP->isSessionRestored()) { if (!trayIconEnabled) showMinimized(); // krazy:exclude=qmethods } @@ -444,12 +453,16 @@ } void MainWindow::setActive(const bool yes) { + setActive(yes, true); +} + +void MainWindow::setActive(const bool yes, const bool needAuthorization) { // private if (m_active == yes) return; U_DEBUG << "MainWindow::setActive( " << yes << " )" U_END; - if (!yes && !PasswordDialog::authorize(this, i18n("Cancel"), "kshutdown/action/cancel")) + if (needAuthorization && !yes && !PasswordDialog::authorize(this, i18n("Cancel"), "kshutdown/action/cancel")) return; Action *action = getSelectedAction(); @@ -475,6 +488,7 @@ m_active = yes; m_systemTray->updateIcon(this); + m_progressBar->updateTaskbar(-1, -1, false); //U_DEBUG << "\tMainWindow::getSelectedAction() == " << action->id() U_END; //U_DEBUG << "\tMainWindow::getSelectedTrigger() == " << trigger->id() U_END; @@ -579,7 +593,7 @@ setSelectedTrigger(trigger); QTime t = TimeOption::parseTime(time); - bool absolute = (trigger == "date-time") ? true : false; + bool absolute = (trigger == "date-time"); setTime(trigger, t, absolute); } @@ -621,7 +635,10 @@ e->ignore(); // no system tray, minimize instead - if (!m_systemTray->isSupported()) { + if ( + !m_systemTray->isSupported() || + Utils::isUnity() // HACK: QSystemTrayIcon::activated not called in Unity + ) { showMinimized(); // krazy:exclude=qmethods } // hide in system tray instead of close @@ -647,7 +664,7 @@ MainWindow::MainWindow() : U_MAIN_WINDOW( - 0, + nullptr, Qt::Window | // disable "Maximize" button; no Qt::WindowMaximizeButtonHint Qt::CustomizeWindowHint | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint @@ -657,11 +674,11 @@ m_ignoreUpdateWidgets(true), m_showActiveWarning(true), m_showMinimizeInfo(true), - m_progressBar(0), + m_progressBar(nullptr), m_lastNotificationID(QString::null), m_triggerTimer(new QTimer(this)), - m_currentActionWidget(0), - m_currentTriggerWidget(0) { + m_currentActionWidget(nullptr), + m_currentTriggerWidget(nullptr) { //U_DEBUG << "MainWindow::MainWindow()" U_END; @@ -761,6 +778,10 @@ QDBusConnection::ExportScriptableSlots ); #endif // KS_DBUS + + // Do not focus OK button on startup + // to avoid accidental action activation via Enter key. + m_actions->setFocus(); } void MainWindow::addAction(Action *action) { @@ -789,8 +810,10 @@ auto *quitAction = new U_ACTION(this); quitAction->setIcon(U_STOCK_ICON("application-exit")); quitAction->setShortcut(QKeySequence("Ctrl+Q")); + //quitAction->setShortcuts(QKeySequence::Quit <- useless); connect(quitAction, SIGNAL(triggered()), SLOT(onQuit())); #endif // KS_NATIVE_KDE + // NOTE: Use "Quit KShutdown" instead of "Quit" because // it may be too similar to "Turn Off" in some language translations. quitAction->setText(i18n("Quit KShutdown")); @@ -798,7 +821,7 @@ return quitAction; } -void MainWindow::initFileMenu(U_MENU *fileMenu, const bool addQuitAction) { +void MainWindow::initFileMenu(U_MENU *fileMenu) { Action *a; QString id; for (int i = 0; i < m_actions->count(); ++i) { @@ -815,7 +838,7 @@ if (!a->showInMenu()) continue; // for - ConfirmAction *confirmAction = new ConfirmAction(this, a); + auto *confirmAction = new ConfirmAction(this, a); if (a == LockAction::self()) m_confirmLockAction = confirmAction; @@ -847,36 +870,43 @@ } fileMenu->addSeparator(); fileMenu->addAction(m_cancelAction); - //fileMenu->addSeparator(); - - if (addQuitAction) - fileMenu->addAction(createQuitAction()); + fileMenu->addAction(createQuitAction()); } void MainWindow::initMenuBar() { //U_DEBUG << "MainWindow::initMenuBar()" U_END; - U_MENU_BAR *menuBar = new U_MENU_BAR(); + auto *menuBar = new U_MENU_BAR(); + + // HACK: Fixes Bookmarks menu and key shortcuts + if (Utils::isXfce()) + menuBar->setNativeMenuBar(false); // file menu U_MENU *fileMenu = new U_MENU(i18n("A&ction"), menuBar); + connect(fileMenu, SIGNAL(hovered(QAction *)), SLOT(onMenuHovered(QAction *))); + #if QT_VERSION >= 0x050100 + fileMenu->setToolTipsVisible(true); + #endif // QT_VERSION + Utils::addTitle(fileMenu, /*U_STOCK_ICON("dialog-warning")*/U_ICON(), i18n("No Delay")); - initFileMenu(fileMenu, true); + initFileMenu(fileMenu); menuBar->addMenu(fileMenu); - U_MENU *systemTrayFileMenu = new U_MENU(); // need copy -// FIXME: wrong tool tip location -// connect(systemTrayFileMenu, SIGNAL(hovered(QAction *)), SLOT(onMenuHovered(QAction *))); - initFileMenu( - systemTrayFileMenu, - #ifdef KS_KF5 - !Utils::isKDE() - #else - true - #endif // KS_KF5 - ); + auto *systemTrayFileMenu = new U_MENU(); // need copy + + #if QT_VERSION < 0x050100 + // HACK: wrong tool tip location + // connect(systemTrayFileMenu, SIGNAL(hovered(QAction *)), SLOT(onMenuHovered(QAction *))); + #else + connect(systemTrayFileMenu, SIGNAL(hovered(QAction *)), SLOT(onMenuHovered(QAction *))); + systemTrayFileMenu->setToolTipsVisible(true); + #endif // QT_VERSION + + initFileMenu(systemTrayFileMenu); + m_systemTray->setContextMenu(systemTrayFileMenu); // bookmarks menu @@ -886,16 +916,21 @@ // tools menu - U_MENU *toolsMenu = new U_MENU(i18n("&Tools"), menuBar); + auto *toolsMenu = new U_MENU(i18n("&Tools"), menuBar); +// TODO: add more related tools #ifndef Q_OS_WIN32 - toolsMenu->addAction(i18n("Statistics"), this, SLOT(onStats())); + auto *statsAction = toolsMenu->addAction(i18n("Statistics"), this, SLOT(onStats())); + statsAction->setShortcut(QKeySequence("Ctrl+Shift+S")); toolsMenu->addSeparator(); #endif // Q_OS_WIN32 #ifdef KS_PURE_QT - toolsMenu->addAction(i18n("Preferences"), this, SLOT(onPreferences())) - ->setIcon(U_STOCK_ICON("configure")); + toolsMenu->addAction( + U_STOCK_ICON("configure"), i18n("Preferences"), + this, SLOT(onPreferences()), + QKeySequence::Preferences + ); #endif // KS_PURE_QT #ifdef KS_NATIVE_KDE @@ -938,7 +973,7 @@ #endif // KS_KF5 #else U_MENU *helpMenu = new U_MENU(i18n("&Help"), menuBar); - helpMenu->addAction(i18n("About"), this, SLOT(onAbout())); + helpMenu->addAction(i18n("About"), this, SLOT(onAbout()), QKeySequence("Ctrl+H,E,L,P")); menuBar->addMenu(helpMenu); #endif // KS_NATIVE_KDE @@ -946,12 +981,6 @@ if (Mod::getBool("ui-hide-menu-bar")) menuBar->hide(); - // HACK: Fixes Bookmarks menu and key shortcuts - // (Global app menus in Unity are all f*** - it's a fact) - // BUG: https://bugs.launchpad.net/appmenu-qt5/+bug/1449373 - // https://bugs.launchpad.net/appmenu-qt5/+bug/1380702 - else - menuBar->show(); } void MainWindow::initWidgets() { @@ -961,7 +990,7 @@ QWidget *mainWidget = new QWidget(); mainWidget->setObjectName("main-widget"); - QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget); + auto *mainLayout = new QVBoxLayout(mainWidget); mainLayout->setMargin(5_px); mainLayout->setSpacing(10_px); @@ -1076,10 +1105,16 @@ #elif defined(KS_NATIVE_KDE) setCaption(plain); #else + #if QT_VERSION >= 0x050200 + setWindowTitle(plain); + // NOTE: the " - KShutdown" suffix is appended automatically + // if QApplication::applicationDispayName is set + #else if (plain.isEmpty()) setWindowTitle("KShutdown"); else setWindowTitle(plain + " - KShutdown"); + #endif // QT_VERSION #endif // KS_NATIVE_KDE QString s = html.isEmpty() ? "KShutdown" : html; @@ -1209,7 +1244,7 @@ // TEST: iconLabel->setPixmap(U_ICON(":/images/hi128-app-kshutdown.png").pixmap(128, 128)); QString titleText = "KShutdown " KS_FULL_VERSION; - QString buildText = "Build: " KS_BUILD; + QString buildText = KS_RELEASE_DATE; if (Config::isPortable()) buildText += " | Portable"; auto *titleLabel = new QLabel( @@ -1221,11 +1256,11 @@ titleLabel->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); QString releaseNotes = - "http://kshutdown.sourceforge.net/releases/" KS_FILE_VERSION ".html"; + "https://kshutdown.sourceforge.io/releases/" KS_FILE_VERSION ".html"; auto *aboutLabel = new QLabel( "" + i18n("A graphical shutdown utility") + "
          " \ - "kshutdown.sf.net
          " \ + "kshutdown.sourceforge.io
          " \ "
          " \ "" + i18n("What's New?") + "
          " \ "          " @@ -1250,8 +1285,7 @@ aboutLayout->addStretch(); QString licenseText = -R"(
          -This program is free software; you can redistribute it and/or modify
+R"(This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
@@ -1259,9 +1293,9 @@
 This program 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 General Public License for more details. (tl;dr)
          )"; +GNU General Public License for more details. (tl;dr)          )"; - auto *licenseLabel = new QLabel(licenseText); + auto *licenseLabel = new QLabel(licenseText.replace("\n", "
          ")); licenseLabel->setAlignment(Qt::AlignLeft | Qt::AlignTop); licenseLabel->setOpenExternalLinks(true); @@ -1338,7 +1372,9 @@ // activate action Trigger *trigger = getSelectedTrigger(); if (trigger->canActivateAction()) { - setActive(false); + // NOTE: 2nd "false" fixes https://sourceforge.net/p/kshutdown/bugs/33/ + setActive(false, false); + Action *action = getSelectedAction(); if (action->isEnabled()) { U_DEBUG << "Activate action: force=" << m_force->isChecked() U_END; @@ -1426,7 +1462,7 @@ // DOC: http://www.kdedevelopers.org/node/3919 QPointer dialog = new Preferences(this); - if ((dialog->exec() == Preferences::Accepted) || Utils::isGTKStyle()) { + if (dialog->exec() == Preferences::Accepted) { dialog->apply(); m_progressBar->setVisible(m_active && getSelectedTrigger()->supportsProgressBar() && Config::progressBarEnabled()); @@ -1442,8 +1478,8 @@ delete dialog; } -void MainWindow::onStatusChange(const bool aUpdateWidgets) { - //U_DEBUG << "onStatusChange(" << aUpdateWidgets << ")" U_END; +void MainWindow::onStatusChange(const bool forceUpdateWidgets) { + //U_DEBUG << "onStatusChange(" << forceUpdateWidgets << ")" U_END; Action *action = getSelectedAction(); Trigger *trigger = getSelectedTrigger(); @@ -1464,7 +1500,7 @@ else type = InfoWidget::Type::Info; - if (aUpdateWidgets) { + if (forceUpdateWidgets) { updateWidgets(); // do not override status set in "updateWidgets()" @@ -1488,10 +1524,10 @@ Trigger *trigger = getSelectedTrigger(); m_currentTriggerWidget = trigger->getWidget(); if (m_currentTriggerWidget) { - static_cast(m_triggerBox->layout())->insertWidget(1, m_currentTriggerWidget); + dynamic_cast(m_triggerBox->layout())->insertWidget(1, m_currentTriggerWidget); m_currentTriggerWidget->show(); } - + m_triggers->setToolTip(trigger->toolTip()); onStatusChange(true); diff -Nru kshutdown-4.0/src/mainwindow.h kshutdown-4.2/src/mainwindow.h --- kshutdown-4.0/src/mainwindow.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/mainwindow.h 2017-10-16 13:21:59.000000000 +0000 @@ -19,28 +19,20 @@ #define KSHUTDOWN_MAINWINDOW_H // used in both main.cpp and mainwindow.cpp -#define KS_CONTACT "http://kshutdown.sourceforge.net/contact.html" +#define KS_CONTACT "https://kshutdown.sourceforge.io/contact.html" #define KS_COPYRIGHT "(C) 2003-3000 Konrad Twardowski" -#define KS_HOME_PAGE "http://kshutdown.sf.net/" - -#ifdef KS_PURE_QT - class QComboBox; -#elif defined(KS_KF5) - class QComboBox; - - class KActionCollection; -#else - class KActionCollection; - class KComboBox; -#endif // KS_PURE_QT +#define KS_HOME_PAGE "https://kshutdown.sourceforge.io/" #include "kshutdown.h" -class QCheckBox; -class QGroupBox; +#include +#include + +#ifdef KS_NATIVE_KDE + #include +#endif // KS_NATIVE_KDE class BookmarksMenu; -class InfoWidget; class ProgressBar; class USystemTray; @@ -80,8 +72,8 @@ return m_instance; } - bool maybeShow(); - void setTime(const QString &trigger, const QTime &time, const bool absolute); + bool maybeShow(const bool forceShow = false); + void setTime(const QString &selectTrigger, const QTime &time, const bool absolute); QHash triggerHash() const { return m_triggerHash; } public slots: Q_SCRIPTABLE QStringList actionList(const bool showDescription); @@ -132,12 +124,13 @@ static void addAction(Action *action); static void addTrigger(Trigger *trigger); U_ACTION *createQuitAction(); - void initFileMenu(U_MENU *fileMenu, const bool addQuitAction); + void initFileMenu(U_MENU *fileMenu); void initMenuBar(); void initTriggers(); void initWidgets(); static void pluginConfig(const bool read); void readConfig(); + void setActive(const bool yes, const bool needAuthorization); void setTitle(const QString &plain, const QString &html); void updateWidgets(); private slots: @@ -158,7 +151,7 @@ void onPreferences(); void onQuit(); void onStats(); - void onStatusChange(const bool updateWidgets); + void onStatusChange(const bool forceUpdateWidgets); void onTriggerActivated(int index); }; diff -Nru kshutdown-4.0/src/mod.cpp kshutdown-4.2/src/mod.cpp --- kshutdown-4.0/src/mod.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/mod.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -19,12 +19,13 @@ #include "config.h" #include "mainwindow.h" -#include "pureqt.h" #include "utils.h" +#include + // private -QHash *Mod::m_map = 0; +QHash *Mod::m_map = nullptr; // public diff -Nru kshutdown-4.0/src/mod.h kshutdown-4.2/src/mod.h --- kshutdown-4.0/src/mod.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/mod.h 2017-10-16 13:21:59.000000000 +0000 @@ -19,7 +19,6 @@ #define KSHUTDOWN_MOD_H #include -#include #include class MainWindow; diff -Nru kshutdown-4.0/src/password.cpp kshutdown-4.2/src/password.cpp --- kshutdown-4.0/src/password.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/password.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -23,19 +23,18 @@ #include "mainwindow.h" #include "utils.h" -#ifdef KS_NATIVE_KDE - #include -#endif // KS_NATIVE_KDE +#include +#include +#include +#include #ifdef KS_PURE_QT #include #endif // KS_PURE_QT -#include -#include -#include -#include -#include +#ifdef KS_NATIVE_KDE + #include +#endif // KS_NATIVE_KDE // PasswordDialog @@ -122,7 +121,7 @@ QPointer dialog = new KPasswordDialog(parent); dialog->setPixmap(U_ICON("kshutdown").pixmap(48_px, 48_px)); dialog->setPrompt(prompt); - bool ok = dialog->exec(); + bool ok = dialog->exec() == KPasswordDialog::Accepted; QString password = ok ? dialog->password() : QString::null; delete dialog; @@ -235,7 +234,7 @@ { //U_DEBUG << "PasswordPreferences::PasswordPreferences()" U_END; - QVBoxLayout *mainLayout = new QVBoxLayout(this); + auto *mainLayout = new QVBoxLayout(this); mainLayout->setMargin(10_px); mainLayout->setSpacing(10_px); @@ -277,17 +276,13 @@ userActionListLabel->setBuddy(m_userActionList); mainLayout->addWidget(m_userActionList); - InfoWidget *kioskInfo = new InfoWidget(this); - kioskInfo->setText("" + i18n("See Also: %0").arg("Kiosk") + "", InfoWidget::Type::Info); + auto *kioskInfo = new InfoWidget(this); + kioskInfo->setText("" + i18n("See Also: %0").arg("Kiosk") + "", InfoWidget::Type::Info); mainLayout->addWidget(kioskInfo); updateWidgets(m_enablePassword->isChecked()); } -PasswordPreferences::~PasswordPreferences() { - //U_DEBUG << "PasswordPreferences::~PasswordPreferences()" U_END; -} - void PasswordPreferences::apply() { //U_DEBUG << "PasswordPreferences::apply()" U_END; @@ -312,7 +307,7 @@ // private: QListWidgetItem *PasswordPreferences::addItem(const QString &key, const QString &text, const QIcon &icon) { - QListWidgetItem *item = new QListWidgetItem(text, m_userActionList); + auto *item = new QListWidgetItem(text, m_userActionList); item->setCheckState( Config::readBool("Password Protection", key, false) ? Qt::Checked diff -Nru kshutdown-4.0/src/password.h kshutdown-4.2/src/password.h --- kshutdown-4.0/src/password.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/password.h 2017-10-16 13:21:59.000000000 +0000 @@ -18,11 +18,12 @@ #ifndef KSHUTDOWN_PASSWORD_H #define KSHUTDOWN_PASSWORD_H +#include "pureqt.h" #include "udialog.h" -class InfoWidget; +#include -class QCheckBox; +class InfoWidget; class PasswordDialog: public UDialog { Q_OBJECT @@ -49,7 +50,7 @@ Q_OBJECT public: explicit PasswordPreferences(QWidget *parent); - virtual ~PasswordPreferences(); + virtual ~PasswordPreferences() = default; void apply(); private: Q_DISABLE_COPY(PasswordPreferences) diff -Nru kshutdown-4.0/src/preferences.cpp kshutdown-4.2/src/preferences.cpp --- kshutdown-4.0/src/preferences.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/preferences.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,22 +15,20 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#include -#include -#include -#include +#include "preferences.h" #include "config.h" #include "mainwindow.h" #include "password.h" -#include "preferences.h" #include "progressbar.h" #include "utils.h" +#include + // public Preferences::Preferences(QWidget *parent) : - UDialog(parent, i18n("Preferences"), Utils::isGTKStyle()) { + UDialog(parent, i18n("Preferences"), false) { //U_DEBUG << "Preferences::Preferences()" U_END; #ifdef Q_OS_WIN32 @@ -47,14 +45,16 @@ m_passwordPreferences = new PasswordPreferences(this); m_tabs->addTab(m_passwordPreferences, i18n("Password")); - + +// TODO: "Tweaks/Advanced" tab + // TODO: actions/triggers config. //tabs->addTab(createActionsWidget(), i18n("Actions")); //tabs->addTab(createTriggersWidget(), i18n("Triggers")); #ifdef KS_NATIVE_KDE /* - int iconSize = 24; + int iconSize = U_APP->style()->pixelMetric(QStyle::PM_); // TODO: int iconSize = KIconLoader::global()->currentSize(KIconLoader::Dialog); m_tabs->setIconSize(QSize(iconSize, iconSize)); m_tabs->setTabIcon(0, U_STOCK_ICON("edit-bomb")); // General @@ -76,10 +76,6 @@ connect(this, SIGNAL(finished(int)), SLOT(onFinish(int))); } -Preferences::~Preferences() { - //U_DEBUG << "Preferences::~Preferences()" U_END; -} - void Preferences::apply() { Config *config = Config::user(); @@ -90,7 +86,8 @@ Config::setProgressBarEnabled(m_progressBarEnabled->isChecked()); #ifndef KS_KF5 Config::setSystemTrayIconEnabled(m_systemTrayIconEnabled->isChecked()); - #endif // KS_KF5 + Config::write("General", "Use Theme Icon In System Tray", m_useThemeIconInSystemTray->isChecked()); + #endif // !KS_KF5 m_passwordPreferences->apply(); @@ -115,7 +112,7 @@ QWidget *Preferences::createGeneralWidget() { QWidget *w = new QWidget(); - QVBoxLayout *l = new QVBoxLayout(w); + auto *l = new QVBoxLayout(w); l->setMargin(10); m_confirmAction = new QCheckBox(i18n("Confirm Action")); @@ -128,6 +125,8 @@ // TODO: connect(m_progressBarEnabled, SIGNAL(toggled(bool)), SLOT(onProgressBarEnabled(bool))); l->addWidget(m_progressBarEnabled); + l->addStretch(); + m_lockScreenBeforeHibernate = new QCheckBox(i18n("Lock Screen Before Hibernate")); m_lockScreenBeforeHibernate->setChecked(Config::lockScreenBeforeHibernate()); l->addWidget(m_lockScreenBeforeHibernate); @@ -135,9 +134,10 @@ m_lockScreenBeforeHibernate->hide(); #endif // Q_OS_WIN32 - l->addStretch(); - #ifdef Q_OS_LINUX + if (m_lockScreenBeforeHibernate->isVisible()) + l->addSpacing(10_px); + m_lockCommand = new U_LINE_EDIT(); #if QT_VERSION >= 0x050200 m_lockCommand->setClearButtonEnabled(true); @@ -150,25 +150,27 @@ QLabel *lockCommandLabel = new QLabel(i18n("Custom Lock Screen Command:")); lockCommandLabel->setBuddy(m_lockCommand); - l->addSpacing(20_px); + l->addSpacing(10_px); l->addWidget(lockCommandLabel); l->addWidget(m_lockCommand); #endif // Q_OS_LINUX -#ifdef KS_NATIVE_KDE - l->addSpacing(20_px); + #ifdef KS_KF5 + if (Utils::isKDE()) { + l->addSpacing(20_px); - U_PUSH_BUTTON *kdeRelatedSettingsPushButton = new U_PUSH_BUTTON(U_STOCK_ICON("start-here-kde"), i18n("Related KDE Settings...")); - l->addWidget(kdeRelatedSettingsPushButton); - connect(kdeRelatedSettingsPushButton, SIGNAL(clicked()), SLOT(onKDERelatedSettings())); -#endif // KS_NATIVE_KDE + auto *systemSettingsButton = new U_PUSH_BUTTON(U_STOCK_ICON("preferences-system"), i18n("System Settings...")); + l->addWidget(systemSettingsButton); + connect(systemSettingsButton, SIGNAL(clicked()), SLOT(onSystemSettings())); + } + #endif // KS_KF5 return w; } QWidget *Preferences::createSystemTrayWidget() { QWidget *w = new QWidget(); - QVBoxLayout *l = new QVBoxLayout(w); + auto *l = new QVBoxLayout(w); l->setMargin(10); m_systemTrayIconEnabled = new QCheckBox(i18n("Enable System Tray Icon")); @@ -190,14 +192,33 @@ m_noMinimizeToSystemTrayIcon->setEnabled(m_systemTrayIconEnabled->isChecked()); connect(m_systemTrayIconEnabled, SIGNAL(toggled(bool)), m_noMinimizeToSystemTrayIcon, SLOT(setEnabled(bool))); + l->addSpacing(10_px); + + #ifndef KS_KF5 + m_useThemeIconInSystemTray = new QCheckBox(i18n("Use System Icon Theme")); + m_useThemeIconInSystemTray->setChecked(Config::readBool("General", "Use Theme Icon In System Tray", true)); + connect(m_useThemeIconInSystemTray, SIGNAL(toggled(bool)), SLOT(onUseThemeIconInSystemTraySelected(bool))); + l->addWidget(m_useThemeIconInSystemTray); + #endif // !KS_KF5 + m_bwTrayIcon = new QCheckBox(i18n("Black and White System Tray Icon")); m_bwTrayIcon->setChecked(Config::blackAndWhiteSystemTrayIcon()); #ifdef KS_KF5 // TODO: redesign this option m_bwTrayIcon->hide(); + #else + #ifdef KS_UNIX + m_bwTrayIcon->setEnabled(!m_useThemeIconInSystemTray->isChecked()); + #endif // KS_UNIX #endif // KS_KF5 l->addWidget(m_bwTrayIcon); + #ifndef KS_UNIX + m_useThemeIconInSystemTray->hide(); + #endif // !KS_UNIX + +// TODO: system tray icon preview + l->addStretch(); return w; @@ -236,15 +257,14 @@ progressBar->setVisible(enabled || m_oldProgressBarVisible); } -#ifdef KS_NATIVE_KDE -void Preferences::onKDERelatedSettings() { - QProcess *process = new QProcess(0); - #ifdef KS_KF5 - process->start("kcmshell5 autostart kcmsmserver kcm_sddm keys powerdevilglobalconfig powerdevilprofilesconfig screenlocker"); - #else -// HACK: Ubuntu Natty, Qt 4.7.2, KDE 4.6.2: "kdm" module resets all fonts to "Ubuntu" -// - process->start("kcmshell4 screensaver kcmsmserver powerdevilglobalconfig powerdevilprofilesconfig autostart kcmkded kgrubeditor keys"); - #endif // KS_KF5 +#ifdef KS_KF5 +void Preferences::onSystemSettings() { + QProcess::execute("kcmshell5 autostart kcmkded kcmnotify kcmsmserver kcm_energyinfo kcm_sddm kcm_splashscreen keys powerdevilprofilesconfig screenlocker"); +} +#endif // KS_KF5 + +#ifndef KS_KF5 +void Preferences::onUseThemeIconInSystemTraySelected(bool selected) { + m_bwTrayIcon->setEnabled(!selected); } -#endif // KS_NATIVE_KDE +#endif // !KS_KF5 diff -Nru kshutdown-4.0/src/preferences.h kshutdown-4.2/src/preferences.h --- kshutdown-4.0/src/preferences.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/preferences.h 2017-10-16 13:21:59.000000000 +0000 @@ -18,17 +18,18 @@ #ifndef KSHUTDOWN_PREFERENCES_H #define KSHUTDOWN_PREFERENCES_H +#include "pureqt.h" #include "udialog.h" -class PasswordPreferences; +#include -class QCheckBox; +class PasswordPreferences; class Preferences: public UDialog { Q_OBJECT public: explicit Preferences(QWidget *parent); - virtual ~Preferences(); + virtual ~Preferences() = default; void apply(); private: Q_DISABLE_COPY(Preferences) @@ -40,6 +41,9 @@ QCheckBox *m_noMinimizeToSystemTrayIcon; QCheckBox *m_progressBarEnabled; QCheckBox *m_systemTrayIconEnabled; + #ifndef KS_KF5 + QCheckBox *m_useThemeIconInSystemTray; + #endif // !KS_KF5 //QWidget *createActionsWidget(); QWidget *createGeneralWidget(); QWidget *createSystemTrayWidget(); @@ -51,9 +55,12 @@ private slots: void onFinish(int result); void onProgressBarEnabled(bool enabled); -#ifdef KS_NATIVE_KDE - void onKDERelatedSettings(); -#endif // KS_NATIVE_KDE + #ifdef KS_KF5 + void onSystemSettings(); + #endif // KS_KF5 + #ifndef KS_KF5 + void onUseThemeIconInSystemTraySelected(bool selected); + #endif // !KS_KF5 }; #endif // KSHUTDOWN_PREFERENCES_H diff -Nru kshutdown-4.0/src/progressbar.cpp kshutdown-4.2/src/progressbar.cpp --- kshutdown-4.0/src/progressbar.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/progressbar.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,12 +15,12 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#include "progressbar.h" + #include "config.h" #include "mainwindow.h" #include "mod.h" #include "password.h" -#include "progressbar.h" -#include "pureqt.h" #include "utils.h" #include @@ -29,22 +29,17 @@ #include #if defined(KS_NATIVE_KDE) && !defined(KS_KF5) - #include + #include // #kde4 #else #include #endif // KS_NATIVE_KDE // public -ProgressBar::~ProgressBar() { - //U_DEBUG << "ProgressBar::~ProgressBar()" U_END; -} - void ProgressBar::setAlignment(const Qt::Alignment value, const bool updateConfig) { if (updateConfig) { - Config *config = Config::user(); - config->setProgressBarAlignment(value); - config->sync(); + m_alignmentVar->set(value); + m_alignmentVar->sync(); } m_alignment = value; @@ -87,7 +82,21 @@ void ProgressBar::setValue(const int value) { m_value = value; - if (m_total == 0) + //U_DEBUG << "m_total = " << m_total U_END; + //U_DEBUG << "m_value = " << m_value U_END; + + #ifdef KS_V5 + if (m_value == -1) { + updateTaskbar(-1, -1, false); + } + else { + double progress = 1 - (double)m_value / (double)m_total;//!!!div zero + progress = qBound(0.0, progress, 1.0); + updateTaskbar(progress, m_value, (m_value <= 55));//!!!60 + } + #endif // KS_V5 + + if ((m_total == 0) || (m_value == -1)) return; int newCompleteWidth = (int)((float)width() * ((float)(m_total - m_value) / (float)m_total)); @@ -97,6 +106,62 @@ } } +void ProgressBar::updateTaskbar(const double progress, const int seconds, const bool urgent) { +#ifdef KS_V5 + #if defined(Q_OS_LINUX) && defined(KS_DBUS) + // CREDITS: https://askubuntu.com/questions/65054/unity-launcher-api-for-c/310940 + // DOC: https://wiki.ubuntu.com/Unity/LauncherAPI + + if (!Utils::isUnity() && !Utils::isKDE()) + return; + + QDBusMessage taskbarMessage = QDBusMessage::createSignal( + "/", + "com.canonical.Unity.LauncherEntry", + "Update" + ); + + #ifdef KS_PURE_QT + taskbarMessage << "application://kshutdown-qt.desktop"; + #else + taskbarMessage << "application://kshutdown.desktop"; + #endif // KS_PURE_QT + + QVariantMap properties; + + U_DEBUG << "" U_END; + U_DEBUG << progress U_END; + U_DEBUG << m_value U_END; + U_DEBUG << m_total U_END; + + bool countVisible = (seconds >= 0) && (seconds <= 55);//!!!60 + properties["count"] = qint64(countVisible ? seconds : 0); + properties["count-visible"] = countVisible; + + bool progressVisible = (progress >= 0); + properties["progress"] = progressVisible ? progress : 0; + properties["progress-visible"] = progressVisible; + + properties["urgent"] = urgent; + + taskbarMessage << properties; + QDBusConnection::sessionBus() + .send(taskbarMessage); + #endif // defined(Q_OS_LINUX) && defined(KS_DBUS) + + #ifdef Q_OS_WIN32 +// TODO: taskbar progress + Q_UNUSED(progress) + Q_UNUSED(seconds) + Q_UNUSED(urgent) + #endif // Q_OS_WIN32 +#else + Q_UNUSED(progress) + Q_UNUSED(seconds) + Q_UNUSED(urgent) +#endif // KS_V5 +} + // protected void ProgressBar::contextMenuEvent(QContextMenuEvent *e) { @@ -107,7 +172,7 @@ return; // show popup menu - U_MENU *menu = new U_MENU(this); + auto *menu = new U_MENU(this); Utils::addTitle(menu, U_APP->windowIcon(), i18n("Progress Bar") + " - " + @@ -128,21 +193,21 @@ // position - U_MENU *positionMenu = new U_MENU(i18n("Position"), menu); + auto *positionMenu = new U_MENU(i18n("Position"), menu); - QActionGroup *positionGroup = new QActionGroup(this); + auto *positionGroup = new QActionGroup(this); - QAction *a = positionMenu->addAction(i18n("Top"), this, SLOT(onSetTopAlignment())); + auto *a = positionMenu->addAction(i18n("Top"), this, SLOT(onSetTopAlignment())); makeRadioButton(a, positionGroup, m_alignment.testFlag(Qt::AlignTop)); a = positionMenu->addAction(i18n("Bottom"), this, SLOT(onSetBottomAlignment())); makeRadioButton(a, positionGroup, m_alignment.testFlag(Qt::AlignBottom)); - U_MENU *sizeMenu = new U_MENU(i18n("Size"), menu); + auto *sizeMenu = new U_MENU(i18n("Size"), menu); // size - QActionGroup *sizeGroup = new QActionGroup(this); + auto *sizeGroup = new QActionGroup(this); a = sizeMenu->addAction(i18n("Small"), this, SLOT(onSetSizeSmall())); makeRadioButton(a, sizeGroup, height() == SmallSize); @@ -168,7 +233,7 @@ void ProgressBar::mousePressEvent(QMouseEvent *e) { if (!Utils::isArg("hide-ui") && (e->button() == Qt::LeftButton)) { - MainWindow *mainWindow = MainWindow::self(); + auto *mainWindow = MainWindow::self(); mainWindow->show(); mainWindow->activateWindow(); @@ -208,7 +273,7 @@ ProgressBar::ProgressBar() // public : QWidget( - 0, + nullptr, Qt::FramelessWindowHint | #if QT_VERSION >= 0x050000 Qt::NoDropShadowWindowHint | @@ -218,7 +283,11 @@ Qt::X11BypassWindowManagerHint | Qt::Tool ) { - + + m_alignmentVar = new Var("Progress Bar", "Alignment", Qt::AlignTop); + m_foregroundColorVar = new Var("Progress Bar", "Foreground Color", QColor(0xF8FFBF/* lime 1 */)); + m_sizeVar = new Var("Progress Bar", "Size", NormalSize); + //U_DEBUG << "ProgressBar::ProgressBar()" U_END; m_demoTimer = new QTimer(this); @@ -241,22 +310,16 @@ QColor background = Mod::getColor("ui-progress-bar-window-color", Qt::black); p.setColor(QPalette::Window, background); - Config *config = Config::user(); - config->beginGroup("Progress Bar"); - - QColor defaultForeground = 0xF8FFBF /* lime 1 */; + QColor defaultForeground = m_foregroundColorVar->getDefault().value(); m_demoColor = defaultForeground; - QColor foreground = config->read("Foreground Color", defaultForeground).value(); - - setHeight(qBound(SmallSize, (Size)config->read("Size", NormalSize).toInt(), LargeSize)); - - config->endGroup(); + QColor foreground = m_foregroundColorVar->getColor(); p.setColor(QPalette::WindowText, (foreground.rgb() == background.rgb()) ? defaultForeground : foreground); - setPalette(p); - setAlignment(Config::user()->progressBarAlignment(), false); + setHeight(qBound(SmallSize, static_cast(m_sizeVar->getInt()), LargeSize)); + + setAlignment(static_cast(m_alignmentVar->getInt()), false); QDesktopWidget *desktop = QApplication::desktop(); connect(desktop, SIGNAL(resized(int)), SLOT(onResize(int))); @@ -267,6 +330,7 @@ } void ProgressBar::makeRadioButton(QAction *action, QActionGroup *group, const bool checked) { +// TODO: icons with size/position preview action->setActionGroup(group); action->setCheckable(true); action->setChecked(checked); @@ -277,11 +341,8 @@ setHeight(size); setAlignment(m_alignment, false); - Config *config = Config::user(); - config->beginGroup("Progress Bar"); - config->write("Size", size); - config->endGroup(); - config->sync(); + m_sizeVar->set(size); + m_sizeVar->sync(); } // private slots @@ -341,17 +402,15 @@ QString::null // use default title ); #endif // KS_NATIVE_KDE + if (newColor.isValid()) { QPalette p(palette()); p.setColor(QPalette::WindowText, newColor); setPalette(p); repaint(); - Config *config = Config::user(); - config->beginGroup("Progress Bar"); - config->write("Foreground Color", newColor); - config->endGroup(); - config->sync(); + m_foregroundColorVar->set(newColor); + m_foregroundColorVar->sync(); } } diff -Nru kshutdown-4.0/src/progressbar.h kshutdown-4.2/src/progressbar.h --- kshutdown-4.0/src/progressbar.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/progressbar.h 2017-10-16 13:21:59.000000000 +0000 @@ -18,22 +18,23 @@ #ifndef KSHUTDOWN_PROGRESSBAR_H #define KSHUTDOWN_PROGRESSBAR_H -#include +#include -class QActionGroup; +class Var; class ProgressBar: public QWidget { Q_OBJECT public: enum/* non-class */Size { SmallSize = 2, NormalSize = 3, MediumSize = 6, LargeSize = 9 }; explicit ProgressBar(); - virtual ~ProgressBar(); + virtual ~ProgressBar() = default; inline Qt::Alignment alignment() const { return m_alignment; } void setAlignment(const Qt::Alignment value, const bool updateConfig); void setDemo(const bool active); void setHeight(const int value); void setTotal(const int total); void setValue(const int value); + void updateTaskbar(const double progress, const int seconds, const bool urgent); protected: virtual void contextMenuEvent(QContextMenuEvent *e) override; virtual void mousePressEvent(QMouseEvent *e) override; @@ -47,6 +48,9 @@ Qt::Alignment m_alignment; QColor m_demoColor; QTimer *m_demoTimer; + Var *m_alignmentVar; + Var *m_foregroundColorVar; + Var *m_sizeVar; bool authorize(); void makeRadioButton(QAction *action, QActionGroup *group, const bool checked); void setSize(const Size size); diff -Nru kshutdown-4.0/src/pureqt.h kshutdown-4.2/src/pureqt.h --- kshutdown-4.0/src/pureqt.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/pureqt.h 2017-10-16 13:21:59.000000000 +0000 @@ -20,6 +20,8 @@ #ifndef KSHUTDOWN_PUREQT_H #define KSHUTDOWN_PUREQT_H +//#define KS_V5 + #ifdef KS_PURE_QT // Q-Files @@ -27,15 +29,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include -#include #else @@ -44,16 +43,14 @@ #include #include #include - #include #include #include #include #include #include #include - #include - #include #else + // #kde4 #include #include #include diff -Nru kshutdown-4.0/src/src.pro kshutdown-4.2/src/src.pro --- kshutdown-4.0/src/src.pro 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/src.pro 2017-10-16 13:21:59.000000000 +0000 @@ -4,7 +4,7 @@ INCLUDEPATH += . DEFINES += KS_PURE_QT -#DEFINES += KS_CONSOLE + exists(portable.pri) { include(portable.pri) message("Building portable version...") @@ -33,6 +33,7 @@ win32 { LIBS += -lpowrprof # QMAKE_LFLAGS = -static-libgcc + RC_FILE = kshutdown.rc } # Input diff -Nru kshutdown-4.0/src/stats.cpp kshutdown-4.2/src/stats.cpp --- kshutdown-4.0/src/stats.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/stats.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -16,10 +16,8 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "stats.h" -#include "utils.h" -#include -#include +#include "utils.h" // public: @@ -42,4 +40,4 @@ m_textView->setPlainText(Utils::read(process, ok)); } -Stats::~Stats() { } +Stats::~Stats() = default; diff -Nru kshutdown-4.0/src/triggers/idlemonitor.cpp kshutdown-4.2/src/triggers/idlemonitor.cpp --- kshutdown-4.0/src/triggers/idlemonitor.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/triggers/idlemonitor.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,11 +15,10 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#include +#include "idlemonitor.h" #include "../mainwindow.h" #include "../progressbar.h" -#include "idlemonitor.h" #ifdef Q_OS_WIN32 #ifndef WIN32_LEAN_AND_MEAN @@ -31,11 +30,6 @@ #include "../actions/lock.h" #endif // Q_OS_WIN32 -#ifdef KS_DBUS - #include - #include -#endif // KS_DBUS - #ifdef KS_NATIVE_KDE #include #endif // KS_NATIVE_KDE @@ -78,7 +72,7 @@ setToolTip(i18n("Use this trigger to detect user inactivity\n(example: no mouse clicks).")); } -IdleMonitor::~IdleMonitor() { } +IdleMonitor::~IdleMonitor() = default; bool IdleMonitor::canActivateAction() { getSessionIdleTime(); @@ -141,7 +135,7 @@ ProgressBar *progressBar = MainWindow::self()->progressBar(); progressBar->setTotal(getMaximumIdleTime()); - progressBar->setValue(0); + progressBar->setValue(-1); #ifdef KS_NATIVE_KDE KIdleTime::instance()->simulateUserActivity(); diff -Nru kshutdown-4.0/src/triggers/processmonitor.cpp kshutdown-4.2/src/triggers/processmonitor.cpp --- kshutdown-4.0/src/triggers/processmonitor.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/triggers/processmonitor.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,42 +15,29 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#ifdef KS_TRIGGER_PROCESS_MONITOR_UNIX - #include -#endif // KS_TRIGGER_PROCESS_MONITOR_UNIX +#include "processmonitor.h" +#include "../config.h" #include "../utils.h" -#include "processmonitor.h" + +#include +#include #ifdef KS_TRIGGER_PROCESS_MONITOR_UNIX - #include - #include + #include // for ::kill #endif // KS_TRIGGER_PROCESS_MONITOR_UNIX -#include -#include - // public Process::Process(QObject *parent, const QString &command) : QObject(parent), - m_command(command), -#ifdef KS_TRIGGER_PROCESS_MONITOR_UNIX - m_own(false), - m_pid(0), - m_user(QString::null) -#endif // KS_TRIGGER_PROCESS_MONITOR_UNIX -#ifdef KS_TRIGGER_PROCESS_MONITOR_WIN - m_pid(0), - m_visible(false), - m_windowHandle(NULL) -#endif // KS_TRIGGER_PROCESS_MONITOR_WIN -{ + m_command(command) { } U_ICON Process::icon() const { #ifdef KS_TRIGGER_PROCESS_MONITOR_UNIX // show icons for own processes only (faster) +// FIXME: laggy/slow combo box return own() ? U_STOCK_ICON(m_command) : U_ICON(); #endif // KS_TRIGGER_PROCESS_MONITOR_UNIX @@ -129,7 +116,7 @@ QWidget *ProcessMonitor::getWidget() { if (!m_widget) { m_widget = new QWidget(); - QHBoxLayout *layout = new QHBoxLayout(m_widget); + auto *layout = new QHBoxLayout(m_widget); layout->setMargin(0_px); layout->setSpacing(10_px); @@ -140,7 +127,7 @@ connect(m_processesComboBox, SIGNAL(activated(int)), SLOT(onProcessSelect(const int))); layout->addWidget(m_processesComboBox); - U_PUSH_BUTTON *refreshButton = new U_PUSH_BUTTON(m_widget); + auto *refreshButton = new U_PUSH_BUTTON(m_widget); refreshButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred)); refreshButton->setText(i18n("Refresh")); connect( @@ -303,7 +290,13 @@ ) continue; // for - Process *p = new Process(this, processInfo[2]/* command */); + QString command; + if (processInfo.count() > 3) // HACK: fix a command name that contains spaces + command = QStringList(processInfo.mid(2)).join(" "); + else + command = processInfo[2]; + + auto *p = new Process(this, command); p->m_user = processInfo[0]; p->m_pid = processID; p->m_own = (p->m_user == user); @@ -314,6 +307,46 @@ #ifdef KS_TRIGGER_PROCESS_MONITOR_WIN ::EnumWindows(EnumWindowsCallback, (LPARAM)this); +/* TODO: also use tasklist.exe + QStringList args; + args << "/NH"; // no header + args << "/FO" << "CSV"; // CSV output format + + QProcess process; + process.start("tasklist.exe", args); + process.waitForStarted(-1); +// TODO: Q_PID psPID = process.pid(); - use QProcess::processId() + + bool ok; + QString text = Utils::read(process, ok); + + if (!ok) + return; + + qint64 appPID = QApplication::applicationPid(); + QStringList processLines = text.split('\n'); + + foreach (const QString &i, processLines) { + QStringList processInfo = i.simplified().split("\",\""); + + if (processInfo.count() >= 2) { + qint64 processID = processInfo[1].toLongLong(); + + // exclude "tasklist.exe" and self + if ( + (processID == appPID) + //((processID == psPID) && (psPID != 0)) + ) + continue; // for + + QString command = processInfo[0].remove(0, 1); // remove first " + Process *p = new Process(this, command); + p->m_pid = processID; + p->setVisible(true); + addProcess(p); + } + } +*/ #endif // KS_TRIGGER_PROCESS_MONITOR_WIN } @@ -361,6 +394,7 @@ qSort(m_processList.begin(), m_processList.end(), compareProcess); bool separatorAdded = false; + int dummyProcessIndex = -1; foreach (Process *i, m_processList) { // separate non-important processes @@ -374,12 +408,20 @@ !separatorAdded ) { separatorAdded = true; + dummyProcessIndex = m_processesComboBox->count(); m_processesComboBox->insertSeparator(m_processesComboBox->count()); } + // NOTE: insert dummy list entry to match combo box indexes + if (dummyProcessIndex != -1) { + m_processList.insert(dummyProcessIndex, new Process(this, "")); + dummyProcessIndex = -1; + } + m_processesComboBox->addItem(i->icon(), i->toString(), i->m_command); } +// FIXME: also compare recent PID int i = m_processesComboBox->findData(m_recentCommand); if (i != -1) m_processesComboBox->setCurrentIndex(i); diff -Nru kshutdown-4.0/src/triggers/processmonitor.h kshutdown-4.2/src/triggers/processmonitor.h --- kshutdown-4.0/src/triggers/processmonitor.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/triggers/processmonitor.h 2017-10-16 13:21:59.000000000 +0000 @@ -20,11 +20,6 @@ #include "../kshutdown.h" -#ifdef KS_UNIX - #define KS_TRIGGER_PROCESS_MONITOR - #define KS_TRIGGER_PROCESS_MONITOR_UNIX -#endif // KS_UNIX - #ifdef Q_OS_WIN32 #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -35,7 +30,13 @@ #define KS_TRIGGER_PROCESS_MONITOR_WIN #endif // Q_OS_WIN32 +#ifdef KS_UNIX + #define KS_TRIGGER_PROCESS_MONITOR + #define KS_TRIGGER_PROCESS_MONITOR_UNIX +#endif // KS_UNIX + #ifdef KS_TRIGGER_PROCESS_MONITOR_UNIX + // HACK: fixes some compilation error (?) #include #endif // KS_TRIGGER_PROCESS_MONITOR_UNIX @@ -62,15 +63,15 @@ QString m_stringCache = ""; #ifdef KS_TRIGGER_PROCESS_MONITOR_UNIX - bool m_own; - pid_t m_pid; - QString m_user; // an owner of the process (e.g. "root") + bool m_own = false; + pid_t m_pid = 0; + QString m_user = QString::null; // an owner of the process (e.g. "root") #endif // KS_TRIGGER_PROCESS_MONITOR_UNIX #ifdef KS_TRIGGER_PROCESS_MONITOR_WIN - DWORD m_pid; - bool m_visible; - HWND m_windowHandle; + DWORD m_pid = 0; + bool m_visible = false; + HWND m_windowHandle = NULL; #endif // KS_TRIGGER_PROCESS_MONITOR_WIN void makeStringCache(); diff -Nru kshutdown-4.0/src/udialog.cpp kshutdown-4.2/src/udialog.cpp --- kshutdown-4.0/src/udialog.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/udialog.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,14 +15,9 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#include "pureqt.h" - #include "udialog.h" -#include "utils.h" -// TODO: clean up all headers - -#include +#include "utils.h" // public: @@ -31,6 +26,8 @@ //U_DEBUG << "UDialog::UDialog()" U_END; setWindowTitle(windowTitle); +// TODO: AA_DisableWindowContextHelpButton #Qt5.10 + #ifdef KS_KF5 if (simple) { m_dialogButtonBox = new QDialogButtonBox(QDialogButtonBox::Close); @@ -74,7 +71,3 @@ m_rootLayout->addWidget(mainWidget); m_rootLayout->addWidget(m_dialogButtonBox); } - -UDialog::~UDialog() { - //U_DEBUG << "UDialog::~UDialog()" U_END; -} diff -Nru kshutdown-4.0/src/udialog.h kshutdown-4.2/src/udialog.h --- kshutdown-4.0/src/udialog.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/udialog.h 2017-10-16 13:21:59.000000000 +0000 @@ -18,23 +18,20 @@ #ifndef KSHUTDOWN_UDIALOG_H #define KSHUTDOWN_UDIALOG_H -#include "pureqt.h" - #include +#include #if defined(KS_PURE_QT) || defined(KS_KF5) #include #else - #include + #include // #kde4 #endif // KS_PURE_QT -class QVBoxLayout; - class UDialog: public QDialog { Q_OBJECT public: explicit UDialog(QWidget *parent, const QString &windowTitle, const bool simple); - virtual ~UDialog(); + virtual ~UDialog() = default; inline QPushButton *acceptButton() { return m_acceptButton; } inline QVBoxLayout *mainLayout() { return m_mainLayout; } inline QVBoxLayout *rootLayout() { return m_rootLayout; } diff -Nru kshutdown-4.0/src/usystemtray.cpp kshutdown-4.2/src/usystemtray.cpp --- kshutdown-4.0/src/usystemtray.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/usystemtray.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -15,21 +15,20 @@ // with this program; if not, write to the Free Software Foundation, Inc., // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +#include "usystemtray.h" + #include "config.h" #include "mainwindow.h" -#include "pureqt.h" -#include "usystemtray.h" #include "utils.h" #include +// TODO: better support for dock(ish) taskbars (Windows 7/Unity) + // public: USystemTray::USystemTray(MainWindow *mainWindow) : QObject(mainWindow) - #ifdef KS_PURE_QT - , m_applyGeometryHack(true) - #endif // KS_PURE_QT { //U_DEBUG << "USystemTray::USystemTray()" U_END; @@ -37,12 +36,12 @@ m_sessionRestored = false; #ifdef KS_KF5 m_trayIcon = new KStatusNotifierItem(mainWindow); + m_trayIcon->setCategory(KStatusNotifierItem::ApplicationStatus); + m_trayIcon->setStandardActionsEnabled(false); // FIXME: m_trayIcon->setToolTipIconByPixmap(QIcon(":/images/kshutdown.png")); m_trayIcon->setToolTipIconByName("kshutdown"); #else m_trayIcon = new KSystemTrayIcon(mainWindow); -// TODO: "KShutdown" caption in System Tray Settings dialog (Entries tab). -// Currently it's lower case "kshutdown". #endif // KS_KF5 #endif // KS_NATIVE_KDE @@ -61,10 +60,6 @@ U_DEBUG << "USystemTray::isSupported:" << isSupported() U_END; } -USystemTray:: ~USystemTray() { - //U_DEBUG << "USystemTray::~USystemTray()" U_END; -} - void USystemTray::info(const QString &message) const { #ifdef KS_KF5 m_trayIcon->showMessage("KShutdown", message, "dialog-information"); @@ -75,12 +70,12 @@ bool USystemTray::isSupported() const { #ifdef KS_KF5 +// TODO: use classic QSystemTrayIcon as fallback if KStatusNotifierItem is unsupported // TODO: test other DE // Blacklist: GNOME Shell, Unity - return Utils::isKDE(); + return Utils::isKDE() || Utils::isXfce(); #else return - !Utils::isUnity() && QSystemTrayIcon::isSystemTrayAvailable() && // HACK: MATE launches KShutdown before system tray panel is created !(Utils::isMATE() && m_sessionRestored); @@ -94,8 +89,11 @@ void USystemTray::setToolTip(const QString &toolTip) const { #ifdef KS_KF5 m_trayIcon->setToolTipTitle("KShutdown"); -// TODO: remove leading/duplicated "KShutdown" - m_trayIcon->setToolTipSubTitle((toolTip == m_trayIcon->toolTipTitle()) ? "" : toolTip); + m_trayIcon->setToolTipSubTitle( + (toolTip == m_trayIcon->toolTipTitle()) + ? "" + : QString(toolTip).replace("KShutdown

          ", "") // remove leading/duplicated "KShutdown" text + ); #else m_trayIcon->setToolTip(toolTip); #endif // KS_KF5 @@ -114,65 +112,65 @@ } void USystemTray::updateIcon(MainWindow *mainWindow) { - // HACK: We need to show an empty system tray icon first to get proper geometry() value later. - // Wrong/unknown geometry (or something) causes bad icon alignment and background repaint issues... - #ifdef KS_PURE_QT - if (m_applyGeometryHack) { - m_applyGeometryHack = false; + #ifndef KS_KF5 + bool active = mainWindow->active(); + bool bw = Config::blackAndWhiteSystemTrayIcon(); + // HACK: We need to show an empty system tray icon first + // to fix wrong icon alignment and background repaint issues... + if (m_applyIconHack) { + m_applyIconHack = false; if (Utils::isMATE() && Config::systemTrayIconEnabled()) { m_trayIcon->setIcon(mainWindow->windowIcon()); // suppress Qt warning m_trayIcon->show(); } } - #endif // KS_PURE_QT - - #ifndef KS_KF5 - bool active = mainWindow->active(); - bool bw = Config::blackAndWhiteSystemTrayIcon(); - #endif // KS_KF5 + #endif // !KS_KF5 // get base icon - - #ifndef KS_KF5 - QIcon icon; - #ifdef KS_UNIX - if (Utils::isKDE()) - icon = U_STOCK_ICON("system-shutdown"); - else - icon = mainWindow->windowIcon(); - #else - icon = mainWindow->windowIcon(); - #endif // KS_UNIX - #endif // KS_KF5 #ifdef KS_KF5 Q_UNUSED(mainWindow) +// TODO: option +// FIXME: setIconByPixmap does not work... if (Utils::isKDE()) m_trayIcon->setIconByName("system-shutdown"); else m_trayIcon->setIconByName("kshutdown"); -// FIXME: setIconByPixmap does not work... + +/* TODO: hide if inactive #5.x + bool active = mainWindow->active(); + m_trayIcon->setStatus(active ? KStatusNotifierItem::Active : KStatusNotifierItem::Passive); +*/ #else // convert base icon to pixmap - int w = 22; - int h = 22; - QRect iconSize = m_trayIcon->geometry(); - // HACK: https://bugreports.qt-project.org/browse/QTBUG-24683 - if (!iconSize.size().isEmpty() && (iconSize.width() <= 64) && (iconSize.height() <= 64)) { - //U_DEBUG << "USystemTray::updateIcon: system tray icon size: " << iconSize U_END; - w = qBound(22, iconSize.width(), 64); - h = qBound(22, iconSize.height(), 64); + QIcon icon; + #ifdef KS_UNIX + if (!active && Config::readBool("General", "Use Theme Icon In System Tray", true)) { + icon = U_STOCK_ICON("system-shutdown"); + if (icon.isNull()) { + U_DEBUG << "System theme icon not found in: " << icon.themeName() U_END; + icon = mainWindow->windowIcon(); // fallback + } + // HACK: fixes https://sourceforge.net/p/kshutdown/bugs/27/ + else { + m_trayIcon->setIcon(icon); + + return; // no image effects + } } -/* else { - U_DEBUG << "USystemTray::updateIcon: using safe tray icon size; reported geometry = " << iconSize U_END; + icon = mainWindow->windowIcon(); } -*/ + #else + icon = U_ICON(":/images/hi16-app-kshutdown.png"); + #endif // KS_UNIX + int w = 64_px; + int h = 64_px; QPixmap pixmap = icon.pixmap(w, h); - QImage image = pixmap.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied); + QImage image = pixmap.toImage().convertToFormat(QImage::Format_ARGB32); // add some effects @@ -212,21 +210,6 @@ } } - // add overlay icons (active trigger/action) - - w = pixmap.width() / 2; - if (active && (w >= 11)) { - h = pixmap.height() / 2; - - QPainter p(&image); - p.setOpacity(0.7); - - // left/bottom - mainWindow->getSelectedAction()->icon().paint(&p, 0, h, w, h); - // right/bottom - mainWindow->getSelectedTrigger()->icon().paint(&p, w, h, w, h); - } - m_trayIcon->setIcon(QPixmap::fromImage(image)); #endif // KS_KF5 } @@ -248,12 +231,23 @@ if (reason == QSystemTrayIcon::Trigger) { MainWindow *mainWindow = MainWindow::self(); - if (mainWindow->isVisible()) { + if (mainWindow->isVisible() && !mainWindow->isMinimized()) { mainWindow->hide(); } else { + #ifdef Q_OS_WIN32 + if (mainWindow->isMinimized()) { + // HACK: activateWindow() does not work and causes funny bugs + mainWindow->showNormal(); + } + else { + mainWindow->show(); + mainWindow->activateWindow(); + } + #else mainWindow->show(); mainWindow->activateWindow(); + #endif // Q_OS_WIN32 } } } diff -Nru kshutdown-4.0/src/usystemtray.h kshutdown-4.2/src/usystemtray.h --- kshutdown-4.0/src/usystemtray.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/usystemtray.h 2017-10-16 13:21:59.000000000 +0000 @@ -18,25 +18,21 @@ #ifndef KSHUTDOWN_USYSTEMTRAY_H #define KSHUTDOWN_USYSTEMTRAY_H -#include - #ifdef KS_KF5 #include #elif defined(KS_PURE_QT) #include #else - #include + #include // #kde4 #endif // KS_KF5 class MainWindow; -class QMenu; - class USystemTray: public QObject { Q_OBJECT public: - explicit USystemTray(MainWindow *parent); - virtual ~USystemTray(); + explicit USystemTray(MainWindow *mainWindow); + virtual ~USystemTray() = default; void info(const QString &message) const; bool isSupported() const; void setContextMenu(QMenu *menu) const; @@ -49,11 +45,11 @@ #ifdef KS_KF5 KStatusNotifierItem *m_trayIcon; #elif defined(KS_PURE_QT) - bool m_applyGeometryHack; QSystemTrayIcon *m_trayIcon; #else KSystemTrayIcon *m_trayIcon; #endif // KS_KF5 + bool m_applyIconHack = true; bool m_sessionRestored; #ifdef KS_PURE_QT private slots: diff -Nru kshutdown-4.0/src/utils.cpp kshutdown-4.2/src/utils.cpp --- kshutdown-4.0/src/utils.cpp 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/utils.cpp 2017-10-16 13:21:59.000000000 +0000 @@ -17,13 +17,7 @@ #include "utils.h" -#include "pureqt.h" - -#include -#include #include -#include -#include #ifdef KS_NATIVE_KDE #include @@ -31,12 +25,11 @@ // private -bool Utils::m_gui = true; #ifdef KS_NATIVE_KDE #ifdef KS_KF5 - QCommandLineParser *Utils::m_args = 0; + QCommandLineParser *Utils::m_args = nullptr; #else - KCmdLineArgs *Utils::m_args = 0; + KCmdLineArgs *Utils::m_args = nullptr; #endif // KS_KF5 #else QStringList Utils::m_args; @@ -52,7 +45,7 @@ menu->addTitle(icon, text); #else // FIXME: useless & unimplemented decoy API to annoy developers: menu->addSection(icon, text); - U_ACTION *action = new U_ACTION(menu); + auto *action = new U_ACTION(menu); QFont font = action->font(); font.setBold(true); @@ -163,18 +156,20 @@ } void Utils::init() { - #ifdef KS_CONSOLE - m_gui = false; - #else - m_gui = true; - #endif // KS_CONSOLE - m_desktopSession = m_env.value("DESKTOP_SESSION"); m_xdgCurrentDesktop = m_env.value("XDG_CURRENT_DESKTOP"); #ifdef Q_OS_LINUX - if (m_gui && m_desktopSession.isEmpty() && m_xdgCurrentDesktop.isEmpty()) + if (m_desktopSession.isEmpty() && m_xdgCurrentDesktop.isEmpty()) { qWarning("kshutdown: WARNING: \"DESKTOP_SESSION\" and \"XDG_CURRENT_DESKTOP\" environment variables not set (unknown or unsupported Desktop Environment). Good luck."); + } + else { + qDebug( + "kshutdown: DESKTOP_SESSION=%s | XDG_CURRENT_DESKTOP=%s", + m_desktopSession.toLocal8Bit().constData(), + m_xdgCurrentDesktop.toLocal8Bit().constData() + ); + } #endif // Q_OS_LINUX } @@ -213,8 +208,6 @@ m_xdgCurrentDesktop.contains("enlightenment", Qt::CaseInsensitive); } -bool Utils::isGUI() { return m_gui; } - bool Utils::isHelpArg() { #ifdef KS_KF5 return isArg("help"); @@ -229,7 +222,6 @@ #endif // KS_KF5 } -// FIXME: test GNOME 2 bool Utils::isGNOME() { return m_desktopSession.contains("gnome", Qt::CaseInsensitive) || @@ -288,9 +280,12 @@ } bool Utils::isOpenbox() { + // NOTE: Use "contains" instead of "compare" + // to correctly detect "DESKTOP_SESSION=/usr/share/xsessions/openbox". + // BUG: https://sourceforge.net/p/kshutdown/bugs/31/ return - (m_desktopSession.compare("openbox", Qt::CaseInsensitive) == 0) || - (m_xdgCurrentDesktop.compare("openbox", Qt::CaseInsensitive) == 0); + m_desktopSession.contains("openbox", Qt::CaseInsensitive) || + m_xdgCurrentDesktop.contains("openbox", Qt::CaseInsensitive); } bool Utils::isRazor() { @@ -366,18 +361,26 @@ widget->setFont(newFont); } + void Utils::showMenuToolTip(QAction *action) { -// TODO: use QMenu.toolTipsVisible instead #Qt5 QList list = action->associatedWidgets(); - if (list.count() == 1) { - QWidget *widget = list.first(); - int magicNumber = 5_px; - QToolTip::showText( - QPoint(widget->x() + magicNumber, widget->y() + widget->height() - (magicNumber * 2)), - //QCursor::pos(), - action->statusTip() - ); - } + + if (list.count() != 1) + return; + + #if QT_VERSION >= 0x050100 + // HACK: hide previous tool tip window if no tool tip... + if (action->statusTip().isEmpty()) + QToolTip::hideText(); + #else + QWidget *widget = list.first(); + int magicNumber = 5_px; + QToolTip::showText( + QPoint(widget->x() + magicNumber, widget->y() + widget->height() - (magicNumber * 2)), + //QCursor::pos(), + action->statusTip() + ); + #endif // QT_VERSION } void Utils::shutDown() { diff -Nru kshutdown-4.0/src/utils.h kshutdown-4.2/src/utils.h --- kshutdown-4.0/src/utils.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/utils.h 2017-10-16 13:21:59.000000000 +0000 @@ -21,23 +21,18 @@ #include "pureqt.h" #include -#include -#include #ifdef KS_NATIVE_KDE #ifdef KS_KF5 #include #else - #include + #include // #kde4 #endif // KS_KF5 #endif // KS_NATIVE_KDE // TODO: use std::chrono and "hrs" literals #C++14 #experimental inline int operator "" _px(unsigned long long int value) { return value; } -class QAction; -class QWidget; - class Utils final { public: static void addTitle(U_MENU *menu, const QIcon &icon, const QString &text); @@ -49,7 +44,6 @@ static bool isArg(const QString &name); static bool isCinnamon(); static bool isEnlightenment(); - static bool isGUI(); static bool isHelpArg(); static bool isGNOME(); static bool isGTKStyle(); @@ -75,7 +69,6 @@ static void shutDown(); static QString trim(QString &text, const int maxLength); private: - static bool m_gui; #ifdef KS_NATIVE_KDE #ifdef KS_KF5 static QCommandLineParser *m_args; diff -Nru kshutdown-4.0/src/version.h kshutdown-4.2/src/version.h --- kshutdown-4.0/src/version.h 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/src/version.h 2017-10-16 13:21:59.000000000 +0000 @@ -2,8 +2,8 @@ #ifndef KSHUTDOWN_VERSION_H #define KSHUTDOWN_VERSION_H -#define KS_BUILD "2016-08-30" -#define KS_FILE_VERSION "4.0" -#define KS_FULL_VERSION "4.0" +#define KS_FILE_VERSION "4.2" +#define KS_FULL_VERSION "4.2" +#define KS_RELEASE_DATE "2017-10-15" #endif // KSHUTDOWN_VERSION_H diff -Nru kshutdown-4.0/TODO kshutdown-4.2/TODO --- kshutdown-4.0/TODO 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/TODO 2017-10-16 13:21:59.000000000 +0000 @@ -1,9 +1,9 @@ Tracker @ SourceForge.net: -* Bugs: http://sourceforge.net/p/kshutdown/bugs/ -* RFE: http://sourceforge.net/p/kshutdown/feature-requests/ -* Patches: http://sourceforge.net/p/kshutdown/patches/ +* Bugs: https://sourceforge.net/p/kshutdown/bugs/ +* RFE: https://sourceforge.net/p/kshutdown/feature-requests/ +* Patches: https://sourceforge.net/p/kshutdown/patches/ Qt 5.x Based: @@ -26,12 +26,8 @@ * Optionally (--delay ) show warning message before action, and automatically continue action if no user reaction * Optionally mute sound (master mixer) before lock screen -* Shutdown everyday to save energy: - http://sourceforge.net/p/kshutdown/discussion/324058/thread/538d9af2 -* Execute a command: - http://sourceforge.net/p/kshutdown/discussion/324058/thread/e28a7ef9 -* Command before action: - http://sourceforge.net/p/kshutdown/discussion/324058/thread/1725b7c5 +* Shutdown everyday to save energy +* Execute a command before action * Automatically chmod /sbin/shutdown, so every user can shutdown or reboot * Switch to console mode (tty) [by DigitalCyanide] * KDE: Optionally force application exit (no session save) @@ -39,8 +35,7 @@ * Detect unsaved documents and show warning (is there any KDE API to do this?) * "Switch User" menu functionality * Command to Reboot Directly into Windows - http://sourceforge.net/p/kshutdown/feature-requests/1/ - + https://sourceforge.net/p/kshutdown/feature-requests/1/ - Related: https://bugs.kde.org/show_bug.cgi?id=198255 - API: http://api.kde.org/4.x-api/kdebase-workspace-apidocs/libs/kworkspace/html/classKDisplayManager.html - http://ksmanis.wordpress.com/2011/04/21/hello-planet-and-grub2-support-for-kdm/ diff -Nru kshutdown-4.0/tools/clang-tidy.sh kshutdown-4.2/tools/clang-tidy.sh --- kshutdown-4.0/tools/clang-tidy.sh 1970-01-01 00:00:00.000000000 +0000 +++ kshutdown-4.2/tools/clang-tidy.sh 2017-10-16 13:21:59.000000000 +0000 @@ -0,0 +1,22 @@ +#!/bin/bash + +# DOC: http://clang.llvm.org/extra/clang-tidy/index.html + +if [ ! -d "src" ]; then + echo "Usage: ./tools/clang-tidy.sh" + exit 1 +fi + +echo "Hint: 1. Set Clang as C++ compiler: export CXX=/usr/bin/clang++" +echo " 2. Reconfigure project: ./Setup-kf5.sh" + +CHECKS="*"\ +",-cert-err58-cpp"\ +",-google-readability-braces-around-statements,-google-readability-todo"\ +",-modernize-raw-string-literal"\ +",-readability-braces-around-statements,-readability-implicit-bool-cast,-readability-redundant-declaration" +# NOTE: readability-redundant-declaration is false positive (?) + +run-clang-tidy-4.0.py \ + -checks "$CHECKS" -j2 -p build.tmp \ + src/*.cpp src/actions/*.cpp src/triggers/*.cpp \ diff -Nru kshutdown-4.0/tools/cppcheck.sh kshutdown-4.2/tools/cppcheck.sh --- kshutdown-4.0/tools/cppcheck.sh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/tools/cppcheck.sh 2017-10-16 13:21:59.000000000 +0000 @@ -2,6 +2,7 @@ cppcheck \ --enable=all \ + --force \ src/*.cpp src/*.h \ src/actions/*.cpp src/actions/*.h \ src/triggers/*.cpp src/triggers/*.h diff -Nru kshutdown-4.0/tools/flint++.sh kshutdown-4.2/tools/flint++.sh --- kshutdown-4.0/tools/flint++.sh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/tools/flint++.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ ! -d "src" ]; then - echo "Usage: ./tools/flint++.sh" - exit 1 -fi - -echo "Hint: https://github.com/L2Program/FlintPlusPlus" - -# TODO: exclude moc_* and qrc_* files - -flint++ \ - --level 2 \ - --recursive \ - src diff -Nru kshutdown-4.0/tools/i18n.sh kshutdown-4.2/tools/i18n.sh --- kshutdown-4.0/tools/i18n.sh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/tools/i18n.sh 2017-10-16 13:21:59.000000000 +0000 @@ -36,7 +36,7 @@ cp "$i" "$i.`date "+%Y%m%d_%H%M_%S"`~" echo - echo ">>> Creating $i translation..." + echo "==== Creating $i translation ====" msgmerge "$i" po/TEMPLATE.pot --output-file="$i" # echo "Creating KDE messages..." @@ -51,6 +51,10 @@ --output-file="src/i18n/kshutdown_$(basename "$i" .po).qm" \ --qt \ --statistics + + if ! POFileChecker --ignore-fuzzy "$i"; then + echo "NOTE: POFileChecker (optional gettext-lint package) not installed" + fi fi done diff -Nru kshutdown-4.0/tools/krazy2.sh kshutdown-4.2/tools/krazy2.sh --- kshutdown-4.0/tools/krazy2.sh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/tools/krazy2.sh 2017-10-16 13:21:59.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/bash # SEE: https://github.com/Krazy-collection/krazy -# DOC: http://techbase.kde.org/Development/Tutorials/Code_Checking +# DOC: https://community.kde.org/Guidelines_and_HOWTOs/Code_Checking if [ ! -f "ChangeLog" ]; then echo "Usage: ./tools/krazy2.sh [directory to test]" diff -Nru kshutdown-4.0/tools/make-version.sh kshutdown-4.2/tools/make-version.sh --- kshutdown-4.0/tools/make-version.sh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/tools/make-version.sh 2017-10-16 13:21:59.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/bash -echo "Reading \"tools/VERSION\"..." - -KS_BUILD=`date +%Y-%m-%d` -KS_FILE_VERSION=`sed 1!d tools/VERSION` -KS_FULL_VERSION=`sed 2!d tools/VERSION` +if [ ! -d "src" ]; then + echo "Usage: ./tools/`basename $0`" + exit 1 +fi + +echo "Reading \"VERSION\"..." + +KS_FILE_VERSION=$(sed 1!d VERSION) +KS_FULL_VERSION=$(sed 2!d VERSION) +KS_RELEASE_DATE=$(sed 3!d VERSION) echo "Generating \"kshutdown.nsh\"..." @@ -21,13 +26,13 @@ #ifndef KSHUTDOWN_VERSION_H #define KSHUTDOWN_VERSION_H -#define KS_BUILD "$KS_BUILD" #define KS_FILE_VERSION "$KS_FILE_VERSION" #define KS_FULL_VERSION "$KS_FULL_VERSION" +#define KS_RELEASE_DATE "$KS_RELEASE_DATE" #endif // KSHUTDOWN_VERSION_H EOF -echo "File version (used in file names) : \"$KS_FILE_VERSION\"" -echo "Full version (used in User Interface): \"$KS_FULL_VERSION\"" -echo "Build date: : \"$KS_BUILD\"" +echo "File version (used in file names): \"$KS_FILE_VERSION\"" +echo "Full version (used in UI) : \"$KS_FULL_VERSION\"" +echo "Release date (updated manually) : \"$KS_RELEASE_DATE\"" diff -Nru kshutdown-4.0/tools/package-zip-source.sh kshutdown-4.2/tools/package-zip-source.sh --- kshutdown-4.0/tools/package-zip-source.sh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/tools/package-zip-source.sh 2017-10-16 13:21:59.000000000 +0000 @@ -1,14 +1,14 @@ #!/bin/bash -if [ ! -f "./tools/make-version.sh" ]; then - echo "Usage: ./tools/`basename $0`" +if [ ! -d "src" ]; then + echo "Usage: ./tools/$(basename $0)" exit 1 fi # make version number ./tools/make-version.sh -KS_FILE_VERSION=`sed 1!d tools/VERSION` +KS_FILE_VERSION=$(sed 1!d VERSION) # init variables @@ -18,8 +18,12 @@ # clean before copy -rm -f ./kshutdown -rm -f ./kshutdown-qt +rm -f ./kshutdown-*-win32.exe ./kshutdown-portable-*-win32.7z +rm -fR ./kshutdown-portable +rm -fR ./src/debug ./src/release +rm -f ./src/.qmake.stash \ + ./src/Makefile.Debug ./src/Makefile.Release \ + ./src/object_script.kshutdown-qt.Debug ./src/object_script.kshutdown-qt.Release rm -fR "$KS_DIR" rm -fR "$KS_DIST_DIR" @@ -43,7 +47,6 @@ rm -f po/*.po~ cp -r "po" "$KS_DIR" -cp -r ".kdev4" "$KS_DIR" cp -r "src" "$KS_DIR" cp -r "tools" "$KS_DIR" diff -Nru kshutdown-4.0/tools/scan-build.sh kshutdown-4.2/tools/scan-build.sh --- kshutdown-4.0/tools/scan-build.sh 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/tools/scan-build.sh 2017-10-16 13:21:59.000000000 +0000 @@ -9,5 +9,5 @@ pushd src make clean -scan-build --view make +scan-build --view make -j2 popd diff -Nru kshutdown-4.0/tools/test-wine.bat kshutdown-4.2/tools/test-wine.bat --- kshutdown-4.0/tools/test-wine.bat 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/tools/test-wine.bat 2017-10-16 13:21:59.000000000 +0000 @@ -1,10 +1,15 @@ rem Usage: wineconsole tools/test-wine.bat -call C:\Qt\4.8.6\bin\qtvars.bat +call C:\Qt\4.8.7\bin\qtvars.bat cd src qmake -config release -mingw32-make.exe +mingw32-make.exe -j2 +pause cd .. -rem "C:\Program Files\NSIS\makensis.exe" kshutdown.nsi + +rem Installer test: +rem "%ProgramFiles%\NSIS\makensis.exe" kshutdown.nsi +rem kshutdown-4.2-win32.exe + src\release\kshutdown-qt.exe diff -Nru kshutdown-4.0/tools/VERSION kshutdown-4.2/tools/VERSION --- kshutdown-4.0/tools/VERSION 2016-08-30 20:01:42.000000000 +0000 +++ kshutdown-4.2/tools/VERSION 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -4.0 -4.0 \ No newline at end of file diff -Nru kshutdown-4.0/VERSION kshutdown-4.2/VERSION --- kshutdown-4.0/VERSION 1970-01-01 00:00:00.000000000 +0000 +++ kshutdown-4.2/VERSION 2017-10-16 13:21:59.000000000 +0000 @@ -0,0 +1,3 @@ +4.2 +4.2 +2017-10-15 \ No newline at end of file