From ce991f442b0870f114568a7aab4f88b7dd2f7434 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 28 Apr 2006 12:53:07 +0200
Subject: Changed the "Really restart?" prompt in the call to
 cPluginManager::Active() in menu.c to "restart anyway?"

---
 CONTRIBUTORS |  2 ++
 HISTORY      |  2 ++
 i18n.c       | 24 +++++++++++++++++++++++-
 menu.c       |  4 ++--
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 36ccac42..f6222676 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -981,6 +981,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for reporting a bug in handling the color button texts when switching from the
  'Schedule' menu of a channel without EPG info to the 'What's on now' menu
  for reporting a bug in handling empty titles in cEvent::FixEpgBugs()
+ for suggesting to replace the "Really restart?" prompt in the call to
+ cPluginManager::Active() in menu.c to "restart anyway?"
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index 985e636d..f7abcb9d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4672,3 +4672,5 @@ Video Disk Recorder Revision History
 - Added a hint about commenting out the line '#define USE_FADVISE' in tools.c in
   case of problems with replaying in fast forward mode if the video directory is
   mounted via a Samba share (reported by Andy Grobb).
+- Changed the "Really restart?" prompt in the call to cPluginManager::Active() in
+  menu.c to "restart anyway?" (suggested by Rolf Ahrenberg).
diff --git a/i18n.c b/i18n.c
index 9c0f0ef1..06a59716 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.274 2006/04/25 21:24:33 kls Exp $
+ * $Id: i18n.c 1.275 2006/04/28 12:50:04 kls Exp $
  *
  * Translations provided by:
  *
@@ -1275,6 +1275,28 @@ const tI18nPhrase Phrases[] = {
     "Vil du virkelig genstarte?",
     "Opravdu restartovat?",
   },
+  { "restart anyway?",
+    "trotzdem neu starten?",
+    "zares ponoven zagon?",
+    "riavvio comunque?",
+    "toch opnieuw starten?",
+    "quer mesmo reiniciar?",
+    "redémarrer?",
+    "starte på nytt likevel?",
+    "käynnistetäänkö uudelleen?",
+    "zrestartowaæ mimo to?",
+    "¿reiniciar igualmente?",
+    "ÔåëéêÜ íá ãßíåé åðáíåêêßíçóç?",
+    "vill du ändå starta om?",
+    "repornesc, totuºi?",
+    "mégis újraindítani?",
+    "Reiniciar de totes maneres?",
+    "ÔÕÙáâÒØâÕÛìÝÞ ßÕàÕ×ÐßãáâØâì?",
+    "svejedno restart sistema?",
+    "restart?",
+    "genstart alligevel?",
+    "pøesto restartovat?",
+  },
   { "shut down anyway?",
     "trotzdem ausschalten?",
     "zares izklopi?",
diff --git a/menu.c b/menu.c
index 8c3fe2ec..950a7d9e 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.434 2006/04/16 12:20:46 kls Exp $
+ * $Id: menu.c 1.435 2006/04/28 12:48:01 kls Exp $
  */
 
 #include "menu.h"
@@ -2704,7 +2704,7 @@ eOSState cMenuSetup::Restart(void)
 {
   if (Interface->Confirm(tr("Really restart?"))
      && (!cRecordControls::Active() || Interface->Confirm(tr("Recording - restart anyway?")))
-     && !cPluginManager::Active(tr("Really restart?"))) {
+     && !cPluginManager::Active(tr("restart anyway?"))) {
      cThread::EmergencyExit(true);
      return osEnd;
      }
-- 
cgit v1.2.3