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

This commit is contained in:
Klaus Schmidinger 2006-01-07 15:54:10 +01:00
parent e8ee9a1c4b
commit f7bf9b4090
4 changed files with 103 additions and 101 deletions

View File

@ -4090,6 +4090,8 @@ Video Disk Recorder Revision History
remember why it wasn't active... remember why it wasn't active...
- Removed an obsolete "Summary" text from i18n.c and preceded all key definition - Removed an obsolete "Summary" text from i18n.c and preceded all key definition
texts with "Key$" to avoid duplicates (reported by Lucian Muresan). 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). - Added missing #include "thread.h" to dvbspu.c (reported by Gavin Hamill).
- Disabled the use of "fadvise" in cUnbufferedFile because there have been - Disabled the use of "fadvise" in cUnbufferedFile because there have been
several reports that it causes more problems than it solves (suggested by several reports that it causes more problems than it solves (suggested by

166
i18n.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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: * Translations provided by:
* *
@ -483,8 +483,29 @@ const tI18nPhrase Phrases[] = {
"Järgmisena eetris", "Järgmisena eetris",
"Hvad vises som det næste?", "Hvad vises som det næste?",
}, },
{ "Summary",
"Inhalt",
"Vsebina",
"Sommario",
"Inhoud",
"Resumo",
"Résumé",
"Sammendrag",
"Yhteenveto",
"Zawartosc",
"Resumen",
"Ðåñéå÷üìåíï",
"Sammanfattning",
"Cuprins",
"Tartalom",
"Resum",
"¾ßØáÐÝØÕ",
"Sadr¾aj",
"Kokkuvõte",
"Omtale",
},
// Button texts (should not be more than 10 characters!): // Button texts (should not be more than 10 characters!):
{ "Edit", { "Button$Edit",
"Editieren", "Editieren",
"Uredi", "Uredi",
"Modifica", "Modifica",
@ -505,7 +526,7 @@ const tI18nPhrase Phrases[] = {
"Muuda", "Muuda",
"Rediger", "Rediger",
}, },
{ "New", { "Button$New",
"Neu", "Neu",
"Novo", "Novo",
"Nuovo", "Nuovo",
@ -526,7 +547,7 @@ const tI18nPhrase Phrases[] = {
"Uus", "Uus",
"Ny", "Ny",
}, },
{ "Delete", { "Button$Delete",
"Löschen", "Löschen",
"Izbri¹i", "Izbri¹i",
"Cancella", "Cancella",
@ -547,7 +568,7 @@ const tI18nPhrase Phrases[] = {
"Kustuta", "Kustuta",
"Slet", "Slet",
}, },
{ "Mark", { "Button$Mark",
"Markieren", "Markieren",
"Oznaèi", "Oznaèi",
"Marca", "Marca",
@ -568,7 +589,7 @@ const tI18nPhrase Phrases[] = {
"Siirda", "Siirda",
"Markér", "Markér",
}, },
{ "On/Off", { "Button$On/Off",
"Ein/Aus", "Ein/Aus",
"Vklop/Izklop", "Vklop/Izklop",
"On/Off", "On/Off",
@ -589,7 +610,7 @@ const tI18nPhrase Phrases[] = {
"Sees/Väljas", "Sees/Väljas",
"Til/Fra", "Til/Fra",
}, },
{ "Record", { "Button$Record",
"Aufnehmen", "Aufnehmen",
"Posnemi", "Posnemi",
"Registra", "Registra",
@ -610,7 +631,7 @@ const tI18nPhrase Phrases[] = {
"Salvesta", "Salvesta",
"Optag", "Optag",
}, },
{ "Play", { "Button$Play",
"Wiedergabe", "Wiedergabe",
"Predvajaj", "Predvajaj",
"Riproduci", "Riproduci",
@ -631,7 +652,28 @@ const tI18nPhrase Phrases[] = {
"Start", "Start",
"Afspil", "Afspil",
}, },
{ "Rewind", { "Button$Pause",
"Pause",
"Pavza",
"Pausa",
"Pauze",
"",// TODO
"Pause",
"",// TODO
"Tauko",
"Przerwa",
"Pausa",
"Ðáýóç",
"Pausa",
"Pauzã",
"Szünet",
"Pausa",
"¿Ðã×Ð",
"Pauza",
"Paus",
"Pause",
},
{ "Button$Rewind",
"Anfang", "Anfang",
"Na zaèetek", "Na zaèetek",
"Da inizio", "Da inizio",
@ -673,7 +715,7 @@ const tI18nPhrase Phrases[] = {
"Stopp", "Stopp",
"Stop", "Stop",
}, },
{ "Resume", { "Button$Resume",
"Weiter", "Weiter",
"Nadaljuj", "Nadaljuj",
"Riprendi", "Riprendi",
@ -694,28 +736,7 @@ const tI18nPhrase Phrases[] = {
"Jätka", "Jätka",
"Fortsæt", "Fortsæt",
}, },
{ "Summary", { "Button$Open",
"Inhalt",
"Vsebina",
"Sommario",
"Inhoud",
"Resumo",
"Résumé",
"Sammendrag",
"Yhteenveto",
"Zawartosc",
"Resumen",
"Ðåñéå÷üìåíï",
"Sammanfattning",
"Cuprins",
"Tartalom",
"Resum",
"¾ßØáÐÝØÕ",
"Sadr¾aj",
"Kokkuvõte",
"Omtale",
},
{ "Open",
"Öffnen", "Öffnen",
"Odpri", "Odpri",
"Apri", "Apri",
@ -736,7 +757,7 @@ const tI18nPhrase Phrases[] = {
"Ava", "Ava",
"Åbn", "Åbn",
}, },
{ "Switch", { "Button$Switch",
"Umschalten", "Umschalten",
"Preklopi", "Preklopi",
"Cambia", "Cambia",
@ -757,7 +778,7 @@ const tI18nPhrase Phrases[] = {
"Vali", "Vali",
"Skift", "Skift",
}, },
{ "Now", { "Button$Now",
"Jetzt", "Jetzt",
"Sedaj", "Sedaj",
"Adesso", "Adesso",
@ -778,7 +799,7 @@ const tI18nPhrase Phrases[] = {
"Nüüd", "Nüüd",
"Nu", "Nu",
}, },
{ "Next", { "Button$Next",
"Nächste", "Nächste",
"Sledi", "Sledi",
"Prossimo", "Prossimo",
@ -820,49 +841,7 @@ const tI18nPhrase Phrases[] = {
"Kava", "Kava",
"Program", "Program",
}, },
{ "Language", { "Button$ABC/abc",
"Sprache",
"Jezik",
"Linguaggio",
"Taal",
"Linguagem",
"Langue",
"Språk",
"Kieli",
"Jezyk",
"Idioma",
"Ãëþóóá",
"Språk",
"Limba",
"Nyelv",
"Idioma",
"Ï×ëÚ",
"Jezik",
"Keel",
"Sprog",
},
{ "Eject",
"Auswerfen",
"Izvr¾i",
"Eject",
"Eject",
"Ejectar",
"Ejection",
"Eject",
"Avaa",
"Wyrzucenie",
"Expulsar",
"ÅîáãùãÞ",
"Mata ut",
"Ejecteazã",
"Kidobni",
"Expulsar",
"¸×ÒÛÕçì",
"Izbaci",
"Ava",
"Skub ud",
},
{ "ABC/abc",
"ABC/abc", "ABC/abc",
"ABC/abc", "ABC/abc",
"ABC/abc", "ABC/abc",
@ -883,7 +862,7 @@ const tI18nPhrase Phrases[] = {
"ABC/abc", "ABC/abc",
"ABC/abc", "ABC/abc",
}, },
{ "Insert", { "Button$Insert",
"Einfügen", "Einfügen",
"Vstavi", "Vstavi",
"Inserisci", "Inserisci",
@ -904,7 +883,7 @@ const tI18nPhrase Phrases[] = {
"Lisa (INS)", "Lisa (INS)",
"Indsæt", "Indsæt",
}, },
{ "Overwrite", { "Button$Overwrite",
"Überschreiben", "Überschreiben",
"Prepi¹i", "Prepi¹i",
"Sovrascrivi", "Sovrascrivi",
@ -925,7 +904,7 @@ const tI18nPhrase Phrases[] = {
"Asenda (OVR)", "Asenda (OVR)",
"Overskriv", "Overskriv",
}, },
{ "Menu", { "Button$Menu",
"Menü", "Menü",
"Meni", "Meni",
"Menù", "Menù",
@ -946,7 +925,7 @@ const tI18nPhrase Phrases[] = {
"Menüü", "Menüü",
"Menu", "Menu",
}, },
{ "Reset", { "Button$Reset",
"Reset", "Reset",
"Reset", "Reset",
"Reset", "Reset",
@ -967,7 +946,7 @@ const tI18nPhrase Phrases[] = {
"Nullimine", "Nullimine",
"Nulstille", "Nulstille",
}, },
{ "Scan", { "Button$Scan",
"Scan", "Scan",
"I¹èi", "I¹èi",
"Scansione", "Scansione",
@ -988,6 +967,27 @@ const tI18nPhrase Phrases[] = {
"Uuenda", "Uuenda",
"Skan", "Skan",
}, },
{ "Button$Audio",
"Audio",
"Zvok",
"",// TODO
"Audio",
"",// TODO
"Audio",
"",// TODO
"Ääni",
"",// TODO
"",// TODO
"¹÷ïò",
"Ljud",
"Sunet",
"",// TODO
"",// TODO
"Ï×ëÚ",
"",// TODO
"Audio",
"Audio",
},
// Confirmations: // Confirmations:
{ "Delete channel?", { "Delete channel?",
"Kanal löschen?", "Kanal löschen?",

32
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "menu.h"
@ -421,7 +421,7 @@ void cMenuChannels::Setup(void)
if (cMenuChannelItem::SortMode() != cMenuChannelItem::csmNumber) if (cMenuChannelItem::SortMode() != cMenuChannelItem::csmNumber)
Sort(); Sort();
SetCurrent(currentItem); 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(); Display();
} }
@ -788,7 +788,7 @@ cMenuTimers::cMenuTimers(void)
Add(new cMenuTimerItem(timer)); Add(new cMenuTimerItem(timer));
if (Setup.SortTimers) if (Setup.SortTimers)
Sort(); 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(); Timers.IncBeingEdited();
} }
@ -916,7 +916,7 @@ cMenuEvent::cMenuEvent(const cEvent *Event, bool CanSwitch)
SetTitle(channel->Name()); SetTitle(channel->Name());
int TimerMatch = tmNone; int TimerMatch = tmNone;
Timers.GetMatch(event, &TimerMatch); 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; NewHelpKeys = 1;
} }
if (NewHelpKeys != helpKeys) { if (NewHelpKeys != helpKeys) {
const char *Red[] = { NULL, tr("Record"), tr("Timer") }; const char *Red[] = { NULL, tr("Button$Record"), tr("Timer") };
SetHelp(Red[NewHelpKeys], now ? tr("Next") : tr("Now"), tr("Button$Schedule"), tr("Switch")); SetHelp(Red[NewHelpKeys], now ? tr("Button$Next") : tr("Button$Now"), tr("Button$Schedule"), tr("Button$Switch"));
helpKeys = NewHelpKeys; helpKeys = NewHelpKeys;
} }
} }
@ -1235,8 +1235,8 @@ void cMenuSchedule::SetHelpKeys(void)
NewHelpKeys = 1; NewHelpKeys = 1;
} }
if (NewHelpKeys != helpKeys) { if (NewHelpKeys != helpKeys) {
const char *Red[] = { NULL, tr("Record"), tr("Timer") }; const char *Red[] = { NULL, tr("Button$Record"), tr("Timer") };
SetHelp(Red[NewHelpKeys], tr("Now"), tr("Next")); SetHelp(Red[NewHelpKeys], tr("Button$Now"), tr("Button$Next"));
helpKeys = NewHelpKeys; helpKeys = NewHelpKeys;
} }
} }
@ -1328,7 +1328,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key)
PrepareSchedule(channel); PrepareSchedule(channel);
if (channel->Number() != cDevice::CurrentChannel()) { if (channel->Number() != cDevice::CurrentChannel()) {
otherChannel = channel->Number(); 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(); Display();
} }
@ -1589,7 +1589,7 @@ cMenuRecording::cMenuRecording(const cRecording *Recording)
{ {
recording = Recording; recording = Recording;
if (recording) if (recording)
SetHelp(tr("Play"), tr("Rewind")); SetHelp(tr("Button$Play"), tr("Button$Rewind"));
} }
void cMenuRecording::Display(void) void cMenuRecording::Display(void)
@ -1714,9 +1714,9 @@ void cMenuRecordings::SetHelpKeys(void)
if (NewHelpKeys != helpKeys) { if (NewHelpKeys != helpKeys) {
switch (NewHelpKeys) { switch (NewHelpKeys) {
case 0: SetHelp(NULL); break; case 0: SetHelp(NULL); break;
case 1: SetHelp(tr("Open")); break; case 1: SetHelp(tr("Button$Open")); break;
case 2: 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; helpKeys = NewHelpKeys;
} }
@ -2072,7 +2072,7 @@ cMenuSetupEPG::cMenuSetupEPG(void)
; ;
originalNumLanguages = numLanguages; originalNumLanguages = numLanguages;
SetSection(tr("EPG")); SetSection(tr("EPG"));
SetHelp(tr("Scan")); SetHelp(tr("Button$Scan"));
Setup(); Setup();
} }
@ -2325,7 +2325,7 @@ cMenuSetupCICAM::cMenuSetupCICAM(void)
} }
} }
} }
SetHelp(tr("Menu"), tr("Reset")); SetHelp(tr("Button$Menu"), tr("Button$Reset"));
} }
eOSState cMenuSetupCICAM::Menu(void) eOSState cMenuSetupCICAM::Menu(void)
@ -2704,7 +2704,7 @@ bool cMenuMain::Update(bool Force)
stopReplayItem = NULL; stopReplayItem = NULL;
} }
// Color buttons: // 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; result = true;
} }
@ -3160,7 +3160,7 @@ cDisplayTracks::cDisplayTracks(void)
} }
} }
timeout.Set(TRACKTIMEOUT); timeout.Set(TRACKTIMEOUT);
displayTracks = Skins.Current()->DisplayTracks(tr("Audio"), numTracks, descriptions); displayTracks = Skins.Current()->DisplayTracks(tr("Button$Audio"), numTracks, descriptions);
Show(); Show();
} }

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "menuitems.h"
@ -257,7 +257,7 @@ cMenuEditStrItem::~cMenuEditStrItem()
void cMenuEditStrItem::SetHelpKeys(void) void cMenuEditStrItem::SetHelpKeys(void)
{ {
if (InEditMode()) 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 else
cSkinDisplay::Current()->SetButtons(NULL); cSkinDisplay::Current()->SetButtons(NULL);
} }