Regenerate .pot files and merge .po files with them

8 files changed, 34 insertions, 19 deletions

diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 881b3d979..c6d7ce1ef 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.15.8.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-10-12 05:21+0200\n"
+"POT-Creation-Date: 2014-10-20 15:20+0200\n"
 "PO-Revision-Date: 2014-08-15 14:10+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
diff --git a/scripts/po/de.po b/scripts/po/de.po
index 76c03e4ca..941f100ff 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.17.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-10-13 19:13+0200\n"
+"POT-Creation-Date: 2014-10-20 15:20+0200\n"
 "PO-Revision-Date: 2014-10-13 21:08+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -107,15 +107,16 @@ msgstr ""
 "  -A, --target-arch <Arch>  Ziel-Debian-Architektur setzen\n"
 "  -T, --target-type <Typ>   Ziel-GNU-Systemtyp setzen\n"
 "  -W, --match-wildcard <Arch-Platzhalter>\n"
-"                            Architekturliste auf zu <Arch-Platzhalter> passende "
-"einschränken\n"
+"                            Architekturliste auf zu <Arch-Platzhalter> "
+"passende einschränken\n"
 "  -B, --match-bits <Arch-Bits>\n"
-"                            Architekturliste auf zu <Arch-Bits> passende einschränken\n"
+"                            Architekturliste auf zu <Arch-Bits> passende "
+"einschränken\n"
 "  -E, --match-endian <Arch-Endian>\n"
 "                            Architekturliste auf zu <Arch-Endian> passende "
 "einschränken\n"
-"  -f, --force               Schalter zum Erzwingen (setzt Umgebungsvariablen außer "
-"Kraft)"
+"  -f, --force               Schalter zum Erzwingen (setzt Umgebungsvariablen "
+"außer Kraft)"
 
 #: scripts/dpkg-architecture.pl:83
 #, perl-format
@@ -2050,6 +2051,16 @@ msgstr ""
 "Lesen Sie dpkg-source(1) für weitere Informationen."
 
 #: scripts/dpkg-vendor.pl:44
+#, fuzzy
+#| msgid ""
+#| "Commands:\n"
+#| "  --is <vendor>           returns true if current vendor is <vendor>.\n"
+#| "  --derives-from <vendor> returns true if current vendor derives from "
+#| "<vendor>.\n"
+#| "  --query <field>         print the content of the vendor-specific "
+#| "field.\n"
+#| "  --help                  show this help message.\n"
+#| "  --version               show the version.\n"
 msgid ""
 "Commands:\n"
 "  --is <vendor>           returns true if current vendor is <vendor>.\n"
@@ -2057,13 +2068,16 @@ msgid ""
 "<vendor>.\n"
 "  --query <field>         print the content of the vendor-specific field.\n"
 "  --help                  show this help message.\n"
-"  --version               show the version.\n"
+"  --version               show the version."
 msgstr ""
 "Befehle:\n"
-"  --is <Lieferant>     liefert wahr, falls der aktuelle Lieferant <Lieferant> ist.\n"
+"  --is <Lieferant>     liefert wahr, falls der aktuelle Lieferant "
+"<Lieferant> ist.\n"
 "  --derives-from <Lieferant>\n"
-"                       liefert wahr, falls der aktuelle Lieferant vom <Lieferant> abgeleitet ist.\n"
-"  --query <Feld>       den Inhalt des Lieferanten-spezifischen Feldes ausgeben.\n"
+"                       liefert wahr, falls der aktuelle Lieferant vom "
+"<Lieferant> abgeleitet ist.\n"
+"  --query <Feld>       den Inhalt des Lieferanten-spezifischen Feldes "
+"ausgeben.\n"
 "  --help               diese Hilfenachricht anzeigen.\n"
 "  --version            die Version anzeigen.\n"
 
@@ -2073,7 +2087,8 @@ msgid ""
 "  --vendor <vendor>       assume <vendor> is the current vendor."
 msgstr ""
 "Optionen:\n"
-"  --vendor <Lieferant>    annehmen, dass <Lieferant> der aktuelle Lieferant ist."
+"  --vendor <Lieferant>    annehmen, dass <Lieferant> der aktuelle Lieferant "
+"ist."
 
 #: scripts/dpkg-vendor.pl:87
 #, perl-format
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index f94ca4275..b060a38bd 100644
--- a/scripts/po/dpkg-dev.pot
+++ b/scripts/po/dpkg-dev.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.17.17\n"
+"Project-Id-Version: dpkg 1.17.19\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-10-12 05:21+0200\n"
+"POT-Creation-Date: 2014-10-20 15:20+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/scripts/po/es.po b/scripts/po/es.po
index 4bfb57eec..db47e6006 100644
--- a/scripts/po/es.po
+++ b/scripts/po/es.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-10-12 05:21+0200\n"
+"POT-Creation-Date: 2014-10-20 15:20+0200\n"
 "PO-Revision-Date: 2014-08-15 14:11+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index 28a379f26..b63c35e27 100644
--- a/scripts/po/fr.po
+++ b/scripts/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.17.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-10-12 05:21+0200\n"
+"POT-Creation-Date: 2014-10-20 15:20+0200\n"
 "PO-Revision-Date: 2014-08-15 14:22+0200\n"
 "Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index 7746ec069..61c455fc9 100644
--- a/scripts/po/pl.po
+++ b/scripts/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-10-12 05:21+0200\n"
+"POT-Creation-Date: 2014-10-20 15:20+0200\n"
 "PO-Revision-Date: 2014-08-15 14:11+0200\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
diff --git a/scripts/po/ru.po b/scripts/po/ru.po
index c74a5f7cc..3ff16d224 100644
--- a/scripts/po/ru.po
+++ b/scripts/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.16.9\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-10-12 05:21+0200\n"
+"POT-Creation-Date: 2014-10-20 15:20+0200\n"
 "PO-Revision-Date: 2014-08-15 14:11+0200\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index 13bc37d03..75cfc069f 100644
--- a/scripts/po/sv.po
+++ b/scripts/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.17.11\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-10-12 05:21+0200\n"
+"POT-Creation-Date: 2014-10-20 15:20+0200\n"
 "PO-Revision-Date: 2014-08-15 14:12+0200\n"
 "Last-Translator: Peter Krefting <peterk@debian.org>\n"
 "Language-Team: Svenska <debian-l10n-swedish@lists.debian.org>\n"