Regenerate .pot files and merge .po files with them

1 files changed, 54 insertions, 54 deletions

diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index a93bb0921..c48481fc5 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.15.8.4-20-gf505\n"
+"Project-Id-Version: dpkg 1.15.8.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2010-08-31 20:58+0200\n"
+"POT-Creation-Date: 2010-11-25 07:13+0100\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"
@@ -846,9 +846,9 @@ msgstr ""
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:141
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:150
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:156
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:221
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:319
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:329
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:223
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:321
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:331
 #, perl-format
 msgid "cannot write %s"
 msgstr ""
@@ -1406,9 +1406,9 @@ msgstr ""
 #: scripts/Dpkg/Interface/Storable.pm:87 scripts/Dpkg/Shlibs/Objdump.pm:122
 #: scripts/Dpkg/Source/Package/V2.pm:355 scripts/Dpkg/Source/Package/V2.pm:499
 #: scripts/Dpkg/Source/Package/V3/quilt.pm:111
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:272
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:326
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:373
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:274
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:328
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:375
 #, perl-format
 msgid "cannot read %s"
 msgstr ""
@@ -1428,8 +1428,8 @@ msgstr ""
 msgid "using source format `%s'"
 msgstr ""
 
-#: scripts/dpkg-source.pl:349 scripts/Dpkg/Source/Package/V1.pm:300
-#: scripts/Dpkg/Source/Package/V1.pm:345 scripts/Dpkg/Source/Package/V2.pm:482
+#: scripts/dpkg-source.pl:349 scripts/Dpkg/Source/Package/V1.pm:301
+#: scripts/Dpkg/Source/Package/V1.pm:346 scripts/Dpkg/Source/Package/V2.pm:482
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:152
 #: scripts/Dpkg/Source/Package/V3/native.pm:83
 #, perl-format
@@ -2389,41 +2389,41 @@ msgstr ""
 msgid "%s is not a plain file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:60
+#: scripts/Dpkg/Source/Package/V1.pm:61
 #, perl-format
 msgid "-s%s option overrides earlier -s%s option"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:82
+#: scripts/Dpkg/Source/Package/V1.pm:83
 #, perl-format
 msgid "source handling style -s%s not allowed with -x"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:94
+#: scripts/Dpkg/Source/Package/V1.pm:95
 #: scripts/Dpkg/Source/Package/V3/native.pm:50
 msgid "multiple tarfiles in v1.0 source package"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:99 scripts/Dpkg/Source/Package/V2.pm:122
+#: scripts/Dpkg/Source/Package/V1.pm:100 scripts/Dpkg/Source/Package/V2.pm:122
 #, perl-format
 msgid "unrecognized file for a %s source package: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:104
+#: scripts/Dpkg/Source/Package/V1.pm:105
 #: scripts/Dpkg/Source/Package/V3/native.pm:57
 msgid "no tarfile in Files field"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:107
+#: scripts/Dpkg/Source/Package/V1.pm:108
 msgid "native package with .orig.tar"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:120
+#: scripts/Dpkg/Source/Package/V1.pm:121
 #, perl-format
 msgid "unable to rename `%s' to `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:124 scripts/Dpkg/Source/Package/V2.pm:134
+#: scripts/Dpkg/Source/Package/V1.pm:125 scripts/Dpkg/Source/Package/V2.pm:134
 #: scripts/Dpkg/Source/Package/V2.pm:141 scripts/Dpkg/Source/Package/V2.pm:154
 #: scripts/Dpkg/Source/Package/V3/bzr.pm:190
 #: scripts/Dpkg/Source/Package/V3/native.pm:60
@@ -2431,166 +2431,166 @@ msgstr ""
 msgid "unpacking %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:131
+#: scripts/Dpkg/Source/Package/V1.pm:132
 msgid "unable to keep orig directory (already exists)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:138
+#: scripts/Dpkg/Source/Package/V1.pm:139
 #, perl-format
 msgid "failed to rename newly-extracted %s to %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:144
+#: scripts/Dpkg/Source/Package/V1.pm:145
 #, perl-format
 msgid "failed to rename saved %s to %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:151 scripts/Dpkg/Source/Package/V2.pm:209
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:169
+#: scripts/Dpkg/Source/Package/V1.pm:152 scripts/Dpkg/Source/Package/V2.pm:209
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:171
 #, perl-format
 msgid "applying %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:157
+#: scripts/Dpkg/Source/Package/V1.pm:158
 #, perl-format
 msgid "upstream files that have been modified: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:167
+#: scripts/Dpkg/Source/Package/V1.pm:168
 msgid "only supports gzip compression"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:178
+#: scripts/Dpkg/Source/Package/V1.pm:179
 msgid ""
 "-b takes at most a directory and an orig source argument (with v1.0 source "
 "package)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:184
+#: scripts/Dpkg/Source/Package/V1.pm:185
 #, perl-format
 msgid "source handling style -s%s not allowed with -b"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:199
+#: scripts/Dpkg/Source/Package/V1.pm:200
 #, perl-format
 msgid "packed orig `%s' exists but is not a plain file"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:211
+#: scripts/Dpkg/Source/Package/V1.pm:212
 #, perl-format
 msgid "cannot stat orig argument %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:217
+#: scripts/Dpkg/Source/Package/V1.pm:218
 #, perl-format
 msgid ""
 "orig argument is unpacked but source handling style -s%s calls for packed (."
 "orig.tar.<ext>)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:225
+#: scripts/Dpkg/Source/Package/V1.pm:226
 #, perl-format
 msgid ""
 "orig argument is packed but source handling style -s%s calls for unpacked (."
 "orig/)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:230
+#: scripts/Dpkg/Source/Package/V1.pm:231
 #, perl-format
 msgid "orig argument %s is not a plain file or directory"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:236
+#: scripts/Dpkg/Source/Package/V1.pm:237
 #, perl-format
 msgid ""
 "orig argument is empty (means no orig, no diff) but source handling style -s"
 "%s wants something"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:249
+#: scripts/Dpkg/Source/Package/V1.pm:250
 #, perl-format
 msgid "unpacked orig `%s' exists but is not a directory"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:254
+#: scripts/Dpkg/Source/Package/V1.pm:255
 #, perl-format
 msgid "unable to stat putative unpacked orig `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:263
+#: scripts/Dpkg/Source/Package/V1.pm:264
 #, perl-format
 msgid "source directory '%s' is not <sourcepackage>-<upstreamversion> '%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:272
+#: scripts/Dpkg/Source/Package/V1.pm:273
 #, perl-format
 msgid ".orig directory name %s is not <package>-<upstreamversion> (wanted %s)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:281
+#: scripts/Dpkg/Source/Package/V1.pm:282
 #, perl-format
 msgid ""
 ".orig.tar name %s is not <package>_<upstreamversion>.orig.tar (wanted %s)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:293
+#: scripts/Dpkg/Source/Package/V1.pm:294
 #, perl-format
 msgid ""
 "tarfile `%s' already exists, not overwriting, giving up; use -sU or -sR to "
 "override"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:297
+#: scripts/Dpkg/Source/Package/V1.pm:298
 #, perl-format
 msgid "unable to check for existence of `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:312 scripts/Dpkg/Source/Package/V1.pm:374
+#: scripts/Dpkg/Source/Package/V1.pm:313 scripts/Dpkg/Source/Package/V1.pm:375
 #: scripts/Dpkg/Source/Package/V3/native.pm:96
 #, perl-format
 msgid "unable to rename `%s' (newly created) to `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:315 scripts/Dpkg/Source/Package/V1.pm:377
+#: scripts/Dpkg/Source/Package/V1.pm:316 scripts/Dpkg/Source/Package/V1.pm:378
 #: scripts/Dpkg/Source/Package/V2.pm:455
 #: scripts/Dpkg/Source/Package/V3/native.pm:99
 #, perl-format
 msgid "unable to change permission of `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:317 scripts/Dpkg/Source/Package/V2.pm:325
+#: scripts/Dpkg/Source/Package/V1.pm:318 scripts/Dpkg/Source/Package/V2.pm:325
 #, perl-format
 msgid "building %s using existing %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:326
+#: scripts/Dpkg/Source/Package/V1.pm:327
 #, perl-format
 msgid ""
 "orig dir `%s' already exists, not overwriting, giving up; use -sA, -sK or -"
 "sP to override"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:334
+#: scripts/Dpkg/Source/Package/V1.pm:335
 #, perl-format
 msgid "unable to check for existence of orig dir `%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:365
+#: scripts/Dpkg/Source/Package/V1.pm:366
 #, perl-format
 msgid "the diff modifies the following upstream files: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:367
+#: scripts/Dpkg/Source/Package/V1.pm:368
 msgid ""
 "use the '3.0 (quilt)' format to have separate and documented changes to "
 "upstream files, see dpkg-source(1)"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:369 scripts/Dpkg/Source/Package/V2.pm:459
+#: scripts/Dpkg/Source/Package/V1.pm:370 scripts/Dpkg/Source/Package/V2.pm:459
 msgid "aborting due to --abort-on-upstream-changes"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V1.pm:387
+#: scripts/Dpkg/Source/Package/V1.pm:388
 #, perl-format
 msgid "%s: unrepresentable changes to source"
 msgstr ""
@@ -2610,7 +2610,7 @@ msgid "required removal of `%s' installed by original tarball"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package/V2.pm:227
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:242
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:244
 #, perl-format
 msgid "unapplying %s"
 msgstr ""
@@ -2620,7 +2620,7 @@ msgid "no orig.tar file found"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package/V2.pm:280
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:306
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:308
 msgid ""
 "patches have not been applied, applying them now (use --no-preparation to "
 "override)"
@@ -2849,13 +2849,13 @@ msgstr ""
 msgid "cannot mkdir %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:208
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:210
 #, perl-format
 msgid "can't create symlink %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:280
-#: scripts/Dpkg/Source/Package/V3/quilt.pm:283
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:282
+#: scripts/Dpkg/Source/Package/V3/quilt.pm:285
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr ""