Regenerate .pot files and merge .po files with them

1 files changed, 492 insertions, 486 deletions

diff --git a/po/dpkg.pot b/po/dpkg.pot
index 1dff1d424..88c416e58 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.16.0.3-219-ga56b\n"
+"Project-Id-Version: dpkg 1.16.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-08-01 22:21+0200\n"
+"POT-Creation-Date: 2011-09-23 03:37+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"
@@ -24,7 +24,7 @@ msgid "invalid character '%c' in archive '%.250s' member '%.16s' size"
 msgstr ""
 
 #: lib/dpkg/ar.c:81 lib/dpkg/ar.c:97 lib/dpkg/ar.c:108 lib/dpkg/ar.c:112
-#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1114
+#: lib/dpkg/ar.c:134 utils/update-alternatives.c:1154
 #, c-format
 msgid "unable to write file '%s'"
 msgstr ""
@@ -44,31 +44,31 @@ msgstr ""
 msgid "ar member file (%s)"
 msgstr ""
 
-#: lib/dpkg/buffer.c:195
+#: lib/dpkg/buffer.c:196
 #, c-format
 msgid "failed to read on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/buffer.c:197
+#: lib/dpkg/buffer.c:212
 #, c-format
 msgid "failed in write on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/buffer.c:199
+#: lib/dpkg/buffer.c:220
 #, c-format
 msgid "short read on buffer copy for %s"
 msgstr ""
 
-#: lib/dpkg/buffer.c:262
+#: lib/dpkg/buffer.c:288
 #, c-format
 msgid "failed to seek %s"
 msgstr ""
 
-#: lib/dpkg/command.c:179 lib/dpkg/command.c:205 src/help.c:621
-#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:422
-#: src/processarc.c:829 dpkg-deb/build.c:459 dpkg-deb/build.c:538
+#: lib/dpkg/command.c:178 lib/dpkg/command.c:204 src/help.c:621
+#: src/processarc.c:98 src/processarc.c:138 src/processarc.c:432
+#: src/processarc.c:839 dpkg-deb/build.c:459 dpkg-deb/build.c:538
 #: dpkg-deb/build.c:561 dpkg-deb/extract.c:317 dpkg-deb/info.c:65
-#: dpkg-split/split.c:68 utils/update-alternatives.c:433
+#: dpkg-split/split.c:69 utils/update-alternatives.c:457
 #, c-format
 msgid "unable to execute %s (%s)"
 msgstr ""
@@ -152,109 +152,109 @@ msgstr ""
 msgid "unexpected bzip2 error"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:69
+#: lib/dpkg/dbmodify.c:68
 #, c-format
 msgid ""
 "updates directory contains file `%.250s' whose name is too long (length=%d, "
 "max=%d)"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:73
+#: lib/dpkg/dbmodify.c:72
 #, c-format
 msgid ""
 "updates directory contains files with different length names (both %d and %d)"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:87
+#: lib/dpkg/dbmodify.c:86
 #, c-format
 msgid "cannot scan updates directory `%.255s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:103
+#: lib/dpkg/dbmodify.c:102
 #, c-format
 msgid "failed to remove incorporated update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:122 dpkg-deb/build.c:447
+#: lib/dpkg/dbmodify.c:121 dpkg-deb/build.c:447
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:126
+#: lib/dpkg/dbmodify.c:125
 #, c-format
 msgid "unable to fill %.250s with padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:128
+#: lib/dpkg/dbmodify.c:127
 #, c-format
 msgid "unable to flush %.250s after padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:130
+#: lib/dpkg/dbmodify.c:129
 #, c-format
 msgid "unable to seek to start of %.250s after padding"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:197
+#: lib/dpkg/dbmodify.c:195
 #, c-format
 msgid "unable to open lock file %s for testing"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:223
+#: lib/dpkg/dbmodify.c:221
 msgid "unable to open/create status database lockfile"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:233
+#: lib/dpkg/dbmodify.c:231
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:235
+#: lib/dpkg/dbmodify.c:233
 msgid "dpkg status database"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:259
+#: lib/dpkg/dbmodify.c:257
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:264
+#: lib/dpkg/dbmodify.c:262
 msgid "unable to access dpkg status area"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:266
+#: lib/dpkg/dbmodify.c:264
 msgid "operation requires read/write access to dpkg status area"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:311
+#: lib/dpkg/dbmodify.c:309
 #, c-format
 msgid "failed to remove my own update file %.255s"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:349
+#: lib/dpkg/dbmodify.c:347
 #, c-format
 msgid "unable to write updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:351
+#: lib/dpkg/dbmodify.c:349
 #, c-format
 msgid "unable to flush updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:353
+#: lib/dpkg/dbmodify.c:351
 #, c-format
 msgid "unable to truncate for updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:355
+#: lib/dpkg/dbmodify.c:353
 #, c-format
 msgid "unable to fsync updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:357
+#: lib/dpkg/dbmodify.c:355
 #, c-format
 msgid "unable to close updated status of `%.250s'"
 msgstr ""
 
-#: lib/dpkg/dbmodify.c:360
+#: lib/dpkg/dbmodify.c:358
 #, c-format
 msgid "unable to install updated status of `%.250s'"
 msgstr ""
@@ -274,22 +274,22 @@ msgstr ""
 msgid "unable to open directory '%s'"
 msgstr ""
 
-#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:204
-#: utils/update-alternatives.c:1253
+#: lib/dpkg/dir.c:109 src/divertcmd.c:218 dpkg-split/split.c:202
+#: utils/update-alternatives.c:1293
 #, c-format
 msgid "unable to open file '%s'"
 msgstr ""
 
 #: lib/dpkg/dir.c:111 src/divertcmd.c:232 src/divertcmd.c:377
 #: src/statcmd.c:217 dpkg-deb/build.c:598 dpkg-split/join.c:65
-#: dpkg-split/queue.c:188 utils/update-alternatives.c:1366
+#: dpkg-split/queue.c:187 utils/update-alternatives.c:1406
 #, c-format
 msgid "unable to sync file '%s'"
 msgstr ""
 
 #: lib/dpkg/dir.c:113 src/divertcmd.c:234 src/divertcmd.c:379
-#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:190
-#: utils/update-alternatives.c:1274 utils/update-alternatives.c:1368
+#: dpkg-deb/build.c:600 dpkg-split/join.c:67 dpkg-split/queue.c:189
+#: utils/update-alternatives.c:1314 utils/update-alternatives.c:1408
 #, c-format
 msgid "unable to close file '%s'"
 msgstr ""
@@ -474,112 +474,112 @@ msgstr ""
 msgid "error in Config-Version string '%.250s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:267
+#: lib/dpkg/fields.c:266
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:288
+#: lib/dpkg/fields.c:287
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c:305
+#: lib/dpkg/fields.c:304
 msgid "root or null directory is listed as a conffile"
 msgstr ""
 
-#: lib/dpkg/fields.c:366
+#: lib/dpkg/fields.c:365
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 
-#: lib/dpkg/fields.c:371
+#: lib/dpkg/fields.c:370
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:407
+#: lib/dpkg/fields.c:406
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " bad version relationship %c%c"
 msgstr ""
 
-#: lib/dpkg/fields.c:413
+#: lib/dpkg/fields.c:412
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " `%c' is obsolete, use `%c=' or `%c%c' instead"
 msgstr ""
 
-#: lib/dpkg/fields.c:423
+#: lib/dpkg/fields.c:422
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " implicit exact match on version number, suggest using `=' instead"
 msgstr ""
 
-#: lib/dpkg/fields.c:431
+#: lib/dpkg/fields.c:430
 msgid "Only exact versions may be used for Provides"
 msgstr ""
 
-#: lib/dpkg/fields.c:435
+#: lib/dpkg/fields.c:434
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
 
-#: lib/dpkg/fields.c:452 lib/dpkg/fields.c:456
+#: lib/dpkg/fields.c:451 lib/dpkg/fields.c:455
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `%c'"
 msgstr ""
 
-#: lib/dpkg/fields.c:460
+#: lib/dpkg/fields.c:459
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr ""
 
-#: lib/dpkg/fields.c:466
+#: lib/dpkg/fields.c:465
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
 msgstr ""
 
-#: lib/dpkg/fields.c:476
+#: lib/dpkg/fields.c:475
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:483
+#: lib/dpkg/fields.c:482
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr ""
 
-#: lib/dpkg/fields.c:537
+#: lib/dpkg/fields.c:536
 msgid "value for `triggers-pending' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:544
+#: lib/dpkg/fields.c:543
 #, c-format
 msgid "illegal pending trigger name `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:548
+#: lib/dpkg/fields.c:547
 #, c-format
 msgid "duplicate pending trigger `%.255s'"
 msgstr ""
 
-#: lib/dpkg/fields.c:562
+#: lib/dpkg/fields.c:561
 msgid "value for `triggers-awaited' field not allowed in this context"
 msgstr ""
 
-#: lib/dpkg/fields.c:569
+#: lib/dpkg/fields.c:568
 #, c-format
 msgid "illegal package name in awaited trigger `%.255s': %s"
 msgstr ""
 
-#: lib/dpkg/fields.c:575
+#: lib/dpkg/fields.c:574
 #, c-format
 msgid "duplicate awaited trigger package `%.255s'"
 msgstr ""
@@ -644,7 +644,7 @@ msgid "realloc failed (%zu bytes)"
 msgstr ""
 
 #: lib/dpkg/mlib.c:72 lib/dpkg/mlib.c:90 utils/update-alternatives.c:277
-#: utils/update-alternatives.c:318 utils/update-alternatives.c:1067
+#: utils/update-alternatives.c:334 utils/update-alternatives.c:1107
 msgid "failed to allocate memory"
 msgstr ""
 
@@ -762,117 +762,117 @@ msgstr ""
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr ""
 
-#: lib/dpkg/parse.c:131
+#: lib/dpkg/parse.c:134
 #, c-format
 msgid "duplicate value for `%s' field"
 msgstr ""
 
-#: lib/dpkg/parse.c:143
+#: lib/dpkg/parse.c:146
 #, c-format
 msgid "user-defined field name `%.*s' too short"
 msgstr ""
 
-#: lib/dpkg/parse.c:149
+#: lib/dpkg/parse.c:152
 #, c-format
 msgid "duplicate value for user-defined field `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:204
+#: lib/dpkg/parse.c:207
 msgid "Configured-Version for package with inappropriate Status"
 msgstr ""
 
-#: lib/dpkg/parse.c:215
+#: lib/dpkg/parse.c:218
 #, c-format
 msgid "package has status %s but triggers are awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:219
+#: lib/dpkg/parse.c:222
 msgid "package has status triggers-awaited but no triggers awaited"
 msgstr ""
 
-#: lib/dpkg/parse.c:225
+#: lib/dpkg/parse.c:228
 #, c-format
 msgid "package has status %s but triggers are pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:229
+#: lib/dpkg/parse.c:232
 msgid "package has status triggers-pending but no triggers pending"
 msgstr ""
 
-#: lib/dpkg/parse.c:239
+#: lib/dpkg/parse.c:242
 msgid "Package which in state not-installed has conffiles, forgetting them"
 msgstr ""
 
-#: lib/dpkg/parse.c:346
+#: lib/dpkg/parse.c:335
 #, c-format
 msgid "failed to open package info file `%.255s' for reading"
 msgstr ""
 
-#: lib/dpkg/parse.c:351
+#: lib/dpkg/parse.c:341
 #, c-format
 msgid "can't stat package info file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:357
+#: lib/dpkg/parse.c:347
 #, c-format
 msgid "can't mmap package info file `%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:362
+#: lib/dpkg/parse.c:352
 #, c-format
 msgid "reading package info file '%.255s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:400
+#: lib/dpkg/parse.c:363
+#, c-format
+msgid "failed to close after read: `%.255s'"
+msgstr ""
+
+#: lib/dpkg/parse.c:404
 #, c-format
 msgid "EOF after field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:403
+#: lib/dpkg/parse.c:407
 #, c-format
 msgid "newline in field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:406
+#: lib/dpkg/parse.c:410
 #, c-format
 msgid "MSDOS EOF (^Z) in field name `%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:410
+#: lib/dpkg/parse.c:414
 #, c-format
 msgid "field name `%.*s' must be followed by colon"
 msgstr ""
 
-#: lib/dpkg/parse.c:419
+#: lib/dpkg/parse.c:425
 #, c-format
 msgid "EOF before value of field `%.*s' (missing final newline)"
 msgstr ""
 
-#: lib/dpkg/parse.c:423
+#: lib/dpkg/parse.c:429
 #, c-format
 msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
 msgstr ""
 
-#: lib/dpkg/parse.c:433
+#: lib/dpkg/parse.c:440
 #, c-format
 msgid "blank line in value of field '%.*s'"
 msgstr ""
 
-#: lib/dpkg/parse.c:449
+#: lib/dpkg/parse.c:461
 #, c-format
 msgid "EOF during value of field `%.*s' (missing final newline)"
 msgstr ""
 
-#: lib/dpkg/parse.c:466
+#: lib/dpkg/parse.c:546
 msgid "several package info entries found, only one allowed"
 msgstr ""
 
-#: lib/dpkg/parse.c:498
-#, c-format
-msgid "failed to close after read: `%.255s'"
-msgstr ""
-
-#: lib/dpkg/parse.c:499
+#: lib/dpkg/parse.c:572
 #, c-format
 msgid "no package information in `%.255s'"
 msgstr ""
@@ -891,58 +891,58 @@ msgid ""
 " %.255s"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:127
+#: lib/dpkg/parsehelp.c:125
 msgid "may not be empty string"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:129
+#: lib/dpkg/parsehelp.c:127
 msgid "must start with an alphanumeric character"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:138
+#: lib/dpkg/parsehelp.c:136
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:180
+#: lib/dpkg/parsehelp.c:178
 msgctxt "version"
 msgid "<none>"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:197
+#: lib/dpkg/parsehelp.c:209
 msgid "version string is empty"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:211
+#: lib/dpkg/parsehelp.c:224
 msgid "version string has embedded spaces"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:216
+#: lib/dpkg/parsehelp.c:230
 msgid "epoch in version is not number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:217
+#: lib/dpkg/parsehelp.c:232
 msgid "nothing after colon in version number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:250
+#: lib/dpkg/parsehelp.c:247
 msgid "version number does not start with digit"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:253
+#: lib/dpkg/parsehelp.c:250
 msgid "invalid character in version number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:257
+#: lib/dpkg/parsehelp.c:254
 msgid "invalid character in revision number"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:323 lib/dpkg/parsehelp.c:336
+#: lib/dpkg/parsehelp.c:299 lib/dpkg/parsehelp.c:311
 #, c-format
 msgid "missing %s"
 msgstr ""
 
-#: lib/dpkg/parsehelp.c:325 lib/dpkg/parsehelp.c:339
+#: lib/dpkg/parsehelp.c:301 lib/dpkg/parsehelp.c:314
 #, c-format
 msgid "empty value for %s"
 msgstr ""
@@ -976,7 +976,7 @@ msgstr ""
 msgid "%s (subprocess): %s\n"
 msgstr ""
 
-#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:430
+#: lib/dpkg/subproc.c:89 utils/update-alternatives.c:454
 msgid "fork failed"
 msgstr ""
 
@@ -1004,7 +1004,7 @@ msgstr ""
 msgid "subprocess %s failed with wait status code %d"
 msgstr ""
 
-#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:437
+#: lib/dpkg/subproc.c:151 utils/update-alternatives.c:461
 #, c-format
 msgid "wait for subprocess %s failed"
 msgstr ""
@@ -1024,202 +1024,202 @@ msgstr ""
 msgid "syntax error in triggers deferred file `%.250s' at character `%s'%s"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:133
+#: lib/dpkg/trigdeferred.l:134
 #, c-format
 msgid "unable to open/create triggers lockfile `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:140
+#: lib/dpkg/trigdeferred.l:141
 msgid "triggers area"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:150
+#: lib/dpkg/trigdeferred.l:151
 #, c-format
 msgid "unable to stat triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:164
+#: lib/dpkg/trigdeferred.l:165
 #, c-format
 msgid "unable to open triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:178
+#: lib/dpkg/trigdeferred.l:179
 #, c-format
 msgid "unable to open/create new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:214
+#: lib/dpkg/trigdeferred.l:215
 #, c-format
 msgid "error reading triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:222
+#: lib/dpkg/trigdeferred.l:223
 #, c-format
 msgid "unable to write new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:227
+#: lib/dpkg/trigdeferred.l:228
 #, c-format
 msgid "unable to close new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/trigdeferred.l:231
+#: lib/dpkg/trigdeferred.l:232
 #, c-format
 msgid "unable to install new triggers deferred file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:48
-msgid "empty trigger names are not permitted"
-msgstr ""
-
-#: lib/dpkg/triglib.c:52
-msgid "trigger name contains invalid character"
-msgstr ""
-
-#: lib/dpkg/triglib.c:325
+#: lib/dpkg/triglib.c:222
 #, c-format
 msgid ""
 "invalid or unknown syntax in trigger name `%.250s' (in trigger interests for "
 "package `%.250s')"
 msgstr ""
 
-#: lib/dpkg/triglib.c:365
+#: lib/dpkg/triglib.c:263
 #, c-format
 msgid "failed to open trigger interest list file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:394
+#: lib/dpkg/triglib.c:292
 #, c-format
 msgid "failed to rewind trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:407
+#: lib/dpkg/triglib.c:305
 #, c-format
 msgid ""
 "trigger interest file `%.250s' syntax error; illegal package name `%.250s': "
 "%.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:420
+#: lib/dpkg/triglib.c:318
 #, c-format
 msgid "unable to write new trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:423
+#: lib/dpkg/triglib.c:321
 #, c-format
 msgid "unable to flush new trigger interest file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:426
+#: lib/dpkg/triglib.c:324
 #, c-format
 msgid "unable to sync new trigger interest file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:434
+#: lib/dpkg/triglib.c:332
 #, c-format
 msgid "unable to install new trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:442 lib/dpkg/triglib.c:444 lib/dpkg/triglib.c:574
+#: lib/dpkg/triglib.c:340 lib/dpkg/triglib.c:342 lib/dpkg/triglib.c:472
 #: src/remove.c:286 src/remove.c:377
 #, c-format
 msgid "cannot remove `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:462
+#: lib/dpkg/triglib.c:360
 #, c-format
 msgid "unable to create new trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:485
+#: lib/dpkg/triglib.c:383
 #, c-format
 msgid "unable to close new trigger interest file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:558
+#: lib/dpkg/triglib.c:456
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename `%.250s' and package `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:585
+#: lib/dpkg/triglib.c:483
 #, c-format
 msgid "unable to create new file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:595
+#: lib/dpkg/triglib.c:493
 #, c-format
 msgid "unable to write new file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:598
+#: lib/dpkg/triglib.c:496
 #, c-format
 msgid "unable to flush new file triggers file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:601
+#: lib/dpkg/triglib.c:499
 #, c-format
 msgid "unable to sync new file triggers file '%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:605
+#: lib/dpkg/triglib.c:503
 #, c-format
 msgid "unable to close new file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:609
+#: lib/dpkg/triglib.c:507
 #, c-format
 msgid "unable to install new file triggers file as `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:644
+#: lib/dpkg/triglib.c:542
 #, c-format
 msgid "unable to read file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:654
+#: lib/dpkg/triglib.c:552
 #, c-format
 msgid "syntax error in file triggers file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:665
+#: lib/dpkg/triglib.c:563
 #, c-format
 msgid ""
 "file triggers record mentions illegal package name `%.250s' (for interest in "
 "file `%.250s'): %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:767
+#: lib/dpkg/triglib.c:665
 #, c-format
 msgid ""
 "triggers ci file `%.250s' contains illegal trigger syntax in trigger name `"
 "%.250s': %.250s"
 msgstr ""
 
-#: lib/dpkg/triglib.c:786
+#: lib/dpkg/triglib.c:684
 #, c-format
 msgid "unable to open triggers ci file `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:801
+#: lib/dpkg/triglib.c:699
 msgid "triggers ci file contains unknown directive syntax"
 msgstr ""
 
-#: lib/dpkg/triglib.c:814
+#: lib/dpkg/triglib.c:712
 #, c-format
 msgid "triggers ci file contains unknown directive `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:878
+#: lib/dpkg/triglib.c:776
 #, c-format
 msgid "unable to create triggers state directory `%.250s'"
 msgstr ""
 
-#: lib/dpkg/triglib.c:881
+#: lib/dpkg/triglib.c:779
 #, c-format
 msgid "unable to set ownership of triggers state directory `%.250s'"
 msgstr ""
 
+#: lib/dpkg/trigname.c:34
+msgid "empty trigger names are not permitted"
+msgstr ""
+
+#: lib/dpkg/trigname.c:38
+msgid "trigger name contains invalid character"
+msgstr ""
+
 #: lib/dpkg/utils.c:56
 #, c-format
 msgid "read error in `%.250s'"
@@ -1319,10 +1319,11 @@ msgstr ""
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr ""
 
-#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:293
-#: utils/update-alternatives.c:659 utils/update-alternatives.c:1182
-#: utils/update-alternatives.c:1244 utils/update-alternatives.c:1401
-#: utils/update-alternatives.c:1635
+#: src/archives.c:626 src/divertcmd.c:150 utils/update-alternatives.c:682
+#: utils/update-alternatives.c:1222 utils/update-alternatives.c:1284
+#: utils/update-alternatives.c:1441 utils/update-alternatives.c:1680
+#: utils/update-alternatives.c:2167 utils/update-alternatives.c:2244
+#: utils/update-alternatives.c:2527
 #, c-format
 msgid "cannot stat file '%s'"
 msgstr ""
@@ -1359,7 +1360,7 @@ msgstr ""
 msgid "backend dpkg-deb during `%.255s'"
 msgstr ""
 
-#: src/archives.c:744 src/archives.c:905 src/archives.c:946
+#: src/archives.c:744 src/archives.c:908 src/archives.c:949
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr ""
@@ -1379,7 +1380,7 @@ msgstr ""
 msgid "error creating hard link `%.255s'"
 msgstr ""
 
-#: src/archives.c:777 utils/update-alternatives.c:516
+#: src/archives.c:777 utils/update-alternatives.c:539
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr ""
@@ -1394,190 +1395,195 @@ msgstr ""
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 
-#: src/archives.c:832 utils/update-alternatives.c:304
+#: src/archives.c:832 utils/update-alternatives.c:322
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr ""
 
-#: src/archives.c:837
+#: src/archives.c:834 src/configure.c:423
 #, c-format
-msgid "unable to make backup symlink for `%.255s'"
+msgid "symbolic link '%.250s' size has changed from %jd to %zd"
 msgstr ""
 
 #: src/archives.c:839
 #, c-format
+msgid "unable to make backup symlink for `%.255s'"
+msgstr ""
+
+#: src/archives.c:841
+#, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:844
+#: src/archives.c:846
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 
-#: src/archives.c:860 src/archives.c:954
+#: src/archives.c:863 src/archives.c:957
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr ""
 
-#: src/archives.c:899 src/archives.c:942
+#: src/archives.c:902 src/archives.c:945
 #, c-format
 msgid "unable to open '%.255s'"
 msgstr ""
 
-#: src/archives.c:944
+#: src/archives.c:947
 #, c-format
 msgid "unable to sync file '%.255s'"
 msgstr ""
 
-#: src/archives.c:997
+#: src/archives.c:1000
 #, c-format
 msgid ""
 "ignoring dependency problem with %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1002
+#: src/archives.c:1005
 #, c-format
 msgid ""
 "considering deconfiguration of essential\n"
 " package %s, to enable %s."
 msgstr ""
 
-#: src/archives.c:1005
+#: src/archives.c:1008
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable %s.\n"
 msgstr ""
 
-#: src/archives.c:1019
+#: src/archives.c:1022
 #, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1029
+#: src/archives.c:1032
 #, c-format
 msgid "removal of %.250s"
 msgstr ""
 
-#: src/archives.c:1054
+#: src/archives.c:1057
 #, c-format
 msgid "installation of %.250s"
 msgstr ""
 
-#: src/archives.c:1055
+#: src/archives.c:1058
 #, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr ""
 
-#: src/archives.c:1062
+#: src/archives.c:1065
 #, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr ""
 
-#: src/archives.c:1066 src/archives.c:1184
+#: src/archives.c:1069 src/archives.c:1187
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:1074
+#: src/archives.c:1077
 msgid "ignoring breakage, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c:1079
+#: src/archives.c:1082
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:1083
+#: src/archives.c:1086
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:1113
+#: src/archives.c:1116
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr ""
 
-#: src/archives.c:1119
+#: src/archives.c:1122
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 
-#: src/archives.c:1148
+#: src/archives.c:1151
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 
-#: src/archives.c:1163
+#: src/archives.c:1166
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "requested.\n"
 msgstr ""
 
-#: src/archives.c:1166
+#: src/archives.c:1169
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 
-#: src/archives.c:1175
+#: src/archives.c:1178
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr ""
 
-#: src/archives.c:1187
+#: src/archives.c:1190
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr ""
 
-#: src/archives.c:1188
+#: src/archives.c:1191
 msgid "ignoring conflict, may proceed anyway!"
 msgstr ""
 
-#: src/archives.c:1232
+#: src/archives.c:1235
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr ""
 
-#: src/archives.c:1242
+#: src/archives.c:1245
 msgid "find for dpkg --recursive"
 msgstr ""
 
-#: src/archives.c:1263
+#: src/archives.c:1266
 msgid "failed to fdopen find's pipe"
 msgstr ""
 
-#: src/archives.c:1269
+#: src/archives.c:1272
 msgid "error reading find's pipe"
 msgstr ""
 
-#: src/archives.c:1270
+#: src/archives.c:1273
 msgid "error closing find's pipe"
 msgstr ""
 
-#: src/archives.c:1273
+#: src/archives.c:1276
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 
-#: src/archives.c:1276
+#: src/archives.c:1279
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 
-#: src/archives.c:1287
+#: src/archives.c:1290
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
-#: src/archives.c:1322 src/divertcmd.c:78 src/divertcmd.c:118
+#: src/archives.c:1325 src/divertcmd.c:78 src/divertcmd.c:118
 #: src/enquiry.c:166 src/enquiry.c:279 src/enquiry.c:449 src/enquiry.c:451
 #: src/enquiry.c:464 src/main.c:66 src/main.c:163 src/main.c:314
 #: src/main.c:493 src/packages.c:254 src/querycmd.c:252 src/querycmd.c:355
@@ -1585,39 +1591,39 @@ msgstr ""
 #: src/querycmd.c:606 src/querycmd.c:650 src/select.c:79 src/statcmd.c:68
 #: src/statcmd.c:98 src/trigcmd.c:58 src/trigcmd.c:90 dpkg-deb/build.c:441
 #: dpkg-deb/extract.c:217 dpkg-deb/extract.c:250 dpkg-deb/info.c:203
-#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:123
+#: dpkg-deb/info.c:265 dpkg-deb/main.c:60 dpkg-deb/main.c:126
 #: dpkg-split/info.c:257 dpkg-split/main.c:54 dpkg-split/main.c:98
-#: dpkg-split/queue.c:145 dpkg-split/queue.c:281
+#: dpkg-split/queue.c:144 dpkg-split/queue.c:280
 msgid "<standard output>"
 msgstr ""
 
-#: src/archives.c:1323 src/packages.c:255 src/querycmd.c:253
+#: src/archives.c:1326 src/packages.c:255 src/querycmd.c:253
 #: src/querycmd.c:353 src/querycmd.c:454 src/querycmd.c:518 src/select.c:80
-#: dpkg-split/main.c:179 dpkg-split/queue.c:219
+#: dpkg-split/main.c:169 dpkg-split/queue.c:218
 msgid "<standard error>"
 msgstr ""
 
-#: src/archives.c:1364
+#: src/archives.c:1367
 #, c-format
 msgid "Selecting previously unselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1368
+#: src/archives.c:1371
 #, c-format
 msgid "Skipping unselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1384
+#: src/archives.c:1387
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 
-#: src/archives.c:1394
+#: src/archives.c:1397
 #, c-format
 msgid "downgrading %.250s from %.250s to %.250s."
 msgstr ""
 
-#: src/archives.c:1399
+#: src/archives.c:1402
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1649,17 +1655,17 @@ msgstr ""
 msgid "unable to remove newly-extracted version of `%.250s'"
 msgstr ""
 
-#: src/configure.c:103
+#: src/configure.c:104
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
 msgstr ""
 
-#: src/configure.c:113
+#: src/configure.c:114
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 
-#: src/configure.c:125
+#: src/configure.c:126
 #, c-format
 msgid ""
 "\n"
@@ -1667,159 +1673,159 @@ msgid ""
 "Installing new config file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:167
+#: src/configure.c:168
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:175
+#: src/configure.c:176
 #, c-format
 msgid "%s: failed to rename '%.250s' to '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:181
+#: src/configure.c:182
 #, c-format
 msgid "%s: failed to remove '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:187
+#: src/configure.c:188
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:191
+#: src/configure.c:192
 #, c-format
 msgid "%s: failed to remove '%.250s' (before overwrite): %s"
 msgstr ""
 
-#: src/configure.c:195
+#: src/configure.c:196
 #, c-format
 msgid "%s: failed to link '%.250s' to '%.250s': %s"
 msgstr ""
 
-#: src/configure.c:199
+#: src/configure.c:200
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr ""
 
-#: src/configure.c:205 utils/update-alternatives.c:523
+#: src/configure.c:206 utils/update-alternatives.c:546
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr ""
 
-#: src/configure.c:256
+#: src/configure.c:257
 #, c-format
 msgid "no package named `%s' is installed, cannot configure"
 msgstr ""
 
-#: src/configure.c:259
+#: src/configure.c:260
 #, c-format
 msgid "package %.250s is already installed and configured"
 msgstr ""
 
-#: src/configure.c:262
+#: src/configure.c:263
 #, c-format
 msgid ""
 "package %.250s is not ready for configuration\n"
 " cannot configure (current status `%.250s')"
 msgstr ""
 
-#: src/configure.c:293
+#: src/configure.c:294
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c:296
+#: src/configure.c:297
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: src/configure.c:300
+#: src/configure.c:301
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you requested:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c:308
+#: src/configure.c:309
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
 msgstr ""
 
-#: src/configure.c:311
+#: src/configure.c:312
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr ""
 
-#: src/configure.c:395
+#: src/configure.c:396
 #, c-format
 msgid ""
 "%s: unable to stat config file '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c:408
+#: src/configure.c:409
 #, c-format
 msgid ""
 "%s: config file '%s' is a circular link\n"
 " (= '%s')"
 msgstr ""
 
-#: src/configure.c:417
+#: src/configure.c:418
 #, c-format
 msgid ""
 "%s: unable to readlink conffile '%s'\n"
 " (= '%s'): %s"
 msgstr ""
 
-#: src/configure.c:439
+#: src/configure.c:444
 #, c-format
 msgid ""
 "%s: conffile '%.250s' resolves to degenerate filename\n"
 " ('%s' is a symlink to '%s')"
 msgstr ""
 
-#: src/configure.c:455
+#: src/configure.c:460
 #, c-format
 msgid "%s: conffile '%.250s' is not a plain file or symlink (= '%s')"
 msgstr ""
 
-#: src/configure.c:481
+#: src/configure.c:486
 msgid "md5hash"
 msgstr ""
 
-#: src/configure.c:487
+#: src/configure.c:492
 #, c-format
 msgid "%s: unable to open conffile %s for hash: %s"
 msgstr ""
 
-#: src/configure.c:517 src/configure.c:521
+#: src/configure.c:522 src/configure.c:526
 msgid "conffile difference visualizer"
 msgstr ""
 
-#: src/configure.c:538
+#: src/configure.c:543
 msgid "Type `exit' when you're done.\n"
 msgstr ""
 
-#: src/configure.c:547 src/configure.c:551
+#: src/configure.c:552 src/configure.c:556
 msgid "conffile shell"
 msgstr ""
 
-#: src/configure.c:597
+#: src/configure.c:602
 #, c-format
 msgid ""
 "\n"
 "Configuration file `%s'"
 msgstr ""
 
-#: src/configure.c:599
+#: src/configure.c:604
 #, c-format
 msgid " (actually `%s')"
 msgstr ""
 
-#: src/configure.c:603
+#: src/configure.c:608
 #, c-format
 msgid ""
 "\n"
@@ -1827,58 +1833,58 @@ msgid ""
 " ==> File also in package provided by package maintainer.\n"
 msgstr ""
 
-#: src/configure.c:608
+#: src/configure.c:613
 #, c-format
 msgid ""
 "\n"
 "     Not modified since installation.\n"
 msgstr ""
 
-#: src/configure.c:610
+#: src/configure.c:615
 #, c-format
 msgid ""
 "\n"
 " ==> Modified (by you or by a script) since installation.\n"
 msgstr ""
 
-#: src/configure.c:611
+#: src/configure.c:616
 #, c-format
 msgid ""
 "\n"
 " ==> Deleted (by you or by a script) since installation.\n"
 msgstr ""
 
-#: src/configure.c:614
+#: src/configure.c:619
 #, c-format
 msgid " ==> Package distributor has shipped an updated version.\n"
 msgstr ""
 
-#: src/configure.c:615
+#: src/configure.c:620
 #, c-format
 msgid "     Version in package is the same as at last installation.\n"
 msgstr ""
 
-#: src/configure.c:623
+#: src/configure.c:628
 #, c-format
 msgid " ==> Using new file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:627
+#: src/configure.c:632
 #, c-format
 msgid " ==> Using current old file as you requested.\n"
 msgstr ""
 
-#: src/configure.c:636
+#: src/configure.c:641
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
 msgstr ""
 
-#: src/configure.c:640
+#: src/configure.c:645
 #, c-format
 msgid " ==> Using new config file as default.\n"
 msgstr ""
 
-#: src/configure.c:647
+#: src/configure.c:652
 #, c-format
 msgid ""
 "   What would you like to do about it ?  Your options are:\n"
@@ -1888,37 +1894,37 @@ msgid ""
 "      Z     : start a shell to examine the situation\n"
 msgstr ""
 
-#: src/configure.c:654
+#: src/configure.c:659
 #, c-format
 msgid " The default action is to keep your current version.\n"
 msgstr ""
 
-#: src/configure.c:656
+#: src/configure.c:661
 #, c-format
 msgid " The default action is to install the new version.\n"
 msgstr ""
 
-#: src/configure.c:663
+#: src/configure.c:666
 msgid "[default=N]"
 msgstr ""
 
-#: src/configure.c:664
+#: src/configure.c:667
 msgid "[default=Y]"
 msgstr ""
 
-#: src/configure.c:665
+#: src/configure.c:668
 msgid "[no default]"
 msgstr ""
 
-#: src/configure.c:668
+#: src/configure.c:671
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
 
-#: src/configure.c:677
+#: src/configure.c:680
 msgid "read error on stdin at conffile prompt"
 msgstr ""
 
-#: src/configure.c:678
+#: src/configure.c:681
 msgid "EOF on stdin at conffile prompt"
 msgstr ""
 
@@ -2122,7 +2128,7 @@ msgid ""
 "  different file `%s', not allowed"
 msgstr ""
 
-#: src/divertcmd.c:223 utils/update-alternatives.c:1333
+#: src/divertcmd.c:223 utils/update-alternatives.c:1373
 #, c-format
 msgid "unable to create file '%s'"
 msgstr ""
@@ -2181,7 +2187,7 @@ msgstr ""
 msgid "cannot create new %s file"
 msgstr ""
 
-#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1364
+#: src/divertcmd.c:375 src/statcmd.c:215 utils/update-alternatives.c:1404
 #, c-format
 msgid "unable to flush file '%s'"
 msgstr ""
@@ -2332,7 +2338,7 @@ msgstr ""
 
 #: src/enquiry.c:137 src/enquiry.c:211 src/enquiry.c:292 src/enquiry.c:373
 #: src/enquiry.c:460 src/select.c:98 src/select.c:164 src/trigcmd.c:199
-#: src/update.c:48 src/update.c:112 dpkg-split/queue.c:233
+#: src/update.c:48 src/update.c:113 dpkg-split/queue.c:232
 #, c-format
 msgid "--%s takes no arguments"
 msgstr ""
@@ -2414,7 +2420,7 @@ msgstr ""
 msgid "--compare-versions bad relation"
 msgstr ""
 
-#: src/enquiry.c:529 src/enquiry.c:536
+#: src/enquiry.c:529 src/enquiry.c:531 src/enquiry.c:540 src/enquiry.c:542
 #, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr ""
@@ -2460,80 +2466,80 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
-#: src/filesdb.c:306
+#: src/filesdb.c:307
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:310
+#: src/filesdb.c:311
 #, c-format
 msgid ""
 "files list file for package `%.250s' missing, assuming package has no files "
 "currently installed."
 msgstr ""
 
-#: src/filesdb.c:321
+#: src/filesdb.c:322
 #, c-format
 msgid "unable to stat files list file for package '%.250s'"
 msgstr ""
 
-#: src/filesdb.c:329
+#: src/filesdb.c:330
 #, c-format
 msgid "reading files list for package '%.250s'"
 msgstr ""
 
-#: src/filesdb.c:335
+#: src/filesdb.c:336
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr ""
 
-#: src/filesdb.c:343
+#: src/filesdb.c:344
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 
-#: src/filesdb.c:351
+#: src/filesdb.c:352
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 
-#: src/filesdb.c:461
+#: src/filesdb.c:462
 msgid "(Reading database ... "
 msgstr ""
 
-#: src/filesdb.c:482
+#: src/filesdb.c:483
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/filesdb.c:515
+#: src/filesdb.c:516
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:525
+#: src/filesdb.c:526
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:527
+#: src/filesdb.c:528
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:529
+#: src/filesdb.c:530
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:532
+#: src/filesdb.c:533
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 
-#: src/filesdb.c:534
+#: src/filesdb.c:535
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
@@ -2571,7 +2577,7 @@ msgid "installed"
 msgstr ""
 
 #: src/help.c:107
-msgid "error: PATH is not set."
+msgid "PATH is not set."
 msgstr ""
 
 #: src/help.c:129
@@ -2677,7 +2683,7 @@ msgstr ""
 msgid "unable to check existence of `%.250s'"
 msgstr ""
 
-#: src/infodb.c:69
+#: src/infodb.c:70
 msgid "cannot read info directory"
 msgstr ""
 
@@ -2717,7 +2723,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:86
+#: src/main.c:113 src/querycmd.c:631 src/trigcmd.c:77 dpkg-deb/main.c:88
 #: dpkg-split/main.c:77
 #, c-format
 msgid ""
@@ -3051,7 +3057,7 @@ msgid "unexpected eof before end of line %d"
 msgstr ""
 
 #: src/main.c:719 src/main.c:741 src/querycmd.c:692 src/statcmd.c:379
-#: dpkg-deb/main.c:195 dpkg-split/main.c:165
+#: dpkg-deb/main.c:201 dpkg-split/main.c:163
 msgid "need an action option"
 msgstr ""
 
@@ -3207,192 +3213,192 @@ msgstr ""
 msgid "passed\n"
 msgstr ""
 
-#: src/processarc.c:166
+#: src/processarc.c:165 dpkg-deb/info.c:81
+msgid "unable to create temporary directory"
+msgstr ""
+
+#: src/processarc.c:205
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr ""
 
-#: src/processarc.c:204
+#: src/processarc.c:243
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 
-#: src/processarc.c:242
+#: src/processarc.c:281
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:247
+#: src/processarc.c:286
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:257
+#: src/processarc.c:296
 msgid "unable to open temp control directory"
 msgstr ""
 
-#: src/processarc.c:268
+#: src/processarc.c:307
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 
-#: src/processarc.c:275
+#: src/processarc.c:314
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr ""
 
-#: src/processarc.c:277
+#: src/processarc.c:316
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 
-#: src/processarc.c:287
+#: src/processarc.c:326
 #, c-format
 msgid "package %s contained list as info file"
 msgstr ""
 
-#: src/processarc.c:294
+#: src/processarc.c:333
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 
-#: src/processarc.c:310 src/remove.c:198
+#: src/processarc.c:349 src/remove.c:198
 #, c-format
 msgid "unable to delete control info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:372
+#: src/processarc.c:411
 msgid "cannot access archive"
 msgstr ""
 
-#: src/processarc.c:389 dpkg-deb/info.c:81
-msgid "unable to create temporary directory"
-msgstr ""
-
-#: src/processarc.c:423
+#: src/processarc.c:433
 msgid "package control information extraction"
 msgstr ""
 
-#: src/processarc.c:450
+#: src/processarc.c:460
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr ""
 
-#: src/processarc.c:458
+#: src/processarc.c:468
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr ""
 
-#: src/processarc.c:513
+#: src/processarc.c:523
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
 "%s"
 msgstr ""
 
-#: src/processarc.c:516
+#: src/processarc.c:526
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr ""
 
-#: src/processarc.c:517
+#: src/processarc.c:527
 msgid "ignoring pre-dependency problem!"
 msgstr ""
 
-#: src/processarc.c:533
+#: src/processarc.c:543
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr ""
 
-#: src/processarc.c:539
+#: src/processarc.c:549
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr ""
 
-#: src/processarc.c:570
+#: src/processarc.c:580
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 
-#: src/processarc.c:623 utils/update-alternatives.c:1927
+#: src/processarc.c:633 utils/update-alternatives.c:2071
 #, c-format
 msgid "read error in %.250s"
 msgstr ""
 
-#: src/processarc.c:625
+#: src/processarc.c:635
 #, c-format
 msgid "error closing %.250s"
 msgstr ""
 
-#: src/processarc.c:627
+#: src/processarc.c:637
 #, c-format
 msgid "error trying to open %.250s"
 msgstr ""
 
-#: src/processarc.c:668
+#: src/processarc.c:678
 #, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr ""
 
-#: src/processarc.c:671
+#: src/processarc.c:681
 #, c-format
 msgid "De-configuring %s ...\n"
 msgstr ""
 
-#: src/processarc.c:745
+#: src/processarc.c:755
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr ""
 
-#: src/processarc.c:830
+#: src/processarc.c:840
 msgid "package filesystem archive extraction"
 msgstr ""
 
-#: src/processarc.c:844
+#: src/processarc.c:854
 msgid "error reading dpkg-deb tar output"
 msgstr ""
 
-#: src/processarc.c:846
+#: src/processarc.c:856
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 
-#: src/processarc.c:849
+#: src/processarc.c:859
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr ""
 
-#: src/processarc.c:909
+#: src/processarc.c:919
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
 
-#: src/processarc.c:915
+#: src/processarc.c:925
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
 msgstr ""
 
-#: src/processarc.c:918
+#: src/processarc.c:928
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
 
-#: src/processarc.c:965
+#: src/processarc.c:975
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:976
+#: src/processarc.c:986
 #, c-format
 msgid ""
 "old file '%.250s' is the same as several new files! (both '%.250s' and "
 "'%.250s')"
 msgstr ""
 
-#: src/processarc.c:1015
+#: src/processarc.c:1025
 #, c-format
 msgid "unable to securely remove old file '%.250s': %s"
 msgstr ""
 
-#: src/processarc.c:1196
+#: src/processarc.c:1206
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
@@ -3537,7 +3543,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/querycmd.c:642 dpkg-deb/main.c:109
+#: src/querycmd.c:642 dpkg-deb/main.c:112
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -3931,35 +3937,35 @@ msgstr ""
 
 #: src/update.c:52
 #, c-format
-msgid "--%s needs exactly one Packages file argument"
+msgid "--%s needs exactly one Packages-file argument"
 msgstr ""
 
-#: src/update.c:61
+#: src/update.c:62
 msgid "unable to access dpkg status area for bulk available update"
 msgstr ""
 
-#: src/update.c:63
+#: src/update.c:64
 msgid "bulk available update requires write access to dpkg status area"
 msgstr ""
 
-#: src/update.c:70
+#: src/update.c:71
 #, c-format
 msgid "Replacing available packages info, using %s.\n"
 msgstr ""
 
-#: src/update.c:73
+#: src/update.c:74
 #, c-format
 msgid "Updating available packages info, using %s.\n"
 msgstr ""
 
-#: src/update.c:100
+#: src/update.c:101
 #, c-format
 msgid "Information about %d package was updated.\n"
 msgid_plural "Information about %d packages was updated.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/update.c:114
+#: src/update.c:115
 #, c-format
 msgid ""
 "obsolete '--%s' option, unavailable packages are automatically cleaned up."
@@ -4068,8 +4074,8 @@ msgid_plural "ignoring %d warnings about the control file(s)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/build.c:403 utils/update-alternatives.c:2172
-#: utils/update-alternatives.c:2179
+#: dpkg-deb/build.c:403 utils/update-alternatives.c:2429
+#: utils/update-alternatives.c:2436
 #, c-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
@@ -4290,19 +4296,20 @@ msgstr ""
 msgid "paste"
 msgstr ""
 
-#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/info.c:77
+#: dpkg-deb/extract.c:342 dpkg-deb/extract.c:363 dpkg-deb/extract.c:402
+#: dpkg-deb/info.c:77
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr ""
 
-#: dpkg-deb/extract.c:347
+#: dpkg-deb/extract.c:347 dpkg-deb/extract.c:406
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
 "Perhaps you should be using dpkg --install ?"
 msgstr ""
 
-#: dpkg-deb/extract.c:350
+#: dpkg-deb/extract.c:350 dpkg-deb/extract.c:410
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr ""
@@ -4338,7 +4345,7 @@ msgid_plural "%d requested control components are missing"
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-deb/info.c:139 utils/update-alternatives.c:408
+#: dpkg-deb/info.c:139 utils/update-alternatives.c:424
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
@@ -4410,11 +4417,13 @@ msgid ""
 "  -e|--control <deb> [<directory>] Extract control info.\n"
 "  -x|--extract <deb> <directory>   Extract files.\n"
 "  -X|--vextract <deb> <directory>  Extract & list files.\n"
+"  -R|--raw-extract <deb> <directory>\n"
+"                                   Extract control info and files.\n"
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:91
+#: dpkg-deb/main.c:93
 #, c-format
 msgid ""
 "<deb> is the filename of a Debian format archive.\n"
@@ -4423,11 +4432,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:97
+#: dpkg-deb/main.c:99
 #, c-format
 msgid ""
 "Options:\n"
 "  --showformat=<format>            Use alternative format for --show.\n"
+"  -v, --verbose                    Enable verbose output.\n"
 "  -D                               Enable debugging output.\n"
 "  --old, --new                     Select archive format.\n"
 "  --nocheck                        Suppress control file check (build bad\n"
@@ -4440,7 +4450,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dpkg-deb/main.c:118
+#: dpkg-deb/main.c:121
 #, c-format
 msgid ""
 "\n"
@@ -4449,23 +4459,23 @@ msgid ""
 "unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 
-#: dpkg-deb/main.c:129
+#: dpkg-deb/main.c:132
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
 msgstr ""
 
-#: dpkg-deb/main.c:144
+#: dpkg-deb/main.c:148
 #, c-format
 msgid "invalid integer for -%c: '%.250s'"
 msgstr ""
 
-#: dpkg-deb/main.c:147
+#: dpkg-deb/main.c:151
 #, c-format
 msgid "invalid compression level for -%c: %ld'"
 msgstr ""
 
-#: dpkg-deb/main.c:157
+#: dpkg-deb/main.c:161
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""
@@ -4668,7 +4678,7 @@ msgstr ""
 msgid "split package part"
 msgstr ""
 
-#: dpkg-split/join.c:69 dpkg-split/split.c:239
+#: dpkg-split/join.c:69 dpkg-split/split.c:237
 #, c-format
 msgid "done\n"
 msgstr ""
@@ -4756,141 +4766,141 @@ msgstr ""
 msgid "unable to read depot directory `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:135
+#: dpkg-split/queue.c:134
 msgid "--auto requires the use of the --output option"
 msgstr ""
 
-#: dpkg-split/queue.c:137
+#: dpkg-split/queue.c:136
 msgid "--auto requires exactly one part file argument"
 msgstr ""
 
-#: dpkg-split/queue.c:141
+#: dpkg-split/queue.c:140
 #, c-format
 msgid "unable to read part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:144
+#: dpkg-split/queue.c:143
 #, c-format
 msgid "File `%.250s' is not part of a multipart archive.\n"
 msgstr ""
 
-#: dpkg-split/queue.c:180
+#: dpkg-split/queue.c:179
 #, c-format
 msgid "unable to reopen part file `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:183
+#: dpkg-split/queue.c:182
 #, c-format
 msgid "unable to open new depot file `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:185
+#: dpkg-split/queue.c:184
 msgid "extracting split part"
 msgstr ""
 
-#: dpkg-split/queue.c:193
+#: dpkg-split/queue.c:192
 #, c-format
 msgid "unable to rename new depot file `%.250s' to `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:197
+#: dpkg-split/queue.c:196
 #, c-format
 msgid "Part %d of package %s filed (still want "
 msgstr ""
 
-#: dpkg-split/queue.c:201
+#: dpkg-split/queue.c:200
 msgid " and "
 msgstr ""
 
-#: dpkg-split/queue.c:215
+#: dpkg-split/queue.c:214
 #, c-format
 msgid "unable to delete used-up depot file `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:236
+#: dpkg-split/queue.c:235
 msgid "Junk files left around in the depot directory:\n"
 msgstr ""
 
-#: dpkg-split/queue.c:241 dpkg-split/queue.c:270
+#: dpkg-split/queue.c:240 dpkg-split/queue.c:269
 #, c-format
 msgid "unable to stat `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:244
+#: dpkg-split/queue.c:243
 #, c-format
 msgid " %s (%jd bytes)\n"
 msgstr ""
 
-#: dpkg-split/queue.c:246
+#: dpkg-split/queue.c:245
 #, c-format
 msgid " %s (not a plain file)\n"
 msgstr ""
 
-#: dpkg-split/queue.c:251
+#: dpkg-split/queue.c:250
 msgid "Packages not yet reassembled:\n"
 msgstr ""
 
-#: dpkg-split/queue.c:259
+#: dpkg-split/queue.c:258
 #, c-format
 msgid " Package %s: part(s) "
 msgstr ""
 
-#: dpkg-split/queue.c:272
+#: dpkg-split/queue.c:271
 #, c-format
 msgid "part file `%.250s' is not a plain file"
 msgstr ""
 
-#: dpkg-split/queue.c:279
+#: dpkg-split/queue.c:278
 #, c-format
 msgid "(total %jd bytes)\n"
 msgstr ""
 
-#: dpkg-split/queue.c:305
+#: dpkg-split/queue.c:304
 #, c-format
 msgid "unable to discard `%.250s'"
 msgstr ""
 
-#: dpkg-split/queue.c:306
+#: dpkg-split/queue.c:305
 #, c-format
 msgid "Deleted %s.\n"
 msgstr ""
 
-#: dpkg-split/split.c:69 dpkg-split/split.c:75 dpkg-split/split.c:80
+#: dpkg-split/split.c:70 dpkg-split/split.c:76 dpkg-split/split.c:81
 msgid "package field value extraction"
 msgstr ""
 
-#: dpkg-split/split.c:130
+#: dpkg-split/split.c:131
 #, c-format
 msgid "unable to open source file `%.250s'"
 msgstr ""
 
-#: dpkg-split/split.c:132
+#: dpkg-split/split.c:133
 msgid "unable to fstat source file"
 msgstr ""
 
-#: dpkg-split/split.c:134
+#: dpkg-split/split.c:135
 #, c-format
 msgid "source file `%.250s' not a plain file"
 msgstr ""
 
-#: dpkg-split/split.c:152
+#: dpkg-split/split.c:153
 #, c-format
 msgid "Splitting package %s into %d part: "
 msgid_plural "Splitting package %s into %d parts: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: dpkg-split/split.c:195
+#: dpkg-split/split.c:193
 msgid ""
 "Header is too long, making part too long. Your package name or version\n"
 "numbers must be extraordinarily long, or something. Giving up.\n"
 msgstr ""
 
-#: dpkg-split/split.c:251
+#: dpkg-split/split.c:249
 msgid "--split needs a source filename argument"
 msgstr ""
 
-#: dpkg-split/split.c:254
+#: dpkg-split/split.c:252
 msgid "--split takes at most a source filename and destination prefix"
 msgstr ""
 
@@ -4966,426 +4976,422 @@ msgstr ""
 msgid "warning"
 msgstr ""
 
-#: utils/update-alternatives.c:340
+#: utils/update-alternatives.c:356
 #, c-format
 msgid "two commands specified: --%s and --%s"
 msgstr ""
 
-#: utils/update-alternatives.c:371
+#: utils/update-alternatives.c:387
 #, c-format
 msgid "cannot append to '%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:533
+#: utils/update-alternatives.c:556
 #, c-format
 msgid "unable to remove '%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:1071
+#: utils/update-alternatives.c:1111
 #, c-format
 msgid "unexpected end of file while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1073
+#: utils/update-alternatives.c:1113
 #, c-format
 msgid "while reading %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1079
+#: utils/update-alternatives.c:1119
 #, c-format
 msgid "line not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1097
+#: utils/update-alternatives.c:1137
 #, c-format
 msgid "%s corrupt: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1110
+#: utils/update-alternatives.c:1150
 #, c-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: utils/update-alternatives.c:1123
+#: utils/update-alternatives.c:1163
 msgid "slave name"
 msgstr ""
 
-#: utils/update-alternatives.c:1131 utils/update-alternatives.c:2148
+#: utils/update-alternatives.c:1171 utils/update-alternatives.c:2405
 #, c-format
 msgid "duplicate slave name %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1134
+#: utils/update-alternatives.c:1174
 msgid "slave link"
 msgstr ""
 
-#: utils/update-alternatives.c:1138
+#: utils/update-alternatives.c:1178
 #, c-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1145 utils/update-alternatives.c:2155
+#: utils/update-alternatives.c:1185 utils/update-alternatives.c:2412
 #, c-format
 msgid "duplicate slave link %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1164
+#: utils/update-alternatives.c:1204
 msgid "master file"
 msgstr ""
 
-#: utils/update-alternatives.c:1173
+#: utils/update-alternatives.c:1213
 #, c-format
 msgid "duplicate path %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1186
+#: utils/update-alternatives.c:1226
 #, c-format
 msgid ""
 "alternative %s (part of link group %s) doesn't exist. Removing from list of "
 "alternatives."
 msgstr ""
 
-#: utils/update-alternatives.c:1189 utils/update-alternatives.c:1200
+#: utils/update-alternatives.c:1229 utils/update-alternatives.c:1240
 msgid "priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1192 utils/update-alternatives.c:1209
+#: utils/update-alternatives.c:1232 utils/update-alternatives.c:1249
 msgid "slave file"
 msgstr ""
 
-#: utils/update-alternatives.c:1204
+#: utils/update-alternatives.c:1244
 #, c-format
 msgid "priority of %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1257
+#: utils/update-alternatives.c:1297
 msgid "status"
 msgstr ""
 
-#: utils/update-alternatives.c:1259
+#: utils/update-alternatives.c:1299
 msgid "invalid status"
 msgstr ""
 
-#: utils/update-alternatives.c:1264
+#: utils/update-alternatives.c:1304
 msgid "master link"
 msgstr ""
 
-#: utils/update-alternatives.c:1308
+#: utils/update-alternatives.c:1348
 #, c-format
 msgid "discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: utils/update-alternatives.c:1462 utils/update-alternatives.c:1529
-#: utils/update-alternatives.c:2484
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1569
+#: utils/update-alternatives.c:2638
 msgid "auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1462 utils/update-alternatives.c:1538
-#: utils/update-alternatives.c:2485
+#: utils/update-alternatives.c:1502 utils/update-alternatives.c:1578
+#: utils/update-alternatives.c:2639
 msgid "manual mode"
 msgstr ""
 
-#: utils/update-alternatives.c:1465
+#: utils/update-alternatives.c:1505
 #, c-format
 msgid "  link currently points to %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1468
+#: utils/update-alternatives.c:1508
 msgid "  link currently absent"
 msgstr ""
 
-#: utils/update-alternatives.c:1472
+#: utils/update-alternatives.c:1512
 #, c-format
 msgid "%s - priority %d"
 msgstr ""
 
-#: utils/update-alternatives.c:1475
+#: utils/update-alternatives.c:1515
 #, c-format
 msgid "  slave %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1482
+#: utils/update-alternatives.c:1522
 #, c-format
 msgid "Current 'best' version is '%s'."
 msgstr ""
 
-#: utils/update-alternatives.c:1484
+#: utils/update-alternatives.c:1524
 msgid "No versions available."
 msgstr ""
 
-#: utils/update-alternatives.c:1513
+#: utils/update-alternatives.c:1553
 #, c-format
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/update-alternatives.c:1520
+#: utils/update-alternatives.c:1560
 msgid "Selection"
 msgstr ""
 
-#: utils/update-alternatives.c:1521
+#: utils/update-alternatives.c:1561
 msgid "Path"
 msgstr ""
 
-#: utils/update-alternatives.c:1521
+#: utils/update-alternatives.c:1561
 msgid "Priority"
 msgstr ""
 
-#: utils/update-alternatives.c:1521
+#: utils/update-alternatives.c:1561
 msgid "Status"
 msgstr ""
 
-#: utils/update-alternatives.c:1542
+#: utils/update-alternatives.c:1582
 #, c-format
 msgid "Press enter to keep the current choice[*], or type selection number: "
 msgstr ""
 
-#: utils/update-alternatives.c:1666
+#: utils/update-alternatives.c:1721
 #, c-format
 msgid "not replacing %s with a link."
 msgstr ""
 
-#: utils/update-alternatives.c:1679
+#: utils/update-alternatives.c:1762
 #, c-format
 msgid "can't install unknown choice %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1697
+#: utils/update-alternatives.c:1780
 #, c-format
 msgid ""
 "skip creation of %s because associated file %s (of link group %s) doesn't "
 "exist."
 msgstr ""
 
-#: utils/update-alternatives.c:1707
+#: utils/update-alternatives.c:1790
 #, c-format
 msgid "not removing %s since it's not a symlink."
 msgstr ""
 
-#: utils/update-alternatives.c:1897 utils/update-alternatives.c:1903
+#: utils/update-alternatives.c:2041 utils/update-alternatives.c:2047
 #, c-format
 msgid "Call %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1907
+#: utils/update-alternatives.c:2051
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
 msgstr ""
 
-#: utils/update-alternatives.c:1911
+#: utils/update-alternatives.c:2055
 #, c-format
 msgid "Skip unknown alternative %s."
 msgstr ""
 
-#: utils/update-alternatives.c:1933
+#: utils/update-alternatives.c:2077
 #, c-format
 msgid "line too long or not terminated while trying to read %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1946 utils/update-alternatives.c:1959
-#: utils/update-alternatives.c:1969
+#: utils/update-alternatives.c:2090 utils/update-alternatives.c:2103
+#: utils/update-alternatives.c:2113
 #, c-format
 msgid "Skip invalid line: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:1988
+#: utils/update-alternatives.c:2132
 #, c-format
 msgid "renaming %s link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2019
+#: utils/update-alternatives.c:2173
 #, c-format
 msgid "renaming %s slave link from %s to %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2067
+#: utils/update-alternatives.c:2189
 #, c-format
-msgid "unknown argument `%s'"
-msgstr ""
-
-#: utils/update-alternatives.c:2086
-msgid "--install needs <link> <name> <path> <priority>"
+msgid "alternative name (%s) must not contain '/' and spaces."
 msgstr ""
 
-#: utils/update-alternatives.c:2089 utils/update-alternatives.c:2140
-msgid "<link> and <path> can't be the same"
+#: utils/update-alternatives.c:2193
+#, c-format
+msgid "alternative link is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2092
-msgid "priority must be an integer"
+#: utils/update-alternatives.c:2197
+#, c-format
+msgid "alternative path is not absolute as it should be: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2105
+#: utils/update-alternatives.c:2224
 #, c-format
-msgid "--%s needs <name> <path>"
+msgid "alternative %s can't be master: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2119
+#: utils/update-alternatives.c:2232 utils/update-alternatives.c:2267
 #, c-format
-msgid "--%s needs <name>"
+msgid "alternative link %s is already managed by %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2131
-msgid "--slave only allowed with --install"
+#: utils/update-alternatives.c:2241
+#, c-format
+msgid "alternative path %s doesn't exist."
 msgstr ""
 
-#: utils/update-alternatives.c:2133
-msgid "--slave needs <link> <name> <path>"
+#: utils/update-alternatives.c:2254
+#, c-format
+msgid "alternative %s can't be slave of %s: it is a master alternative."
 msgstr ""
 
-#: utils/update-alternatives.c:2142
+#: utils/update-alternatives.c:2258
 #, c-format
-msgid "name %s is both primary and slave"
+msgid "alternative %s can't be slave of %s: it is a slave of %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2145
+#: utils/update-alternatives.c:2278
 #, c-format
-msgid "link %s is both primary and slave"
+msgid "alternative link %s is already managed by %s (slave of %s)."
 msgstr ""
 
-#: utils/update-alternatives.c:2165
+#: utils/update-alternatives.c:2324
 #, c-format
-msgid "--%s needs a <file> argument"
+msgid "unknown argument `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2191
-#, c-format
-msgid "unknown option `%s'"
+#: utils/update-alternatives.c:2343
+msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: utils/update-alternatives.c:2196
-msgid ""
-"need --display, --query, --list, --get-selections, --config, --set, --set-"
-"selections, --install, --remove, --all, --remove-all or --auto"
+#: utils/update-alternatives.c:2346 utils/update-alternatives.c:2397
+msgid "<link> and <path> can't be the same"
 msgstr ""
 
-#: utils/update-alternatives.c:2238
-#, c-format
-msgid "alternative %s can't be master: it is a slave of %s"
+#: utils/update-alternatives.c:2349
+msgid "priority must be an integer"
 msgstr ""
 
-#: utils/update-alternatives.c:2249 utils/update-alternatives.c:2290
+#: utils/update-alternatives.c:2362
 #, c-format
-msgid "alternative link %s is already managed by %s."
+msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2254 utils/update-alternatives.c:2307
+#: utils/update-alternatives.c:2376
 #, c-format
-msgid "alternative link is not absolute as it should be: %s"
+msgid "--%s needs <name>"
 msgstr ""
 
-#: utils/update-alternatives.c:2258 utils/update-alternatives.c:2311
-#, c-format
-msgid "alternative path is not absolute as it should be: %s"
+#: utils/update-alternatives.c:2388
+msgid "--slave only allowed with --install"
 msgstr ""
 
-#: utils/update-alternatives.c:2262
-#, c-format
-msgid "alternative path %s doesn't exist."
+#: utils/update-alternatives.c:2390
+msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: utils/update-alternatives.c:2266 utils/update-alternatives.c:2315
+#: utils/update-alternatives.c:2399
 #, c-format
-msgid "alternative name (%s) must not contain '/' and spaces."
+msgid "name %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2278
-msgid "it is a master alternative."
+#: utils/update-alternatives.c:2402
+#, c-format
+msgid "link %s is both primary and slave"
 msgstr ""
 
-#: utils/update-alternatives.c:2280
+#: utils/update-alternatives.c:2422
 #, c-format
-msgid "it is a slave of %s"
+msgid "--%s needs a <file> argument"
 msgstr ""
 
-#: utils/update-alternatives.c:2282
+#: utils/update-alternatives.c:2448
 #, c-format
-msgid "alternative %s can't be slave of %s: %s"
+msgid "unknown option `%s'"
 msgstr ""
 
-#: utils/update-alternatives.c:2300
-#, c-format
-msgid "alternative link %s is already managed by %s (slave of %s)."
+#: utils/update-alternatives.c:2453
+msgid ""
+"need --display, --query, --list, --get-selections, --config, --set, --set-"
+"selections, --install, --remove, --all, --remove-all or --auto"
 msgstr ""
 
-#: utils/update-alternatives.c:2340
+#: utils/update-alternatives.c:2490
 msgid "<standard input>"
 msgstr ""
 
-#: utils/update-alternatives.c:2349 utils/update-alternatives.c:2352
+#: utils/update-alternatives.c:2500 utils/update-alternatives.c:2503
 #, c-format
 msgid "no alternatives for %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2376
+#: utils/update-alternatives.c:2530
 #, c-format
 msgid "%s/%s is dangling, it will be updated with best choice."
 msgstr ""
 
-#: utils/update-alternatives.c:2380
+#: utils/update-alternatives.c:2534
 #, c-format
 msgid ""
 "%s/%s has been changed (manually or by a script). Switching to manual "
 "updates only."
 msgstr ""
 
-#: utils/update-alternatives.c:2388
+#: utils/update-alternatives.c:2542
 #, c-format
 msgid "setting up automatic selection of %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2397
+#: utils/update-alternatives.c:2551
 #, c-format
 msgid "alternative %s for %s not registered, not setting."
 msgstr ""
 
-#: utils/update-alternatives.c:2403 utils/update-alternatives.c:2409
+#: utils/update-alternatives.c:2557 utils/update-alternatives.c:2563
 #, c-format
 msgid "There is no program which provides %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2411 utils/update-alternatives.c:2421
+#: utils/update-alternatives.c:2565 utils/update-alternatives.c:2575
 msgid "Nothing to configure."
 msgstr ""
 
-#: utils/update-alternatives.c:2419
+#: utils/update-alternatives.c:2573
 #, c-format
 msgid "There is only one alternative in link group %s: %s"
 msgstr ""
 
-#: utils/update-alternatives.c:2430
+#: utils/update-alternatives.c:2584
 #, c-format
 msgid "alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: utils/update-alternatives.c:2438
+#: utils/update-alternatives.c:2592
 #, c-format
 msgid "removing manually selected alternative - switching %s to auto mode"
 msgstr ""
 
-#: utils/update-alternatives.c:2463
+#: utils/update-alternatives.c:2617
 #, c-format
 msgid "automatic updates of %s/%s are disabled, leaving it alone."
 msgstr ""
 
-#: utils/update-alternatives.c:2465
+#: utils/update-alternatives.c:2619
 #, c-format
 msgid "to return to automatic updates use '%s --auto %s'."
 msgstr ""
 
-#: utils/update-alternatives.c:2482
+#: utils/update-alternatives.c:2636
 #, c-format
 msgid "using %s to provide %s (%s) in %s."
 msgstr ""
 
-#: utils/update-alternatives.c:2490
+#: utils/update-alternatives.c:2644
 #, c-format
 msgid ""
 "forcing reinstallation of alternative %s because link group %s is broken."
 msgstr ""
 
-#: utils/update-alternatives.c:2497
+#: utils/update-alternatives.c:2651
 #, c-format
 msgid "current alternative %s is unknown, switching to %s for link group %s."
 msgstr ""