Regenerate .pot files and merge .po files with them

1 files changed, 91 insertions, 90 deletions

diff --git a/po/dpkg.pot b/po/dpkg.pot
index d1051929f..44fd3aa16 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2009-03-10 16:03+0200\n"
+"POT-Creation-Date: 2009-05-21 06:30+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"
@@ -103,7 +103,7 @@ msgstr ""
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 
-#: lib/dbmodify.c:115 dpkg-deb/build.c:352
+#: lib/dbmodify.c:115 dpkg-deb/build.c:358
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
@@ -774,45 +774,45 @@ msgstr ""
 msgid "failed to write parsing warning"
 msgstr ""
 
-#: lib/parsehelp.c:147
+#: lib/parsehelp.c:141
 msgid "may not be empty string"
 msgstr ""
 
-#: lib/parsehelp.c:148
+#: lib/parsehelp.c:142
 msgid "must start with an alphanumeric"
 msgstr ""
 
-#: lib/parsehelp.c:157
+#: lib/parsehelp.c:151
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 
-#: lib/parsehelp.c:212
+#: lib/parsehelp.c:206
 msgid "<none>"
 msgstr ""
 
-#: lib/parsehelp.c:227
+#: lib/parsehelp.c:221
 msgid "version string is empty"
 msgstr ""
 
-#: lib/parsehelp.c:238
+#: lib/parsehelp.c:232
 msgid "version string has embedded spaces"
 msgstr ""
 
-#: lib/parsehelp.c:243
+#: lib/parsehelp.c:237
 msgid "epoch in version is not number"
 msgstr ""
 
-#: lib/parsehelp.c:244
+#: lib/parsehelp.c:238
 msgid "nothing after colon in version number"
 msgstr ""
 
-#: lib/parsehelp.c:264 lib/parsehelp.c:278
+#: lib/parsehelp.c:258 lib/parsehelp.c:272
 #, c-format
 msgid "missing %s"
 msgstr ""
 
-#: lib/parsehelp.c:266 lib/parsehelp.c:281
+#: lib/parsehelp.c:260 lib/parsehelp.c:275
 #, c-format
 msgid "empty value for %s"
 msgstr ""
@@ -1948,16 +1948,21 @@ msgstr ""
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 
-#: src/enquiry.c:426
+#: src/enquiry.c:393
+#, c-format
+msgid "obsolete option '--%s', please use '--%s' instead."
+msgstr ""
+
+#: src/enquiry.c:434
 msgid ""
 "--compare-versions takes three arguments: <version> <relation> <version>"
 msgstr ""
 
-#: src/enquiry.c:431
+#: src/enquiry.c:439
 msgid "--compare-versions bad relation"
 msgstr ""
 
-#: src/enquiry.c:436 src/enquiry.c:447
+#: src/enquiry.c:444 src/enquiry.c:455
 #, c-format
 msgid "dpkg: version '%s' has bad syntax: %s\n"
 msgstr ""
@@ -2212,8 +2217,8 @@ msgstr ""
 msgid "failed to chroot to `%.250s'"
 msgstr ""
 
-#: src/help.c:159 dpkg-deb/build.c:360 dpkg-deb/build.c:434
-#: dpkg-deb/build.c:455
+#: src/help.c:159 dpkg-deb/build.c:366 dpkg-deb/build.c:440
+#: dpkg-deb/build.c:461
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
@@ -2434,17 +2439,17 @@ msgid ""
 "`more' !"
 msgstr ""
 
-#: src/main.c:213 src/query.c:507 dpkg-deb/main.c:182 dpkg-split/main.c:160
+#: src/main.c:211 src/query.c:507 dpkg-deb/main.c:182 dpkg-split/main.c:162
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr ""
 
-#: src/main.c:219
+#: src/main.c:217
 #, c-format
 msgid "obsolete option '--%s'\n"
 msgstr ""
 
-#: src/main.c:227
+#: src/main.c:225
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2468,30 +2473,30 @@ msgid ""
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:251
+#: src/main.c:249
 msgid "--debug requires an octal argument"
 msgstr ""
 
-#: src/main.c:275
+#: src/main.c:273
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: src/main.c:281
+#: src/main.c:279
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: src/main.c:297 src/main.c:309
+#: src/main.c:295 src/main.c:307 src/main.c:548 dpkg-split/main.c:119
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: src/main.c:311
+#: src/main.c:309
 msgid "<package status and progress file descriptor>"
 msgstr ""
 
-#: src/main.c:326
+#: src/main.c:324
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2532,45 +2537,41 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:372
+#: src/main.c:370
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:377
+#: src/main.c:375
 #, c-format
 msgid "obsolete force/refuse option '%s'\n"
 msgstr ""
 
-#: src/main.c:525
+#: src/main.c:526
 #, c-format
 msgid "failed to exec %s"
 msgstr ""
 
-#: src/main.c:540
-msgid "--command-fd takes one argument, not zero"
-msgstr ""
-
 #: src/main.c:542
-msgid "--command-fd only takes one argument"
+msgid "--command-fd takes one argument, not zero"
 msgstr ""
 
 #: src/main.c:544
-msgid "invalid number for --command-fd"
+msgid "--command-fd only takes one argument"
 msgstr ""
 
-#: src/main.c:546
+#: src/main.c:550
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:571
+#: src/main.c:575
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:615 src/main.c:637 src/query.c:551 dpkg-deb/main.c:213
-#: dpkg-split/main.c:179
+#: src/main.c:619 src/main.c:641 src/query.c:551 dpkg-deb/main.c:213
+#: dpkg-split/main.c:181
 msgid "need an action option"
 msgstr ""
 
@@ -3339,227 +3340,227 @@ msgstr ""
 msgid "--forget-old-unavail takes no arguments"
 msgstr ""
 
-#: dpkg-deb/build.c:91
+#: dpkg-deb/build.c:97
 #, c-format
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
 msgstr ""
 
-#: dpkg-deb/build.c:135
+#: dpkg-deb/build.c:141
 #, c-format
 msgid "file name '%.50s...' is too long"
 msgstr ""
 
-#: dpkg-deb/build.c:198 scripts/dpkg-divert.pl:123
+#: dpkg-deb/build.c:204 scripts/dpkg-divert.pl:123
 #: scripts/dpkg-statoverride.pl:81 scripts/update-alternatives.pl:107
 #: scripts/update-alternatives.pl:111
 #, c-format, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
 
-#: dpkg-deb/build.c:208
+#: dpkg-deb/build.c:214
 msgid "--build takes at most two arguments"
 msgstr ""
 
-#: dpkg-deb/build.c:212
+#: dpkg-deb/build.c:218
 #, c-format
 msgid "unable to check for existence of archive `%.250s'"
 msgstr ""
 
-#: dpkg-deb/build.c:227
+#: dpkg-deb/build.c:233
 msgid "target is directory - cannot skip control file check"
 msgstr ""
 
-#: dpkg-deb/build.c:228
+#: dpkg-deb/build.c:234
 msgid "not checking contents of control area."
 msgstr ""
 
-#: dpkg-deb/build.c:229
+#: dpkg-deb/build.c:235
 #, c-format
 msgid "dpkg-deb: building an unknown package in '%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:246
+#: dpkg-deb/build.c:252
 msgid "package name has characters that aren't lowercase alphanums or `-+.'"
 msgstr ""
 
-#: dpkg-deb/build.c:248
+#: dpkg-deb/build.c:254
 #, c-format
 msgid "'%s' contains user-defined Priority value '%s'"
 msgstr ""
 
-#: dpkg-deb/build.c:256
+#: dpkg-deb/build.c:262
 #, c-format
 msgid "'%s' contains user-defined field '%s'"
 msgstr ""
 
-#: dpkg-deb/build.c:261
+#: dpkg-deb/build.c:267
 msgid "(upstream) version"
 msgstr ""
 
-#: dpkg-deb/build.c:263
+#: dpkg-deb/build.c:269
 msgid "Debian revision"
 msgstr ""
 
-#: dpkg-deb/build.c:264
+#: dpkg-deb/build.c:270
 #, c-format
 msgid "%d errors in control file"
 msgstr ""
 
-#: dpkg-deb/build.c:275
+#: dpkg-deb/build.c:281
 #, c-format
 msgid "dpkg-deb: building package `%s' in `%s'.\n"
 msgstr ""
 
-#: dpkg-deb/build.c:281
+#: dpkg-deb/build.c:287
 msgid "unable to stat control directory"
 msgstr ""
 
-#: dpkg-deb/build.c:283
+#: dpkg-deb/build.c:289
 msgid "control directory is not a directory"
 msgstr ""
 
-#: dpkg-deb/build.c:285
+#: dpkg-deb/build.c:291
 #, c-format
 msgid "control directory has bad permissions %03lo (must be >=0755 and <=0775)"
 msgstr ""
 
-#: dpkg-deb/build.c:296
+#: dpkg-deb/build.c:302
 #, c-format
 msgid "maintainer script `%.50s' is not a plain file or symlink"
 msgstr ""
 
-#: dpkg-deb/build.c:298
+#: dpkg-deb/build.c:304
 #, c-format
 msgid ""
 "maintainer script `%.50s' has bad permissions %03lo (must be >=0555 and "
 "<=0775)"
 msgstr ""
 
-#: dpkg-deb/build.c:302
+#: dpkg-deb/build.c:308
 #, c-format
 msgid "maintainer script `%.50s' is not stattable"
 msgstr ""
 
-#: dpkg-deb/build.c:312
+#: dpkg-deb/build.c:318
 msgid "empty string from fgets reading conffiles"
 msgstr ""
 
-#: dpkg-deb/build.c:314
+#: dpkg-deb/build.c:320
 #, c-format
 msgid "conffile name '%.50s...' is too long, or missing final newline"
 msgstr ""
 
-#: dpkg-deb/build.c:327
+#: dpkg-deb/build.c:333
 #, c-format
 msgid "conffile filename '%s' contains trailing white spaces"
 msgstr ""
 
-#: dpkg-deb/build.c:329
+#: dpkg-deb/build.c:335
 #, c-format
 msgid "conffile `%.250s' does not appear in package"
 msgstr ""
 
-#: dpkg-deb/build.c:331
+#: dpkg-deb/build.c:337
 #, c-format
 msgid "conffile `%.250s' is not stattable"
 msgstr ""
 
-#: dpkg-deb/build.c:333
+#: dpkg-deb/build.c:339
 #, c-format
 msgid "conffile '%s' is not a plain file"
 msgstr ""
 
-#: dpkg-deb/build.c:337
+#: dpkg-deb/build.c:343
 msgid "error reading conffiles file"
 msgstr ""
 
-#: dpkg-deb/build.c:340
+#: dpkg-deb/build.c:346
 msgid "error opening conffiles file"
 msgstr ""
 
-#: dpkg-deb/build.c:343
+#: dpkg-deb/build.c:349
 #, c-format
 msgid "dpkg-deb: ignoring %d warnings about the control file(s)\n"
 msgstr ""
 
-#: dpkg-deb/build.c:354
+#: dpkg-deb/build.c:360
 #, c-format
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:361
+#: dpkg-deb/build.c:367
 msgid "failed to chdir to .../DEBIAN"
 msgstr ""
 
-#: dpkg-deb/build.c:363 dpkg-deb/build.c:436
+#: dpkg-deb/build.c:369 dpkg-deb/build.c:442
 msgid "failed to exec tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:369
+#: dpkg-deb/build.c:375
 msgid "failed to make tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:370
+#: dpkg-deb/build.c:376
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:373
+#: dpkg-deb/build.c:379
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:381 dpkg-deb/build.c:410
+#: dpkg-deb/build.c:387 dpkg-deb/build.c:416
 msgid "control"
 msgstr ""
 
-#: dpkg-deb/build.c:386
+#: dpkg-deb/build.c:392
 msgid "failed to fstat tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:409
+#: dpkg-deb/build.c:415
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:417
+#: dpkg-deb/build.c:423
 msgid "failed to make tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:418
+#: dpkg-deb/build.c:424
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:421
+#: dpkg-deb/build.c:427
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:445 dpkg-deb/extract.c:290
+#: dpkg-deb/build.c:451 dpkg-deb/extract.c:290
 msgid "data"
 msgstr ""
 
-#: dpkg-deb/build.c:458
+#: dpkg-deb/build.c:464
 msgid "failed to exec find"
 msgstr ""
 
-#: dpkg-deb/build.c:469 dpkg-deb/build.c:476
+#: dpkg-deb/build.c:475 dpkg-deb/build.c:482
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:480
+#: dpkg-deb/build.c:486
 msgid "<compress> from tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:502
+#: dpkg-deb/build.c:508
 msgid "failed to fstat tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:512
+#: dpkg-deb/build.c:518
 msgid "failed to rewind tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:513
+#: dpkg-deb/build.c:519
 msgid "cat (data)"
 msgstr ""
 
@@ -4188,11 +4189,11 @@ msgstr ""
 msgid "unexpected end of file in %.250s"
 msgstr ""
 
-#: dpkg-split/main.c:119
+#: dpkg-split/main.c:121
 msgid "part size is far too large or is not positive"
 msgstr ""
 
-#: dpkg-split/main.c:123
+#: dpkg-split/main.c:125
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr ""