summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY2
-rw-r--r--i18n.c71
-rw-r--r--interface.c6
4 files changed, 32 insertions, 48 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a2da43bd..c5a6d11b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1331,6 +1331,7 @@ Lucian Muresan <lucianm@users.sourceforge.net>
for updating the Romanian language texts and the iso8859-2 fonts
for making VDR actually use the iso8859-15 fonts
for suggesting to make the function ExchangeChars()
+ for reporting duplicate texts in i18n.c
Mattias Grönlund <Mattias@Gronlund.net>
for pointing out a missing cleanup at program exit in case there is a problem
diff --git a/HISTORY b/HISTORY
index 928213bf..47e0fd89 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4088,3 +4088,5 @@ Video Disk Recorder Revision History
- A message is now given when an instant recording is started (suggested by
Helmut Auer). Actually the code was already there, just commented out - don't
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).
diff --git a/i18n.c b/i18n.c
index db1d7e0c..b65230ab 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.224 2006/01/04 15:14:10 kls Exp $
+ * $Id: i18n.c 1.225 2006/01/04 15:50:19 kls Exp $
*
* Translations provided by:
*
@@ -399,27 +399,6 @@ const tI18nPhrase Phrases[] = {
"Sündmus",
"Udsendelse",
},
- { "Summary",
- "Inhalt",
- "Vsebina",
- "Sommario",
- "Inhoud",
- "Resumo",
- "Résumé",
- "Sammendrag",
- "Yhteenveto",
- "Zawartosc",
- "Resúmen",
- "Ðåñßëçøç",
- "Sammanfattning",
- "Detalii",
- "Tartalom",
- "Sinopsi",
- "¾ßØáÐÝØÕ",
- "Sadr¾aj",
- "Kokkuvõte",
- "Omtale",
- },
{ "Info",
"Info",
"Info",
@@ -4421,7 +4400,7 @@ const tI18nPhrase Phrases[] = {
"Tryk 'Op' for at gemme, 'Ned' for at annullere",
},
// Key names:
- { "Up",
+ { "Key$Up",
"Auf",
"Gor",
"Su",
@@ -4442,7 +4421,7 @@ const tI18nPhrase Phrases[] = {
"Üles",
"Op",
},
- { "Down",
+ { "Key$Down",
"Ab",
"Dol",
"Giù",
@@ -4463,7 +4442,7 @@ const tI18nPhrase Phrases[] = {
"Alla",
"Ned",
},
- { "Menu",
+ { "Key$Menu",
"Menü",
"Meni",
"Menù",
@@ -4484,7 +4463,7 @@ const tI18nPhrase Phrases[] = {
"Menüü",
"Menu",
},
- { "Ok",
+ { "Key$Ok",
"Ok",
"Ok",
"Ok",
@@ -4505,7 +4484,7 @@ const tI18nPhrase Phrases[] = {
"Ok",
"Ok",
},
- { "Back",
+ { "Key$Back",
"Zurück",
"Nazaj",
"Indietro",
@@ -4526,7 +4505,7 @@ const tI18nPhrase Phrases[] = {
"Tagasi",
"Tilbage",
},
- { "Left",
+ { "Key$Left",
"Links",
"Levo",
"Sinistra",
@@ -4547,7 +4526,7 @@ const tI18nPhrase Phrases[] = {
"Vasakule",
"Venstre",
},
- { "Right",
+ { "Key$Right",
"Rechts",
"Desno",
"Destra",
@@ -4568,7 +4547,7 @@ const tI18nPhrase Phrases[] = {
"Paremale",
"Højre",
},
- { "Red",
+ { "Key$Red",
"Rot",
"Rdeèa",
"Rosso",
@@ -4589,7 +4568,7 @@ const tI18nPhrase Phrases[] = {
"Punane",
"Rød",
},
- { "Green",
+ { "Key$Green",
"Grün",
"Zelena",
"Verde",
@@ -4610,7 +4589,7 @@ const tI18nPhrase Phrases[] = {
"Roheline",
"Grøn",
},
- { "Yellow",
+ { "Key$Yellow",
"Gelb",
"Rumena",
"Giallo",
@@ -4631,7 +4610,7 @@ const tI18nPhrase Phrases[] = {
"Kollane",
"Gul",
},
- { "Blue",
+ { "Key$Blue",
"Blau",
"Modra",
"Blu",
@@ -4652,7 +4631,7 @@ const tI18nPhrase Phrases[] = {
"Sinine",
"Blå",
},
- { "Play",
+ { "Key$Play",
"Wiedergabe",
"Predvajaj",
"Riproduci",
@@ -4673,7 +4652,7 @@ const tI18nPhrase Phrases[] = {
"Start",
"Afspil",
},
- { "Pause",
+ { "Key$Pause",
"Pause",
"Pavza",
"Pausa",
@@ -4694,7 +4673,7 @@ const tI18nPhrase Phrases[] = {
"Paus",
"Pause",
},
- { "Stop",
+ { "Key$Stop",
"Stop",
"Ustavi",
"Stop",
@@ -4715,7 +4694,7 @@ const tI18nPhrase Phrases[] = {
"Stopp",
"Stop",
},
- { "Record",
+ { "Key$Record",
"Aufnehmen",
"Snemaj",
"Registra",
@@ -4736,7 +4715,7 @@ const tI18nPhrase Phrases[] = {
"Salvestamine",
"Optag",
},
- { "FastFwd",
+ { "Key$FastFwd",
"Vorlauf",
"Hitro naprej",
"Avanti Veloce",
@@ -4757,7 +4736,7 @@ const tI18nPhrase Phrases[] = {
"Edasikerimine",
"Spol fremad",
},
- { "FastRew",
+ { "Key$FastRew",
"Rücklauf",
"Hitro nazaj",
"Indietro Veloce",
@@ -4778,7 +4757,7 @@ const tI18nPhrase Phrases[] = {
"Tagasikerimine",
"Spol tilbage",
},
- { "Power",
+ { "Key$Power",
"Ausschalten",
"Izklop",
"Power",
@@ -4799,7 +4778,7 @@ const tI18nPhrase Phrases[] = {
"Toide",
"Sluk",
},
- { "Channel+",
+ { "Key$Channel+",
"Kanal+",
"Program+",
"Canale +",
@@ -4820,7 +4799,7 @@ const tI18nPhrase Phrases[] = {
"Kanal+",
"Kanal+",
},
- { "Channel-",
+ { "Key$Channel-",
"Kanal-",
"Program-",
"Canale -",
@@ -4841,7 +4820,7 @@ const tI18nPhrase Phrases[] = {
"Kanal-",
"Kanal-",
},
- { "Volume+",
+ { "Key$Volume+",
"Lautstärke+",
"Glasnost+",
"Volume +",
@@ -4862,7 +4841,7 @@ const tI18nPhrase Phrases[] = {
"Helitugevus+",
"Lydstyrke+",
},
- { "Volume-",
+ { "Key$Volume-",
"Lautstärke-",
"Glasnost-",
"Volume -",
@@ -4883,7 +4862,7 @@ const tI18nPhrase Phrases[] = {
"Helitugevus-",
"Lydstyrke-",
},
- { "Mute",
+ { "Key$Mute",
"Stumm",
"Izklop zvoka",
"Mute",
@@ -4904,7 +4883,7 @@ const tI18nPhrase Phrases[] = {
"Hääletu",
"Sluk lyd",
},
- { "Audio",
+ { "Key$Audio",
"Audio",
"Zvok",
"",// TODO
diff --git a/interface.c b/interface.c
index 56084784..b2e842da 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: interface.c 1.70 2005/11/27 15:31:06 kls Exp $
+ * $Id: interface.c 1.71 2006/01/04 15:44:19 kls Exp $
*/
#include "interface.h"
@@ -84,7 +84,9 @@ bool cInterface::QueryKeys(cRemote *Remote, cSkinDisplayMenu *DisplayMenu)
eKeys NewKey = kUp;
while (NewKey != kNone) {
char *Prompt;
- asprintf(&Prompt, tr("Press key for '%s'"), tr(cKey::ToString(NewKey)));
+ char buf[32];
+ snprintf(buf, sizeof(buf), "Key$%s", cKey::ToString(NewKey));
+ asprintf(&Prompt, tr("Press key for '%s'"), tr(buf));
DisplayMenu->SetItem(Prompt, 4, false, false);
free(Prompt);
cRemote::Clear();