Regenerate .pot files and merge .po files with them.

1 files changed, 590 insertions, 533 deletions

diff --git a/po/bs.po b/po/bs.po
index f611d46b2..688ef9803 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2007-05-24 19:33+0300\n"
+"POT-Creation-Date: 2007-08-18 03:58+0300\n"
 "PO-Revision-Date: 2006-02-17 08:50+0200\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -151,7 +151,7 @@ msgstr ""
 
 #  Now that we have verified everything its time to actually
 #  * build something. Lets start by making the ar-wrapper.
-#: lib/dbmodify.c:111 src/archives.c:601 dpkg-deb/build.c:319
+#: lib/dbmodify.c:111 src/archives.c:650 dpkg-deb/build.c:319
 #, c-format
 msgid "unable to create `%.255s'"
 msgstr ""
@@ -490,7 +490,7 @@ msgstr ""
 msgid "malloc failed (%ld bytes)"
 msgstr ""
 
-#: lib/mlib.c:64 dpkg-deb/info.c:98
+#: lib/mlib.c:64 dpkg-deb/info.c:99
 #, c-format
 msgid "realloc failed (%ld bytes)"
 msgstr ""
@@ -778,67 +778,64 @@ msgstr ""
 msgid "failed to read `%s' at line %d"
 msgstr ""
 
-#: lib/parsehelp.c:39
+#: lib/parsehelp.c:41
 #, c-format
-msgid "%s, in file `%.255s' near line %d"
+msgid "warning, in file `%.255s' near line %d"
 msgstr ""
 
-#: lib/parsehelp.c:40
-msgid "warning"
-msgstr "upozorenje"
-
-#: lib/parsehelp.c:40
-msgid "parse error"
+#: lib/parsehelp.c:44
+#, c-format
+msgid "parse error, in file `%.255s' near line %d"
 msgstr ""
 
-#: lib/parsehelp.c:42
+#: lib/parsehelp.c:48
 #, c-format
 msgid " package `%.255s'"
 msgstr ""
 
-#: lib/parsehelp.c:53
+#: lib/parsehelp.c:59
 msgid "failed to write parsing warning"
 msgstr ""
 
-#: lib/parsehelp.c:113
+#: lib/parsehelp.c:119
 msgid "may not be empty string"
 msgstr ""
 
-#: lib/parsehelp.c:114
+#: lib/parsehelp.c:120
 msgid "must start with an alphanumeric"
 msgstr "mora počinjati sa alfanumeričkim znakom"
 
-#: lib/parsehelp.c:123
+#: lib/parsehelp.c:129
 #, c-format
 msgid "character `%c' not allowed (only letters, digits and characters `%s')"
 msgstr ""
 
-#: lib/parsehelp.c:178
+#: lib/parsehelp.c:184
 msgid "<none>"
 msgstr ""
 
-#: lib/parsehelp.c:193
+#: lib/parsehelp.c:199
 msgid "version string is empty"
 msgstr ""
 
-#: lib/parsehelp.c:204
+#: lib/parsehelp.c:210
 msgid "version string has embedded spaces"
 msgstr ""
 
-#: lib/parsehelp.c:209
+#: lib/parsehelp.c:215
 msgid "epoch in version is not number"
 msgstr ""
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:216
 msgid "nothing after colon in version number"
 msgstr ""
 
-#: lib/parsehelp.c:232
+#: lib/parsehelp.c:238
 #, c-format
 msgid "missing %s"
 msgstr ""
 
-#: lib/parsehelp.c:236
+#: lib/parsehelp.c:242
 #, c-format
 msgid "empty value for %s"
 msgstr ""
@@ -874,283 +871,334 @@ msgstr ""
 msgid "error setting timestamps of `%.255s'"
 msgstr ""
 
-#: src/archives.c:273 src/archives.c:618
+#: src/archives.c:273 src/archives.c:667
 #, c-format
 msgid "error setting ownership of `%.255s'"
 msgstr ""
 
-#: src/archives.c:275 src/archives.c:621
+#: src/archives.c:275 src/archives.c:670
 #, c-format
 msgid "error setting permissions of `%.255s'"
 msgstr ""
 
-#: src/archives.c:368
+#: src/archives.c:339
+#, c-format
+msgid "failed to stat (dereference) existing symlink `%.250s'"
+msgstr ""
+
+#: src/archives.c:360
 #, c-format
 msgid ""
-"trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
-"%.100s%.10s"
+"failed to stat (dereference) proposed new symlink target `%.250s' for "
+"symlink `%.250s'"
 msgstr ""
 
-#: src/archives.c:372
-msgid " (package: "
+#: src/archives.c:411
+#, c-format
+msgid ""
+"trying to overwrite `%.250s', which is the diverted version of `"
+"%.250s' (package: %.100s)"
 msgstr ""
 
-#: src/archives.c:394
+#: src/archives.c:417
+#, c-format
+msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
+msgstr ""
+
+#: src/archives.c:440
 #, c-format
 msgid "unable to stat `%.255s' (which I was about to install)"
 msgstr ""
 
-#: src/archives.c:402
+#: src/archives.c:448
 #, c-format
 msgid ""
 "unable to clean up mess surrounding `%.255s' before installing another "
 "version"
 msgstr ""
 
-#: src/archives.c:408
+#: src/archives.c:454
 #, c-format
 msgid "unable to stat restored `%.255s' before installing another version"
 msgstr ""
 
-#: src/archives.c:440
+#: src/archives.c:489
 #, c-format
 msgid "archive contained object `%.255s' of unknown type 0x%x"
 msgstr ""
 
-#: src/archives.c:500
+#: src/archives.c:549
 #, c-format
 msgid "Replacing files in old package %s ...\n"
 msgstr ""
 
-#: src/archives.c:503
+#: src/archives.c:552
 #, fuzzy, c-format
 msgid "Replaced by files in installed package %s ...\n"
 msgstr "Ažurirani instalirani paketi"
 
-#: src/archives.c:509
+#: src/archives.c:558
 #, c-format
 msgid ""
 "trying to overwrite directory `%.250s' in package %.250s with nondirectory"
 msgstr ""
 
-#: src/archives.c:519
+#: src/archives.c:568
 #, c-format
 msgid "trying to overwrite `%.250s', which is also in package %.250s"
 msgstr ""
 
-#: src/archives.c:544
+#: src/archives.c:593
 #, c-format
 msgid "gobble replaced file `%.255s'"
 msgstr ""
 
-#: src/archives.c:606
+#: src/archives.c:655
 #, c-format
 msgid "backend dpkg-deb during `%.255s'"
 msgstr ""
 
-#: src/archives.c:624
+#: src/archives.c:673
 #, c-format
 msgid "error closing/writing `%.255s'"
 msgstr ""
 
-#: src/archives.c:629
+#: src/archives.c:678
 #, c-format
 msgid "error creating pipe `%.255s'"
 msgstr ""
 
-#: src/archives.c:635 src/archives.c:641
+#: src/archives.c:684 src/archives.c:690
 #, c-format
 msgid "error creating device `%.255s'"
 msgstr ""
 
-#: src/archives.c:650
+#: src/archives.c:699
 #, c-format
 msgid "error creating hard link `%.255s'"
 msgstr ""
 
-#: src/archives.c:657
+#: src/archives.c:706
 #, c-format
 msgid "error creating symbolic link `%.255s'"
 msgstr ""
 
-#: src/archives.c:663 src/archives.c:668
+#: src/archives.c:712 src/archives.c:717
 #, c-format
 msgid "error setting ownership of symlink `%.255s'"
 msgstr ""
 
-#: src/archives.c:674
+#: src/archives.c:723
 #, c-format
 msgid "error creating directory `%.255s'"
 msgstr ""
 
-#: src/archives.c:709
+#: src/archives.c:758
 #, c-format
 msgid "unable to move aside `%.255s' to install new version"
 msgstr ""
 
-#: src/archives.c:718
+#: src/archives.c:767
 #, c-format
 msgid "unable to read link `%.255s'"
 msgstr ""
 
-#: src/archives.c:722
+#: src/archives.c:771
 #, c-format
 msgid "unable to make backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:725 src/archives.c:728
+#: src/archives.c:774 src/archives.c:777
 #, c-format
 msgid "unable to chown backup symlink for `%.255s'"
 msgstr ""
 
-#: src/archives.c:733
+#: src/archives.c:782
 #, c-format
 msgid "unable to make backup link of `%.255s' before installing new version"
 msgstr ""
 
-#: src/archives.c:757
+#: src/archives.c:806
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr ""
 
-#: src/archives.c:789
+#: src/archives.c:853
 #, c-format
 msgid ""
-"dpkg: warning - ignoring dependency problem with removal of %s:\n"
+"dpkg: warning - ignoring dependency problem with %s:\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:796
+#: src/archives.c:860
 #, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
-" package %s, to enable removal of %s.\n"
+" package %s, to enable %s.\n"
 msgstr ""
 
-#: src/archives.c:800
+#: src/archives.c:864
 #, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
-" it in order to enable removal of %s.\n"
+" it in order to enable %s.\n"
 msgstr ""
 
-#: src/archives.c:813
+#: src/archives.c:878
 #, c-format
 msgid ""
-"dpkg: no, cannot remove %s (--auto-deconfigure will help):\n"
+"dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
 
-#: src/archives.c:847
+#: src/archives.c:888
+#, c-format
+msgid "removal of %.250s"
+msgstr ""
+
+#: src/archives.c:915
+#, c-format
+msgid "installation of %.250s"
+msgstr ""
+
+#: src/archives.c:916
+#, c-format
+msgid ""
+"dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
+msgstr ""
+
+#: src/archives.c:923
+#, c-format
+msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
+msgstr ""
+
+#: src/archives.c:927 src/archives.c:1048
+#, c-format
+msgid ""
+"dpkg: regarding %s containing %s:\n"
+"%s"
+msgstr ""
+
+#: src/archives.c:935
+#, c-format
+msgid "dpkg: warning - ignoring breakage, may proceed anyway !\n"
+msgstr ""
+
+#: src/archives.c:941
+#, c-format
+msgid ""
+"installing %.250s would break %.250s, and\n"
+" deconfiguration is not permitted (--auto-deconfigure might help)"
+msgstr ""
+
+#: src/archives.c:945
+#, c-format
+msgid "installing %.250s would break existing software"
+msgstr ""
+
+#: src/archives.c:978
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr ""
 
-#: src/archives.c:851
+#: src/archives.c:982
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr ""
 
-#: src/archives.c:878
+#: src/archives.c:1009
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr ""
 
-#: src/archives.c:893
+#: src/archives.c:1024
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
 "request.\n"
 msgstr ""
 
-#: src/archives.c:896
+#: src/archives.c:1027
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr ""
 
-#: src/archives.c:903
+#: src/archives.c:1034
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr ""
 
-#: src/archives.c:909
+#: src/archives.c:1040
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr ""
 
-#: src/archives.c:917
-#, c-format
-msgid ""
-"dpkg: regarding %s containing %s:\n"
-"%s"
-msgstr ""
-
-#: src/archives.c:920
+#: src/archives.c:1051
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr ""
 
-#: src/archives.c:921
+#: src/archives.c:1052
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr ""
 
-#: src/archives.c:959
+#: src/archives.c:1090
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr ""
 
-#: src/archives.c:989
+#: src/archives.c:1120
 msgid "failed to exec find for --recursive"
 msgstr ""
 
-#: src/archives.c:994
+#: src/archives.c:1125
 msgid "failed to fdopen find's pipe"
 msgstr ""
 
-#: src/archives.c:1000
+#: src/archives.c:1131
 msgid "error reading find's pipe"
 msgstr ""
 
-#: src/archives.c:1001
+#: src/archives.c:1132
 msgid "error closing find's pipe"
 msgstr ""
 
-#: src/archives.c:1004
+#: src/archives.c:1135
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr ""
 
-#: src/archives.c:1007
+#: src/archives.c:1138
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr ""
 
-#: src/archives.c:1023
+#: src/archives.c:1154
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr ""
 
-#: src/archives.c:1092
+#: src/archives.c:1223
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1097
+#: src/archives.c:1228
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr ""
 
-#: src/archives.c:1111
+#: src/archives.c:1242
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr ""
 
-#: src/archives.c:1121
+#: src/archives.c:1252
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr ""
 
-#: src/archives.c:1127
+#: src/archives.c:1258
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -1194,46 +1242,46 @@ msgid ""
 " cannot configure (current status `%.250s')"
 msgstr ""
 
-#: src/configure.c:115
+#: src/configure.c:117
 #, c-format
 msgid ""
 "dpkg: dependency problems prevent configuration of %s:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c:118
+#: src/configure.c:120
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: src/configure.c:122
+#: src/configure.c:124
 #, c-format
 msgid ""
 "dpkg: %s: dependency problems, but configuring anyway as you request:\n"
 "%s"
 msgstr ""
 
-#: src/configure.c:130
+#: src/configure.c:132
 msgid ""
 "Package is in a very bad inconsistent state - you should\n"
 " reinstall it before attempting configuration."
 msgstr ""
 
-#: src/configure.c:133
+#: src/configure.c:135
 #, c-format
 msgid "Setting up %s (%s) ...\n"
 msgstr ""
 
-#: src/configure.c:180
+#: src/configure.c:182
 #, c-format
 msgid "unable to stat new dist conffile `%.250s'"
 msgstr ""
 
-#: src/configure.c:190 src/configure.c:431
+#: src/configure.c:192 src/configure.c:431
 #, c-format
 msgid "unable to stat current installed conffile `%.250s'"
 msgstr ""
 
-#: src/configure.c:199
+#: src/configure.c:201
 #, c-format
 msgid ""
 "\n"
@@ -1241,42 +1289,42 @@ msgid ""
 "Installing new config file as you request.\n"
 msgstr ""
 
-#: src/configure.c:233
+#: src/configure.c:235
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old backup `%.250s': %s\n"
 msgstr ""
 
-#: src/configure.c:241
+#: src/configure.c:243
 #, c-format
 msgid "dpkg: %s: warning - failed to rename `%.250s' to `%.250s': %s\n"
 msgstr ""
 
-#: src/configure.c:249
+#: src/configure.c:251
 #, c-format
 msgid "dpkg: %s: warning - failed to remove `%.250s': %s\n"
 msgstr ""
 
-#: src/configure.c:257
+#: src/configure.c:259
 #, c-format
 msgid "dpkg: %s: warning - failed to remove old distrib version `%.250s': %s\n"
 msgstr ""
 
-#: src/configure.c:262
+#: src/configure.c:264
 #, c-format
 msgid "dpkg: %s: warning - failed to remove `%.250s' (before overwrite): %s\n"
 msgstr ""
 
-#: src/configure.c:267
+#: src/configure.c:269
 #, c-format
 msgid "dpkg: %s: warning - failed to link `%.250s' to `%.250s': %s\n"
 msgstr ""
 
-#: src/configure.c:271
+#: src/configure.c:273
 #, c-format
 msgid "Installing new version of config file %s ...\n"
 msgstr ""
 
-#: src/configure.c:275
+#: src/configure.c:277
 #, c-format
 msgid "unable to install `%.250s' as `%.250s'"
 msgstr ""
@@ -1514,82 +1562,82 @@ msgstr "sukobljava se sa"
 msgid "%s enhances %s"
 msgstr "poboljšava"
 
-#: src/depcon.c:269
+#: src/depcon.c:265
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:272
+#: src/depcon.c:268
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:276
+#: src/depcon.c:272
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:284
+#: src/depcon.c:280
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:299
+#: src/depcon.c:295
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr ""
 
-#: src/depcon.c:303
+#: src/depcon.c:299
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:309
+#: src/depcon.c:305
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr ""
 
-#: src/depcon.c:318
+#: src/depcon.c:314
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr ""
 
-#: src/depcon.c:354
+#: src/depcon.c:350
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr ""
 
-#: src/depcon.c:358
+#: src/depcon.c:354
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 
-#: src/depcon.c:363
+#: src/depcon.c:359
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr ""
 
-#: src/depcon.c:377
+#: src/depcon.c:373
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr ""
 
-#: src/depcon.c:408
+#: src/depcon.c:404
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:422
+#: src/depcon.c:424
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr ""
 
-#: src/depcon.c:447
+#: src/depcon.c:449
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr ""
 
-#: src/depcon.c:478
+#: src/depcon.c:485
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr ""
@@ -1925,99 +1973,99 @@ msgid ""
 "NB: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin."
 msgstr ""
 
-#: src/help.c:179
+#: src/help.c:185
 #, c-format
 msgid "failed to chroot to `%.250s'"
 msgstr ""
 
-#: src/help.c:227
+#: src/help.c:233
 #, c-format
 msgid "error un-catching signal %s: %s\n"
 msgstr ""
 
-#: src/help.c:245
+#: src/help.c:251
 #, c-format
 msgid "unable to ignore signal %s before running script"
 msgstr ""
 
-#: src/help.c:254
+#: src/help.c:260
 #, c-format
 msgid "unable to set execute permissions on `%.250s'"
 msgstr ""
 
-#: src/help.c:299
+#: src/help.c:305
 #, c-format
 msgid "unable to stat installed %s script `%.250s'"
 msgstr ""
 
-#: src/help.c:301 src/help.c:357 src/help.c:377
+#: src/help.c:307 src/help.c:363 src/help.c:383
 #, c-format
 msgid "unable to execute %s"
 msgstr ""
 
-#: src/help.c:325
+#: src/help.c:331
 #, c-format
 msgid "unable to stat new %s script `%.250s'"
 msgstr ""
 
-#: src/help.c:327
+#: src/help.c:333
 #, c-format
 msgid "unable to execute new %s"
 msgstr ""
 
-#: src/help.c:346
+#: src/help.c:352
 #, c-format
 msgid "old %s script"
 msgstr ""
 
-#: src/help.c:354
+#: src/help.c:360
 #, c-format
 msgid "dpkg: warning - unable to stat %s `%.250s': %s\n"
 msgstr ""
 
-#: src/help.c:361
+#: src/help.c:367
 #, c-format
 msgid "dpkg - trying script from the new package instead ...\n"
 msgstr ""
 
-#: src/help.c:368
+#: src/help.c:374
 #, c-format
 msgid "new %s script"
 msgstr ""
 
-#: src/help.c:372
+#: src/help.c:378
 msgid "there is no script in the new version of the package - giving up"
 msgstr ""
 
-#: src/help.c:374
+#: src/help.c:380
 #, c-format
 msgid "unable to stat %s `%.250s'"
 msgstr ""
 
-#: src/help.c:378
+#: src/help.c:384
 #, c-format
 msgid "dpkg: ... it looks like that went OK.\n"
 msgstr ""
 
-#: src/help.c:467
+#: src/help.c:473
 msgid "unlink"
 msgstr ""
 
-#: src/help.c:481
+#: src/help.c:487
 #, fuzzy
 msgid "chmod"
 msgstr "zadrži"
 
-#: src/help.c:497 src/processarc.c:711
+#: src/help.c:503 src/processarc.c:721
 msgid "delete"
 msgstr ""
 
-#: src/help.c:507
+#: src/help.c:513
 #, c-format
 msgid "failed to %s `%%.255s'"
 msgstr ""
 
-#: src/help.c:513 dpkg-deb/info.c:54
+#: src/help.c:519 dpkg-deb/info.c:54
 msgid "failed to exec rm for cleanup"
 msgstr ""
 
@@ -2026,7 +2074,7 @@ msgstr ""
 msgid "Debian `%s' package management program version %s.\n"
 msgstr "Debianov `%s' program za rukovanje paketima."
 
-#: src/main.c:46 src/query.c:467 dpkg-deb/main.c:48 dpkg-split/main.c:41
+#: src/main.c:46 src/query.c:490 dpkg-deb/main.c:48 dpkg-split/main.c:41
 #, fuzzy, c-format
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -2040,7 +2088,7 @@ msgstr ""
 "ili kasniju za uslove kopiranja.  NEMA garancije.  Pogledajte\n"
 "dselect --licence za detalje.\n"
 
-#: src/main.c:57 src/query.c:478 dpkg-deb/main.c:56 dpkg-split/main.c:49
+#: src/main.c:57 src/query.c:501 dpkg-deb/main.c:56 dpkg-split/main.c:49
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -2077,7 +2125,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/main.c:88 src/query.c:492 dpkg-deb/main.c:73 dpkg-split/main.c:63
+#: src/main.c:88 src/query.c:515 dpkg-deb/main.c:73 dpkg-split/main.c:63
 #, c-format
 msgid ""
 "  -h|--help                        Show this help message.\n"
@@ -2164,17 +2212,17 @@ msgid ""
 "`more' !"
 msgstr ""
 
-#: src/main.c:206 src/query.c:544 dpkg-deb/main.c:177 dpkg-split/main.c:157
+#: src/main.c:207 src/query.c:567 dpkg-deb/main.c:177 dpkg-split/main.c:157
 #, c-format
 msgid "conflicting actions -%c (--%s) and -%c (--%s)"
 msgstr ""
 
-#: src/main.c:212
+#: src/main.c:213
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr ""
 
-#: src/main.c:220
+#: src/main.c:221
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2195,26 +2243,26 @@ msgid ""
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:241
+#: src/main.c:242
 msgid "--debug requires an octal argument"
 msgstr ""
 
-#: src/main.c:265
+#: src/main.c:266
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: src/main.c:271
+#: src/main.c:272
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: src/main.c:287 src/main.c:298
+#: src/main.c:288 src/main.c:299
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: src/main.c:318
+#: src/main.c:319
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2254,52 +2302,52 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:363
+#: src/main.c:364
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:368
+#: src/main.c:369
 #, c-format
 msgid "Warning: obsolete force/refuse option `%s'\n"
 msgstr ""
 
-#: src/main.c:491 src/main.c:501 src/main.c:509
+#: src/main.c:492 src/main.c:502 src/main.c:510
 msgid "couldn't malloc in execbackend"
 msgstr ""
 
-#: src/main.c:495 src/main.c:518
+#: src/main.c:496 src/main.c:519
 msgid "couldn't strdup in execbackend"
 msgstr ""
 
-#: src/main.c:523
+#: src/main.c:524
 #, c-format
 msgid "failed to exec %s"
 msgstr ""
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "--command-fd takes one argument, not zero"
 msgstr ""
 
-#: src/main.c:540
+#: src/main.c:541
 msgid "--command-fd only takes one argument"
 msgstr ""
 
-#: src/main.c:542
+#: src/main.c:543
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: src/main.c:544
+#: src/main.c:545
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:569
+#: src/main.c:570
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:613 src/main.c:628 src/query.c:580 dpkg-deb/main.c:202
+#: src/main.c:614 src/main.c:629 src/query.c:603 dpkg-deb/main.c:202
 #: dpkg-split/main.c:170
 msgid "need an action option"
 msgstr ""
@@ -2309,7 +2357,7 @@ msgstr ""
 msgid "--%s --pending does not take any non-option arguments"
 msgstr ""
 
-#: src/packages.c:109 src/query.c:321
+#: src/packages.c:109 src/query.c:331
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr ""
@@ -2372,11 +2420,26 @@ msgstr ""
 msgid "  Package %s is not installed.\n"
 msgstr ""
 
-#: src/packages.c:396
+#: src/packages.c:362
+#, c-format
+msgid " %s (%s) breaks %s and is %s.\n"
+msgstr ""
+
+#: src/packages.c:370
+#, c-format
+msgid "  %s (%s) provides %s.\n"
+msgstr ""
+
+#: src/packages.c:375
+#, c-format
+msgid "  Version of %s to be configured is %s.\n"
+msgstr ""
+
+#: src/packages.c:467
 msgid " depends on "
 msgstr "zavisi o"
 
-#: src/packages.c:402
+#: src/packages.c:473
 msgid "; however:\n"
 msgstr ""
 
@@ -2445,184 +2508,172 @@ msgstr ""
 msgid "package architecture (%s) does not match system (%s)"
 msgstr ""
 
-#: src/processarc.c:256
-#, c-format
-msgid ""
-"dpkg: regarding %s containing %s:\n"
-" package uses Breaks; not supported in this dpkg\n"
-msgstr ""
-
-#: src/processarc.c:260
-#, c-format
-msgid "unsupported dependency problem - not installing %.250s"
-msgstr ""
-
-#: src/processarc.c:262
-#, c-format
-msgid "dpkg: warning - ignoring Breaks !\n"
-msgstr ""
-
-#: src/processarc.c:275
+#: src/processarc.c:269
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
 "%s"
 msgstr ""
 
-#: src/processarc.c:278
+#: src/processarc.c:272
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr ""
 
-#: src/processarc.c:279
+#: src/processarc.c:273
 #, c-format
 msgid "dpkg: warning - ignoring pre-dependency problem !\n"
 msgstr ""
 
-#: src/processarc.c:294
+#: src/processarc.c:288
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr ""
 
-#: src/processarc.c:299
+#: src/processarc.c:293
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr ""
 
-#: src/processarc.c:321
+#: src/processarc.c:315
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 
-#: src/processarc.c:374
+#: src/processarc.c:368
 #, c-format
 msgid "read error in %.250s"
 msgstr ""
 
-#: src/processarc.c:376
+#: src/processarc.c:370
 #, c-format
 msgid "error closing %.250s"
 msgstr ""
 
-#: src/processarc.c:378
+#: src/processarc.c:372
 #, c-format
 msgid "error trying to open %.250s"
 msgstr ""
 
-#: src/processarc.c:411
+#: src/processarc.c:405
 #, c-format
-msgid "De-configuring %s, so that we can remove %s ...\n"
+msgid "De-configuring %s, to allow removal of %s ...\n"
 msgstr ""
 
-#: src/processarc.c:469
+#: src/processarc.c:408
+#, c-format
+msgid "De-configuring %s ...\n"
+msgstr ""
+
+#: src/processarc.c:479
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr ""
 
-#: src/processarc.c:550
+#: src/processarc.c:560
 msgid "unable to exec dpkg-deb to get filesystem archive"
 msgstr ""
 
-#: src/processarc.c:563
+#: src/processarc.c:573
 msgid "error reading dpkg-deb tar output"
 msgstr ""
 
-#: src/processarc.c:565
+#: src/processarc.c:575
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 
-#: src/processarc.c:568
+#: src/processarc.c:578
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr ""
 
-#: src/processarc.c:621
+#: src/processarc.c:631
 #, c-format
 msgid "dpkg: warning - could not stat old file `%.250s' so not deleting it: %s"
 msgstr ""
 
-#: src/processarc.c:629
+#: src/processarc.c:639
 #, c-format
 msgid "dpkg: warning - unable to delete old directory `%.250s': %s\n"
 msgstr ""
 
-#: src/processarc.c:633
+#: src/processarc.c:643
 #, c-format
 msgid ""
 "dpkg: warning - old conffile `%.250s' was an empty directory (and has now "
 "been deleted)\n"
 msgstr ""
 
-#: src/processarc.c:663
+#: src/processarc.c:673
 #, c-format
 msgid "unable to stat other new file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:674
+#: src/processarc.c:684
 #, c-format
 msgid ""
 "dpkg: warning - old file `%.250s' is the same as several new files!  (both `"
 "%.250s' and `%.250s')\n"
 msgstr ""
 
-#: src/processarc.c:715
+#: src/processarc.c:725
 #, c-format
 msgid "dpkg: warning - unable to %s old file `%%.250s': %%s\n"
 msgstr ""
 
-#: src/processarc.c:741 src/processarc.c:982 src/remove.c:292
+#: src/processarc.c:751 src/processarc.c:992 src/remove.c:292
 msgid "cannot read info directory"
 msgstr ""
 
-#: src/processarc.c:754
+#: src/processarc.c:764
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 
-#: src/processarc.c:766
+#: src/processarc.c:776
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:769
+#: src/processarc.c:779
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 
-#: src/processarc.c:776
+#: src/processarc.c:786
 msgid "unable to open temp control directory"
 msgstr ""
 
-#: src/processarc.c:785
+#: src/processarc.c:795
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 
-#: src/processarc.c:790
+#: src/processarc.c:800
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr ""
 
-#: src/processarc.c:792
+#: src/processarc.c:802
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 
-#: src/processarc.c:798
+#: src/processarc.c:808
 #, c-format
 msgid "dpkg: warning - package %s contained list as info file"
 msgstr ""
 
-#: src/processarc.c:805
+#: src/processarc.c:815
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 
-#: src/processarc.c:962
+#: src/processarc.c:972
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
 
-#: src/processarc.c:998
+#: src/processarc.c:1008
 #, c-format
 msgid "unable to delete disappearing control info file `%.250s'"
 msgstr ""
@@ -2647,85 +2698,87 @@ msgstr "Verzija"
 msgid "Description"
 msgstr "Opis"
 
-#: src/query.c:218 src/query.c:453 src/select.c:80
+#: src/query.c:232 src/query.c:475 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr ""
 
-#: src/query.c:240
+#: src/query.c:254
 #, c-format
-msgid "diversion by %s"
+msgid "diversion by %s from: %s\n"
 msgstr ""
 
-#: src/query.c:241
+#: src/query.c:256
 #, c-format
-msgid "local diversion"
+msgid "diversion by %s to: %s\n"
 msgstr ""
 
-#: src/query.c:242
-msgid "to"
-msgstr "za"
+#: src/query.c:259
+#, c-format
+msgid "local diversion from: %s\n"
+msgstr ""
 
-#: src/query.c:242
-msgid "from"
-msgstr "od"
+#: src/query.c:260
+#, c-format
+msgid "local diversion to: %s\n"
+msgstr ""
 
-#: src/query.c:275
+#: src/query.c:285
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 
-#: src/query.c:303
+#: src/query.c:313
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr ""
 
-#: src/query.c:341
+#: src/query.c:351
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 
-#: src/query.c:350
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr ""
 
-#: src/query.c:360
+#: src/query.c:370
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr ""
 
-#: src/query.c:369
+#: src/query.c:379
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr ""
 
-#: src/query.c:376
+#: src/query.c:386
 #, c-format
 msgid "locally diverted to: %s\n"
 msgstr ""
 
-#: src/query.c:379
+#: src/query.c:389
 #, c-format
 msgid "package diverts others to: %s\n"
 msgstr ""
 
-#: src/query.c:382
+#: src/query.c:392
 #, c-format
 msgid "diverted by %s to: %s\n"
 msgstr ""
 
-#: src/query.c:404
+#: src/query.c:414
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgstr ""
 
-#: src/query.c:465
+#: src/query.c:488
 #, fuzzy, c-format
 msgid "Debian `%s' package management program query tool\n"
 msgstr "Debianov `%s' program za rukovanje paketima."
 
-#: src/query.c:482
+#: src/query.c:505
 #, c-format
 msgid ""
 "Commands:\n"
@@ -2738,7 +2791,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/query.c:498
+#: src/query.c:521
 #, c-format
 msgid ""
 "Options:\n"
@@ -2747,7 +2800,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/query.c:504 dpkg-deb/main.c:97
+#: src/query.c:527 dpkg-deb/main.c:97
 #, c-format
 msgid ""
 "Format syntax:\n"
@@ -2761,7 +2814,7 @@ msgid ""
 "  case left alignment will be used.\n"
 msgstr ""
 
-#: src/query.c:514
+#: src/query.c:537
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --license for copyright license and lack of warranty (GNU GPL).\n"
@@ -3093,7 +3146,7 @@ msgstr ""
 msgid "unable to unbuffer `%.255s'"
 msgstr ""
 
-#: dpkg-deb/build.c:325 dpkg-deb/build.c:398 dpkg-deb/build.c:419
+#: dpkg-deb/build.c:325 dpkg-deb/build.c:399 dpkg-deb/build.c:420
 #, c-format
 msgid "failed to chdir to `%.255s'"
 msgstr ""
@@ -3102,272 +3155,272 @@ msgstr ""
 msgid "failed to chdir to .../DEBIAN"
 msgstr ""
 
-#: dpkg-deb/build.c:327 dpkg-deb/build.c:400
+#: dpkg-deb/build.c:328 dpkg-deb/build.c:401
 msgid "failed to exec tar -cf"
 msgstr ""
 
-#: dpkg-deb/build.c:333
+#: dpkg-deb/build.c:334
 msgid "failed to make tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:334
+#: dpkg-deb/build.c:335
 #, c-format
 msgid "failed to open tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:337
+#: dpkg-deb/build.c:338
 #, c-format
 msgid "failed to unlink tmpfile (control), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:345 dpkg-deb/build.c:374
+#: dpkg-deb/build.c:346 dpkg-deb/build.c:375
 msgid "control"
 msgstr ""
 
-#: dpkg-deb/build.c:350
+#: dpkg-deb/build.c:351
 msgid "failed to fstat tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:373
+#: dpkg-deb/build.c:374
 msgid "failed to rewind tmpfile (control)"
 msgstr ""
 
-#: dpkg-deb/build.c:381
+#: dpkg-deb/build.c:382
 msgid "failed to make tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:382
+#: dpkg-deb/build.c:383
 #, c-format
 msgid "failed to open tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:385
+#: dpkg-deb/build.c:386
 #, c-format
 msgid "failed to unlink tmpfile (data), %s"
 msgstr ""
 
-#: dpkg-deb/build.c:409 dpkg-deb/extract.c:278
+#: dpkg-deb/build.c:410 dpkg-deb/extract.c:279
 msgid "data"
 msgstr ""
 
-#: dpkg-deb/build.c:421
+#: dpkg-deb/build.c:423
 msgid "failed to exec find"
 msgstr ""
 
-#: dpkg-deb/build.c:432 dpkg-deb/build.c:439
+#: dpkg-deb/build.c:434 dpkg-deb/build.c:441
 msgid "failed to write filename to tar pipe (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:462
+#: dpkg-deb/build.c:464
 #, c-format
 msgid "Internal error, compress_type `%i' unknown!"
 msgstr ""
 
-#: dpkg-deb/build.c:474
+#: dpkg-deb/build.c:476
 msgid "failed to rewind tmpfile (data)"
 msgstr ""
 
-#: dpkg-deb/build.c:475
+#: dpkg-deb/build.c:477
 msgid "cat (data)"
 msgstr ""
 
-#: dpkg-deb/extract.c:51
+#: dpkg-deb/extract.c:52
 msgid "failed to exec sh -c mv foo/* &c"
 msgstr ""
 
-#: dpkg-deb/extract.c:59
+#: dpkg-deb/extract.c:60
 #, c-format
 msgid "error reading %s from file %.255s"
 msgstr ""
 
-#: dpkg-deb/extract.c:61
+#: dpkg-deb/extract.c:62
 #, c-format
 msgid "unexpected end of file in %s in %.255s"
 msgstr ""
 
-#: dpkg-deb/extract.c:72 dpkg-split/info.c:52
+#: dpkg-deb/extract.c:73 dpkg-split/info.c:52
 #, c-format
 msgid "file `%.250s' is corrupt - %.250s length contains nulls"
 msgstr ""
 
-#: dpkg-deb/extract.c:79 dpkg-split/info.c:43
+#: dpkg-deb/extract.c:80 dpkg-split/info.c:43
 #, c-format
 msgid "file `%.250s' is corrupt - bad digit (code %d) in %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:104
+#: dpkg-deb/extract.c:105
 #, c-format
 msgid "failed to read archive `%.255s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:105
+#: dpkg-deb/extract.c:106
 msgid "failed to fstat archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:106
+#: dpkg-deb/extract.c:107
 msgid "version number"
 msgstr "broj verzije"
 
-#: dpkg-deb/extract.c:115
+#: dpkg-deb/extract.c:116
 msgid "between members"
 msgstr ""
 
-#: dpkg-deb/extract.c:117 dpkg-split/info.c:95
+#: dpkg-deb/extract.c:118 dpkg-split/info.c:95
 #, c-format
 msgid "file `%.250s' is corrupt - bad magic at end of first header"
 msgstr ""
 
-#: dpkg-deb/extract.c:121
+#: dpkg-deb/extract.c:122
 #, c-format
 msgid "file `%.250s' is corrupt - negative member length %zi"
 msgstr ""
 
-#: dpkg-deb/extract.c:125
+#: dpkg-deb/extract.c:126
 #, c-format
 msgid "file `%.250s' is not a debian binary archive (try dpkg-split?)"
 msgstr ""
 
-#: dpkg-deb/extract.c:128
+#: dpkg-deb/extract.c:129
 msgid "header info member"
 msgstr ""
 
-#: dpkg-deb/extract.c:131
+#: dpkg-deb/extract.c:132
 msgid "archive has no newlines in header"
 msgstr ""
 
-#: dpkg-deb/extract.c:134
+#: dpkg-deb/extract.c:135
 msgid "archive has no dot in version number"
 msgstr ""
 
-#: dpkg-deb/extract.c:137
+#: dpkg-deb/extract.c:138
 #, c-format
 msgid "archive version %.250s not understood, get newer dpkg-deb"
 msgstr ""
 
-#: dpkg-deb/extract.c:146 dpkg-deb/extract.c:179
+#: dpkg-deb/extract.c:147 dpkg-deb/extract.c:180
 #, c-format
 msgid "skipped member data from %s"
 msgstr ""
 
-#: dpkg-deb/extract.c:169
+#: dpkg-deb/extract.c:170
 #, c-format
 msgid "file `%.250s' contains ununderstood data member %.*s, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:175
+#: dpkg-deb/extract.c:176
 #, c-format
 msgid "file `%.250s' contains two control members, giving up"
 msgstr ""
 
-#: dpkg-deb/extract.c:187
+#: dpkg-deb/extract.c:188
 #, c-format
 msgid ""
 " new debian package, version %s.\n"
 " size %ld bytes: control archive= %zi bytes.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:199
+#: dpkg-deb/extract.c:200
 msgid "control information length"
 msgstr ""
 
-#: dpkg-deb/extract.c:201
+#: dpkg-deb/extract.c:202
 #, c-format
 msgid "archive has malformatted control length `%s'"
 msgstr ""
 
-#: dpkg-deb/extract.c:204
+#: dpkg-deb/extract.c:205
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
 " size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:212
+#: dpkg-deb/extract.c:213
 msgid "failed allocating memory for variable `ctrlarea'"
 msgstr ""
 
-#: dpkg-deb/extract.c:215
+#: dpkg-deb/extract.c:216
 msgid "control area"
 msgstr ""
 
-#: dpkg-deb/extract.c:221
+#: dpkg-deb/extract.c:222
 #, c-format
 msgid ""
 "dpkg-deb: file looks like it might be an archive which has been\n"
 "dpkg-deb:    corrupted by being downloaded in ASCII mode\n"
 msgstr ""
 
-#: dpkg-deb/extract.c:226
+#: dpkg-deb/extract.c:227
 #, c-format
 msgid "`%.255s' is not a debian format archive"
 msgstr ""
 
-#: dpkg-deb/extract.c:232
+#: dpkg-deb/extract.c:233
 msgid "failed getting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:237
+#: dpkg-deb/extract.c:238
 msgid "failed setting the current file position"
 msgstr ""
 
-#: dpkg-deb/extract.c:246
+#: dpkg-deb/extract.c:247
 msgid "failed to open pipe descriptor `1' in paste"
 msgstr ""
 
-#: dpkg-deb/extract.c:248
+#: dpkg-deb/extract.c:249
 msgid "failed to write to gzip -dc"
 msgstr ""
 
-#: dpkg-deb/extract.c:249
+#: dpkg-deb/extract.c:250
 msgid "failed to close gzip -dc"
 msgstr ""
 
-#: dpkg-deb/extract.c:256
+#: dpkg-deb/extract.c:257
 msgid "failed to syscall lseek to files archive portion"
 msgstr ""
 
-#: dpkg-deb/extract.c:264
+#: dpkg-deb/extract.c:265
 msgid "failed to write to pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:265
+#: dpkg-deb/extract.c:266
 msgid "failed to close pipe in copy"
 msgstr ""
 
-#: dpkg-deb/extract.c:286
+#: dpkg-deb/extract.c:287
 msgid "failed to create directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:287
+#: dpkg-deb/extract.c:288
 msgid "failed to chdir to directory after creating it"
 msgstr ""
 
-#: dpkg-deb/extract.c:289
+#: dpkg-deb/extract.c:290
 msgid "failed to chdir to directory"
 msgstr ""
 
-#: dpkg-deb/extract.c:303
+#: dpkg-deb/extract.c:304
 msgid "failed to exec tar"
 msgstr ""
 
-#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
+#: dpkg-deb/extract.c:327 dpkg-deb/extract.c:342 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr ""
 
-#: dpkg-deb/extract.c:329
+#: dpkg-deb/extract.c:330
 #, c-format
 msgid ""
 "--%s needs a target directory.\n"
 "Perhaps you should be using dpkg --install ?"
 msgstr ""
 
-#: dpkg-deb/extract.c:332
+#: dpkg-deb/extract.c:333
 #, c-format
 msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr ""
 
-#: dpkg-deb/extract.c:343
+#: dpkg-deb/extract.c:344
 #, c-format
 msgid "--%s takes only one argument (.deb filename)"
 msgstr ""
@@ -3393,85 +3446,85 @@ msgstr ""
 msgid "failed to make temporary directoryname"
 msgstr ""
 
-#: dpkg-deb/info.c:75
+#: dpkg-deb/info.c:76
 msgid "failed to exec rm -rf"
 msgstr ""
 
-#: dpkg-deb/info.c:107
+#: dpkg-deb/info.c:108
 msgid "info_spew"
 msgstr ""
 
-#: dpkg-deb/info.c:109
+#: dpkg-deb/info.c:110
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
 
-#: dpkg-deb/info.c:113
+#: dpkg-deb/info.c:114
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
-#: dpkg-deb/info.c:119
+#: dpkg-deb/info.c:120
 msgid "One requested control component is missing"
 msgstr ""
 
-#: dpkg-deb/info.c:121
+#: dpkg-deb/info.c:122
 #, c-format
 msgid "%d requested control components are missing"
 msgstr ""
 
-#: dpkg-deb/info.c:134
+#: dpkg-deb/info.c:135
 #, c-format
 msgid "cannot scan directory `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:139
+#: dpkg-deb/info.c:140
 #, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:142
+#: dpkg-deb/info.c:143
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:156
+#: dpkg-deb/info.c:157
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:159
+#: dpkg-deb/info.c:160
 #, c-format
 msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:165
+#: dpkg-deb/info.c:166
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:170
+#: dpkg-deb/info.c:171
 #, c-format
 msgid "failed to read `control' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:171
+#: dpkg-deb/info.c:172
 msgid "(no `control' file in control archive!)\n"
 msgstr ""
 
-#: dpkg-deb/info.c:191
+#: dpkg-deb/info.c:192
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:221
+#: dpkg-deb/info.c:222
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:232
+#: dpkg-deb/info.c:233
 msgid "Error in format"
 msgstr "Greška u formatu"
 
-#: dpkg-deb/info.c:268
+#: dpkg-deb/info.c:269
 msgid "--contents takes exactly one argument"
 msgstr ""
 
@@ -3727,12 +3780,7 @@ msgstr ""
 msgid "Type dpkg-split --help for help."
 msgstr ""
 
-#: dpkg-split/main.c:91
-#, c-format
-msgid "error reading %s"
-msgstr ""
-
-#: dpkg-split/main.c:95
+#: dpkg-split/main.c:91 dpkg-split/main.c:95
 #, c-format
 msgid "error reading %.250s"
 msgstr ""
@@ -3881,22 +3929,22 @@ msgstr ""
 msgid "unable to exec mksplit"
 msgstr ""
 
-#: scripts/cleanup-info.pl:36 scripts/dpkg-divert.pl:19
-#: scripts/dpkg-statoverride.pl:29 scripts/install-info.pl:17
-#: scripts/update-alternatives.pl:64
+#: scripts/cleanup-info.pl:35 scripts/dpkg-divert.pl:15
+#: scripts/dpkg-statoverride.pl:23 scripts/install-info.pl:13
+#: scripts/update-alternatives.pl:60
 #, fuzzy, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debianov `%s' program za rukovanje paketima."
 
-#: scripts/cleanup-info.pl:38
+#: scripts/cleanup-info.pl:37
 msgid ""
 "\n"
 "Copyright (C) 1996 Kim-Minh Kaplan."
 msgstr ""
 
-#: scripts/cleanup-info.pl:41 scripts/dpkg-divert.pl:25
-#: scripts/dpkg-statoverride.pl:34 scripts/install-info.pl:22
-#: scripts/update-alternatives.pl:70
+#: scripts/cleanup-info.pl:40 scripts/dpkg-divert.pl:21
+#: scripts/dpkg-statoverride.pl:28 scripts/install-info.pl:18
+#: scripts/update-alternatives.pl:66
 #, fuzzy
 msgid ""
 "\n"
@@ -3910,7 +3958,7 @@ msgstr ""
 "ili kasniju za uslove kopiranja.  NEMA garancije.  Pogledajte\n"
 "dselect --licence za detalje.\n"
 
-#: scripts/cleanup-info.pl:49
+#: scripts/cleanup-info.pl:48
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] [--] [<dirname>]\n"
@@ -3922,92 +3970,92 @@ msgid ""
 "  --version    show the version.\n"
 msgstr ""
 
-#: scripts/cleanup-info.pl:66 scripts/install-info.pl:508
+#: scripts/cleanup-info.pl:65 scripts/install-info.pl:504
 #, perl-format
 msgid "%s: warning - unable to unlock %s: %s"
 msgstr ""
 
-#: scripts/cleanup-info.pl:86 scripts/install-info.pl:119
+#: scripts/cleanup-info.pl:85 scripts/install-info.pl:115
 #, perl-format
 msgid "%s: unknown option `%s'"
 msgstr ""
 
-#: scripts/cleanup-info.pl:94 scripts/install-info.pl:130
+#: scripts/cleanup-info.pl:93 scripts/install-info.pl:126
 #, perl-format
 msgid "%s: too many arguments"
 msgstr ""
 
-#: scripts/cleanup-info.pl:101 scripts/install-info.pl:305
+#: scripts/cleanup-info.pl:100 scripts/install-info.pl:301
 #, perl-format
 msgid "%s: failed to lock dir for editing! %s"
 msgstr ""
 
-#: scripts/cleanup-info.pl:103
+#: scripts/cleanup-info.pl:102
 #, perl-format
 msgid "try deleting %s"
 msgstr ""
 
-#: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:167
+#: scripts/cleanup-info.pl:106 scripts/install-info.pl:308
+#: scripts/update-alternatives.pl:163
 #, perl-format
 msgid "unable to open %s: %s"
 msgstr ""
 
-#: scripts/cleanup-info.pl:109 scripts/install-info.pl:482
+#: scripts/cleanup-info.pl:108 scripts/install-info.pl:478
 #, perl-format
 msgid "unable to create %s: %s"
 msgstr ""
 
-#: scripts/cleanup-info.pl:120 scripts/install-info.pl:485
+#: scripts/cleanup-info.pl:119 scripts/install-info.pl:481
 #, perl-format
 msgid "unable to write %s: %s"
 msgstr ""
 
-#: scripts/cleanup-info.pl:160 scripts/install-info.pl:165
-#: scripts/install-info.pl:207 scripts/install-info.pl:314
+#: scripts/cleanup-info.pl:159 scripts/install-info.pl:161
+#: scripts/install-info.pl:203 scripts/install-info.pl:310
 #, perl-format
 msgid "unable to read %s: %s"
 msgstr ""
 
-#: scripts/cleanup-info.pl:161 scripts/install-info.pl:315
+#: scripts/cleanup-info.pl:160 scripts/install-info.pl:311
 #, perl-format
 msgid "unable to close %s after read: %s"
 msgstr ""
 
-#: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:539
+#: scripts/cleanup-info.pl:164 scripts/install-info.pl:482
+#: scripts/update-alternatives.pl:535
 #, perl-format
 msgid "unable to close %s: %s"
 msgstr ""
 
-#: scripts/cleanup-info.pl:171 scripts/install-info.pl:490
+#: scripts/cleanup-info.pl:170 scripts/install-info.pl:486
 #, perl-format
 msgid "unable to backup old %s, giving up: %s"
 msgstr ""
 
-#: scripts/cleanup-info.pl:174
+#: scripts/cleanup-info.pl:173
 #, perl-format
 msgid "failed to install %s; it will be left as %s: %s"
 msgstr ""
 
-#: scripts/cleanup-info.pl:178
+#: scripts/cleanup-info.pl:177
 #, perl-format
 msgid "%s: unable to unlock %s: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:15 scripts/update-alternatives.pl:60
+#: scripts/dpkg-divert.pl:11 scripts/update-alternatives.pl:56
 #, perl-format
 msgid "Cannot get ENOENT value from %s: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:21
+#: scripts/dpkg-divert.pl:17
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-divert.pl:33
+#: scripts/dpkg-divert.pl:29
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4037,90 +4085,90 @@ msgid ""
 "divert.\n"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:78 scripts/dpkg-statoverride.pl:62
-#: scripts/update-alternatives.pl:233
+#: scripts/dpkg-divert.pl:74 scripts/dpkg-statoverride.pl:56
+#: scripts/update-alternatives.pl:229
 #, perl-format
 msgid "two commands specified: %s and --%s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:111
+#: scripts/dpkg-divert.pl:107
 #, perl-format
 msgid "--%s needs a divert-to argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:113
+#: scripts/dpkg-divert.pl:109
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:115
+#: scripts/dpkg-divert.pl:111
 #, perl-format
 msgid "--%s needs a <package> argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:117
+#: scripts/dpkg-divert.pl:113
 msgid "package may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:119 scripts/dpkg-statoverride.pl:81
-#: scripts/update-alternatives.pl:282 scripts/update-alternatives.pl:285
+#: scripts/dpkg-divert.pl:115 scripts/dpkg-statoverride.pl:75
+#: scripts/update-alternatives.pl:278 scripts/update-alternatives.pl:281
 #, perl-format
 msgid "--%s needs a <directory> argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:122 scripts/dpkg-statoverride.pl:93
-#: scripts/update-alternatives.pl:290
+#: scripts/dpkg-divert.pl:118 scripts/dpkg-statoverride.pl:87
+#: scripts/update-alternatives.pl:286
 #, perl-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:128
+#: scripts/dpkg-divert.pl:124
 #, perl-format
 msgid "cannot open diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:131
+#: scripts/dpkg-divert.pl:127
 msgid "missing altname"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:133
+#: scripts/dpkg-divert.pl:129
 msgid "missing package"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:139 scripts/dpkg-divert.pl:167
-#: scripts/dpkg-divert.pl:210 scripts/dpkg-statoverride.pl:156
+#: scripts/dpkg-divert.pl:135 scripts/dpkg-divert.pl:163
+#: scripts/dpkg-divert.pl:206 scripts/dpkg-statoverride.pl:150
 #, perl-format
 msgid "--%s needs a single argument"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:141 scripts/dpkg-divert.pl:145
+#: scripts/dpkg-divert.pl:137 scripts/dpkg-divert.pl:141
 #, perl-format
 msgid "filename \"%s\" is not absolute"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:142 scripts/dpkg-statoverride.pl:130
+#: scripts/dpkg-divert.pl:138 scripts/dpkg-statoverride.pl:124
 msgid "file may not contain newlines"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:143
+#: scripts/dpkg-divert.pl:139
 msgid "Cannot divert directories"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:152
+#: scripts/dpkg-divert.pl:148
 #, perl-format
 msgid "Leaving `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:155
+#: scripts/dpkg-divert.pl:151
 #, perl-format
 msgid "`%s' clashes with `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:161
+#: scripts/dpkg-divert.pl:157
 #, perl-format
 msgid "Adding `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:171
+#: scripts/dpkg-divert.pl:167
 #, perl-format
 msgid ""
 "mismatch on divert-to\n"
@@ -4128,7 +4176,7 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:173
+#: scripts/dpkg-divert.pl:169
 #, perl-format
 msgid ""
 "mismatch on package\n"
@@ -4136,95 +4184,95 @@ msgid ""
 "  found `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:175
+#: scripts/dpkg-divert.pl:171
 #, perl-format
 msgid "Removing `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:190
+#: scripts/dpkg-divert.pl:186
 #, perl-format
 msgid "No diversion `%s', none removed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:220
+#: scripts/dpkg-divert.pl:216
 #, perl-format
 msgid "internal error - bad mode `%s'"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:234
+#: scripts/dpkg-divert.pl:230
 #, perl-format
 msgid "cannot stat old name `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:236
+#: scripts/dpkg-divert.pl:232
 #, perl-format
 msgid "cannot stat new name `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:251
+#: scripts/dpkg-divert.pl:247
 #, perl-format
 msgid "error checking `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:256
+#: scripts/dpkg-divert.pl:252
 #, perl-format
 msgid ""
 "rename involves overwriting `%s' with\n"
 "  different file `%s', not allowed"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:266
+#: scripts/dpkg-divert.pl:262
 #, perl-format
 msgid "rename: remove duplicate old link `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:268
+#: scripts/dpkg-divert.pl:264
 #, perl-format
 msgid "rename: rename `%s' to `%s': %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:275
+#: scripts/dpkg-divert.pl:271
 #, perl-format
 msgid "create diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:279
+#: scripts/dpkg-divert.pl:275
 #, perl-format
 msgid "write diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:281
+#: scripts/dpkg-divert.pl:277
 #, perl-format
 msgid "close diversions-new: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:283
+#: scripts/dpkg-divert.pl:279
 #, perl-format
 msgid "remove old diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:285
+#: scripts/dpkg-divert.pl:281
 #, perl-format
 msgid "create new diversions-old: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:287
+#: scripts/dpkg-divert.pl:283
 #, perl-format
 msgid "install new diversions: %s"
 msgstr ""
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:741
+#: scripts/dpkg-divert.pl:306 scripts/update-alternatives.pl:738
 #, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:31
+#: scripts/dpkg-statoverride.pl:25
 msgid ""
 "\n"
 "Copyright (C) 2000 Wichert Akkerman."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:42
+#: scripts/dpkg-statoverride.pl:36
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4244,118 +4292,118 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:100
+#: scripts/dpkg-statoverride.pl:94
 msgid "no mode specified"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:104
+#: scripts/dpkg-statoverride.pl:98
 msgid "--add needs four arguments"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:112
+#: scripts/dpkg-statoverride.pl:106
 #, perl-format
 msgid "illegal user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:115
+#: scripts/dpkg-statoverride.pl:109
 #, perl-format
 msgid "non-existing user %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:121
+#: scripts/dpkg-statoverride.pl:115
 #, perl-format
 msgid "illegal group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:124
+#: scripts/dpkg-statoverride.pl:118
 #, perl-format
 msgid "non-existing group %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:128
+#: scripts/dpkg-statoverride.pl:122
 #, perl-format
 msgid "illegal mode %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:131 scripts/dpkg-statoverride.pl:158
-#: scripts/dpkg-statoverride.pl:177
+#: scripts/dpkg-statoverride.pl:125 scripts/dpkg-statoverride.pl:152
+#: scripts/dpkg-statoverride.pl:171
 msgid "stripping trailing /"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:134
+#: scripts/dpkg-statoverride.pl:128
 #, perl-format
 msgid "An override for \"%s\" already exists, "
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:136
+#: scripts/dpkg-statoverride.pl:130
 msgid "but --force specified so will be ignored."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:138
+#: scripts/dpkg-statoverride.pl:132
 #, fuzzy
 msgid "aborting"
 msgstr "upozorenje"
 
-#: scripts/dpkg-statoverride.pl:149
+#: scripts/dpkg-statoverride.pl:143
 #, perl-format
 msgid "warning: --update given but %s does not exist"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:151
+#: scripts/dpkg-statoverride.pl:145
 #, perl-format
 msgid "failed to chown %s: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:152
+#: scripts/dpkg-statoverride.pl:146
 #, perl-format
 msgid "failed to chmod %s: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:160
+#: scripts/dpkg-statoverride.pl:154
 msgid "No override present."
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:168
+#: scripts/dpkg-statoverride.pl:162
 msgid "warning: --update is useless for --remove"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:195
+#: scripts/dpkg-statoverride.pl:189
 #, perl-format
 msgid "cannot open statoverride: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:201
+#: scripts/dpkg-statoverride.pl:195
 #, perl-format
 msgid "Multiple overrides for \"%s\", aborting"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:214
+#: scripts/dpkg-statoverride.pl:208
 #, perl-format
 msgid "cannot open new statoverride file: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:221
+#: scripts/dpkg-statoverride.pl:215
 #, perl-format
 msgid "error removing statoverride-old: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:223
+#: scripts/dpkg-statoverride.pl:217
 #, perl-format
 msgid "error creating new statoverride-old: %s"
 msgstr ""
 
-#: scripts/dpkg-statoverride.pl:225
+#: scripts/dpkg-statoverride.pl:219
 #, perl-format
 msgid "error installing new statoverride: %s"
 msgstr ""
 
-#: scripts/install-info.pl:19
+#: scripts/install-info.pl:15
 msgid ""
 "\n"
 "Copyright (C) 1994,1995 Ian Jackson."
 msgstr ""
 
-#: scripts/install-info.pl:31
+#: scripts/install-info.pl:27
 #, perl-format
 msgid ""
 "Usage: %s [<options> ...] [--] <filename>\n"
@@ -4383,46 +4431,46 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/install-info.pl:97
+#: scripts/install-info.pl:93
 #, perl-format
 msgid "could not open stderr for output! %s"
 msgstr ""
 
-#: scripts/install-info.pl:101
+#: scripts/install-info.pl:97
 #, perl-format
 msgid "%s: --section needs two more args"
 msgstr ""
 
-#: scripts/install-info.pl:107
+#: scripts/install-info.pl:103
 #, perl-format
 msgid "%s: option --%s is deprecated (ignored)"
 msgstr ""
 
-#: scripts/install-info.pl:133
+#: scripts/install-info.pl:129
 #, perl-format
 msgid "%s: --section ignored with --remove"
 msgstr ""
 
-#: scripts/install-info.pl:134
+#: scripts/install-info.pl:130
 #, perl-format
 msgid "%s: --description ignored with --remove"
 msgstr ""
 
-#: scripts/install-info.pl:137
+#: scripts/install-info.pl:133
 #, perl-format
 msgid "%s: test mode - dir file will not be updated"
 msgstr ""
 
-#: scripts/install-info.pl:191
+#: scripts/install-info.pl:187
 #, perl-format
 msgid "%s: warning, ignoring confusing INFO-DIR-ENTRY in file."
 msgstr ""
 
-#: scripts/install-info.pl:200
+#: scripts/install-info.pl:196
 msgid "invalid info entry"
 msgstr ""
 
-#: scripts/install-info.pl:226
+#: scripts/install-info.pl:222
 #, perl-format
 msgid ""
 "\n"
@@ -4430,119 +4478,119 @@ msgid ""
 "%s: unable to determine description for `dir' entry - giving up\n"
 msgstr ""
 
-#: scripts/install-info.pl:279
+#: scripts/install-info.pl:275
 #, perl-format
 msgid "%s: no file %s, retrieving backup file %s."
 msgstr ""
 
-#: scripts/install-info.pl:282 scripts/install-info.pl:292
+#: scripts/install-info.pl:278 scripts/install-info.pl:288
 #, perl-format
 msgid "%s: copying %s to %s failed, giving up: %s"
 msgstr ""
 
-#: scripts/install-info.pl:288
+#: scripts/install-info.pl:284
 #, perl-format
 msgid "%s: no backup file %s available, retrieving default file."
 msgstr ""
 
-#: scripts/install-info.pl:297
+#: scripts/install-info.pl:293
 #, perl-format
 msgid "%s: no backup file %s available."
 msgstr ""
 
-#: scripts/install-info.pl:298
+#: scripts/install-info.pl:294
 #, perl-format
 msgid "%s: no default file %s available, giving up."
 msgstr ""
 
-#: scripts/install-info.pl:307
+#: scripts/install-info.pl:303
 #, perl-format
 msgid "try deleting %s?"
 msgstr ""
 
-#: scripts/install-info.pl:348
+#: scripts/install-info.pl:344
 #, perl-format
 msgid "%s: existing entry for `%s' not replaced"
 msgstr ""
 
-#: scripts/install-info.pl:351
+#: scripts/install-info.pl:347
 #, perl-format
 msgid "%s: replacing existing dir entry for `%s'"
 msgstr ""
 
-#: scripts/install-info.pl:364
+#: scripts/install-info.pl:360
 #, perl-format
 msgid "%s: creating new section `%s'"
 msgstr ""
 
-#: scripts/install-info.pl:367
+#: scripts/install-info.pl:363
 #, perl-format
 msgid "%s: no sections yet, creating Miscellaneous section too."
 msgstr ""
 
-#: scripts/install-info.pl:385
+#: scripts/install-info.pl:381
 #, perl-format
 msgid "%s: no section specified for new entry, placing at end"
 msgstr ""
 
-#: scripts/install-info.pl:422
+#: scripts/install-info.pl:418
 #, perl-format
 msgid "%s: deleting entry `%s ...'"
 msgstr ""
 
-#: scripts/install-info.pl:428
+#: scripts/install-info.pl:424
 #, perl-format
 msgid "%s: empty section `%s' not removed"
 msgstr ""
 
-#: scripts/install-info.pl:431
+#: scripts/install-info.pl:427
 #, perl-format
 msgid "%s: deleting empty section `%s'"
 msgstr ""
 
-#: scripts/install-info.pl:438
+#: scripts/install-info.pl:434
 #, perl-format
 msgid "%s: no entry for file `%s' and menu entry `%s'"
 msgstr ""
 
-#: scripts/install-info.pl:440
+#: scripts/install-info.pl:436
 #, perl-format
 msgid "%s: no entry for file `%s'"
 msgstr ""
 
-#: scripts/install-info.pl:493
+#: scripts/install-info.pl:489
 #, perl-format
 msgid "unable to install new %s: %s"
 msgstr ""
 
-#: scripts/install-info.pl:496
+#: scripts/install-info.pl:492
 #, perl-format
 msgid "unable to unlock %s: %s"
 msgstr ""
 
-#: scripts/install-info.pl:498
+#: scripts/install-info.pl:494
 #, perl-format
 msgid "%s: could not backup %s in %s: %s"
 msgstr ""
 
-#: scripts/install-info.pl:515
+#: scripts/install-info.pl:511
 #, perl-format
 msgid "unable to read %s: %d"
 msgstr ""
 
-#: scripts/install-info.pl:519
+#: scripts/install-info.pl:515
 #, perl-format
 msgid "dbg: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:66
+#: scripts/update-alternatives.pl:62
 msgid ""
 "\n"
 "Copyright (C) 1995 Ian Jackson.\n"
 "Copyright (C) 2000-2002 Wichert Akkerman."
 msgstr ""
 
-#: scripts/update-alternatives.pl:78
+#: scripts/update-alternatives.pl:74
 #, perl-format
 msgid ""
 "Usage: %s [<option> ...] <command>\n"
@@ -4583,297 +4631,297 @@ msgid ""
 "  --version                show the version.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:131
+#: scripts/update-alternatives.pl:127
 msgid "invalid update mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:135
+#: scripts/update-alternatives.pl:131
 #, perl-format
 msgid "duplicate slave %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:138
+#: scripts/update-alternatives.pl:134
 #, perl-format
 msgid "slave link same as main link %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:139
+#: scripts/update-alternatives.pl:135
 #, perl-format
 msgid "duplicate slave link %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:143
+#: scripts/update-alternatives.pl:139
 #, perl-format
 msgid "duplicate path %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:149
+#: scripts/update-alternatives.pl:145
 #, perl-format
 msgid "priority %s %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:156
+#: scripts/update-alternatives.pl:152
 #, perl-format
 msgid ""
 "Alternative for %s points to %s - which wasn't found.  Removing from list of "
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:196
+#: scripts/update-alternatives.pl:192
 #, perl-format
 msgid "%s - status is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:200
+#: scripts/update-alternatives.pl:196
 #, perl-format
 msgid " link currently points to %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:202
+#: scripts/update-alternatives.pl:198
 msgid " link currently absent"
 msgstr ""
 
-#: scripts/update-alternatives.pl:204
+#: scripts/update-alternatives.pl:200
 #, perl-format
 msgid " link unreadable - %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:208
+#: scripts/update-alternatives.pl:204
 #, perl-format
 msgid "%s - priority %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:212
+#: scripts/update-alternatives.pl:208
 #, perl-format
 msgid " slave %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:217
+#: scripts/update-alternatives.pl:213
 msgid "No versions available."
 msgstr ""
 
-#: scripts/update-alternatives.pl:219
+#: scripts/update-alternatives.pl:215
 #, perl-format
 msgid "Current `best' version is %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:247
+#: scripts/update-alternatives.pl:243
 #, perl-format
 msgid "unknown argument `%s'"
 msgstr ""
 
-#: scripts/update-alternatives.pl:260
+#: scripts/update-alternatives.pl:256
 msgid "--install needs <link> <name> <path> <priority>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:262
+#: scripts/update-alternatives.pl:258
 msgid "priority must be an integer"
 msgstr ""
 
-#: scripts/update-alternatives.pl:266
+#: scripts/update-alternatives.pl:262
 #, perl-format
 msgid "--%s needs <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:271
+#: scripts/update-alternatives.pl:267
 #, perl-format
 msgid "--%s needs <name>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:275
+#: scripts/update-alternatives.pl:271
 msgid "--slave needs <link> <name> <path>"
 msgstr ""
 
-#: scripts/update-alternatives.pl:277
+#: scripts/update-alternatives.pl:273
 #, perl-format
 msgid "slave name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:278
+#: scripts/update-alternatives.pl:274
 #, perl-format
 msgid "slave link %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:295
+#: scripts/update-alternatives.pl:291
 #, perl-format
 msgid "name %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:297
+#: scripts/update-alternatives.pl:293
 #, perl-format
 msgid "link %s is both primary and slave"
 msgstr ""
 
-#: scripts/update-alternatives.pl:300
+#: scripts/update-alternatives.pl:296
 msgid ""
 "need --display, --config, --set, --install, --remove, --all, --remove-all or "
 "--auto"
 msgstr ""
 
-#: scripts/update-alternatives.pl:302
+#: scripts/update-alternatives.pl:298
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:315
+#: scripts/update-alternatives.pl:311
 #, perl-format
 msgid "No alternatives for %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:362
+#: scripts/update-alternatives.pl:358
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:365 scripts/update-alternatives.pl:367
-#: scripts/update-alternatives.pl:481 scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:361 scripts/update-alternatives.pl:363
+#: scripts/update-alternatives.pl:477 scripts/update-alternatives.pl:479
+#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:544
 #: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:548
-#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:552
-#: scripts/update-alternatives.pl:613 scripts/update-alternatives.pl:615
-#: scripts/update-alternatives.pl:688 scripts/update-alternatives.pl:724
+#: scripts/update-alternatives.pl:594 scripts/update-alternatives.pl:596
+#: scripts/update-alternatives.pl:685 scripts/update-alternatives.pl:721
 #, perl-format
 msgid "unable to remove %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:378
+#: scripts/update-alternatives.pl:374
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:390
+#: scripts/update-alternatives.pl:386
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
 "(You may modify the symlinks there yourself if desired - see `man ln'.)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:396
+#: scripts/update-alternatives.pl:392
 #, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:399 scripts/update-alternatives.pl:423
-#: scripts/update-alternatives.pl:507 scripts/update-alternatives.pl:583
+#: scripts/update-alternatives.pl:395 scripts/update-alternatives.pl:419
+#: scripts/update-alternatives.pl:503 scripts/update-alternatives.pl:579
 #, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:418
+#: scripts/update-alternatives.pl:414
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:420
+#: scripts/update-alternatives.pl:416
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:437
+#: scripts/update-alternatives.pl:433
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:451
+#: scripts/update-alternatives.pl:447
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:478
+#: scripts/update-alternatives.pl:474
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:499
+#: scripts/update-alternatives.pl:495
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:501
+#: scripts/update-alternatives.pl:497
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:505
+#: scripts/update-alternatives.pl:501
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:520
+#: scripts/update-alternatives.pl:516
 #, perl-format
 msgid "unable to open %s for write: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:543
+#: scripts/update-alternatives.pl:539
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:557
+#: scripts/update-alternatives.pl:553
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:577
-#: scripts/update-alternatives.pl:600 scripts/update-alternatives.pl:608
+#: scripts/update-alternatives.pl:559 scripts/update-alternatives.pl:573
+#: scripts/update-alternatives.pl:589 scripts/update-alternatives.pl:605
 #, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:565 scripts/update-alternatives.pl:602
-#: scripts/update-alternatives.pl:625 scripts/update-alternatives.pl:674
-#: scripts/update-alternatives.pl:710 scripts/update-alternatives.pl:749
+#: scripts/update-alternatives.pl:561 scripts/update-alternatives.pl:608
+#: scripts/update-alternatives.pl:622 scripts/update-alternatives.pl:671
+#: scripts/update-alternatives.pl:707 scripts/update-alternatives.pl:746
 #, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:567 scripts/update-alternatives.pl:587
-#: scripts/update-alternatives.pl:604 scripts/update-alternatives.pl:627
-#: scripts/update-alternatives.pl:676 scripts/update-alternatives.pl:712
-#: scripts/update-alternatives.pl:754
+#: scripts/update-alternatives.pl:563 scripts/update-alternatives.pl:583
+#: scripts/update-alternatives.pl:611 scripts/update-alternatives.pl:624
+#: scripts/update-alternatives.pl:673 scripts/update-alternatives.pl:709
+#: scripts/update-alternatives.pl:751
 #, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:570 scripts/update-alternatives.pl:618
+#: scripts/update-alternatives.pl:566 scripts/update-alternatives.pl:615
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:621
+#: scripts/update-alternatives.pl:569 scripts/update-alternatives.pl:618
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:591 scripts/update-alternatives.pl:682
+#: scripts/update-alternatives.pl:718
 #, perl-format
-msgid ""
-"warning: %s is supposed to be a slave symlink to\n"
-" %s, or nonexistent; however, readlink failed: %s"
+msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:610 scripts/update-alternatives.pl:685
-#: scripts/update-alternatives.pl:721
+#: scripts/update-alternatives.pl:599
 #, perl-format
-msgid "Removing %s (%s), not appropriate with %s."
+msgid ""
+"warning: %s is supposed to be a slave symlink to\n"
+" %s, or nonexistent; however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:635
+#: scripts/update-alternatives.pl:632
 #, perl-format
 msgid ""
 "There is no program which provides %s.\n"
 "Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:641
+#: scripts/update-alternatives.pl:638
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:646
+#: scripts/update-alternatives.pl:643
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -4882,41 +4930,50 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:656
+#: scripts/update-alternatives.pl:653
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:671 scripts/update-alternatives.pl:708
+#: scripts/update-alternatives.pl:668 scripts/update-alternatives.pl:705
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:706
+#: scripts/update-alternatives.pl:703
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:729 scripts/update-alternatives.pl:732
+#: scripts/update-alternatives.pl:726 scripts/update-alternatives.pl:729
 #, perl-format
 msgid "error writing stdout: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:731
+#: scripts/update-alternatives.pl:728
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:736
+#: scripts/update-alternatives.pl:733
 #, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:737
+#: scripts/update-alternatives.pl:734
 #, perl-format
 msgid "missing newline after %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:757
+#: scripts/update-alternatives.pl:754
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""
+
+#~ msgid "warning"
+#~ msgstr "upozorenje"
+
+#~ msgid "to"
+#~ msgstr "za"
+
+#~ msgid "from"
+#~ msgstr "od"