Removed an obsolete "Summary" text from i18n.c and preceded all key definition texts with "Key$" to avoid duplicates

This commit is contained in:
Klaus Schmidinger
2006-01-04 15:51:03 +01:00
parent a4ed08b37a
commit d5d97c3d18
4 changed files with 32 additions and 48 deletions

View File

@@ -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<47>nlund <Mattias@Gronlund.net>
for pointing out a missing cleanup at program exit in case there is a problem

View File

@@ -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).

71
i18n.c
View File

@@ -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<EFBFBD>ndmus",
"Udsendelse",
},
{ "Summary",
"Inhalt",
"Vsebina",
"Sommario",
"Inhoud",
"Resumo",
"R<EFBFBD>sum<EFBFBD>",
"Sammendrag",
"Yhteenveto",
"Zawartosc",
"Res<EFBFBD>men",
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"Sammanfattning",
"Detalii",
"Tartalom",
"Sinopsi",
"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
"Sadr<EFBFBD>aj",
"Kokkuv<EFBFBD>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[] = {
"<EFBFBD>les",
"Op",
},
{ "Down",
{ "Key$Down",
"Ab",
"Dol",
"Gi<EFBFBD>",
@@ -4463,7 +4442,7 @@ const tI18nPhrase Phrases[] = {
"Alla",
"Ned",
},
{ "Menu",
{ "Key$Menu",
"Men<EFBFBD>",
"Meni",
"Men<EFBFBD>",
@@ -4484,7 +4463,7 @@ const tI18nPhrase Phrases[] = {
"Men<EFBFBD><EFBFBD>",
"Menu",
},
{ "Ok",
{ "Key$Ok",
"Ok",
"Ok",
"Ok",
@@ -4505,7 +4484,7 @@ const tI18nPhrase Phrases[] = {
"Ok",
"Ok",
},
{ "Back",
{ "Key$Back",
"Zur<EFBFBD>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<EFBFBD>jre",
},
{ "Red",
{ "Key$Red",
"Rot",
"Rde<EFBFBD>a",
"Rosso",
@@ -4589,7 +4568,7 @@ const tI18nPhrase Phrases[] = {
"Punane",
"R<EFBFBD>d",
},
{ "Green",
{ "Key$Green",
"Gr<EFBFBD>n",
"Zelena",
"Verde",
@@ -4610,7 +4589,7 @@ const tI18nPhrase Phrases[] = {
"Roheline",
"Gr<EFBFBD>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<EFBFBD>",
},
{ "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<EFBFBD>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<EFBFBD>rke+",
"Glasnost+",
"Volume +",
@@ -4862,7 +4841,7 @@ const tI18nPhrase Phrases[] = {
"Helitugevus+",
"Lydstyrke+",
},
{ "Volume-",
{ "Key$Volume-",
"Lautst<EFBFBD>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<EFBFBD><EFBFBD>letu",
"Sluk lyd",
},
{ "Audio",
{ "Key$Audio",
"Audio",
"Zvok",
"",// TODO

View File

@@ -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();