Now generating translation files without line numbers; updated the Finnish OSD texts

HISTORY

@@ -5417,7 +5417,7 @@ Video Disk Recorder Revision History
 - Fixed checking for ttDolbyLast in cDevice::SetCurrentAudioTrack() (thanks
   to Marco Schl<68><6C>ler).
 
-2007-10-12: Version 1.5.10
+2007-10-13: Version 1.5.10
 
 - Implemented handling DVB subtitles (thanks to Marco Schl<68><6C>ler, and also to
   Pekka Virtanen for writing the subtitle plugin, which helped in implementing
@@ -5445,3 +5445,7 @@ Video Disk Recorder Revision History
   X 3 03 ger deutsch
   (see vdr.5). Note that these entries need to be added in the proper sequence,
   so that they correspond with the actual track languages in the recording.
+- Now generating translation files without line numbers to avoid unnecessarily
+  large diffs. Plugin authors may want to replace the -F option with
+  --no-location in the xgettext and msgmerge calls in their Makefiles.
+- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).

Makefile

@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.107 2007/09/01 12:19:53 kls Exp $
+# $Id: Makefile 1.108 2007/10/13 09:26:40 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -114,10 +114,10 @@ I18Npot   = $(PODIR)/vdr.pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
 
 $(I18Npo): $(I18Npot)
-	msgmerge -U --no-wrap -F --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
 
 i18n: $(I18Nmo)
 	@mkdir -p $(LOCALEDIR)

PLUGINS/src/hello/Makefile

@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.18 2007/08/19 14:18:59 kls Exp $
+# $Id: Makefile 1.19 2007/10/13 09:28:10 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -80,10 +80,10 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
 
 $(I18Npo): $(I18Npot)
-	msgmerge -U --no-wrap -F --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
 
 i18n: $(I18Nmo)
 	@mkdir -p $(LOCALEDIR)

PLUGINS/src/hello/po/ca_ES.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Jordi Vil<69> <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,26 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/cs_CZ.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vladim<69>r B<>rta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr "P<><50>telsk<73> pozdrav"
 
-#: hello.c:17
 msgid "Hello"
 msgstr "Ahoj"
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr "<22>as pozdravu (s)"
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr "Pou<6F><75>t alternativn<76> pozdrav"
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr "Ahoj sv<73>te!"
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr "Nazdar vespolek!"
+
+msgid "Hello world!"
+msgstr "Ahoj sv<73>te!"

PLUGINS/src/hello/po/da_DK.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/de_DE.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr "Ein freundlicher Gru<72>"
 
-#: hello.c:17
 msgid "Hello"
 msgstr "Hallo"
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr "Dauer des Gru<72>es (s)"
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr "Alternativen Gru<72> verwenden"
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr "Hallo Welt!"
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr "Tach zusammen!"
+
+msgid "Hello world!"
+msgstr "Hallo Welt!"

PLUGINS/src/hello/po/el_GR.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/es_ES.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/et_EE.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/fi_FI.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -18,26 +18,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr "Yst<73>v<EFBFBD>llisin terveisin"
 
-#: hello.c:17
 msgid "Hello"
 msgstr "Hei"
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr "Tervehdysaika (s)"
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr "K<>yt<79> vaihtoehtoista tervehdyst<73>"
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr "Hei maailma!"
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr "Mit<69> kuuluu?"
+
+msgid "Hello world!"
+msgstr "Hei maailma!"

PLUGINS/src/hello/po/fr_FR.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -18,26 +18,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/hr_HR.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,26 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/hu_HU.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,26 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/it_IT.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Sean Carlos <seanc@libero.it>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,26 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/nl_NL.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -17,26 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/nn_NO.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,26 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/pl_PL.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/pt_PT.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/ro_RO.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,26 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/ru_RU.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
-#: hello.c:17
 msgid "Hello"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>!"
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
+
+msgid "Hello world!"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>!"

PLUGINS/src/hello/po/sl_SI.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,26 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/sv_SE.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -16,26 +16,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/hello/po/tr_TR.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr-bugs@cadsoft.de>\n"
-"POT-Creation-Date: 2007-08-11 14:35+0200\n"
+"POT-Creation-Date: 2007-10-13 11:52+0200\n"
 "PO-Revision-Date: 2007-08-11 12:34+0200\n"
 "Last-Translator: Oktay Yolge<67>en <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -15,26 +15,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello.c:16
 msgid "A friendly greeting"
 msgstr ""
 
-#: hello.c:17
 msgid "Hello"
 msgstr ""
 
-#: hello.c:60
 msgid "Greeting time (s)"
 msgstr ""
 
-#: hello.c:61
 msgid "Use alternate greeting"
 msgstr ""
 
-#: hello.c:129
-msgid "Hello world!"
-msgstr ""
-
-#: hello.c:129
 msgid "Howdy folks!"
 msgstr ""
+
+msgid "Hello world!"
+msgstr ""

PLUGINS/src/skincurses/Makefile

@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile 1.11 2007/08/19 14:19:07 kls Exp $
+# $Id: Makefile 1.12 2007/10/13 09:28:28 kls Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -78,10 +78,10 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<vdr-bugs@cadsoft.de>' -o $@ $(wildcard *.c)
 
 $(I18Npo): $(I18Npot)
-	msgmerge -U --no-wrap -F --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
 
 i18n: $(I18Nmo)
 	@mkdir -p $(LOCALEDIR)

PLUGINS/src/skincurses/po/de_DE.po

@@ -15,18 +15,14 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: skincurses.c:15
 msgid "A text only skin"
 msgstr "Eine reine Text-Oberfl<66>che"
 
-#: skincurses.c:566
 msgid "Key$Mute"
 msgstr "Stumm"
 
-#: skincurses.c:569
 msgid "Volume "
 msgstr "Lautst<73>rke"
 
-#: skincurses.c:699
 msgid "Text mode"
 msgstr "Text-Modus"

PLUGINS/src/skincurses/po/fi_FI.po

@@ -15,18 +15,14 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: skincurses.c:15
 msgid "A text only skin"
 msgstr "Tekstipohjainen ulkoasu"
 
-#: skincurses.c:566
 msgid "Key$Mute"
 msgstr "Mykistys"
 
-#: skincurses.c:569
 msgid "Volume "
 msgstr "<22><>nenvoimakkuus "
 
-#: skincurses.c:699
 msgid "Text mode"
 msgstr "Teksti"

newplugin

@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.36 2007/08/19 14:19:49 kls Exp $
+# $Id: newplugin 1.37 2007/10/13 09:28:55 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -139,10 +139,10 @@ I18Npot   = \$(PODIR)/\$(PLUGIN).pot
 	msgfmt -c -o \$\@ \$<
 
 \$(I18Npot): \$(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap -F -k -ktr -ktrNOOP --msgid-bugs-address='<see README>' -o \$\@ \$(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<see README>' -o \$\@ \$(wildcard *.c)
 
 \$(I18Npo): \$(I18Npot)
-	msgmerge -U --no-wrap -F --backup=none -q \$\@ \$<
+	msgmerge -U --no-wrap --no-location --backup=none -q \$\@ \$<
 
 i18n: \$(I18Nmo)
 	\@mkdir -p \$(LOCALEDIR)