summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2007-08-12 09:54:23 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2007-08-12 09:54:23 +0200
commit84faea7f0d74d596189d6f7073fa2a976a892b34 (patch)
tree38edcb4ca77e6825a9ead701282b17fbda7372b8
parent26e2e4dee23d000f260c779947824988a4bff52c (diff)
downloadvdr-84faea7f0d74d596189d6f7073fa2a976a892b34.tar.gz
vdr-84faea7f0d74d596189d6f7073fa2a976a892b34.tar.bz2
Put the three letter language codes and aliases into i18n.c
-rw-r--r--HISTORY5
-rw-r--r--i18n.c98
-rw-r--r--po/ca_ES.po8
-rw-r--r--po/cs_CZ.po8
-rw-r--r--po/da_DK.po6
-rw-r--r--po/de_DE.po8
-rw-r--r--po/el_GR.po8
-rw-r--r--po/es_ES.po8
-rw-r--r--po/et_EE.po6
-rw-r--r--po/fi_FI.po8
-rw-r--r--po/fr_FR.po8
-rw-r--r--po/hr_HR.po6
-rw-r--r--po/hu_HU.po6
-rw-r--r--po/it_IT.po6
-rw-r--r--po/nl_NL.po8
-rw-r--r--po/nn_NO.po6
-rw-r--r--po/pl_PL.po6
-rw-r--r--po/pt_PT.po6
-rw-r--r--po/ro_RO.po8
-rw-r--r--po/ru_RU.po6
-rw-r--r--po/sl_SI.po8
-rw-r--r--po/sv_SE.po8
-rw-r--r--po/tr_TR.po6
23 files changed, 157 insertions, 94 deletions
diff --git a/HISTORY b/HISTORY
index ab14ac1e..fa600981 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5299,7 +5299,7 @@ Video Disk Recorder Revision History
- Added a missing 'P' to vdr.c's SHUTDOWNCANCELROMPT macro (reported by Marco
Schlüßler).
-2007-08-11: Version 1.5.7
+2007-08-12: Version 1.5.7
- All logging now goes to LOG_ERR, because some systems split error, info and
debug messages into separate files, which repeatedly caused extra efforts to
@@ -5321,6 +5321,9 @@ Video Disk Recorder Revision History
to make strings in arrays translatable.
See README.i18n for information on how to create new or maintain existing
translations.
+- The three letter language codes and their aliases are stored in i18n.c, and
+ each translation file only contains one of them to link that language name
+ to the code.
- The 'newplugin' script has been extended to generate the Makefile section
for i18n support.
- The parameter OSDLanguage in 'setup.conf' is now a string and holds the locale
diff --git a/i18n.c b/i18n.c
index 17b954bb..2d096048 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.306 2007/08/11 14:27:02 kls Exp $
+ * $Id: i18n.c 1.307 2007/08/12 09:51:15 kls Exp $
*
*
*/
@@ -27,8 +27,39 @@
// TRANSLATORS: The name of the language, as written natively
const char *LanguageName = trNOOP("LanguageName$English");
-// TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
-const char *LanguageCode = trNOOP("LanguageCode$eng,dos");
+// TRANSLATORS: The 3-letter code of the language
+const char *LanguageCode = trNOOP("LanguageCode$eng");
+
+// List of known language codes with aliases.
+// Actually we could list all codes from http://www.loc.gov/standards/iso639-2
+// here, but that would be several hundreds - and for most of them it's unlikely
+// they're ever going to be used...
+
+const char *LanguageCodeList[] = {
+ "eng,dos",
+ "deu,ger",
+ "slv,slo",
+ "ita",
+ "dut,nla,nld",
+ "por",
+ "fra,fre",
+ "nor",
+ "fin,smi",
+ "pol",
+ "esl,spa",
+ "ell,gre",
+ "sve,swe",
+ "rom,rum",
+ "hun",
+ "cat,cln",
+ "rus",
+ "hrv",
+ "est",
+ "dan",
+ "cze,ces",
+ "tur",
+ NULL
+ };
static char *I18nLocaleDir = LOCDIR;
@@ -38,6 +69,21 @@ static cStringList LanguageCodes;
static int CurrentLanguage = 0;
+static bool ContainsCode(const char *Codes, const char *Code)
+{
+ while (*Codes) {
+ int l = 0;
+ for ( ; l < 3 && Code[l]; l++) {
+ if (Codes[l] != tolower(Code[l]))
+ break;
+ }
+ if (l == 3)
+ return true;
+ Codes++;
+ }
+ return false;
+}
+
static const char *SkipContext(const char *s)
{
const char *p = strchr(s, '$');
@@ -46,9 +92,9 @@ static const char *SkipContext(const char *s)
void I18nInitialize(void)
{
- LanguageNames.Append(strdup(SkipContext(LanguageName)));
- LanguageCodes.Append(strdup(SkipContext(LanguageCode)));
LanguageLocales.Append(strdup(I18N_DEFAULT_LOCALE));
+ LanguageNames.Append(strdup(SkipContext(LanguageName)));
+ LanguageCodes.Append(strdup(LanguageCodeList[0]));
textdomain("vdr");
bindtextdomain("vdr", I18nLocaleDir);
cFileNameList Locales(I18nLocaleDir, true);
@@ -58,11 +104,18 @@ void I18nInitialize(void)
for (int i = 0; i < Locales.Size(); i++) {
if (i < I18N_MAX_LANGUAGES - 1) {
if (setlocale(LC_MESSAGES, Locales[i])) {
+ if (strstr(OldLocale, Locales[i]) == OldLocale)
+ CurrentLanguage = LanguageLocales.Size();
LanguageLocales.Append(strdup(Locales[i]));
LanguageNames.Append(strdup(gettext(LanguageName)));
- LanguageCodes.Append(strdup(gettext(LanguageCode)));
- if (strstr(OldLocale, Locales[i]) == OldLocale)
- CurrentLanguage = LanguageLocales.Size() - 1;
+ const char *Code = gettext(LanguageCode);
+ for (const char **lc = LanguageCodeList; *lc; lc++) {
+ if (ContainsCode(*lc, Code)) {
+ Code = *lc;
+ break;
+ }
+ }
+ LanguageCodes.Append(strdup(Code));
}
}
else
@@ -71,6 +124,22 @@ void I18nInitialize(void)
setlocale(LC_MESSAGES, OldLocale);
free(OldLocale);
}
+ // Prepare any known language codes for which there was no locale:
+ for (const char **lc = LanguageCodeList; *lc; lc++) {
+ bool Found = false;
+ for (int i = 0; i < LanguageCodes.Size(); i++) {
+ if (strcmp(*lc, LanguageCodes[i]) == 0) {
+ Found = true;
+ break;
+ }
+ }
+ if (!Found) {
+ dsyslog("no locale for language code '%s'", *lc);
+ LanguageLocales.Append(strdup(I18N_DEFAULT_LOCALE));
+ LanguageNames.Append(strdup(*lc));
+ LanguageCodes.Append(strdup(*lc));
+ }
+ }
}
void I18nRegister(const char *Plugin)
@@ -134,17 +203,8 @@ const char *I18nLanguageCode(int Language)
int I18nLanguageIndex(const char *Code)
{
for (int i = 0; i < LanguageCodes.Size(); i++) {
- const char *s = LanguageCodes[i];
- while (*s) {
- int l = 0;
- for ( ; l < 3 && Code[l]; l++) {
- if (s[l] != tolower(Code[l]))
- break;
- }
- if (l == 3)
- return i;
- s++;
- }
+ if (ContainsCode(LanguageCodes[i], Code))
+ return i;
}
//dsyslog("unknown language code: '%s'", Code);
return -1;
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 34fc7538..741bc9a2 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -42,10 +42,10 @@ msgstr ""
msgid "LanguageName$English"
msgstr "Català"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
-msgstr "cat,cln"
+msgid "LanguageCode$eng"
+msgstr "cat"
#: interface.c:75
msgid "Phase 1: Detecting RC code type"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 40532a1c..25cef7f6 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -40,10 +40,10 @@ msgstr "Bez názvu"
msgid "LanguageName$English"
msgstr "Èesky"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
-msgstr "cze,ces"
+msgid "LanguageCode$eng"
+msgstr "cze"
#: interface.c:75
msgid "Phase 1: Detecting RC code type"
diff --git a/po/da_DK.po b/po/da_DK.po
index af9510db..a43a1ae3 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -40,9 +40,9 @@ msgstr "Ingen titel"
msgid "LanguageName$English"
msgstr "Dansk"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
+msgid "LanguageCode$eng"
msgstr "dan"
#: interface.c:75
diff --git a/po/de_DE.po b/po/de_DE.po
index 6833a67b..cd29b369 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 15:18+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -40,10 +40,10 @@ msgstr "Kein Titel"
msgid "LanguageName$English"
msgstr "Deutsch"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
-msgstr "deu,ger"
+msgid "LanguageCode$eng"
+msgstr "deu"
#: interface.c:75
msgid "Phase 1: Detecting RC code type"
diff --git a/po/el_GR.po b/po/el_GR.po
index af96853a..7c40487a 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -40,10 +40,10 @@ msgstr "×ùñßò Ôßôëï"
msgid "LanguageName$English"
msgstr "ÅëëçíéêÜ"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
-msgstr "ell,gre"
+msgid "LanguageCode$eng"
+msgstr "ell"
#: interface.c:75
msgid "Phase 1: Detecting RC code type"
diff --git a/po/es_ES.po b/po/es_ES.po
index 63dcd2b8..7e00ff08 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -40,10 +40,10 @@ msgstr "Sin título"
msgid "LanguageName$English"
msgstr "Español"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
-msgstr "esl,spa"
+msgid "LanguageCode$eng"
+msgstr "esl"
#: interface.c:75
msgid "Phase 1: Detecting RC code type"
diff --git a/po/et_EE.po b/po/et_EE.po
index d04369e8..5fba8d1f 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -40,9 +40,9 @@ msgstr "Pealkiri puudub"
msgid "LanguageName$English"
msgstr "eesti"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
+msgid "LanguageCode$eng"
msgstr "est"
#: interface.c:75
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 01b167db..5682c921 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -43,10 +43,10 @@ msgstr "Ei esitystä"
msgid "LanguageName$English"
msgstr "suomi"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
-msgstr "fin,smi"
+msgid "LanguageCode$eng"
+msgstr "fin"
#: interface.c:75
msgid "Phase 1: Detecting RC code type"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 293de4b5..71f418c7 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -43,10 +43,10 @@ msgstr "Sans titre"
msgid "LanguageName$English"
msgstr "Français"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
-msgstr "fra,fre"
+msgid "LanguageCode$eng"
+msgstr "fra"
#: interface.c:75
msgid "Phase 1: Detecting RC code type"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index bba257a4..3d39030c 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -41,9 +41,9 @@ msgstr "Bez titla"
msgid "LanguageName$English"
msgstr "Hrvatski"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
+msgid "LanguageCode$eng"
msgstr "hrv"
#: interface.c:75
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 3fa53069..aca47b83 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -41,9 +41,9 @@ msgstr "név nélkül"
msgid "LanguageName$English"
msgstr "Magyar"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
+msgid "LanguageCode$eng"
msgstr "hun"
#: interface.c:75
diff --git a/po/it_IT.po b/po/it_IT.po
index 6cf890a6..224bc36a 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Sean Carlos <seanc@libero.it>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -42,9 +42,9 @@ msgstr "Senza titolo"
msgid "LanguageName$English"
msgstr "Italiano"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
+msgid "LanguageCode$eng"
msgstr "ita"
#: interface.c:75
diff --git a/po/nl_NL.po b/po/nl_NL.po
index b8e204f8..6e56194c 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -42,10 +42,10 @@ msgstr "Geen titel"
msgid "LanguageName$English"
msgstr "Nederlands"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
-msgstr "dut,nla,nld"
+msgid "LanguageCode$eng"
+msgstr "dut"
#: interface.c:75
msgid "Phase 1: Detecting RC code type"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 77c39e37..8deab349 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -41,9 +41,9 @@ msgstr ""
msgid "LanguageName$English"
msgstr "Norsk"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
+msgid "LanguageCode$eng"
msgstr "nor"
#: interface.c:75
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 1f99932e..18ec7ad3 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -40,9 +40,9 @@ msgstr "Bez tytu³u"
msgid "LanguageName$English"
msgstr "Polski"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
+msgid "LanguageCode$eng"
msgstr "pol"
#: interface.c:75
diff --git a/po/pt_PT.po b/po/pt_PT.po
index cb0a55f9..c083b343 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -40,9 +40,9 @@ msgstr ""
msgid "LanguageName$English"
msgstr "Português"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
+msgid "LanguageCode$eng"
msgstr "por"
#: interface.c:75
diff --git a/po/ro_RO.po b/po/ro_RO.po
index f287f6ad..7cafd046 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -41,10 +41,10 @@ msgstr "Fãrã titlu"
msgid "LanguageName$English"
msgstr "Românã"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
-msgstr "rom,rum"
+msgid "LanguageCode$eng"
+msgstr "rom"
#: interface.c:75
msgid "Phase 1: Detecting RC code type"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 4c1b92eb..6a1aae70 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -40,9 +40,9 @@ msgstr "±Õ× ÝÐ×ÒÐÝØï"
msgid "LanguageName$English"
msgstr "ÀãááÚØÙ"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
+msgid "LanguageCode$eng"
msgstr "rus"
#: interface.c:75
diff --git a/po/sl_SI.po b/po/sl_SI.po
index dabb6d2f..a7720d43 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -41,10 +41,10 @@ msgstr "Brez naziva"
msgid "LanguageName$English"
msgstr "Slovenski"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
-msgstr "slv,slo"
+msgid "LanguageCode$eng"
+msgstr "slv"
#: interface.c:75
msgid "Phase 1: Detecting RC code type"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 2435ae49..3e046753 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -41,10 +41,10 @@ msgstr "ingen titel"
msgid "LanguageName$English"
msgstr "Svenska"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
-msgstr "sve,swe"
+msgid "LanguageCode$eng"
+msgstr "sve"
#: interface.c:75
msgid "Phase 1: Detecting RC code type"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index c4afd634..49085133 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-11 11:00+0200\n"
-"PO-Revision-Date: 2007-08-11 11:00+0200\n"
+"PO-Revision-Date: 2007-08-12 11:53+0200\n"
"Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
"MIME-Version: 1.0\n"
@@ -40,9 +40,9 @@ msgstr "Ýsim yok"
msgid "LanguageName$English"
msgstr "Türkçe"
-#. TRANSLATORS: The 3-letter code(s) of the language (separated by commas)
+#. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31
-msgid "LanguageCode$eng,dos"
+msgid "LanguageCode$eng"
msgstr "tur"
#: interface.c:75