4 files changed, 37 insertions, 12 deletions

diff --git a/HISTORY b/HISTORY
index 3d732af6..73be708f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3869,3 +3869,5 @@ Video Disk Recorder Revision History
 - Fixed setting current menu item if the first one is non-selectable.
 - cOsdItem::cOsdItem() now has a 'Selectable' parameter.
 - Improved displaying 'sub-title' and 'bottom text' in the CAM menu.
+- Added status message "Resetting CAM..." for an immediate feedback when the CAM
+  reset has been triggered.
diff --git a/i18n.c b/i18n.c
index ca5d77eb..bf7fb48e 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.210 2005/09/25 11:57:04 kls Exp $
+ * $Id: i18n.c 1.211 2005/10/02 10:17:41 kls Exp $
  *
  * Translations provided by:
  *
@@ -2294,6 +2294,27 @@ const tI18nPhrase Phrases[] = {
     "Ei saa avada CAM menüüd!",
     "Kan ikke åbne CAM menuen!",
   },
+  { "Resetting CAM...",
+    "CAM wird zurückgesetzt...",
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+    "",//TODO
+  },
   { "Can't reset CAM!",
     "CAM-Reset fehlgeschlagen!",
     "Ne morem resetirati CAM-a",
@@ -2316,23 +2337,23 @@ const tI18nPhrase Phrases[] = {
     "Kan ikke nulstille CAM!",
   },
   { "CAM has been reset",
-    "CAM wurde zurückgesetzt!",
-    "CAM je resetiran!",
-    "Modulo CAM reimpostato!",
-    "CAM is herstart!",
+    "CAM wurde zurückgesetzt",
+    "CAM je resetiran",
+    "Modulo CAM reimpostato",
+    "CAM is herstart",
     "",//TODO
     "La CAM a été réinitialisée",
     "",//TODO
     "Salausmoduuli alustettu",
-    "CAM-Reset wykonany!",
+    "CAM-Reset wykonany",
     "CAM reiniciada",
     "Óôï CAM Ýãéíå åðáíáöïñÜ",
     "CA modulen har återställts",
     "CAM-ul a fost resetat",
     "A CAM vissza lett állítva",
     "CAM reiniciada",
-    "CAM-ÜÞÔãÛì ßÕàÕ×ÐßãéÕÝ!",
-    "CAM je resetiran!",
+    "CAM-ÜÞÔãÛì ßÕàÕ×ÐßãéÕÝ",
+    "CAM je resetiran",
     "CAM mooduli taaskäivitus tehtud",
     "CAM er blevet nulstillet",
   },
diff --git a/menu.c b/menu.c
index bb871ef7..96e07c0a 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.365 2005/10/02 09:59:30 kls Exp $
+ * $Id: menu.c 1.366 2005/10/02 10:08:57 kls Exp $
  */
 
 #include "menu.h"
@@ -2180,6 +2180,7 @@ eOSState cMenuSetupCICAM::Reset(void)
 {
   cMenuSetupCICAMItem *item = (cMenuSetupCICAMItem *)Get(Current());
   if (item) {
+     Skins.Message(mtWarning, tr("Resetting CAM..."));
      if (item->CiHandler()->Reset(item->Slot())) {
         Skins.Message(mtInfo, tr("CAM has been reset"));
         return osEnd;
diff --git a/skins.c b/skins.c
index fb21ed38..e81e8825 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.4 2005/01/14 13:07:19 kls Exp $
+ * $Id: skins.c 1.5 2005/10/02 10:12:10 kls Exp $
  */
 
 #include "skins.h"
@@ -169,8 +169,9 @@ bool cSkins::SetCurrent(const char *Name)
 eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
 {
   switch (Type) {
-    case mtInfo:  isyslog("info: %s", s); break;
-    case mtError: esyslog("ERROR: %s", s); break;
+    case mtInfo:    isyslog("info: %s", s); break;
+    case mtWarning: isyslog("warning: %s", s); break;
+    case mtError:   esyslog("ERROR: %s", s); break;
     default: ;
     }
   if (!Current())