Preceded all button texts with "Button$"; Removed obsolete "Eject" and "Language" texts

2025-03-01 10:50:46 +00:00 · 2006-01-07 15:54:10 +01:00
parent e8ee9a1c4b
commit f7bf9b4090
4 changed files with 103 additions and 101 deletions
--- a/2
+++ b/2
@@ -4090,6 +4090,8 @@ Video Disk Recorder Revision History
  remember why it wasn't active...
 - Removed an obsolete "Summary" text from i18n.c and preceded all key definition
  texts with "Key$" to avoid duplicates (reported by Lucian Muresan).
+- Preceded all button texts with "Button$".
+- Removed obsolete "Eject" and "Language" texts.
 - Added missing #include "thread.h" to dvbspu.c (reported by Gavin Hamill).
 - Disabled the use of "fadvise" in cUnbufferedFile because there have been
  several reports that it causes more problems than it solves (suggested by
--- 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.228 2006/01/07 12:50:33 kls Exp $
+ * $Id: i18n.c 1.229 2006/01/07 15:44:52 kls Exp $
 *
 * Translations provided by:
 *
@@ -483,8 +483,29 @@ const tI18nPhrase Phrases[] = {
    "J<EFBFBD>rgmisena eetris",
    "Hvad vises som det n<>ste?",
  },
+  { "Summary",
+    "Inhalt",
+    "Vsebina",
+    "Sommario",
+    "Inhoud",
+    "Resumo",
+    "R<EFBFBD>sum<EFBFBD>",
+    "Sammendrag",
+    "Yhteenveto",
+    "Zawartosc",
+    "Resumen",
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
+    "Sammanfattning",
+    "Cuprins",
+    "Tartalom",
+    "Resum",
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
+    "Sadr<EFBFBD>aj",
+    "Kokkuv<EFBFBD>te",
+    "Omtale",
+  },
  // Button texts (should not be more than 10 characters!):
-  { "Edit",
+  { "Button$Edit",
    "Editieren",
    "Uredi",
    "Modifica",
@@ -505,7 +526,7 @@ const tI18nPhrase Phrases[] = {
    "Muuda",
    "Rediger",
  },
-  { "New",
+  { "Button$New",
    "Neu",
    "Novo",
    "Nuovo",
@@ -526,7 +547,7 @@ const tI18nPhrase Phrases[] = {
    "Uus",
    "Ny",
  },
-  { "Delete",
+  { "Button$Delete",
    "L<EFBFBD>schen",
    "Izbri<EFBFBD>i",
    "Cancella",
@@ -547,7 +568,7 @@ const tI18nPhrase Phrases[] = {
    "Kustuta",
    "Slet",
  },
-  { "Mark",
+  { "Button$Mark",
    "Markieren",
    "Ozna<EFBFBD>i",
    "Marca",
@@ -568,7 +589,7 @@ const tI18nPhrase Phrases[] = {
    "Siirda",
    "Mark<EFBFBD>r",
  },
-  { "On/Off",
+  { "Button$On/Off",
    "Ein/Aus",
    "Vklop/Izklop",
    "On/Off",
@@ -589,7 +610,7 @@ const tI18nPhrase Phrases[] = {
    "Sees/V<>ljas",
    "Til/Fra",
  },
-  { "Record",
+  { "Button$Record",
    "Aufnehmen",
    "Posnemi",
    "Registra",
@@ -610,7 +631,7 @@ const tI18nPhrase Phrases[] = {
    "Salvesta",
    "Optag",
  },
-  { "Play",
+  { "Button$Play",
    "Wiedergabe",
    "Predvajaj",
    "Riproduci",
@@ -631,7 +652,28 @@ const tI18nPhrase Phrases[] = {
    "Start",
    "Afspil",
  },
-  { "Rewind",
+  { "Button$Pause",
+    "Pause",
+    "Pavza",
+    "Pausa",
+    "Pauze",
+    "",// TODO
+    "Pause",
+    "",// TODO
+    "Tauko",
+    "Przerwa",
+    "Pausa",
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
+    "Pausa",
+    "Pauz<EFBFBD>",
+    "Sz<EFBFBD>net",
+    "Pausa",
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
+    "Pauza",
+    "Paus",
+    "Pause",
+  },
+  { "Button$Rewind",
    "Anfang",
    "Na za<7A>etek",
    "Da inizio",
@@ -673,7 +715,7 @@ const tI18nPhrase Phrases[] = {
    "Stopp",
    "Stop",
  },
-  { "Resume",
+  { "Button$Resume",
    "Weiter",
    "Nadaljuj",
    "Riprendi",
@@ -694,28 +736,7 @@ const tI18nPhrase Phrases[] = {
    "J<EFBFBD>tka",
    "Forts<EFBFBD>t",
  },
-  { "Summary",
-    "Inhalt",
-    "Vsebina",
-    "Sommario",
-    "Inhoud",
-    "Resumo",
-    "R<EFBFBD>sum<EFBFBD>",
-    "Sammendrag",
-    "Yhteenveto",
-    "Zawartosc",
-    "Resumen",
-    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-    "Sammanfattning",
-    "Cuprins",
-    "Tartalom",
-    "Resum",
-    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-    "Sadr<EFBFBD>aj",
-    "Kokkuv<EFBFBD>te",
-    "Omtale",
-  },
-  { "Open",
+  { "Button$Open",
    "<EFBFBD>ffnen",
    "Odpri",
    "Apri",
@@ -736,7 +757,7 @@ const tI18nPhrase Phrases[] = {
    "Ava",
    "<EFBFBD>bn",
  },
-  { "Switch",
+  { "Button$Switch",
    "Umschalten",
    "Preklopi",
    "Cambia",
@@ -757,7 +778,7 @@ const tI18nPhrase Phrases[] = {
    "Vali",
    "Skift",
  },
-  { "Now",
+  { "Button$Now",
    "Jetzt",
    "Sedaj",
    "Adesso",
@@ -778,7 +799,7 @@ const tI18nPhrase Phrases[] = {
    "N<EFBFBD><EFBFBD>d",
    "Nu",
  },
-  { "Next",
+  { "Button$Next",
    "N<EFBFBD>chste",
    "Sledi",
    "Prossimo",
@@ -820,49 +841,7 @@ const tI18nPhrase Phrases[] = {
    "Kava",
    "Program",
  },
-  { "Language",
-    "Sprache",
-    "Jezik",
-    "Linguaggio",
-    "Taal",
-    "Linguagem",
-    "Langue",
-    "Spr<EFBFBD>k",
-    "Kieli",
-    "Jezyk",
-    "Idioma",
-    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-    "Spr<EFBFBD>k",
-    "Limba",
-    "Nyelv",
-    "Idioma",
-    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-    "Jezik",
-    "Keel",
-    "Sprog",
-  },
-  { "Eject",
-    "Auswerfen",
-    "Izvr<EFBFBD>i",
-    "Eject",
-    "Eject",
-    "Ejectar",
-    "Ejection",
-    "Eject",
-    "Avaa",
-    "Wyrzucenie",
-    "Expulsar",
-    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-    "Mata ut",
-    "Ejecteaz<EFBFBD>",
-    "Kidobni",
-    "Expulsar",
-    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-    "Izbaci",
-    "Ava",
-    "Skub ud",
-  },
-  { "ABC/abc",
+  { "Button$ABC/abc",
    "ABC/abc",
    "ABC/abc",
    "ABC/abc",
@@ -883,7 +862,7 @@ const tI18nPhrase Phrases[] = {
    "ABC/abc",
    "ABC/abc",
  },
-  { "Insert",
+  { "Button$Insert",
    "Einf<EFBFBD>gen",
    "Vstavi",
    "Inserisci",
@@ -904,7 +883,7 @@ const tI18nPhrase Phrases[] = {
    "Lisa (INS)",
    "Inds<EFBFBD>t",
  },
-  { "Overwrite",
+  { "Button$Overwrite",
    "<EFBFBD>berschreiben",
    "Prepi<EFBFBD>i",
    "Sovrascrivi",
@@ -925,7 +904,7 @@ const tI18nPhrase Phrases[] = {
    "Asenda (OVR)",
    "Overskriv",
  },
-  { "Menu",
+  { "Button$Menu",
    "Men<EFBFBD>",
    "Meni",
    "Men<EFBFBD>",
@@ -946,7 +925,7 @@ const tI18nPhrase Phrases[] = {
    "Men<EFBFBD><EFBFBD>",
    "Menu",
  },
-  { "Reset",
+  { "Button$Reset",
    "Reset",
    "Reset",
    "Reset",
@@ -967,7 +946,7 @@ const tI18nPhrase Phrases[] = {
    "Nullimine",
    "Nulstille",
  },
-  { "Scan",
+  { "Button$Scan",
    "Scan",
    "I<EFBFBD><EFBFBD>i",
    "Scansione",
@@ -988,6 +967,27 @@ const tI18nPhrase Phrases[] = {
    "Uuenda",
    "Skan",
  },
+  { "Button$Audio",
+    "Audio",
+    "Zvok",
+    "",// TODO
+    "Audio",
+    "",// TODO
+    "Audio",
+    "",// TODO
+    "<EFBFBD><EFBFBD>ni",
+    "",// TODO
+    "",// TODO
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
+    "Ljud",
+    "Sunet",
+    "",// TODO
+    "",// TODO
+    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
+    "",// TODO
+    "Audio",
+    "Audio",
+  },
  // Confirmations:
  { "Delete channel?",
    "Kanal l<>schen?",
--- 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.388 2006/01/07 13:51:09 kls Exp $
+ * $Id: menu.c 1.389 2006/01/07 15:38:16 kls Exp $
 */

 #include "menu.h"
@@ -421,7 +421,7 @@ void cMenuChannels::Setup(void)
  if (cMenuChannelItem::SortMode() != cMenuChannelItem::csmNumber)
     Sort();
  SetCurrent(currentItem);
-  SetHelp(tr("Edit"), tr("New"), tr("Delete"), tr("Mark"));
+  SetHelp(tr("Button$Edit"), tr("Button$New"), tr("Button$Delete"), tr("Button$Mark"));
  Display();
 }

@@ -788,7 +788,7 @@ cMenuTimers::cMenuTimers(void)
      Add(new cMenuTimerItem(timer));
  if (Setup.SortTimers)
     Sort();
-  SetHelp(tr("Edit"), tr("New"), tr("Delete"), Setup.SortTimers ? tr("On/Off") : tr("Mark"));
+  SetHelp(tr("Button$Edit"), tr("Button$New"), tr("Button$Delete"), Setup.SortTimers ? tr("Button$On/Off") : tr("Button$Mark"));
  Timers.IncBeingEdited();
 }

@@ -916,7 +916,7 @@ cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch)
        SetTitle(channel->Name());
        int TimerMatch = tmNone;
        Timers.GetMatch(event, &TimerMatch);
-        SetHelp(TimerMatch == tmFull ? tr("Timer") : tr("Record"), NULL, NULL, CanSwitch ? tr("Switch") : NULL);
+        SetHelp(TimerMatch == tmFull ? tr("Timer") : tr("Button$Record"), NULL, NULL, CanSwitch ? tr("Button$Switch") : NULL);
        }
     }
 }
@@ -1062,8 +1062,8 @@ void cMenuWhatsOn::SetHelpKeys(void)
        NewHelpKeys = 1;
     }
  if (NewHelpKeys != helpKeys) {
-     const char *Red[] = { NULL, tr("Record"), tr("Timer") };
-     SetHelp(Red[NewHelpKeys], now ? tr("Next") : tr("Now"), tr("Button$Schedule"), tr("Switch"));
+     const char *Red[] = { NULL, tr("Button$Record"), tr("Timer") };
+     SetHelp(Red[NewHelpKeys], now ? tr("Button$Next") : tr("Button$Now"), tr("Button$Schedule"), tr("Button$Switch"));
     helpKeys = NewHelpKeys;
     }
 }
@@ -1235,8 +1235,8 @@ void cMenuSchedule::SetHelpKeys(void)
        NewHelpKeys = 1;
     }
  if (NewHelpKeys != helpKeys) {
-     const char *Red[] = { NULL, tr("Record"), tr("Timer") };
-     SetHelp(Red[NewHelpKeys], tr("Now"), tr("Next"));
+     const char *Red[] = { NULL, tr("Button$Record"), tr("Timer") };
+     SetHelp(Red[NewHelpKeys], tr("Button$Now"), tr("Button$Next"));
     helpKeys = NewHelpKeys;
     }
 }
@@ -1328,7 +1328,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
           PrepareSchedule(channel);
           if (channel->Number() != cDevice::CurrentChannel()) {
              otherChannel = channel->Number();
-              SetHelp(Count() ? tr("Record") : NULL, tr("Now"), tr("Next"), tr("Switch"));
+              SetHelp(Count() ? tr("Button$Record") : NULL, tr("Button$Now"), tr("Button$Next"), tr("Button$Switch"));
              }
           Display();
           }
@@ -1589,7 +1589,7 @@ cMenuRecording::cMenuRecording(const cRecording *Recording)
 {
  recording = Recording;
  if (recording)
-     SetHelp(tr("Play"), tr("Rewind"));
+     SetHelp(tr("Button$Play"), tr("Button$Rewind"));
 }

 void cMenuRecording::Display(void)
@@ -1714,9 +1714,9 @@ void cMenuRecordings::SetHelpKeys(void)
  if (NewHelpKeys != helpKeys) {
     switch (NewHelpKeys) {
       case 0: SetHelp(NULL); break;
-       case 1: SetHelp(tr("Open")); break;
+       case 1: SetHelp(tr("Button$Open")); break;
       case 2:
-       case 3: SetHelp(RecordingCommands.Count() ? tr("Commands") : tr("Play"), tr("Rewind"), tr("Delete"), NewHelpKeys == 3 ? tr("Info") : NULL);
+       case 3: SetHelp(RecordingCommands.Count() ? tr("Commands") : tr("Button$Play"), tr("Button$Rewind"), tr("Button$Delete"), NewHelpKeys == 3 ? tr("Info") : NULL);
       }
     helpKeys = NewHelpKeys;
     }
@@ -2072,7 +2072,7 @@ cMenuSetupEPG::cMenuSetupEPG(void)
      ;
  originalNumLanguages = numLanguages;
  SetSection(tr("EPG"));
-  SetHelp(tr("Scan"));
+  SetHelp(tr("Button$Scan"));
  Setup();
 }

@@ -2325,7 +2325,7 @@ cMenuSetupCICAM::cMenuSetupCICAM(void)
            }
         }
      }
-  SetHelp(tr("Menu"), tr("Reset"));
+  SetHelp(tr("Button$Menu"), tr("Button$Reset"));
 }

 eOSState cMenuSetupCICAM::Menu(void)
@@ -2704,7 +2704,7 @@ bool cMenuMain::Update(bool Force)
        stopReplayItem = NULL;
        }
     // Color buttons:
-     SetHelp(!replaying ? tr("Record") : NULL, tr("Audio"), replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
+     SetHelp(!replaying ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : NULL);
     result = true;
     }

@@ -3160,7 +3160,7 @@ cDisplayTracks::cDisplayTracks(void)
         }
      }
  timeout.Set(TRACKTIMEOUT);
-  displayTracks = Skins.Current()->DisplayTracks(tr("Audio"), numTracks, descriptions);
+  displayTracks = Skins.Current()->DisplayTracks(tr("Button$Audio"), numTracks, descriptions);
  Show();
 }

--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
 * See the main source file 'vdr.c' for copyright information and
 * how to reach the author.
 *
- * $Id: menuitems.c 1.28 2006/01/07 11:20:55 kls Exp $
+ * $Id: menuitems.c 1.29 2006/01/07 15:37:03 kls Exp $
 */

 #include "menuitems.h"
@@ -257,7 +257,7 @@ cMenuEditStrItem::~cMenuEditStrItem()
 void cMenuEditStrItem::SetHelpKeys(void)
 {
  if (InEditMode())
-     cSkinDisplay::Current()->SetButtons(tr("ABC/abc"), tr(insert ? "Overwrite" : "Insert"), tr("Delete"));
+     cSkinDisplay::Current()->SetButtons(tr("Button$ABC/abc"), tr(insert ? "Button$Overwrite" : "Button$Insert"), tr("Button$Delete"));
  else
     cSkinDisplay::Current()->SetButtons(NULL);
 }