Revert to use libxine1 as domain name, but ensure that newer gettext versions behave as intended.

CVS patchset: 8032
CVS date: 2006/06/10 17:38:46

12 files changed, 28 insertions, 23 deletions

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 1f5cc285d..c2dbc6460 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -11,6 +11,7 @@
 # Origin: gettext-0.14.4
 
 PACKAGE = @PACKAGE@
+LIBNAME = @LIBNAME@
 VERSION = @VERSION@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
@@ -23,9 +24,13 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+ifeq ($(datarootdir),\@datarootdir\@)
+datarootdir = @datadir@
+endif
 datadir = @datadir@
 localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/po
+gettextsrcdir = $(datarootdir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
diff --git a/po/Makevars b/po/Makevars
index 574541500..b51ea1918 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
+DOMAIN = $(LIBNAME)
 
 # These two variables depend on the location of this directory.
 subdir = po
@@ -34,7 +34,7 @@ COPYRIGHT_HOLDER = Copyright (C) 2000-2006 the xine project
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS =
+MSGID_BUGS_ADDRESS = xine-devel@lists.sourceforge.net
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
diff --git a/po/cs.po b/po/cs.po
index ba233cdc8..71ef7972a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 1.0.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-10 03:56+0200\n"
+"Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2006-06-10 18:55+0200\n"
 "PO-Revision-Date: 2005-12-11 20:47+0100\n"
 "Last-Translator: František Dvořák <valtri@atlas.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/de.po b/po/de.po
index b04013605..8509109c1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 1.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-10 03:56+0200\n"
+"Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2006-06-10 18:55+0200\n"
 "PO-Revision-Date: 2005-12-22 18:17+0200\n"
 "Last-Translator: Philipp Hahn <pmhahn@users.sf.net>\n"
 "Language-Team: German <de@li.org>\n"
diff --git a/po/es.po b/po/es.po
index d8f95fd6f..cfe5042de 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.13\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-10 03:56+0200\n"
+"Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2006-06-10 18:55+0200\n"
 "PO-Revision-Date: 2002-02-20 00:00+0100\n"
 "Last-Translator: Juan Manuel García Molina <juanma_gm@wanadoo.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
diff --git a/po/eu.po b/po/eu.po
index 594d3c545..ef5e410cb 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-10 03:56+0200\n"
+"Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2006-06-10 18:55+0200\n"
 "PO-Revision-Date: 2005-02-17 14:29+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: lubrezale <librezale@librezale.org>\n"
diff --git a/po/fr.po b/po/fr.po
index a933fbc40..ea7001c21 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.13\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-10 03:56+0200\n"
+"Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2006-06-10 18:55+0200\n"
 "PO-Revision-Date: 2002-06-07 15:08 +0200\n"
 "Last-Translator: Daniel Caujolle-Bert <segfault@club-internet.fr>\n"
 "Language-Team: French <fr@li.org>\n"
diff --git a/po/it.po b/po/it.po
index 037f467d1..0a2631ba7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-10 03:56+0200\n"
+"Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2006-06-10 18:55+0200\n"
 "PO-Revision-Date: 2006-06-10 04:06+0200\n"
 "Last-Translator: Diego 'Flameeyes' Pettenò <flameeyes@gentoo.org>\n"
 "Language-Team: Italian\n"
diff --git a/po/xine-lib.pot b/po/libxine1.pot
index 9b1350998..1698bbc7b 100644
--- a/po/xine-lib.pot
+++ b/po/libxine1.pot
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-10 03:56+0200\n"
+"Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2006-06-10 19:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 04295ab35..153752f0f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pl_PL\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-10 03:56+0200\n"
+"Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2006-06-10 18:55+0200\n"
 "PO-Revision-Date: 2003-05-24 12:36+0200\n"
 "Last-Translator: Bartłomiej Muryn <_4ever_@irc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6a321adc3..af5ea6dc9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.13\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-10 03:56+0200\n"
+"Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2006-06-10 18:55+0200\n"
 "PO-Revision-Date: 2002-01-22 18:31GMT-3\n"
 "Last-Translator: Marcelo Roberto Jimenez <mroberto@cetuc.puc-rio.br>\n"
 "Language-Team: Portuguese (Brazilian) <pt_BR@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index f6b48b0bb..0a955487d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-10 03:56+0200\n"
+"Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2006-06-10 18:55+0200\n"
 "PO-Revision-Date: 2004-09-15 13:53+0100\n"
 "Last-Translator: \n"
 "Language-Team: Slovak <ski18n@lists.isternet.sk>\n"