add italian translations, adjust Readme and OK-handling

Italian translations from Diego.
Adjust readme for submenues.
When pressing the ok button in a submenu, vdr returns now to the main menu of the pvrinput plugin

5 files changed, 21 insertions, 30 deletions

diff --git a/README b/README
index b0e3715..9a379cd 100644
--- a/README
+++ b/README
@@ -370,17 +370,14 @@ devices will be used.
 Note: Don't change vdr's setup.conf while vdr is running, it won't take effect
 and will be overwritten by vdr when vdr terminates.
 There is also an OSD menu entry to allow setting PvrSetup.UseOnlyCard while
-vdr is running. By default it is not visible to avoid confusion of a common
-user. To use this feature just uncomment "//#define PVR_DEBUG" in the top of
-menu.c before compiling the plugin. (Note: will be uncommented by default in
-development snapshots)
+vdr is running. Have a look in the 'Expert Parameters' submenu.
 
 Using Stream type V4L2_MPEG_STREAM_TYPE_MPEG2_DVD (not possible for HD PVR)
 ---------------------------------------------------------------------------
 Some users have reported that recordings which were done using this stream type
 work better with the burn plugin or mplex. 
 If you want to use this stream, you can use PvrSetup.StreamType=1 by editing
-the setup.conf. There is also a menu entry when compiling as described above.
+the setup.conf. There is also a menu entry in the 'Expert Parameters' submenu.
 
 Adjust different Audio volume levels (not possible for HD PVR)
 --------------------------------------------------------------
@@ -414,3 +411,6 @@ an external input, pvrinput will call this script with three arguments:
 
 It is up to you what you want to do in this script. For example, you could
 use the lirc irsend command. The scripts contains an exampe for usage of dct6200.  
+
+Note: You need to activate 'use externchannelswitch.sh' in the
+'Expert Parameters' submenu.
\ No newline at end of file
diff --git a/menu.c b/menu.c
index 8706211..aaefb3c 100644
--- a/menu.c
+++ b/menu.c
@@ -27,7 +27,6 @@
 
 /*uncomment the following line to allow setting of PvrSetup.UseOnlyCard
 and StreamType.value via OSD menu (see README) */
-#define PVR_DEBUG
 
 #include "common.h"
 #include "submenu.h"
@@ -106,7 +105,12 @@ eOSState cPvrMenuSetup::ProcessKey(eKeys Key) {
       state = cOsdMenu::ProcessKey(Key);
     }
   } else {
-    state = cOsdMenu::ProcessKey(Key);
+    if (Key == kOk) {
+      // next menu has to be pvrinput plugin menu, not settings menu
+      CloseSubMenu();
+    } else {
+      state = cOsdMenu::ProcessKey(Key);
+    }
   }
   return state;
 }
diff --git a/po/it_IT.po b/po/it_IT.po
index d23e55d..5f58b75 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: it_IT\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-07-08 07:14+0200\n"
-"PO-Revision-Date: 2010-04-06 00:26+0100\n"
+"PO-Revision-Date: 2010-07-17 00:28+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -23,29 +23,23 @@ msgstr ""
 msgid "pvrinput no longer supports old channel syntax!"
 msgstr "Sintassi vecchi canali non supportata"
 
-#, fuzzy
 msgid "Setup.pvrinput$General Parameters"
-msgstr "Utilizza solo scheda"
+msgstr "Parametri generali"
 
-#, fuzzy
 msgid "Setup.pvrinput$Video Parameters"
-msgstr "Utilizza solo scheda"
+msgstr "Parametri video"
 
-#, fuzzy
 msgid "Setup.pvrinput$Audio Parameters"
-msgstr "Utilizza solo scheda"
+msgstr "Parametri audio"
 
-#, fuzzy
 msgid "Setup.pvrinput$MPEG Filter Parameters"
-msgstr "Utilizza solo scheda"
+msgstr "Parametri filtro MPEG"
 
-#, fuzzy
 msgid "Setup.pvrinput$Expert Parameters"
-msgstr "Utilizza solo scheda"
+msgstr "Parametri avanzati"
 
-#, fuzzy
 msgid "Setup.pvrinput$HDPVR Parameters"
-msgstr "Utilizza solo scheda"
+msgstr "Parametri HDPVR"
 
 msgid "Setup.pvrinput$Brightness"
 msgstr "Luminosità"
@@ -224,9 +218,8 @@ msgstr "Ingresso audio HDPVR"
 #, fuzzy
 #~ msgid "Setup.pvrinput$General Parameter"
 #~ msgstr "Utilizza solo scheda"
-
 #~ msgid "Setup.pvrinput$PVRUSB2 Stop on Change"
 #~ msgstr "Ferma PVRUSB2 al cambio"
-
 #~ msgid "Setup.pvrinput$Video bitrate Radio (kbit/s)"
 #~ msgstr "Codifica video radio (kbit/s)"
+
diff --git a/po/pvrinput.pot b/po/pvrinput.pot
index 371bd12..3917169 100644
--- a/po/pvrinput.pot
+++ b/po/pvrinput.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2010-07-08 07:20+0200\n"
+"POT-Creation-Date: 2010-07-19 08:51+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/submenu.c b/submenu.c
index 4bfb039..fd7122c 100644
--- a/submenu.c
+++ b/submenu.c
@@ -26,7 +26,6 @@
  ***************************************************************************/
 
 #include "submenu.h"
-#define PVR_DEBUG
 
 static const char *aspectRatios[] = {
   "1:1",
@@ -66,7 +65,6 @@ static const char *tunerAudioModes[] = {
   "bilingual"
   };
 
-#ifdef PVR_DEBUG
 static const char *useOnlyCard[] = {
   "/dev/video0",
   "/dev/video1",
@@ -89,14 +87,12 @@ static const char *useOnlyCard[] = {
   "PVRUSB2",     //18
   "HDPVR"        //19
   };
-#endif
 
-#ifdef PVR_DEBUG
 static const char *streamType[] = {
   "MPEG2 PS",
   "MPEG2 DVD"
   };
-#endif
+
 
 static const char *exceptionVolumeForCard[] = {
   "/dev/video0",
@@ -279,11 +275,9 @@ cPvrMenuExperts::cPvrMenuExperts(cPvrSetup *setupObject) :
           33/*same col value as in cMenuSetupPage::cMenuSetupPage*/),
           setup(setupObject)
 {
-#ifdef PVR_DEBUG
   Add(new cMenuEditStraItem(tr("Setup.pvrinput$Stream type"), &setup->StreamType.value, 2, streamType));
 
   Add(new cMenuEditStraItem(tr("Setup.pvrinput$Use only card"), &setup->UseOnlyCard, 20, useOnlyCard));
-#endif
 
   Add(new cMenuEditBoolItem(tr("Setup.pvrinput$use externchannelswitch.sh"), &setup->UseExternChannelSwitchScript));
 }