From cebd81cd606f9e1c949d4b58e736fe20689513d8 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 31 Mar 2002 13:39:56 +0200 Subject: [PATCH] Added units to Setup parameters --- HISTORY | 1 + i18n.c | 196 ++++++++++++++++++++++++++++---------------------------- menu.c | 44 ++++++------- 3 files changed, 121 insertions(+), 120 deletions(-) diff --git a/HISTORY b/HISTORY index ef07a740..0c768738 100644 --- a/HISTORY +++ b/HISTORY @@ -1151,3 +1151,4 @@ Video Disk Recorder Revision History (thanks to Achim Lange for reporting this one). - Fixed a bug in the 'First day' timer parameter for timers that record over midnight. +- Added units to Setup parameters. diff --git a/i18n.c b/i18n.c index 0abbc2a3..e3a147fc 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.74 2002/03/29 16:20:39 kls Exp $ + * $Id: i18n.c 1.75 2002/03/31 13:37:44 kls Exp $ * * Slovenian translations provided by Miha Setina * Italian translations provided by Alberto Carraro @@ -995,15 +995,15 @@ const tPhrase Phrases[] = { "", // TODO "Korkeus", }, - { "Setup.OSD$Message time", - "Anzeigedauer für Nachrichten", + { "Setup.OSD$Message time (s)", + "Anzeigedauer für Nachrichten (s)", "", // TODO - "Tempo del messaggio", - "Weergave duur van berichten", - "Mostrar contador", - "Durée affichage écran", + "Tempo del messaggio (s)", + "Weergave duur van berichten (s)", + "Mostrar contador (s)", + "Durée affichage écran (s)", "", // TODO - "Ilmoitusten näkymisaika", + "Ilmoitusten näkymisaika (s)", }, { "Setup.OSD$Channel info position", "Kanal-Info Position", @@ -1055,15 +1055,15 @@ const tPhrase Phrases[] = { "", // TODO "Nauhoitushakemistot", }, - { "Setup.EPG$EPG scan timeout", - "Zeit bis EPG Scan", - "Cas do EPG pregleda", - "Timeout EPG", - "EPG-scan Timeout", - "Expirou o EPG", - "Temps maxi EPG", - "Ledig tid før EPG-søk", - "Ohjelmatied. odotusaika", + { "Setup.EPG$EPG scan timeout (h)", + "Zeit bis EPG Scan (h)", + "Cas do EPG pregleda (h)", + "Timeout EPG (h)", + "EPG-scan Timeout (h)", + "Expirou o EPG (h)", + "Temps maxi EPG (h)", + "Ledig tid før EPG-søk (h)", + "Ohjelmatied. odotusaika (h)", }, { "Setup.EPG$EPG bugfix level", "EPG Fehlerbereinigung", @@ -1115,35 +1115,35 @@ const tPhrase Phrases[] = { "TV Format", "Kuvamuoto", }, - { "Setup.LNB$SLOF", - "SLOF", - "SLOF", - "SLOF", - "SLOF", - "Limite de bandas LNB", - "Limite de bandes LNB", - "LO-grensefrekvens", - "SLOF", + { "Setup.LNB$SLOF (MHz)", + "SLOF (MHz)", + "SLOF (MHz)", + "SLOF (MHz)", + "SLOF (MHz)", + "Limite de bandas LNB (MHz)", + "Limite de bandes LNB (MHz)", + "LO-grensefrekvens (MHz)", + "SLOF (MHz)", }, - { "Setup.LNB$Low LNB frequency", - "Untere LNB-Frequenz", - "Spodnja LNB-frek.", - "Freq LO LNB", - "Laagste LNB frequentie", - "Frequência base LNB", - "Fréquence basse LNB", - "LO-frekvens i lavbåndet", - "LO LNB taajuus", + { "Setup.LNB$Low LNB frequency (MHz)", + "Untere LNB-Frequenz (MHz)", + "Spodnja LNB-frek. (MHz)", + "Freq LO LNB (MHz)", + "Laagste LNB frequentie (MHz)", + "Frequência base LNB (MHz)", + "Fréquence basse LNB (MHz)", + "LO-frekvens i lavbåndet (MHz)", + "LO LNB taajuus (MHz)", }, - { "Setup.LNB$High LNB frequency", - "Obere LNB-Frequenz", - "Zgornja LNB-frek.", - "Freq HI LNB", - "Hoogste LNB frequentie", - "Frequência alta LNB", - "Fréquence haute LNB", - "LO-frekvens i høybåndet", - "HI LNB taajuus", + { "Setup.LNB$High LNB frequency (MHz)", + "Obere LNB-Frequenz (MHz)", + "Zgornja LNB-frek. (MHz)", + "Freq HI LNB (MHz)", + "Hoogste LNB frequentie (MHz)", + "Frequência alta LNB (MHz)", + "Fréquence haute LNB (MHz)", + "LO-frekvens i høybåndet (MHz)", + "HI LNB taajuus (MHz)", }, { "Setup.LNB$Use DiSEqC", "DiSEqC benutzen", @@ -1165,25 +1165,25 @@ const tPhrase Phrases[] = { "CICAM DVB", "CICAM DVB", }, - { "Setup.Recording$Margin at start", - "Zeitpuffer bei Anfang", - "Premor pred zacetkom", - "Min margine inizio", - "Tijd marge (begin)", - "Margem inicial", - "Marge antérieure", - "Opptaks margin (start)", - "Aloitusmarginaali", + { "Setup.Recording$Margin at start (min)", + "Zeitpuffer bei Anfang (min)", + "Premor pred zacetkom (min)", + "Min margine inizio (min)", + "Tijd marge begin (min)", + "Margem inicial (min)", + "Marge antérieure (min)", + "Opptaks margin start (min)", + "Aloitusmarginaali (min)", }, - { "Setup.Recording$Margin at stop", - "Zeitpuffer bei Ende", - "Premor za koncem", - "Min margine fine", - "Tijd marge (eind)", - "Margem final", - "Marge postérieure", - "Opptaks margin (slutt)", - "Lopetusmarginaali", + { "Setup.Recording$Margin at stop (min)", + "Zeitpuffer bei Ende (min)", + "Premor za koncem (min)", + "Min margine fine (min)", + "Tijd marge eind (min)", + "Margem final (min)", + "Marge postérieure (min)", + "Opptaks margin slutt (min)", + "Lopetusmarginaali (min)", }, { "Setup.Recording$Primary limit", "Primär-Limit", @@ -1205,15 +1205,15 @@ const tPhrase Phrases[] = { "Normal prioritet (Timer)", "Oletusprioriteetti", }, - { "Setup.Recording$Default lifetime", - "Default Lebensdauer", + { "Setup.Recording$Default lifetime (d)", + "Default Lebensdauer (d)", "", // TODO - "Durata predefinita", - "Standaard levensduur", - "Validade por defeito", - "Durée de vie par défaut", - "Normal levetid (Timer)", - "Oletus voimassaoloaika", + "Durata predefinita (d)", + "Standaard levensduur (d)", + "Validade por defeito (d)", + "Durée de vie par défaut (d)", + "Normal levetid timer (d)", + "Oletus voimassaoloaika (d)", }, { "Setup.Recording$Use episode name", "Episodenname verwenden", @@ -1255,13 +1255,13 @@ const tPhrase Phrases[] = { "", // TODO "Dolby Digital nauhoitus", }, - { "Setup.Recording$Max. video file size", - "Max. Video Dateigröße", + { "Setup.Recording$Max. video file size (MB)", + "Max. Video Dateigröße (MB)", "", // TODO - "Dimensione massima file video", - "Maximale omvang video file", - "Tamanho máximo dos ficheiros", - "Taille maxi des fichiers", + "Dimensione massima file video (MB)", + "Maximale omvang video file (MB)", + "Tamanho máximo dos ficheiros (MB)", + "Taille maxi des fichiers (MB)", "", // TODO "Maksimi tiedoston koko", }, @@ -1295,35 +1295,35 @@ const tPhrase Phrases[] = { "", // TODO "Näytä toiston tila", }, - { "Setup.Miscellaneous$Min. event timeout", - "Mindest Event Pause", + { "Setup.Miscellaneous$Min. event timeout (min)", + "Mindest Event Pause (min)", "", // TODO - "Tempo minimo di pausa", // ??? i don't know... - "Minimale event time-out", - "Período mínimo de pausa", - "MinEventTimeout", // Too difficult to translate - read the manual! + "Tempo minimo di pausa (min)", // ??? i don't know... + "Minimale event time-out (min)", + "Período mínimo de pausa (min)", + "MinEventTimeout (min)", // Too difficult to translate - read the manual! "", // TODO - "Minimi tapahtuman odotus", + "Minimi tapahtuman odotus (min)", }, - { "Setup.Miscellaneous$Min. user inactivity", - "Mindest Benutzer-Inaktivität", + { "Setup.Miscellaneous$Min. user inactivity (min)", + "Mindest Benutzer-Inaktivität (min)", "", // TODO - "Tempo minimo di inattivita'", - "Minimum gebruikers inactiviteit", - "Período mínimo de inactividade", - "Durée minimale d'inactivité", + "Tempo minimo di inattivita' (min)", + "Minimum gebruikers inactiviteit (min)", + "Período mínimo de inactividade (min)", + "Durée minimale d'inactivité (min)", "", // TODO - "Minimi käyttäjän odotus", + "Minimi käyttäjän odotus (min)", }, - { "Setup.Miscellaneous$SVDRP timeout", - "SVDRP Timeout", + { "Setup.Miscellaneous$SVDRP timeout (min)", + "SVDRP Timeout (min)", "", // TODO - "Timeout SVDRP", - "SVDRP Timeout", - "Timeout SVDRP", - "Temps maxi SVDRP", - "Ubrukt SVDRP-levetid", - "SVDRP odotusaika", + "Timeout SVDRP (min)", + "SVDRP Timeout (min)", + "Timeout SVDRP (min)", + "Temps maxi SVDRP (min)", + "Ubrukt SVDRP-levetid (min)", + "SVDRP odotusaika (min)", }, // The days of the week: { "MTWTFSS", diff --git a/menu.c b/menu.c index 503beb47..8cb0e0dd 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.177 2002/03/31 10:46:24 kls Exp $ + * $Id: menu.c 1.178 2002/03/31 13:39:56 kls Exp $ */ #include "menu.h" @@ -1937,7 +1937,7 @@ public: }; cMenuSetupPage::cMenuSetupPage(void) -:cOsdMenu("", 30) +:cOsdMenu("", 33) { data = Setup; osdLanguage = Setup.OSDLanguage; @@ -1993,7 +1993,7 @@ void cMenuSetupOSD::Set(void) Add(new cMenuEditStraItem(tr("Setup.OSD$Language"), &data.OSDLanguage, NumLanguages, Languages())); Add(new cMenuEditIntItem( tr("Setup.OSD$Width"), &data.OSDwidth, MINOSDWIDTH, MAXOSDWIDTH)); Add(new cMenuEditIntItem( tr("Setup.OSD$Height"), &data.OSDheight, MINOSDHEIGHT, MAXOSDHEIGHT)); - Add(new cMenuEditIntItem( tr("Setup.OSD$Message time"), &data.OSDMessageTime, 1, 60)); + Add(new cMenuEditIntItem( tr("Setup.OSD$Message time (s)"), &data.OSDMessageTime, 1, 60)); Add(new cMenuEditBoolItem(tr("Setup.OSD$Channel info position"), &data.ChannelInfoPos, tr("bottom"), tr("top"))); Add(new cMenuEditBoolItem(tr("Setup.OSD$Info on channel switch"), &data.ShowInfoOnChSwitch)); Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll pages"), &data.MenuScrollPage)); @@ -2014,7 +2014,7 @@ void cMenuSetupEPG::Set(void) { Clear(); SetupTitle("EPG"); - Add(new cMenuEditIntItem( tr("Setup.EPG$EPG scan timeout"), &data.EPGScanTimeout)); + Add(new cMenuEditIntItem( tr("Setup.EPG$EPG scan timeout (h)"), &data.EPGScanTimeout)); Add(new cMenuEditIntItem( tr("Setup.EPG$EPG bugfix level"), &data.EPGBugfixLevel, 0, MAXEPGBUGFIXLEVEL)); Add(new cMenuEditBoolItem(tr("Setup.EPG$Set system time"), &data.SetSystemTime)); Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TimeTransponder)); @@ -2050,10 +2050,10 @@ void cMenuSetupLNB::Set(void) { Clear(); SetupTitle("LNB"); - Add(new cMenuEditIntItem( tr("Setup.LNB$SLOF"), &data.LnbSLOF)); - Add(new cMenuEditIntItem( tr("Setup.LNB$Low LNB frequency"), &data.LnbFrequLo)); - Add(new cMenuEditIntItem( tr("Setup.LNB$High LNB frequency"), &data.LnbFrequHi)); - Add(new cMenuEditBoolItem(tr("Setup.LNB$Use DiSEqC"), &data.DiSEqC)); + Add(new cMenuEditIntItem( tr("Setup.LNB$SLOF (MHz)"), &data.LnbSLOF)); + Add(new cMenuEditIntItem( tr("Setup.LNB$Low LNB frequency (MHz)"), &data.LnbFrequLo)); + Add(new cMenuEditIntItem( tr("Setup.LNB$High LNB frequency (MHz)"), &data.LnbFrequHi)); + Add(new cMenuEditBoolItem(tr("Setup.LNB$Use DiSEqC"), &data.DiSEqC)); } // --- cMenuSetupCICAM ------------------------------------------------------- @@ -2091,17 +2091,17 @@ void cMenuSetupRecord::Set(void) { Clear(); SetupTitle("Recording"); - Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at start"), &data.MarginStart)); - Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at stop"), &data.MarginStop)); - Add(new cMenuEditIntItem( tr("Setup.Recording$Primary limit"), &data.PrimaryLimit, 0, MAXPRIORITY)); - Add(new cMenuEditIntItem( tr("Setup.Recording$Default priority"), &data.DefaultPriority, 0, MAXPRIORITY)); - Add(new cMenuEditIntItem( tr("Setup.Recording$Default lifetime"), &data.DefaultLifetime, 0, MAXLIFETIME)); - Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"), &data.UseSubtitle)); - Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"), &data.MarkInstantRecord)); - Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"), data.NameInstantRecord, sizeof(data.NameInstantRecord), FileNameChars)); - Add(new cMenuEditBoolItem(tr("Setup.Recording$Record Dolby Digital"), &data.RecordDolbyDigital)); - Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE)); - Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"), &data.SplitEditedFiles)); + Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at start (min)"), &data.MarginStart)); + Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at stop (min)"), &data.MarginStop)); + Add(new cMenuEditIntItem( tr("Setup.Recording$Primary limit"), &data.PrimaryLimit, 0, MAXPRIORITY)); + Add(new cMenuEditIntItem( tr("Setup.Recording$Default priority"), &data.DefaultPriority, 0, MAXPRIORITY)); + Add(new cMenuEditIntItem( tr("Setup.Recording$Default lifetime (d)"), &data.DefaultLifetime, 0, MAXLIFETIME)); + Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"), &data.UseSubtitle)); + Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"), &data.MarkInstantRecord)); + Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"), data.NameInstantRecord, sizeof(data.NameInstantRecord), FileNameChars)); + Add(new cMenuEditBoolItem(tr("Setup.Recording$Record Dolby Digital"), &data.RecordDolbyDigital)); + Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZE)); + Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"), &data.SplitEditedFiles)); } // --- cMenuSetupReplay ------------------------------------------------------ @@ -2134,9 +2134,9 @@ void cMenuSetupMisc::Set(void) { Clear(); SetupTitle("Miscellaneous"); - Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout"), &data.MinEventTimeout)); - Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity"), &data.MinUserInactivity)); - Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout"), &data.SVDRPTimeout)); + Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. event timeout (min)"), &data.MinEventTimeout)); + Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Min. user inactivity (min)"), &data.MinUserInactivity)); + Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$SVDRP timeout (min)"), &data.SVDRPTimeout)); } // --- cMenuSetup ------------------------------------------------------------