Explicitly looking for vdr.mo; text files for plugins named 'vdr-name.mo'; revoked 'best match'

This commit is contained in:
Klaus Schmidinger 2007-08-19 14:34:44 +02:00
parent aebcc9d15c
commit 69db18ef8f
28 changed files with 104 additions and 91 deletions

View File

@ -887,6 +887,7 @@ Ludwig Nussel <ludwig.nussel@web.de>
for making the Makefile patch friendlier for making the Makefile patch friendlier
for a patch that was used for implementing setting the user id for a patch that was used for implementing setting the user id
for pointing out that the canonical spelling of codesets is with '-' for pointing out that the canonical spelling of codesets is with '-'
for a hint on using _nl_msg_cat_cntr
Thomas Koch <tom@harhar.net> Thomas Koch <tom@harhar.net>
for his support in keeping the Premiere World channels up to date in 'channels.conf' for his support in keeping the Premiere World channels up to date in 'channels.conf'
@ -2060,6 +2061,7 @@ Anssi Hannula <anssi.hannula@gmail.com>
for code and hints on how to use 'fontconfig' to determine which fonts to use for code and hints on how to use 'fontconfig' to determine which fonts to use
for suggesting to make the "Setup/OSD/Language" menu only show those languages for suggesting to make the "Setup/OSD/Language" menu only show those languages
that actually have a locale that actually have a locale
for suggesting to use setenv() instead of setlocale() to set the language for gettext()
Antti Hartikainen <ami+vdr@ah.fi> Antti Hartikainen <ami+vdr@ah.fi>
for updating 'S13E' in 'sources.conf' for updating 'S13E' in 'sources.conf'
@ -2096,7 +2098,6 @@ Matthias Schwarzott <zzam@gentoo.org>
for suggesting to move the "all" target in plugin Makefiles before the for suggesting to move the "all" target in plugin Makefiles before the
"Implicit rules", so that a plain "make" will compile everything "Implicit rules", so that a plain "make" will compile everything
for adding DESTDIR and PREFIX handling to the Makefile for adding DESTDIR and PREFIX handling to the Makefile
for reporting a problem with locale matching
Martin Ostermann <martin@familie-ostermann.de> Martin Ostermann <martin@familie-ostermann.de>
for fixing processing the PDCDescriptor in 'libsi' on big endian systems for fixing processing the PDCDescriptor in 'libsi' on big endian systems

11
HISTORY
View File

@ -5346,7 +5346,7 @@ Video Disk Recorder Revision History
- Added a debug error message to cReceiver::~cReceiver() in case it is still - Added a debug error message to cReceiver::~cReceiver() in case it is still
attached to a device (thanks to Reinhard Nissl). attached to a device (thanks to Reinhard Nissl).
2007-08-18: Version 1.5.8 2007-08-19: Version 1.5.8
- Added missing install-i18n to the install target in the Makefile (reported - Added missing install-i18n to the install target in the Makefile (reported
by Joachim Wilke). by Joachim Wilke).
@ -5363,8 +5363,6 @@ Video Disk Recorder Revision History
Ahrenberg). Ahrenberg).
- Checking the string for NULL in I18nTranslate(). - Checking the string for NULL in I18nTranslate().
- Updated the French OSD texts (thanks to Bruno Roussel). - Updated the French OSD texts (thanks to Bruno Roussel).
- I18nInitialize() now uses best matching default locale (problem reported by
Matthias Schwarzott).
- Some optimizations in cDvbDevice::SetChannelDevice() (thanks to Tobias Bratfisch). - Some optimizations in cDvbDevice::SetChannelDevice() (thanks to Tobias Bratfisch).
- Optimized cMenuEditChrItem::Set() (thanks to Tobias Bratfisch). - Optimized cMenuEditChrItem::Set() (thanks to Tobias Bratfisch).
- Optimized cNitFilter::Process() (thanks to Tobias Bratfisch). - Optimized cNitFilter::Process() (thanks to Tobias Bratfisch).
@ -5374,3 +5372,10 @@ Video Disk Recorder Revision History
is clrTransparent (thanks to Christoph Haubrich). is clrTransparent (thanks to Christoph Haubrich).
- The "Setup/OSD/Language" menu now only shows those languages that actually - The "Setup/OSD/Language" menu now only shows those languages that actually
have a locale (suggested by Anssi Hannula). have a locale (suggested by Anssi Hannula).
- Now using setenv() instead of setlocale() to set the language for gettext()
(suggested by Anssi Hannula; thanks also to Ludwig Nussel for a hint on using
_nl_msg_cat_cntr).
- When scanning the locale directory, VDR now explicitly looks for a file named
vdr.mo. Text files for plugins are now named "vdr-name.mo", when "name" is the
name of the plugin. The "newplugin" script has been changed accordingly, and
plugin authors should change their Makefiles, too.

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.17 2007/08/15 13:04:37 kls Exp $ # $Id: Makefile 1.18 2007/08/19 14:18:59 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -89,7 +89,7 @@ i18n: $(I18Nmo)
@mkdir -p $(LOCALEDIR) @mkdir -p $(LOCALEDIR)
for i in $(I18Ndirs); do\ for i in $(I18Ndirs); do\
mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\ mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(PLUGIN).mo;\ cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
done done
### Targets: ### Targets:

View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.10 2007/08/15 14:00:27 kls Exp $ # $Id: Makefile 1.11 2007/08/19 14:19:07 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -87,7 +87,7 @@ i18n: $(I18Nmo)
@mkdir -p $(LOCALEDIR) @mkdir -p $(LOCALEDIR)
for i in $(I18Ndirs); do\ for i in $(I18Ndirs); do\
mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\ mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\
cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/$(PLUGIN).mo;\ cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr-$(PLUGIN).mo;\
done done
### Targets: ### Targets:

39
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.311 2007/08/18 09:08:45 kls Exp $ * $Id: i18n.c 1.312 2007/08/19 14:10:46 kls Exp $
* *
* *
*/ */
@ -23,6 +23,7 @@
#include <ctype.h> #include <ctype.h>
#include <libintl.h> #include <libintl.h>
#include <locale.h> #include <locale.h>
#include <unistd.h>
#include "tools.h" #include "tools.h"
// TRANSLATORS: The name of the language, as written natively // TRANSLATORS: The name of the language, as written natively
@ -91,6 +92,13 @@ static const char *SkipContext(const char *s)
return p ? p + 1 : s; return p ? p + 1 : s;
} }
static void SetEnvLanguage(const char *Locale)
{
setenv("LANGUAGE", Locale, 1);
extern int _nl_msg_cat_cntr;
++_nl_msg_cat_cntr;
}
void I18nInitialize(void) void I18nInitialize(void)
{ {
LanguageLocales.Append(strdup(I18N_DEFAULT_LOCALE)); LanguageLocales.Append(strdup(I18N_DEFAULT_LOCALE));
@ -100,17 +108,15 @@ void I18nInitialize(void)
bindtextdomain("vdr", I18nLocaleDir); bindtextdomain("vdr", I18nLocaleDir);
cFileNameList Locales(I18nLocaleDir, true); cFileNameList Locales(I18nLocaleDir, true);
if (Locales.Size() > 0) { if (Locales.Size() > 0) {
dsyslog("found %d locales in %s", Locales.Size(), I18nLocaleDir);
int MatchFull = 0, MatchPartial = 0;
char *OldLocale = strdup(setlocale(LC_MESSAGES, NULL)); char *OldLocale = strdup(setlocale(LC_MESSAGES, NULL));
for (int i = 0; i < Locales.Size(); i++) { for (int i = 0; i < Locales.Size(); i++) {
if (i < I18N_MAX_LANGUAGES - 1) { cString FileName = cString::sprintf("%s/%s/LC_MESSAGES/vdr.mo", I18nLocaleDir, Locales[i]);
if (setlocale(LC_MESSAGES, Locales[i])) { if (access(FileName, F_OK) == 0) { // found a locale with VDR texts
if (i < I18N_MAX_LANGUAGES - 1) {
SetEnvLanguage(Locales[i]);
NumLocales++; NumLocales++;
if (strstr(OldLocale, Locales[i]) == OldLocale) if (strstr(OldLocale, Locales[i]) == OldLocale)
MatchFull = LanguageLocales.Size(); CurrentLanguage = LanguageLocales.Size();
else if (strncmp(OldLocale, Locales[i], 2) == 0)
MatchPartial = LanguageLocales.Size();
LanguageLocales.Append(strdup(Locales[i])); LanguageLocales.Append(strdup(Locales[i]));
LanguageNames.Append(strdup(gettext(LanguageName))); LanguageNames.Append(strdup(gettext(LanguageName)));
const char *Code = gettext(LanguageCode); const char *Code = gettext(LanguageCode);
@ -122,15 +128,15 @@ void I18nInitialize(void)
} }
LanguageCodes.Append(strdup(Code)); LanguageCodes.Append(strdup(Code));
} }
} else {
else { esyslog("ERROR: too many locales - increase I18N_MAX_LANGUAGES!");
esyslog("ERROR: too many locales - increase I18N_MAX_LANGUAGES!"); break;
break; }
} }
} }
CurrentLanguage = MatchFull ? MatchFull : MatchPartial; SetEnvLanguage(LanguageLocales[CurrentLanguage]);
setlocale(LC_MESSAGES, CurrentLanguage ? LanguageLocales[CurrentLanguage] : OldLocale);
free(OldLocale); free(OldLocale);
dsyslog("found %d locales in %s", NumLocales - 1, I18nLocaleDir);
} }
// Prepare any known language codes for which there was no locale: // Prepare any known language codes for which there was no locale:
for (const char **lc = LanguageCodeList; *lc; lc++) { for (const char **lc = LanguageCodeList; *lc; lc++) {
@ -152,7 +158,8 @@ void I18nInitialize(void)
void I18nRegister(const char *Plugin) void I18nRegister(const char *Plugin)
{ {
bindtextdomain(Plugin, I18nLocaleDir); cString Domain = cString::sprintf("vdr-%s", Plugin);
bindtextdomain(Domain, I18nLocaleDir);
} }
void I18nSetLocale(const char *Locale) void I18nSetLocale(const char *Locale)
@ -161,7 +168,7 @@ void I18nSetLocale(const char *Locale)
int i = LanguageLocales.Find(Locale); int i = LanguageLocales.Find(Locale);
if (i >= 0) { if (i >= 0) {
CurrentLanguage = i; CurrentLanguage = i;
setlocale(LC_MESSAGES, Locale); SetEnvLanguage(Locale);
} }
else else
dsyslog("unknown locale: '%s'", Locale); dsyslog("unknown locale: '%s'", Locale);

4
i18n.h
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.h 1.22 2007/08/18 09:10:39 kls Exp $ * $Id: i18n.h 1.23 2007/08/19 14:07:17 kls Exp $
*/ */
#ifndef __I18N_H #ifndef __I18N_H
@ -79,7 +79,7 @@ bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode,
///< the second one (like "deu" out of ""eng+deu"). ///< the second one (like "deu" out of ""eng+deu").
#ifdef PLUGIN_NAME_I18N #ifdef PLUGIN_NAME_I18N
#define tr(s) I18nTranslate(s, PLUGIN_NAME_I18N) #define tr(s) I18nTranslate(s, "vdr-" PLUGIN_NAME_I18N)
#else #else
#define tr(s) I18nTranslate(s) #define tr(s) I18nTranslate(s)
#endif #endif

View File

@ -12,7 +12,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: newplugin 1.35 2007/08/15 13:05:03 kls Exp $ # $Id: newplugin 1.36 2007/08/19 14:19:49 kls Exp $
$PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n"; $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
@ -148,7 +148,7 @@ i18n: \$(I18Nmo)
\@mkdir -p \$(LOCALEDIR) \@mkdir -p \$(LOCALEDIR)
for i in \$(I18Ndirs); do\\ for i in \$(I18Ndirs); do\\
mkdir -p \$(LOCALEDIR)/\$\$i/LC_MESSAGES;\\ mkdir -p \$(LOCALEDIR)/\$\$i/LC_MESSAGES;\\
cp \$(PODIR)/\$\$i.mo \$(LOCALEDIR)/\$\$i/LC_MESSAGES/\$(PLUGIN).mo;\\ cp \$(PODIR)/\$\$i.mo \$(LOCALEDIR)/\$\$i/LC_MESSAGES/vdr-\$(PLUGIN).mo;\\
done done
### Targets: ### Targets:

View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Jordi Vilà <jvila@tinet.org>\n" "Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -38,12 +38,12 @@ msgid "No title"
msgstr "" msgstr ""
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Català" msgstr "Català"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "cat" msgstr "cat"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n" "Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -36,12 +36,12 @@ msgid "No title"
msgstr "Bez názvu" msgstr "Bez názvu"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Èesky" msgstr "Èesky"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "cze" msgstr "cze"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n" "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -36,12 +36,12 @@ msgid "No title"
msgstr "Ingen titel" msgstr "Ingen titel"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Dansk" msgstr "Dansk"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "dan" msgstr "dan"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n" "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -36,12 +36,12 @@ msgid "No title"
msgstr "Kein Titel" msgstr "Kein Titel"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Deutsch" msgstr "Deutsch"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "deu" msgstr "deu"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n" "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -36,12 +36,12 @@ msgid "No title"
msgstr "×ùñßò Ôßôëï" msgstr "×ùñßò Ôßôëï"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "ÅëëçíéêÜ" msgstr "ÅëëçíéêÜ"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "ell" msgstr "ell"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n" "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -36,12 +36,12 @@ msgid "No title"
msgstr "Sin título" msgstr "Sin título"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Español" msgstr "Español"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "esl" msgstr "esl"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n" "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -36,12 +36,12 @@ msgid "No title"
msgstr "Pealkiri puudub" msgstr "Pealkiri puudub"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "eesti" msgstr "eesti"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "est" msgstr "est"

View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-15 15:52+0200\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n" "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -39,12 +39,12 @@ msgid "No title"
msgstr "Ei esitystä" msgstr "Ei esitystä"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "suomi" msgstr "suomi"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "fin" msgstr "fin"

View File

@ -12,7 +12,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-17 13:45+0200\n" "PO-Revision-Date: 2007-08-17 13:45+0200\n"
"Last-Translator: Bruno Roussel <bruno.roussel@free.fr>\n" "Last-Translator: Bruno Roussel <bruno.roussel@free.fr>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -41,12 +41,12 @@ msgid "No title"
msgstr "Sans titre" msgstr "Sans titre"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Français" msgstr "Français"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "fra" msgstr "fra"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n" "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -37,12 +37,12 @@ msgid "No title"
msgstr "Bez titla" msgstr "Bez titla"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Hrvatski" msgstr "Hrvatski"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "hrv" msgstr "hrv"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n" "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -37,12 +37,12 @@ msgid "No title"
msgstr "név nélkül" msgstr "név nélkül"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Magyar" msgstr "Magyar"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "hun" msgstr "hun"

View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Sean Carlos <seanc@libero.it>\n" "Last-Translator: Sean Carlos <seanc@libero.it>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -38,12 +38,12 @@ msgid "No title"
msgstr "Senza titolo" msgstr "Senza titolo"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Italiano" msgstr "Italiano"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "ita" msgstr "ita"

View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n" "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -38,12 +38,12 @@ msgid "No title"
msgstr "Geen titel" msgstr "Geen titel"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Nederlands" msgstr "Nederlands"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "dut" msgstr "dut"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n" "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -37,12 +37,12 @@ msgid "No title"
msgstr "" msgstr ""
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Norsk" msgstr "Norsk"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "nor" msgstr "nor"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Michael Rakowski <mrak@gmx.de>\n" "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -36,12 +36,12 @@ msgid "No title"
msgstr "Bez tytu³u" msgstr "Bez tytu³u"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Polski" msgstr "Polski"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "pol" msgstr "pol"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Paulo Lopes <pmml@netvita.pt>\n" "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -36,12 +36,12 @@ msgid "No title"
msgstr "" msgstr ""
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Português" msgstr "Português"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "por" msgstr "por"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n" "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -37,12 +37,12 @@ msgid "No title"
msgstr "Fãrã titlu" msgstr "Fãrã titlu"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Românã" msgstr "Românã"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "rom" msgstr "rom"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n" "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -36,12 +36,12 @@ msgid "No title"
msgstr "±Õ× ÝÐ×ÒÐÝØï" msgstr "±Õ× ÝÐ×ÒÐÝØï"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "ÀãááÚØÙ" msgstr "ÀãááÚØÙ"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "rus" msgstr "rus"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n" "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -37,12 +37,12 @@ msgid "No title"
msgstr "Brez naziva" msgstr "Brez naziva"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Slovenski" msgstr "Slovenski"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "slv" msgstr "slv"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Tomas Prybil <tomas@prybil.se>\n" "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -37,12 +37,12 @@ msgid "No title"
msgstr "ingen titel" msgstr "ingen titel"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Svenska" msgstr "Svenska"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "sve" msgstr "sve"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: VDR 1.5.7\n" "Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n" "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
"POT-Creation-Date: 2007-08-17 16:36+0200\n" "POT-Creation-Date: 2007-08-19 13:53+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n" "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: <vdr@linuxtv.org>\n" "Language-Team: <vdr@linuxtv.org>\n"
@ -36,12 +36,12 @@ msgid "No title"
msgstr "Ýsim yok" msgstr "Ýsim yok"
#. TRANSLATORS: The name of the language, as written natively #. TRANSLATORS: The name of the language, as written natively
#: i18n.c:29 #: i18n.c:30
msgid "LanguageName$English" msgid "LanguageName$English"
msgstr "Türkçe" msgstr "Türkçe"
#. TRANSLATORS: The 3-letter code of the language #. TRANSLATORS: The 3-letter code of the language
#: i18n.c:31 #: i18n.c:32
msgid "LanguageCode$eng" msgid "LanguageCode$eng"
msgstr "tur" msgstr "tur"