Regenerate .pot files and merge .po files with them

Picked the de.po changes specifically to make it possible to cherry-pick the
German translation changes from master over to sid without causing
conflicts.

dselect/po/de.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.15.6.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:12+0200\n"
+"POT-Creation-Date: 2010-08-21 20:15+0200\n"
 "PO-Revision-Date: 2010-03-31 18:55+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"

po/de.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.15.8~\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:13+0200\n"
+"POT-Creation-Date: 2010-08-21 20:15+0200\n"
 "PO-Revision-Date: 2010-07-26 17:41+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -789,38 +789,38 @@ msgstr "doppelter Wert für benutzerdefiniertes Feld »%.*s«"
 msgid "several package info entries found, only one allowed"
 msgstr "mehrere Paketinfo-Einträge gefunden, nur einer erlaubt"
 
-#: lib/dpkg/parse.c:275
+#: lib/dpkg/parse.c:280
 msgid "Configured-Version for package with inappropriate Status"
 msgstr "Configured-Version für Paket mit unpassendem Status"
 
-#: lib/dpkg/parse.c:285
+#: lib/dpkg/parse.c:290
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr "Paket hat Status %s, aber Trigger werden erwartet"
 
-#: lib/dpkg/parse.c:289
+#: lib/dpkg/parse.c:294
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr "Paket hat Status »triggers-awaited«, erwartet aber keine Trigger"
 
-#: lib/dpkg/parse.c:296
+#: lib/dpkg/parse.c:301
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr "Paket hat Status %s, aber Trigger sind anhängig"
 
-#: lib/dpkg/parse.c:300
+#: lib/dpkg/parse.c:305
 msgid "package has status triggers-pending but no triggers pending"
 msgstr "Paket hat Status »triggers-pending«, aber keine Trigger sind anhängig"
 
-#: lib/dpkg/parse.c:311
+#: lib/dpkg/parse.c:316
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr "Paket mit dem Status »nicht installiert« hat Conffiles, vergesse sie"
 
-#: lib/dpkg/parse.c:396
+#: lib/dpkg/parse.c:401
 #, c-format
 msgid "failed to close after read: `%.255s'"
 msgstr "Konnte nach Lesen nicht schließen: »%.255s«"
 
-#: lib/dpkg/parse.c:397
+#: lib/dpkg/parse.c:402
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr "keine Paketinformationen in »%.255s«"

scripts/po/de.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-scripts\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-13 06:13+0200\n"
+"POT-Creation-Date: 2010-08-21 20:15+0200\n"
 "PO-Revision-Date: 2010-07-26 18:13+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #: scripts/dpkg-architecture.pl:35 scripts/dpkg-buildflags.pl:31
 #: scripts/dpkg-buildpackage.pl:38 scripts/dpkg-checkbuilddeps.pl:36
-#: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:95
+#: scripts/dpkg-distaddfile.pl:33 scripts/dpkg-genchanges.pl:96
 #: scripts/dpkg-gencontrol.pl:56 scripts/dpkg-gensymbols.pl:49
 #: scripts/dpkg-mergechangelogs.pl:53 scripts/dpkg-name.pl:46
 #: scripts/dpkg-parsechangelog.pl:31 scripts/dpkg-scanpackages.pl:60
@@ -40,7 +40,7 @@ msgstr ""
 
 #: scripts/dpkg-architecture.pl:41 scripts/dpkg-buildflags.pl:36
 #: scripts/dpkg-buildpackage.pl:45 scripts/dpkg-distaddfile.pl:38
-#: scripts/dpkg-genchanges.pl:101 scripts/dpkg-gencontrol.pl:62
+#: scripts/dpkg-genchanges.pl:102 scripts/dpkg-gencontrol.pl:62
 #: scripts/dpkg-gensymbols.pl:55 scripts/dpkg-parsechangelog.pl:37
 #: scripts/dpkg-shlibdeps.pl:527 scripts/dpkg-source.pl:423
 #: scripts/changelog/debian.pl:39
@@ -98,7 +98,7 @@ msgstr ""
 "  --version          die Version anzeigen.\n"
 
 #: scripts/dpkg-architecture.pl:119 scripts/dpkg-buildflags.pl:84
-#: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:193
+#: scripts/dpkg-distaddfile.pl:68 scripts/dpkg-genchanges.pl:194
 #: scripts/dpkg-gencontrol.pl:133 scripts/dpkg-gensymbols.pl:141
 #: scripts/dpkg-parsechangelog.pl:113 scripts/dpkg-shlibdeps.pl:118
 #, perl-format
@@ -376,9 +376,9 @@ msgstr ""
 
 #: scripts/dpkg-buildpackage.pl:201 scripts/dpkg-buildpackage.pl:207
 #: scripts/dpkg-buildpackage.pl:213 scripts/dpkg-buildpackage.pl:219
-#: scripts/dpkg-buildpackage.pl:224 scripts/dpkg-genchanges.pl:142
-#: scripts/dpkg-genchanges.pl:145 scripts/dpkg-genchanges.pl:149
-#: scripts/dpkg-genchanges.pl:153
+#: scripts/dpkg-buildpackage.pl:224 scripts/dpkg-genchanges.pl:143
+#: scripts/dpkg-genchanges.pl:146 scripts/dpkg-genchanges.pl:150
+#: scripts/dpkg-genchanges.pl:154
 #, perl-format
 msgid "cannot combine %s and %s"
 msgstr "%s und %s können nicht kombiniert werden"
@@ -630,7 +630,7 @@ msgstr "neue Dateienliste-Datei schließen"
 msgid "install new files list file"
 msgstr "neue Dateienliste-Datei installieren"
 
-#: scripts/dpkg-genchanges.pl:97
+#: scripts/dpkg-genchanges.pl:98
 msgid ""
 "\n"
 "Copyright (C) 1996 Ian Jackson.\n"
@@ -640,7 +640,7 @@ msgstr ""
 "Copyright (C) 1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 
-#: scripts/dpkg-genchanges.pl:109
+#: scripts/dpkg-genchanges.pl:110
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...]\n"
@@ -706,117 +706,117 @@ msgstr ""
 "  -h, --help               diese Hilfemeldung anzeigen.\n"
 "      --version            die Version anzeigen.\n"
 
-#: scripts/dpkg-genchanges.pl:147
+#: scripts/dpkg-genchanges.pl:148
 #, perl-format
 msgid "%s: arch-specific upload - not including arch-independent packages"
 msgstr ""
 "%s: architektur-spezifischer Upload - architektur-unabhängige Pakete nicht "
 "einschließen"
 
-#: scripts/dpkg-genchanges.pl:151
+#: scripts/dpkg-genchanges.pl:152
 #, perl-format
 msgid "%s: arch-indep upload - not including arch-specific packages"
 msgstr ""
 "%s: architektur-unabhängiger Upload - architektur-spezifische Pakete nicht "
 "einschließen"
 
-#: scripts/dpkg-genchanges.pl:218
+#: scripts/dpkg-genchanges.pl:219
 #, perl-format
 msgid "the current version (%s) is earlier than the previous one (%s)"
 msgstr "die aktuelle Version (%s) ist älter als die vorhergehende (%s)"
 
-#: scripts/dpkg-genchanges.pl:225
+#: scripts/dpkg-genchanges.pl:226
 msgid "cannot read files list file"
 msgstr "Dateienliste-Datei nicht gelesen werden"
 
-#: scripts/dpkg-genchanges.pl:229
+#: scripts/dpkg-genchanges.pl:230
 #, perl-format
 msgid "duplicate files list entry for package %s (line %d)"
 msgstr "doppelter Dateienliste-Eintrag für Paket %s (Zeile %d)"
 
-#: scripts/dpkg-genchanges.pl:237 scripts/dpkg-genchanges.pl:251
+#: scripts/dpkg-genchanges.pl:238 scripts/dpkg-genchanges.pl:252
 #, perl-format
 msgid "duplicate files list entry for file %s (line %d)"
 msgstr "doppelter Dateienliste-Eintrag für Datei %s (Zeile %d)"
 
-#: scripts/dpkg-genchanges.pl:257
+#: scripts/dpkg-genchanges.pl:258
 #, perl-format
 msgid "badly formed line in files list file, line %d"
 msgstr "ungültige Zeile in Dateienliste-Datei, Zeile %d"
 
-#: scripts/dpkg-genchanges.pl:298
+#: scripts/dpkg-genchanges.pl:299
 #, perl-format
 msgid "package %s in control file but not in files list"
 msgstr "Paket %s in Steuerdatei, aber nicht in Dateiliste"
 
-#: scripts/dpkg-genchanges.pl:342
+#: scripts/dpkg-genchanges.pl:343
 msgid "read changesdescription"
 msgstr "Änderungsbeschreibung lesen"
 
-#: scripts/dpkg-genchanges.pl:350
+#: scripts/dpkg-genchanges.pl:351
 #, perl-format
 msgid "package %s listed in files list but not in control info"
 msgstr "Paket %s in Dateienliste, aber nicht in der Steuer-Info aufgeführt"
 
-#: scripts/dpkg-genchanges.pl:362
+#: scripts/dpkg-genchanges.pl:363
 #, perl-format
 msgid "missing Section for binary package %s; using '-'"
 msgstr "fehlender Bereich für Binärpaket %s; »-« wird verwendet"
 
-#: scripts/dpkg-genchanges.pl:364
+#: scripts/dpkg-genchanges.pl:365
 #, perl-format
 msgid "package %s has section %s in control file but %s in files list"
 msgstr "Paket %s hat Bereich %s in der Steuerdatei, aber %s in der Dateiliste"
 
-#: scripts/dpkg-genchanges.pl:371
+#: scripts/dpkg-genchanges.pl:372
 #, perl-format
 msgid "missing Priority for binary package %s; using '-'"
 msgstr "fehlende Priorität für Binärpaket %s; »-« wird verwendet"
 
-#: scripts/dpkg-genchanges.pl:373
+#: scripts/dpkg-genchanges.pl:374
 #, perl-format
 msgid "package %s has priority %s in control file but %s in files list"
 msgstr "Paket %s hat Priorität %s in Steuerdatei, aber %s in Dateienliste"
 
-#: scripts/dpkg-genchanges.pl:385
+#: scripts/dpkg-genchanges.pl:386
 msgid "missing Section for source files"
 msgstr "fehlender Bereich für Quelldateien"
 
-#: scripts/dpkg-genchanges.pl:390
+#: scripts/dpkg-genchanges.pl:391
 msgid "missing Priority for source files"
 msgstr "fehlende Priorität für Quelldateien"
 
-#: scripts/dpkg-genchanges.pl:397 scripts/Dpkg/Vendor.pm:71
+#: scripts/dpkg-genchanges.pl:398 scripts/Dpkg/Vendor.pm:71
 #, perl-format
 msgid "%s is empty"
 msgstr "%s ist leer"
 
-#: scripts/dpkg-genchanges.pl:423
+#: scripts/dpkg-genchanges.pl:424
 msgid "not including original source code in upload"
 msgstr "Originalquellen beim Hochladen nicht hinzufügen"
 
-#: scripts/dpkg-genchanges.pl:430
+#: scripts/dpkg-genchanges.pl:431
 msgid "ignoring -sd option for native Debian package"
 msgstr "Option »-sd« bei »Debian native«-Paketen ignorieren"
 
-#: scripts/dpkg-genchanges.pl:432
+#: scripts/dpkg-genchanges.pl:433
 msgid "including full source code in upload"
 msgstr "kompletten Quellcode beim Hochladen hinzufügen"
 
-#: scripts/dpkg-genchanges.pl:435
+#: scripts/dpkg-genchanges.pl:436
 msgid "binary-only upload - not including any source code"
 msgstr "rein binärer Upload - es wird kein Quellcode hinzugefügt"
 
-#: scripts/dpkg-genchanges.pl:439
+#: scripts/dpkg-genchanges.pl:440
 msgid "write original source message"
 msgstr "ursprüngliche Quell-Nachricht schreiben"
 
-#: scripts/dpkg-genchanges.pl:491 scripts/Dpkg/Source/Package.pm:426
+#: scripts/dpkg-genchanges.pl:492 scripts/Dpkg/Source/Package.pm:426
 #, perl-format
 msgid "missing information for critical output field %s"
 msgstr "fehlende Informationen für kritisches Ausgabefeld %s"
 
-#: scripts/dpkg-genchanges.pl:496 scripts/dpkg-gencontrol.pl:272
+#: scripts/dpkg-genchanges.pl:497 scripts/dpkg-gencontrol.pl:272
 #: scripts/dpkg-gencontrol.pl:275 scripts/Dpkg/Source/Package.pm:431
 #, perl-format
 msgid "missing information for output field %s"