Don't use msgmerge --lang.

Fix up Language-Team headers instead so msgmerge adds Language automatically.

10 files changed, 28 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index 3b17060..e2b4bb7 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ $(I18Npot): $(wildcard *.c)
 	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address=http://projects.vdr-developer.org/projects/plg-osdteletext -o $@ $^
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none --lang=$(*F) -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
 	@touch $@
 
 $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
diff --git a/po/ca_ES.po b/po/ca_ES.po
index d82666f..53499dc 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,11 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/plg-osdteletext\n"
-"POT-Creation-Date: 2010-08-29 15:11+0300\n"
+"POT-Creation-Date: 2010-08-29 16:39+0300\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
-"Language-Team: Catalanian\n"
-"Language: ca_ES\n"
+"Language-Team: Catalan <vdr@linuxtv.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/de_DE.po b/po/de_DE.po
index 0315a79..3a2b693 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/plg-osdteletext\n"
-"POT-Creation-Date: 2010-08-29 15:11+0300\n"
+"POT-Creation-Date: 2010-08-29 16:39+0300\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Klaus Schmidinger <Klaus.Schmidinger@tvdr.de>\n"
-"Language-Team: German\n"
-"Language: de_DE\n"
+"Language-Team: German <vdr@linuxtv.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 7943073..cf080f7 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/plg-osdteletext\n"
-"POT-Creation-Date: 2010-08-29 15:11+0300\n"
+"POT-Creation-Date: 2010-08-29 16:39+0300\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
-"Language-Team: Spanish\n"
-"Language: es_ES\n"
+"Language-Team: Spanish <vdr@linuxtv.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index a193da8..c5e9e25 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/plg-osdteletext\n"
-"POT-Creation-Date: 2010-08-29 15:11+0300\n"
+"POT-Creation-Date: 2010-08-29 16:39+0300\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
-"Language-Team: Finnish\n"
-"Language: fi_FI\n"
+"Language-Team: Finnish <vdr@linuxtv.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index c8489f3..8109672 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,11 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/plg-osdteletext\n"
-"POT-Creation-Date: 2010-08-29 15:11+0300\n"
+"POT-Creation-Date: 2010-08-29 16:39+0300\n"
 "PO-Revision-Date: 2009-01-10 19:32+0100\n"
 "Last-Translator: Nival Michaël\n"
-"Language-Team: French\n"
-"Language: fr_FR\n"
+"Language-Team: French <vdr@linuxtv.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/it_IT.po b/po/it_IT.po
index 2bb3ca0..07fd03b 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,11 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/plg-osdteletext\n"
-"POT-Creation-Date: 2010-08-29 15:11+0300\n"
+"POT-Creation-Date: 2010-08-29 16:39+0300\n"
 "PO-Revision-Date: 2009-07-15 22:49+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
-"Language-Team: Italian\n"
-"Language: it_IT\n"
+"Language-Team: Italian <vdr@linuxtv.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 394e63f..c0fa5e6 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/plg-osdteletext\n"
-"POT-Creation-Date: 2010-08-29 15:11+0300\n"
+"POT-Creation-Date: 2010-08-29 16:39+0300\n"
 "PO-Revision-Date: 2008-05-04 15:33+0200\n"
 "Last-Translator: Chris Silva <hudokkow@gmail.com>\n"
-"Language-Team: Portuguese\n"
-"Language: pt_PT\n"
+"Language-Team: Portuguese <vdr@linuxtv.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index aa5108e..9b0e02c 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/plg-osdteletext\n"
-"POT-Creation-Date: 2010-08-29 15:11+0300\n"
+"POT-Creation-Date: 2010-08-29 16:39+0300\n"
 "PO-Revision-Date: 2008-12-30 13:52+0100\n"
 "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
-"Language-Team: Russian\n"
-"Language: ru_RU\n"
+"Language-Team: Russian <vdr@linuxtv.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 917f05c..6c12243 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: http://projects.vdr-developer.org/projects/plg-osdteletext\n"
-"POT-Creation-Date: 2010-08-29 15:11+0300\n"
+"POT-Creation-Date: 2010-08-29 16:39+0300\n"
 "PO-Revision-Date: 2009-05-25 20:33+0200\n"
 "Last-Translator: Yarema P. aka Knedlyk <yupadmin@gmail.com>\n"
-"Language-Team: Ukrainian\n"
-"Language: uk_UA\n"
+"Language-Team: Ukrainian <vdr@linuxtv.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"