-e now only temporarily overrides the command to be executed.

See updated README for details.

24 files changed, 149 insertions, 750 deletions

diff --git a/README b/README
index b424b83..0f84d6f 100644
--- a/README
+++ b/README
@@ -13,8 +13,9 @@ See the file COPYING for license information.
 *** Command Line Parameters ***
 *******************************
 
-use -e parameter to redefine the command for shutdown. By default /sbin/poweroff is called
-
+The -e parameter temporarily overrides the 'Command' option in the plugins setup. Note
+that overriding makes the 'Command' option become unselectable and show the command 
+defined at the command line ignoring the value currently stored in setup.conf.
 
 ********************
 *** Plugin Setup ***
@@ -24,9 +25,14 @@ Default Timespan [min]:
 -defines the default timespan till shutdown, which is shown in the plugins main menu entry
 
 Action:
--Shutdown represents the command to be executed on sleeptimer timeout (default: /sbin/poweroff)
- overridden by command line parameter -e (see above)
--Mute does not execute any command, but mutes audio if not already muted
+-'Shutdown' sends an internal shutdown signal to vdr. Represents exactly the same way
+ as if the Power key would be pressed. This way vdr itself handles the shutdown
+ procedure, delays the shutdown if needed, sets timers correctly etc.
+-'Mute' mutes audio if not already muted
+-'Execute command' invokes a system call to 'Command'
+-'Command' defines the executable to be invoked on sleeptimer timeout (default: /sbin/poweroff)
+ overridden by command line parameter -e. If overriden this option becomes unselectable 
+ (see above).
 
 Use Autoswitch with default:
 -Integrates the default timespan in the predefined values and makes the Autoswitch function
@@ -36,7 +42,6 @@ Confirm:
 -makes the Autoswitch function offer the predefined timespans but does not activate
  the sleeptimer unless the user explicitly confirms by pressing Ok.
 
-
 *****************
 *** Main Menu ***
 *****************
@@ -65,4 +70,4 @@ Red / Autoswitch (inspired by an idea / feature request by grindo):
  value.
 
 Green / Disable:
--Disables an active sleeptimer.
+-Disables an active sleeptimer. 
diff --git a/debian/changelog b/debian/changelog
index e4a0ae2..89b8ecd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
+vdr-plugin-sleeptimer (0.8.2) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+
+ -- Midas <vdrportal_midas <at> gmx <dot> de>  Tue, 02 Aug 2011 02:48:53 +0200
+
 vdr-plugin-sleeptimer (0.8.1) experimental; urgency=low
 
   * Non-maintainer upload.
-  * New Zpstream release
+  * New upstream release
 
  -- Midas <vdrportal_midas at gmx dot de>  Sun, 31 Jul 2011 09:08:16 +0200
 
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 625a7aa..0923127 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -18,116 +18,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 21ec603..1693049 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,116 +16,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/da_DK.po b/po/da_DK.po
index e5574f8..dae5447 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,116 +16,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index a5a818b..468553f 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,116 +16,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr "Sleeptimer"
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr "Automatisch"
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr "Nicht aktiv"
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr "Shutdown [min]"
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr "Shutdown (Uhrzeit)"
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr "Sleeptimer in %d Minuten abbrechen"
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr "Herunterfahren"
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr "Stummschalten"
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr "Befehl ausführen"
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr "Standard-Zeitspanne [min]"
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr "Aktion"
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr "Befehl"
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
-msgstr "Nein"
-
-#: sleeptimer.c:328
 msgid "Use default for autoswitch"
 msgstr "Standard in Automatik"
 
-#: sleeptimer.c:328 sleeptimer.c:329
+msgid "No"
+msgstr "Nein"
+
 msgid "Yes"
 msgstr "Ja"
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr "Sleeptimer in einer Minute"
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
-msgstr ""
+msgid "Disable sleeptimer?"
+msgstr "Sleeptimer deaktivieren?"
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr "Sleeptimer um %i:%.2i aktivieren?"
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr "Zeitspanne kürzer 2 Minuten"
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr "Sleeptimer in %i Minuten aktivieren?"
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr "Sleeptimer in %i Minute"
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr "Sleeptimer in %i Minuten"
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr "Sleeptimer inaktiv"
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr "Sleeptimer in %i Minuten?"
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr "Sleeptimer deaktivieren?"
diff --git a/po/el_GR.po b/po/el_GR.po
index ffb9497..2a83452 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,116 +16,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index b92b381..c7db23c 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,116 +16,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/et_EE.po b/po/et_EE.po
index 0e1887a..a8383fc 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,116 +16,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
index dac6f0b..d331ae1 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -19,116 +19,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr "Ajastin"
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr "Ei aktiivinen"
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr "Sammutus minuutteina"
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr "Sammutusaika"
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr "Peruuta %d minuutin ajastin?"
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr "Toiminto"
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr "Ajastin aktivoituu noin minuutin kuluttua"
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr "Aktivoi ajastin %i:%.2i?"
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr "Aktivoi %d minuutin ajastin?"
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 87343e8..2a8a2fc 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -19,116 +19,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 502c848..8ee2529 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,116 +17,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 05bbe3d..302a60e 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,116 +17,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index 2e45c0e..1870823 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Sean Carlos <seanc@libero.it>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -18,116 +18,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/nl_NL.po b/po/nl_NL.po
index ae6e608..2fa471e 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -18,116 +18,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/nn_NO.po b/po/nn_NO.po
index c4b6bdd..c072b03 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,116 +17,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 7097bdc..ca163a3 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,116 +16,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 34d1a76..9f78ab7 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,116 +16,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
index dad0ed2..b8d2fd8 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,116 +17,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index c56ce8a..4ef5ba0 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,116 +16,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 699126d..d8186ba 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,116 +17,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 9da3084..6e38cc7 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,116 +17,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/po/tr_TR.po b/po/tr_TR.po
index a27f13c..3a84ea5 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: vdrportal_midas at gmx de\n"
-"POT-Creation-Date: 2011-07-31 11:48+0200\n"
+"Report-Msgid-Bugs-To: <vdrportal_midas <at> gmx <dot> de>\n"
+"POT-Creation-Date: 2011-08-01 23:17+0200\n"
 "PO-Revision-Date: 2011-07-31 11:48+0200\n"
 "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,116 +16,86 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sleeptimer.c:20
 msgid "Sleeptimer"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Autoswitch"
 msgstr ""
 
-#: sleeptimer.c:215
 msgid "Disable"
 msgstr ""
 
-#: sleeptimer.c:218
 msgid "Not active"
 msgstr ""
 
-#: sleeptimer.c:221 sleeptimer.c:242
 msgid "Shutdown [min]"
 msgstr ""
 
-#: sleeptimer.c:222 sleeptimer.c:243
 msgid "Shutdown (time)"
 msgstr ""
 
-#: sleeptimer.c:240
 #, c-format
 msgid "Disable sleeptimer in %d minutes"
 msgstr ""
 
-#: sleeptimer.c:319
 msgid "Shutdown"
 msgstr ""
 
-#: sleeptimer.c:320
 msgid "Mute"
 msgstr ""
 
-#: sleeptimer.c:321
 msgid "Execute command"
 msgstr ""
 
-#: sleeptimer.c:325
 msgid "Default Timespan [min]"
 msgstr ""
 
-#: sleeptimer.c:326
 msgid "Action"
 msgstr ""
 
-#: sleeptimer.c:327
 msgid "Command"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
-msgid "No"
+msgid "Use default for autoswitch"
 msgstr ""
 
-#: sleeptimer.c:328
-msgid "Use default for autoswitch"
+msgid "No"
 msgstr ""
 
-#: sleeptimer.c:328 sleeptimer.c:329
 msgid "Yes"
 msgstr ""
 
-#: sleeptimer.c:329
 msgid "Confirm"
 msgstr ""
 
-#: sleeptimer.c:409
 msgid "Going to sleep in about one minute"
 msgstr ""
 
-#: sleeptimer.c:449
-msgid "Disable Sleeptimer?"
+msgid "Disable sleeptimer?"
 msgstr ""
 
-#: sleeptimer.c:462
 #, c-format
 msgid "Activate sleeptimer at %i:%.2i?"
 msgstr ""
 
-#: sleeptimer.c:468
 msgid "Timespan shorter than 2 minutes"
 msgstr ""
 
-#: sleeptimer.c:481
 #, c-format
 msgid "Activate sleeptimer in %i minutes?"
 msgstr ""
 
-#: sleeptimer.c:527
 #, c-format
 msgid "Sleeptimer in %i minute"
 msgstr ""
 
-#: sleeptimer.c:531 sleeptimer.c:550
 #, c-format
 msgid "Sleeptimer in %i minutes"
 msgstr ""
 
-#: sleeptimer.c:537 sleeptimer.c:561 sleeptimer.c:627
 msgid "Sleeptimer disabled"
 msgstr ""
 
-#: sleeptimer.c:546
 #, c-format
 msgid "Enable sleeptimer in %i minutes?"
 msgstr ""
-
-#: sleeptimer.c:557
-msgid "Disable sleeptimer?"
-msgstr ""
diff --git a/sleeptimer.c b/sleeptimer.c
index ae49b6b..e8755d5 100644
--- a/sleeptimer.c
+++ b/sleeptimer.c
@@ -15,7 +15,11 @@
  #include "i18n.h"
 #endif 
 
-static const char *VERSION        = "0.8.2-WIP201108012259";
+#ifndef COMMANDLENGTH
+ #define COMMANDLENGTH 512
+#endif
+
+static const char *VERSION        = "0.8.2";
 static const char *DESCRIPTION    = "Sleeptimer for VDR";
 static const char *MAINMENUENTRY  = tr("Sleeptimer");
 
@@ -25,7 +29,8 @@ int shutdown_time = 0;
 int shutdown_minutes = 2;
 bool start_w_default=false;
 bool do_confirm=false;
-char command[512] = "/sbin/poweroff";
+char command[COMMANDLENGTH] = "/sbin/poweroff";
+char cli_command[COMMANDLENGTH]="";
 bool process_red=false;
 
 #define ARRAYLENGTH 9
@@ -163,7 +168,7 @@ bool cPluginSleeptimer::ProcessArgs(int argc, char *argv[])
 	while((c = getopt(argc, argv, "e:")) != -1 ) {
 		switch(c) {
 			case 'e': 
-				strncpy(command, optarg, sizeof(command) - 1);
+				strncpy(cli_command, optarg, sizeof(cli_command) - 1);
 				break;
 			default: return false;
 		}
@@ -266,7 +271,7 @@ private:
 	int timespan;
 	int setup_start_w_default;
 	int setup_do_confirm;
-	char setup_command[512];
+	char setup_command[COMMANDLENGTH];
 	const char* methods[3];
 public:
 	cMenuSetupSleeptimer(void);
@@ -324,7 +329,19 @@ cMenuSetupSleeptimer::cMenuSetupSleeptimer(void)
  
  Add(new cMenuEditIntItem(tr("Default Timespan [min]"),  &timespan, 2));
  Add(new cMenuEditStraItem(tr("Action"), &new_method, 3, methods)); 
- Add(new cMenuEditStrItem(tr("Command"), setup_command, 511, allowed_chars));
+ 
+ cMenuEditStrItem *commanditem;
+ if (cli_command[0]=='\0')
+ {
+  commanditem = new cMenuEditStrItem(tr("Command"), setup_command, COMMANDLENGTH, allowed_chars);
+ }
+ else
+ {
+  commanditem = new cMenuEditStrItem(tr("Command"), cli_command, COMMANDLENGTH, allowed_chars);
+  commanditem->SetSelectable(false);
+ }
+ Add(commanditem);
+  
  Add(new cMenuEditBoolItem(tr("Use default for autoswitch"), &setup_start_w_default, tr("No"), tr("Yes")));
  Add(new cMenuEditBoolItem(tr("Confirm"), &setup_do_confirm, tr("No"), tr("Yes")));
 }