proper translation of the key bindings (thx to Rolf Ahrenberg)

10 files changed, 46 insertions, 176 deletions

diff --git a/HISTORY b/HISTORY
index 73be9a6..d0c5245 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,7 @@ VDR Plugin 'osdteletext' Revision History
 2008-12-??: version 0.?.?
 - switched completely to VDR 1.6's I18N system and removed the old crap - no
   more support for older VDR versions! (thx to Rolf Ahrenberg)
+- proper translation of the key bindings (thx to Rolf Ahrenberg)
 
 2008-12-02: version 0.6.0
 - Moved installation of README and manpage from all to install target
diff --git a/osdteletext.c b/osdteletext.c
index 52449c9..234d320 100644
--- a/osdteletext.c
+++ b/osdteletext.c
@@ -204,16 +204,14 @@ void cPluginTeletextosd::initTexts() {
    //TODO: rewrite this in the xy[0].cd="fg"; form
    static const ActionKeyName st_actionKeyNames[] =
    {
-      { "Action_kRed",      tr("Red key") },
-      { "Action_kGreen",    tr("Green key") },
-      { "Action_kYellow",   tr("Yellow key") },
-      { "Action_kBlue",     tr("Blue key") },
-      { "Action_kPlay",     tr(cKey::ToString( kPlay)) },
-      //{ "Action_kPause",    tr(cKey::ToString( kPause)) },
-      { "Action_kStop",     tr(cKey::ToString( kStop)) },
-      //{ "Action_kRecord",   tr(cKey::ToString( kRecord)) },
-      { "Action_kFastFwd",  tr(cKey::ToString( kFastFwd)) },
-      { "Action_kFastRew",  tr(cKey::ToString( kFastRew)) }
+      { "Action_kRed",      trVDR("Key$Red") },
+      { "Action_kGreen",    trVDR("Key$Green") },
+      { "Action_kYellow",   trVDR("Key$Yellow") },
+      { "Action_kBlue",     trVDR("Key$Blue") },
+      { "Action_kPlay",     trVDR("Key$Play") },
+      { "Action_kStop",     trVDR("Key$Stop") },
+      { "Action_kFastFwd",  trVDR("Key$FastFwd") },
+      { "Action_kFastRew",  trVDR("Key$FastRew") }
    };
    
    cTeletextSetupPage::actionKeyNames = st_actionKeyNames;
@@ -256,16 +254,6 @@ bool cPluginTeletextosd::SetupParse(const char *Name, const char *Value)
   // Parse your own setup parameters and store their values.
   //Stretch=true;
   if (!strcasecmp(Name, "configuredClrBackground")) ttSetup.configuredClrBackground=( ((unsigned int)atoi(Value)) << 24);
-  /*else if (!strcasecmp(Name, "Action_kRed")) ttSetup.mapKeyToAction[0]=(eTeletextAction)atoi(Value);
-  else if (!strcasecmp(Name, "Action_kGreen")) ttSetup.mapKeyToAction[1]=(eTeletextAction)atoi(Value);
-  else if (!strcasecmp(Name, "Action_kYellow")) ttSetup.mapKeyToAction[2]=(eTeletextAction)atoi(Value);
-  else if (!strcasecmp(Name, "Action_kBlue")) ttSetup.mapKeyToAction[3]=(eTeletextAction)atoi(Value);
-  else if (!strcasecmp(Name, "Action_kPlay")) ttSetup.mapKeyToAction[4]=(eTeletextAction)atoi(Value);
-  else if (!strcasecmp(Name, "Action_kPause")) ttSetup.mapKeyToAction[5]=(eTeletextAction)atoi(Value);
-  else if (!strcasecmp(Name, "Action_kStop")) ttSetup.mapKeyToAction[6]=(eTeletextAction)atoi(Value);
-  else if (!strcasecmp(Name, "Action_kRecord")) ttSetup.mapKeyToAction[7]=(eTeletextAction)atoi(Value);
-  else if (!strcasecmp(Name, "Action_kFastFwd")) ttSetup.mapKeyToAction[8]=(eTeletextAction)atoi(Value);
-  else if (!strcasecmp(Name, "Action_kFastRew")) ttSetup.mapKeyToAction[9]=(eTeletextAction)atoi(Value);*/
   else if (!strcasecmp(Name, "showClock")) ttSetup.showClock=atoi(Value);
      //currently not used
   else if (!strcasecmp(Name, "suspendReceiving")) ttSetup.suspendReceiving=atoi(Value);
@@ -320,16 +308,6 @@ void cTeletextSetupPage::Store(void) {
    for (int i=0;i<LastActionKey;i++) {
       SetupStore(actionKeyNames[i].internalName, ttSetup.mapKeyToAction[i]);
    }
-   /*SetupStore("Action_kRed", ttSetup.mapKeyToAction[0]);
-   SetupStore("Action_kGreen", ttSetup.mapKeyToAction[1]);
-   SetupStore("Action_kYellow", ttSetup.mapKeyToAction[2]);
-   SetupStore("Action_kBlue", ttSetup.mapKeyToAction[3]);
-   SetupStore("Action_kPlay", ttSetup.mapKeyToAction[4]);
-   SetupStore("Action_kPause", ttSetup.mapKeyToAction[5]);
-   SetupStore("Action_kStop", ttSetup.mapKeyToAction[6]);
-   SetupStore("Action_kRecord", ttSetup.mapKeyToAction[7]);
-   SetupStore("Action_kFastFwd", ttSetup.mapKeyToAction[8]);
-   SetupStore("Action_kFastRew", ttSetup.mapKeyToAction[9]);*/
    SetupStore("configuredClrBackground", (int)(ttSetup.configuredClrBackground >> 24));
    SetupStore("showClock", ttSetup.showClock);
       //currently not used
@@ -344,6 +322,9 @@ void cTeletextSetupPage::Store(void) {
 
 
 cTeletextSetupPage::cTeletextSetupPage(void) {
+   cString buf;
+   cOsdItem *item;
+
    //init tables
    for (int i=0;i<LastActionKey;i++) {
       if (ttSetup.mapKeyToAction[i] >= LastAction) {//jump to page selected  
@@ -380,52 +361,16 @@ cTeletextSetupPage::cTeletextSetupPage(void) {
    
    //Using same string as VDR's setup menu
    //Add(new cMenuEditIntItem(tr("Setup.Miscellaneous$Min. user inactivity (min)"), &temp.inactivityTimeout));
-   
+
+   buf = cString::sprintf("%s:", tr("Key bindings"));
+   item = new cOsdItem(*buf);
+   item->SetSelectable(false);
+   Add(item);
+
    for (int i=0;i<LastActionKey;i++) {
       ActionEdits[i].Init(this, i, new cMenuEditIntItem(tr("  Page number"), &tempPageNumber[i], 100, 899),
          new cMenuEditStraItem(actionKeyNames[i].userName, (int*)&temp.mapKeyToAction[i], LastAction+1, modes) );
    }
-   
-   /*ActionEdits[0].Init(this, 0, new cMenuEditIntItem(tr("  Page number"), &tempPageNumber[0], 100, 899),
-      new cMenuEditStraItem(tr("Red key"),     (int*)&temp.mapKeyToAction[0], LAST_ACTION+2, modes) );
-    //Add(tempItem);
-    
-   ActionEdits[1].Init(this, 1, new cMenuEditIntItem(tr("  Page number"), &tempPageNumber[1], 100, 899),
-     new cMenuEditStraItem(tr("Green key"),   (int*)&temp.mapKeyToAction[1], LAST_ACTION+2, modes));
-    //Add(tempItem);
-    
-   ActionEdits[2].Init(this, 2, new cMenuEditIntItem(tr("  Page number"), &tempPageNumber[2], 100, 899),
-     new cMenuEditStraItem(tr("Yellow key"),  (int*)&temp.mapKeyToAction[2], LAST_ACTION+2, modes));
-    //Add(tempItem);
-    
-   ActionEdits[3].Init(this, 3, new cMenuEditIntItem(tr("  Page number"), &tempPageNumber[3], 100, 899),
-     new cMenuEditStraItem(tr("Blue key"),    (int*)&temp.mapKeyToAction[3], LAST_ACTION+2, modes));
-    //Add(tempItem);
-    
-   ActionEdits[4].Init(this, 4, new cMenuEditIntItem(tr("  Page number"), &tempPageNumber[4], 100, 899),
-     new cMenuEditStraItem(tr(cKey::ToString( kPlay)),  (int*)&temp.mapKeyToAction[4], LAST_ACTION+2, modes));
-    //Add(tempItem);
-    
-   ActionEdits[5].Init(this, 5, new cMenuEditIntItem(tr("  Page number"), &tempPageNumber[5], 100, 899),
-     new cMenuEditStraItem(tr(cKey::ToString( kPause)),  (int*)&temp.mapKeyToAction[5], LAST_ACTION+2, modes));
-    //Add(tempItem);
-    
-   ActionEdits[6].Init(this, 6, new cMenuEditIntItem(tr("  Page number"), &tempPageNumber[6], 100, 899),
-     new cMenuEditStraItem(tr(cKey::ToString(kStop)),  (int*)&temp.mapKeyToAction[6], LAST_ACTION+2, modes));
-    //Add(tempItem);
-    
-   ActionEdits[7].Init(this, 7, new cMenuEditIntItem(tr("  Page number"), &tempPageNumber[7], 100, 899),
-     new cMenuEditStraItem(tr(cKey::ToString(kRecord)),  (int*)&temp.mapKeyToAction[7], LAST_ACTION+2, modes));
-    //Add(tempItem);
-    
-   ActionEdits[8].Init(this, 8, new cMenuEditIntItem(tr("  Page number"), &tempPageNumber[8], 100, 899),
-     new cMenuEditStraItem(tr(cKey::ToString(kFastFwd)),  (int*)&temp.mapKeyToAction[8], LAST_ACTION+2, modes));
-    //Add(tempItem);
-    
-   ActionEdits[9].Init(this, 9, new cMenuEditIntItem(tr("  Page number"), &tempPageNumber[9], 100, 899),
-     new cMenuEditStraItem(tr(cKey::ToString(kFastRew)),  (int*)&temp.mapKeyToAction[9], LAST_ACTION+2, modes));
-    //Add(tempItem);*/
-    
 }
 
 eOSState cTeletextSetupPage::ProcessKey(eKeys Key) {
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 93a221f..13df5ff 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-13 17:15+0200\n"
+"POT-Creation-Date: 2008-12-13 23:09+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -32,18 +32,6 @@ msgstr "Visualitza el teletext en l'OSD"
 msgid "Teletext (OSD)"
 msgstr "Teletext (OSD)"
 
-msgid "Red key"
-msgstr "Tecla vermella"
-
-msgid "Green key"
-msgstr "Tecla verda"
-
-msgid "Yellow key"
-msgstr "Tecla groga"
-
-msgid "Blue key"
-msgstr "Tecla blava"
-
 msgid "Zoom"
 msgstr "Zoom"
 
@@ -80,5 +68,8 @@ msgstr ""
 msgid "OSD vertical align"
 msgstr ""
 
+msgid "Key bindings"
+msgstr ""
+
 msgid "  Page number"
 msgstr "  Nombre de pàgina"
diff --git a/po/de_DE.po b/po/de_DE.po
index a54f429..b15f883 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-13 17:15+0200\n"
+"POT-Creation-Date: 2008-12-13 23:09+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -30,18 +30,6 @@ msgstr "Zeigt den Videotext auf dem OSD an"
 msgid "Teletext (OSD)"
 msgstr "Videotext (OSD)"
 
-msgid "Red key"
-msgstr "Rote Taste"
-
-msgid "Green key"
-msgstr "Grüne Taste"
-
-msgid "Yellow key"
-msgstr "Gelbe Taste"
-
-msgid "Blue key"
-msgstr "Blaue Taste"
-
 msgid "Zoom"
 msgstr "Vergrößern"
 
@@ -78,5 +66,8 @@ msgstr "OSD horizontale Anordnung"
 msgid "OSD vertical align"
 msgstr "OSD vertikale Anordnung"
 
+msgid "Key bindings"
+msgstr "Tastenzuweisung"
+
 msgid "  Page number"
 msgstr "  Seitenzahl"
diff --git a/po/es_ES.po b/po/es_ES.po
index 00988e4..7f24c89 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-13 17:15+0200\n"
+"POT-Creation-Date: 2008-12-13 23:09+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -30,18 +30,6 @@ msgstr "Visualiza el teletexto en el OSD"
 msgid "Teletext (OSD)"
 msgstr "Teletexto (OSD)"
 
-msgid "Red key"
-msgstr "Tecla roja"
-
-msgid "Green key"
-msgstr "Tecla verde"
-
-msgid "Yellow key"
-msgstr "Tecla amarilla"
-
-msgid "Blue key"
-msgstr "Tecla azul"
-
 msgid "Zoom"
 msgstr "Zoom"
 
@@ -78,5 +66,8 @@ msgstr ""
 msgid "OSD vertical align"
 msgstr ""
 
+msgid "Key bindings"
+msgstr ""
+
 msgid "  Page number"
 msgstr "  Número de página"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index b558f1e..6efe582 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-13 17:15+0200\n"
+"POT-Creation-Date: 2008-12-13 23:09+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -30,18 +30,6 @@ msgstr "Teksti-TV (OSD)"
 msgid "Teletext (OSD)"
 msgstr "Teksti-TV"
 
-msgid "Red key"
-msgstr "Punainen näppäin"
-
-msgid "Green key"
-msgstr "Vihreä näppäin"
-
-msgid "Yellow key"
-msgstr "Keltainen näppäin"
-
-msgid "Blue key"
-msgstr "Sininen näppäin"
-
 msgid "Zoom"
 msgstr "Suurenna"
 
@@ -78,5 +66,8 @@ msgstr "Pystykeskitys"
 msgid "OSD vertical align"
 msgstr "Vaakakeskitys"
 
+msgid "Key bindings"
+msgstr "Näppäintoiminnot"
+
 msgid "  Page number"
 msgstr "  Sivunumero"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 216441c..e80abad 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-13 17:15+0200\n"
+"POT-Creation-Date: 2008-12-13 23:09+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -33,18 +33,6 @@ msgstr ""
 msgid "Teletext (OSD)"
 msgstr "Teletext (OSD)"
 
-msgid "Red key"
-msgstr "Touche rouge"
-
-msgid "Green key"
-msgstr "Touche verte"
-
-msgid "Yellow key"
-msgstr "Touche jaune"
-
-msgid "Blue key"
-msgstr "Touche bleue"
-
 msgid "Zoom"
 msgstr "Zoom"
 
@@ -81,5 +69,8 @@ msgstr ""
 msgid "OSD vertical align"
 msgstr ""
 
+msgid "Key bindings"
+msgstr ""
+
 msgid "  Page number"
 msgstr "  Nombre de pages"
diff --git a/po/it_IT.po b/po/it_IT.po
index b9ede12..f37873d 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-13 17:15+0200\n"
+"POT-Creation-Date: 2008-12-13 23:09+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Sean Carlos <seanc@libero.it>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -32,18 +32,6 @@ msgstr ""
 msgid "Teletext (OSD)"
 msgstr "Teletext (OSD)"
 
-msgid "Red key"
-msgstr "Tasto Rosso"
-
-msgid "Green key"
-msgstr "Tasto Verde"
-
-msgid "Yellow key"
-msgstr "Tasto Giallo"
-
-msgid "Blue key"
-msgstr "Tasto Blu"
-
 msgid "Zoom"
 msgstr "Zoom"
 
@@ -80,5 +68,8 @@ msgstr ""
 msgid "OSD vertical align"
 msgstr ""
 
+msgid "Key bindings"
+msgstr ""
+
 msgid "  Page number"
 msgstr "  Numero di pagina"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 90f7906..8e10505 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <nobody@nowhere.org>\n"
-"POT-Creation-Date: 2008-12-13 17:15+0200\n"
+"POT-Creation-Date: 2008-12-13 23:09+0200\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -30,18 +30,6 @@ msgstr "¿ÞÚÐ× âÕÛÕâÕÚáâÐ Ò ÜÕÝî"
 msgid "Teletext (OSD)"
 msgstr "ÂÕÛÕâÕÚáâ"
 
-msgid "Red key"
-msgstr "ºàÐáÝÐï ÚÝÞßÚÐ"
-
-msgid "Green key"
-msgstr "·ÕÛñÝÐï ÚÝÞßÚÐ"
-
-msgid "Yellow key"
-msgstr "¶ñÛâÐï ÚÝÞßÚÐ"
-
-msgid "Blue key"
-msgstr "ÁØÝïï ÚÝÞßÚÐ"
-
 msgid "Zoom"
 msgstr "ãÒÕÛØçØâì"
 
@@ -78,5 +66,8 @@ msgstr ""
 msgid "OSD vertical align"
 msgstr ""
 
+msgid "Key bindings"
+msgstr ""
+
 msgid "  Page number"
 msgstr "  ½ÞÜÕà áâàÐÝØæë"
diff --git a/setup.h b/setup.h
index f04488f..b802a4c 100644
--- a/setup.h
+++ b/setup.h
@@ -24,26 +24,13 @@ ActionKeyGreen,
 ActionKeyYellow,
 ActionKeyBlue,
 ActionKeyPlay,
-//ActionKeyPause,
 ActionKeyStop,
-//ActionKeyRecord,
 ActionKeyFastFwd,
 ActionKeyFastRew,
 
 LastActionKey
 };
 
-/* 
-kRed
-kGreen
-kYellow
-kBlue
-kPlay
-kPause
-kStop
-kRecord
-kFastFwd*/
-
 //Default values are set in menu.c, setup menu, parsing and storing can be found in osdteletext.c
 class TeletextSetup {
 public: