releasing package apt version 1.1~exp101.1.exp10

1 files changed, 1288 insertions, 1215 deletions

diff --git a/po/bs.po b/po/bs.po
index e68cee981..75fd51a7e 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-03-09 02:17+0100\n"
+"POT-Creation-Date: 2015-08-21 06:13-0400\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -22,147 +22,148 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:319
+msgid "apt-cache stats does not take any arguments"
+msgstr ""
+
+#: cmdline/apt-cache.cc:325
 msgid "Total package names: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:367
 msgid "  Normal packages: "
 msgstr "  Normalni paketi:"
 
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:368
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:364
+#: cmdline/apt-cache.cc:369
 msgid "  Single virtual packages: "
 msgstr "  Pojedinačni virutuelni paketi:"
 
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:370
 msgid "  Mixed virtual packages: "
 msgstr "  Miješani virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:371
 msgid "  Missing: "
 msgstr "  Nedostajući:"
 
-#: cmdline/apt-cache.cc:368
+#: cmdline/apt-cache.cc:373
 msgid "Total distinct versions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:370
+#: cmdline/apt-cache.cc:375
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:377
 msgid "Total dependencies: "
 msgstr "Ukupno zavisnosti:"
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:380
 msgid "Total ver/file relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:377
+#: cmdline/apt-cache.cc:382
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:379
+#: cmdline/apt-cache.cc:384
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:433
+#: cmdline/apt-cache.cc:440
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:439
+#: cmdline/apt-cache.cc:446
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:454
+#: cmdline/apt-cache.cc:463
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
+#: cmdline/apt-cache.cc:605 cmdline/apt-cache.cc:1256
 #: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
-#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
-#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
-#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
+#: cmdline/apt-cache.cc:680 cmdline/apt-cache.cc:1541 cmdline/apt-cache.cc:1543
+#: cmdline/apt-cache.cc:1624 cmdline/apt-mark.cc:56 cmdline/apt-mark.cc:103
+#: cmdline/apt-mark.cc:229 apt-private/private-show.cc:173
+#: apt-private/private-show.cc:175
 msgid "No packages found"
 msgstr "Paketi nisu pronađeni"
 
-#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1356 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1505
+#: cmdline/apt-cache.cc:1520
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ne mogu pronaći paket %s"
 
-#: cmdline/apt-cache.cc:1630
+#: cmdline/apt-cache.cc:1649
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
+#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1766
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1651
+#: cmdline/apt-cache.cc:1672
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
+#: cmdline/apt-cache.cc:1686 cmdline/apt-cache.cc:1743
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1671
+#. Print the package name and the version we are forcing to
+#: cmdline/apt-cache.cc:1700
+#, c-format
+msgid "%s -> %s with priority %d\n"
+msgstr ""
+
+#: cmdline/apt-cache.cc:1706
 msgid "  Installed: "
 msgstr "  Instalirano:"
 
-#: cmdline/apt-cache.cc:1672
+#: cmdline/apt-cache.cc:1707
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
+#: cmdline/apt-cache.cc:1725 cmdline/apt-cache.cc:1733
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1705
+#: cmdline/apt-cache.cc:1740
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1714
+#: cmdline/apt-cache.cc:1749
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
-#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
-#: cmdline/apt-sortpkgs.cc:149
-#, c-format
-msgid "%s %s for %s compiled on %s %s\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1834
+#: cmdline/apt-cache.cc:1871
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -204,7 +205,7 @@ msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
 #: cmdline/apt-cdrom.cc:92
-msgid "Please insert a Disc in the drive and press enter"
+msgid "Please insert a Disc in the drive and press [Enter]"
 msgstr ""
 
 #: cmdline/apt-cdrom.cc:140
@@ -228,7 +229,7 @@ msgstr ""
 msgid "Arguments not in pairs"
 msgstr "Argumenti nisu u parovima"
 
-#: cmdline/apt-config.cc:89
+#: cmdline/apt-config.cc:88
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -256,78 +257,78 @@ msgstr ""
 "  -c=? Pročitaj ovu konfiguracijsku datoteku\n"
 "  -o=? Podesi odgovarajuću konfiguracijsku opciju, npr. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-get.cc:224
+#: cmdline/apt-get.cc:211
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:311
+#: cmdline/apt-get.cc:287
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:314
+#: cmdline/apt-get.cc:290
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:358
+#: cmdline/apt-get.cc:327
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:414
+#: cmdline/apt-get.cc:386
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:445
+#: cmdline/apt-get.cc:417
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
-#: apt-private/private-install.cc:863
+#: cmdline/apt-get.cc:422 cmdline/apt-mark.cc:78
+#: apt-private/private-install.cc:839
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
+#: cmdline/apt-get.cc:424 cmdline/apt-mark.cc:80
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
+#: cmdline/apt-get.cc:432 cmdline/apt-mark.cc:124
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
+#: cmdline/apt-get.cc:501 cmdline/apt-get.cc:509
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:598
+#: cmdline/apt-get.cc:570
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:716
+#: cmdline/apt-get.cc:688
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
+#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:780
+#: cmdline/apt-get.cc:745
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:750
 #, c-format
 msgid ""
 "Please use:\n"
@@ -335,150 +336,145 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:833
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:863
+#: cmdline/apt-get.cc:828
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:868
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:899
+#: cmdline/apt-get.cc:864
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:929
+#: cmdline/apt-get.cc:894
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:942
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:943
+#: cmdline/apt-get.cc:908
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:971
+#: cmdline/apt-get.cc:936
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:955
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:976
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:994
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1047
+#: cmdline/apt-get.cc:1012
 #, c-format
 msgid "Note, using directory '%s' to get the build dependencies\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1057
+#: cmdline/apt-get.cc:1022
 #, c-format
 msgid "Note, using file '%s' to get the build dependencies\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1070
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1279
+#: cmdline/apt-get.cc:1240
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1297
+#: cmdline/apt-get.cc:1258
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1281
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:1359
+#: cmdline/apt-get.cc:1320
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:1365
+#: cmdline/apt-get.cc:1326
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:1388
+#: cmdline/apt-get.cc:1349
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1364
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1408
+#: cmdline/apt-get.cc:1369
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
-#, c-format
-msgid "Changelog for %s (%s)"
-msgstr ""
-
-#: cmdline/apt-get.cc:1615
+#: cmdline/apt-get.cc:1554
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:1656
+#: cmdline/apt-get.cc:1595
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -524,19 +520,28 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-helper.cc:36
+#: cmdline/apt-helper.cc:37
 msgid "Need one URL as argument"
 msgstr ""
 
-#: cmdline/apt-helper.cc:49
+#: cmdline/apt-helper.cc:50
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
-#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
+#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:93
+#: cmdline/apt-helper.cc:88
+msgid "Must specifc at least one srv record"
+msgstr ""
+
+#: cmdline/apt-helper.cc:95
+#, c-format
+msgid "GetSrvRec failed for %s"
+msgstr ""
+
+#: cmdline/apt-helper.cc:118
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -545,6 +550,7 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
 "   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
@@ -576,8 +582,8 @@ msgid "%s was already not hold.\n"
 msgstr ""
 
 #: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
-#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
-#: apt-pkg/deb/dpkgpm.cc:1303
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:207
+#: apt-pkg/deb/dpkgpm.cc:1302
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
@@ -596,7 +602,7 @@ msgstr "Ne mogu otvoriti %s"
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:450
+#: cmdline/apt-mark.cc:449
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -623,7 +629,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:47
+#: cmdline/apt.cc:46
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -637,6 +643,7 @@ msgid ""
 "\n"
 " install - install packages\n"
 " remove  - remove packages\n"
+" autoremove - Remove automatically all unused packages\n"
 "\n"
 " upgrade - upgrade the system by installing/upgrading packages\n"
 " full-upgrade - upgrade the system by removing/installing/upgrading "
@@ -671,271 +678,271 @@ msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se još uvijek koristi."
 msgid "Disk not found."
 msgstr "Datoteka nije pronađena"
 
-#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281
+#: methods/cdrom.cc:262 methods/file.cc:121 methods/rsh.cc:299
 msgid "File not found"
 msgstr "Datoteka nije pronađena"
 
-#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
-#: methods/rred.cc:608
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
+#: methods/rred.cc:664
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
 msgid "Failed to set modification time"
 msgstr ""
 
-#: methods/file.cc:48
+#: methods/file.cc:49
 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:178
+#: methods/ftp.cc:177
 msgid "Logging in"
 msgstr "Prijavljujem se"
 
-#: methods/ftp.cc:184
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:189
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:220 methods/ftp.cc:248
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:226
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:233
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:253
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:281
+#: methods/ftp.cc:282
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:307
+#: methods/ftp.cc:308
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:346 methods/ftp.cc:458 methods/rsh.cc:213 methods/rsh.cc:261
 msgid "Connection timeout"
 msgstr ""
 
-#: methods/ftp.cc:351
+#: methods/ftp.cc:352
 msgid "Server closed the connection"
 msgstr "Server je zatvorio vezu"
 
-#: methods/ftp.cc:354 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1515
-#: apt-pkg/contrib/fileutl.cc:1524 apt-pkg/contrib/fileutl.cc:1529
-#: apt-pkg/contrib/fileutl.cc:1531
+#: methods/ftp.cc:355 methods/rsh.cc:220 apt-pkg/contrib/fileutl.cc:1569
+#: apt-pkg/contrib/fileutl.cc:1578 apt-pkg/contrib/fileutl.cc:1583
+#: apt-pkg/contrib/fileutl.cc:1585
 msgid "Read error"
 msgstr "Greška pri čitanju"
 
-#: methods/ftp.cc:361 methods/rsh.cc:209
+#: methods/ftp.cc:362 methods/rsh.cc:227
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:378 methods/ftp.cc:390
+#: methods/ftp.cc:379 methods/ftp.cc:391
 #, fuzzy
 msgid "Protocol corruption"
 msgstr "Oštećenje protokola"
 
-#: methods/ftp.cc:463 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:911
-#: apt-pkg/contrib/fileutl.cc:1637 apt-pkg/contrib/fileutl.cc:1646
-#: apt-pkg/contrib/fileutl.cc:1651 apt-pkg/contrib/fileutl.cc:1653
-#: apt-pkg/contrib/fileutl.cc:1678
+#: methods/ftp.cc:464 methods/rsh.cc:267 apt-pkg/contrib/fileutl.cc:946
+#: apt-pkg/contrib/fileutl.cc:1691 apt-pkg/contrib/fileutl.cc:1700
+#: apt-pkg/contrib/fileutl.cc:1705 apt-pkg/contrib/fileutl.cc:1707
+#: apt-pkg/contrib/fileutl.cc:1732
 msgid "Write error"
 msgstr "Greška pri pisanju"
 
-#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
+#: methods/ftp.cc:703 methods/ftp.cc:709 methods/ftp.cc:744
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:713
+#: methods/ftp.cc:714
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:717 methods/connect.cc:116
+#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
 msgid "Failed"
 msgstr "Neuspješno"
 
-#: methods/ftp.cc:719
+#: methods/ftp.cc:720
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:736
+#: methods/ftp.cc:737
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:750
+#: methods/ftp.cc:751
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:754
+#: methods/ftp.cc:755
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:761
+#: methods/ftp.cc:762
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:793
+#: methods/ftp.cc:794
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:812
+#: methods/ftp.cc:813
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:832
+#: methods/ftp.cc:833
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:839
+#: methods/ftp.cc:840
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
+#: methods/ftp.cc:880 methods/server.cc:391 methods/rsh.cc:337
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:892
+#: methods/ftp.cc:893
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
-#: methods/ftp.cc:907 methods/rsh.cc:338
+#: methods/ftp.cc:908 methods/rsh.cc:356
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:944
+#: methods/ftp.cc:945
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1027
+#: methods/ftp.cc:1028
 msgid "Query"
 msgstr ""
 
-#: methods/ftp.cc:1141
+#: methods/ftp.cc:1142
 msgid "Unable to invoke "
 msgstr ""
 
-#: methods/connect.cc:76
+#: methods/connect.cc:80
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr ""
 
-#: methods/connect.cc:87
+#: methods/connect.cc:91
 #, c-format
 msgid "[IP: %s %s]"
 msgstr ""
 
-#: methods/connect.cc:94
+#: methods/connect.cc:98
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: methods/connect.cc:100
+#: methods/connect.cc:104
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: methods/connect.cc:108
+#: methods/connect.cc:112
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: methods/connect.cc:126
+#: methods/connect.cc:130
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:442
+#: methods/connect.cc:155 methods/rsh.cc:460
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se sa %s"
 
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:181 methods/connect.cc:200
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
-#: methods/connect.cc:205
+#: methods/connect.cc:206
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:209
+#: methods/connect.cc:210
 #, c-format
 msgid "System error resolving '%s:%s'"
 msgstr ""
 
-#: methods/connect.cc:211
+#: methods/connect.cc:212
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:258
+#: methods/connect.cc:259
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 
-#: methods/gpgv.cc:158
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+#: methods/gpgv.cc:205 methods/gpgv.cc:215
+msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:162
-msgid "At least one invalid signature was encountered."
+#: methods/gpgv.cc:210
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:164
+#: methods/gpgv.cc:217
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:170
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:227
 msgid "Unknown error executing apt-key"
 msgstr ""
 
-#: methods/gpgv.cc:207 methods/gpgv.cc:214
+#: methods/gpgv.cc:260 methods/gpgv.cc:267
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: methods/gpgv.cc:221
+#: methods/gpgv.cc:274
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -945,31 +952,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:517
+#: methods/http.cc:515
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:531
+#: methods/http.cc:529
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:533
+#: methods/http.cc:531
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:569
+#: methods/http.cc:567
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:629
+#: methods/http.cc:627
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:634
+#: methods/http.cc:632
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:657
+#: methods/http.cc:655
 msgid "Error writing to output file"
 msgstr ""
 
@@ -989,340 +996,190 @@ msgstr ""
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/server.cc:193
+#: methods/server.cc:200
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/server.cc:195
+#: methods/server.cc:202
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/server.cc:219
+#: methods/server.cc:229
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
-#: methods/server.cc:506
+#: methods/server.cc:535
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:523 methods/server.cc:617
+#: methods/server.cc:552 methods/server.cc:646
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/server.cc:589
+#: methods/server.cc:618
 #, c-format
 msgid ""
 "Automatically disabled %s due to incorrect response from server/proxy. (man "
 "5 apt.conf)"
 msgstr ""
 
-#: methods/server.cc:712
+#: methods/server.cc:741
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
-#: apt-private/private-list.cc:121
-msgid "Listing"
+#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
+msgid "Sorting"
 msgstr ""
 
-#: apt-private/private-list.cc:151
+#: apt-private/private-cacheset.cc:127
 #, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Ispravljam zavisnosti..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Ne mogu ispraviti zavisnosti"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
+msgid "Note, selecting '%s' for task '%s'\n"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Urađeno"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
+#: apt-private/private-cacheset.cc:133
+#, c-format
+msgid "Note, selecting '%s' for glob '%s'\n"
 msgstr ""
 
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
+#: apt-private/private-cacheset.cc:139
+#, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr ""
 
-#: apt-private/private-output.cc:265
+#: apt-private/private-cacheset.cc:157
 #, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "ali je virtuelni paket"
 
-#: apt-private/private-output.cc:272
+#: apt-private/private-cacheset.cc:168
 #, fuzzy
-msgid "[installed,automatic]"
+msgid " [Installed]"
 msgstr "[Instalirano]"
 
-#: apt-private/private-output.cc:274
+#: apt-private/private-cacheset.cc:177
 #, fuzzy
-msgid "[installed]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "ali je %s instaliran"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ali se %s treba instalirati"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "ali se ne može instalirati"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "ali je virtuelni paket"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "ali nije instaliran"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "ali se neće instalirati"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " ili"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Slijedeći NOVI paketi će biti instalirani:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Slijedeći paketi će biti UKLONJENI:"
-
-#: apt-private/private-output.cc:571
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Slijedeći paketi su zadržani:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Slijedeći paketi će biti nadograđeni:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
+msgid " [Not candidate version]"
+msgstr "Verzije kandidata"
 
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
+#: apt-private/private-cacheset.cc:179
+msgid "You should explicitly select one to install."
 msgstr ""
 
-#: apt-private/private-output.cc:688
+#: apt-private/private-cacheset.cc:182
 #, c-format
-msgid "%s (due to %s)"
-msgstr ""
-
-#: apt-private/private-output.cc:696
 msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
 msgstr ""
 
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
+#: apt-private/private-cacheset.cc:200
+msgid "However the following packages replace it:"
+msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
 
-#: apt-private/private-output.cc:731
+#: apt-private/private-cacheset.cc:213
 #, c-format
-msgid "%lu reinstalled, "
+msgid "Package '%s' has no installation candidate"
 msgstr ""
 
-#: apt-private/private-output.cc:733
+#: apt-private/private-cacheset.cc:226
 #, c-format
-msgid "%lu downgraded, "
+msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: apt-private/private-output.cc:735
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-cacheset.cc:238 apt-private/private-install.cc:915
 #, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 
-#: apt-private/private-output.cc:739
+#: apt-private/private-cacheset.cc:244 apt-private/private-install.cc:921
 #, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
+msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#: apt-private/private-cacheset.cc:289
 #, c-format
-msgid "Regex compilation error - %s"
+msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr ""
 
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
+#: apt-private/private-install.cc:87
+msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: apt-private/private-install.cc:96
+msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
 msgstr ""
 
-#: apt-private/private-main.cc:32
+#: apt-private/private-install.cc:108
 msgid ""
-"NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
-"      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
+"Essential packages were removed and -y was used without --allow-remove-"
+"essential."
 msgstr ""
 
-#: apt-private/private-install.cc:81
-msgid "Internal error, InstallPackages was called with broken packages!"
+#: apt-private/private-install.cc:110
+msgid "Packages were downgraded and -y was used without --allow-downgrades."
 msgstr ""
 
-#: apt-private/private-install.cc:90
-msgid "Packages need to be removed but remove is disabled."
+#: apt-private/private-install.cc:112
+msgid ""
+"Held packages were changed and -y was used without --allow-change-held-"
+"packages."
 msgstr ""
 
-#: apt-private/private-install.cc:109
+#: apt-private/private-install.cc:128
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: apt-private/private-install.cc:147
+#: apt-private/private-install.cc:166
 msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:154
+#: apt-private/private-install.cc:173
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:159
+#: apt-private/private-install.cc:178
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
+#: apt-private/private-install.cc:185
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:171
+#: apt-private/private-install.cc:190
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
+#: apt-private/private-install.cc:202 apt-private/private-install.cc:224
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:195
+#: apt-private/private-install.cc:206
 msgid "Yes, do as I say!"
 msgstr "Da, uradi kako kažem!"
 
-#: apt-private/private-install.cc:197
+#: apt-private/private-install.cc:208
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1330,33 +1187,33 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
+#: apt-private/private-install.cc:214 apt-private/private-install.cc:232
 msgid "Abort."
 msgstr "Odustani."
 
-#: apt-private/private-install.cc:218
+#: apt-private/private-install.cc:229
 msgid "Do you want to continue?"
 msgstr "Da li želite nastaviti?"
 
-#: apt-private/private-install.cc:288
+#: apt-private/private-install.cc:299
 msgid "Some files failed to download"
 msgstr ""
 
-#: apt-private/private-install.cc:295
+#: apt-private/private-install.cc:306
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: apt-private/private-install.cc:299
+#: apt-private/private-install.cc:310
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: apt-private/private-install.cc:304
+#: apt-private/private-install.cc:315
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: apt-private/private-install.cc:305
+#: apt-private/private-install.cc:316
 msgid "Aborting install."
 msgstr "Odustajem od instalacije."
 
@@ -1370,15 +1227,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:345
+#: apt-private/private-install.cc:348
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:366
+#: apt-private/private-install.cc:370
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:474
+#: apt-private/private-install.cc:463
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1394,15 +1251,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
+#: apt-private/private-install.cc:466 apt-private/private-install.cc:622
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: apt-private/private-install.cc:481
+#: apt-private/private-install.cc:470
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: apt-private/private-install.cc:488
+#: apt-private/private-install.cc:479
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1412,7 +1269,7 @@ msgid_plural ""
 msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
-#: apt-private/private-install.cc:492
+#: apt-private/private-install.cc:486
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1420,23 +1277,23 @@ msgid_plural ""
 msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
-#: apt-private/private-install.cc:494
+#: apt-private/private-install.cc:488
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:587
+#: apt-private/private-install.cc:582
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 
-#: apt-private/private-install.cc:589
+#: apt-private/private-install.cc:584
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: apt-private/private-install.cc:612
+#: apt-private/private-install.cc:607
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1444,1037 +1301,851 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: apt-private/private-install.cc:633
+#: apt-private/private-install.cc:628
 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 
-#: apt-private/private-install.cc:710
-msgid "The following extra packages will be installed:"
+#: apt-private/private-install.cc:685
+#, fuzzy
+msgid "The following additional packages will be installed:"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: apt-private/private-install.cc:800
+#: apt-private/private-install.cc:774
 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 
-#: apt-private/private-install.cc:801
+#: apt-private/private-install.cc:776
 msgid "Recommended packages:"
 msgstr "Preporučeni paketi:"
 
-#: apt-private/private-install.cc:823
+#: apt-private/private-install.cc:798
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:827
+#: apt-private/private-install.cc:802
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:839
+#: apt-private/private-install.cc:814
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:844
+#. TRANSLATORS: First string is package name, second is version
+#: apt-private/private-install.cc:820
 #, c-format
-msgid "%s is already the newest version.\n"
+msgid "%s is already the newest version (%s).\n"
 msgstr ""
 
-#: apt-private/private-install.cc:892
+#: apt-private/private-install.cc:868
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: apt-private/private-install.cc:897
+#: apt-private/private-install.cc:873
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:939
-#, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-
-#: apt-private/private-install.cc:945
-#, c-format
-msgid "Package '%s' is not installed, so not removed\n"
+#: apt-private/private-list.cc:121
+msgid "Listing"
 msgstr ""
 
-#: apt-private/private-download.cc:62
+#: apt-private/private-list.cc:151
 #, c-format
-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
-
-#: apt-private/private-download.cc:94
-#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "Slijedeći paketi će biti nadograđeni:"
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
 
-#: apt-private/private-download.cc:98
-msgid "Authentication warning overridden.\n"
-msgstr ""
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Ispravljam zavisnosti..."
 
-#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
-msgid "Some packages could not be authenticated"
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
 msgstr ""
 
-#: apt-private/private-download.cc:108
-msgid "Install these packages without verification?"
-msgstr ""
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Ne mogu ispraviti zavisnosti"
 
-#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr ""
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Urađeno"
 
-#: apt-private/private-download.cc:188
-#, c-format
-msgid "You don't have enough free space in %s."
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Ne mogu otvoriti %s"
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
 
-#: apt-private/private-sources.cc:70
-#, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
 msgstr ""
 
-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
-msgstr ""
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[Instalirano]"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit:%lu %s"
-msgstr ""
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr "[Instalirano]"
 
-#: apt-private/acqprogress.cc:88
-msgid "Get:%lu %s"
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/acqprogress.cc:119
-msgid "Ign:%lu %s"
-msgstr ""
+#: apt-private/private-output.cc:279
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "[Instalirano]"
 
-#: apt-private/acqprogress.cc:126
-msgid "Err:%lu %s"
-msgstr ""
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr "[Instalirano]"
 
-#: apt-private/acqprogress.cc:150
+#: apt-private/private-output.cc:284
 #, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
+msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/acqprogress.cc:240
-#, c-format
-msgid " [Working]"
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/acqprogress.cc:301
+#: apt-private/private-output.cc:402
 #, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
+msgid "but %s is installed"
+msgstr "ali je %s instaliran"
 
-#. Only warn if there are no sources.list.d.
-#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
-#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
-#: apt-inst/extract.cc:471
+#: apt-private/private-output.cc:404
 #, c-format
-msgid "Unable to read %s"
-msgstr "Ne mogu čitati %s"
+msgid "but %s is to be installed"
+msgstr "ali se %s treba instalirati"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
-#: apt-pkg/contrib/cdromutl.cc:235
-#, c-format
-msgid "Unable to change to %s"
-msgstr ""
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "ali se ne može instalirati"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:280
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "ali je virtuelni paket"
 
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:287
-#, fuzzy, c-format
-msgid "Can not read mirror file '%s'"
-msgstr "Ne mogu otvoriti %s"
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "ali nije instaliran"
 
-#: methods/mirror.cc:315
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Ne mogu otvoriti %s"
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "ali se neće instalirati"
 
-#: methods/mirror.cc:445
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " ili"
 
-#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
-msgid "Failed to create IPC pipe to subprocess"
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: methods/rsh.cc:346
-msgid "Connection closed prematurely"
-msgstr ""
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Slijedeći NOVI paketi će biti instalirani:"
 
-#: dselect/install:33
-msgid "Bad default setting!"
-msgstr "Loša podrazumjevana postavka!"
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Slijedeći paketi će biti UKLONJENI:"
 
-#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
-#: dselect/install:106 dselect/update:45
-msgid "Press enter to continue."
-msgstr "Pritisnite enter za nastavak."
+#: apt-private/private-output.cc:481
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Slijedeći paketi su zadržani:"
 
-#: dselect/install:92
-msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr ""
+#: apt-private/private-output.cc:497
+msgid "The following packages will be upgraded:"
+msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#: dselect/install:102
-msgid "Some errors occurred while unpacking. Packages that were installed"
+#: apt-private/private-output.cc:512
+msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: dselect/install:103
-msgid "will be configured. This may result in duplicate errors"
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
 msgstr ""
 
-#: dselect/install:104
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
 msgstr ""
 
-#: dselect/install:105
+#: apt-private/private-output.cc:602
 msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
-#: dselect/update:30
-msgid "Merging available information"
-msgstr "Sastavljam dostupne informacije"
-
-#: cmdline/apt-extracttemplates.cc:229
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Ne mogu kreirati %s"
-
-#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
-#: apt-pkg/contrib/fileutl.cc:2097
+#: apt-private/private-output.cc:637
 #, c-format
-msgid "Unable to write to %s"
-msgstr "Ne mogu zapisati na %s"
-
-#: cmdline/apt-extracttemplates.cc:305
-msgid "Cannot get debconf version. Is debconf installed?"
+msgid "%lu reinstalled, "
 msgstr ""
-"Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
 
-#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
-msgid "Package extension list is too long"
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
-#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
-#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
+#: apt-private/private-output.cc:641
 #, c-format
-msgid "Error processing directory %s"
+msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:280
-msgid "Source extension list is too long"
+#: apt-private/private-output.cc:645
+#, c-format
+msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:400
-msgid "Error writing header to contents file"
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:667
+msgid "[Y/n]"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:430
-#, c-format
-msgid "Error processing contents %s"
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:673
+msgid "[y/N]"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:625
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:821
-msgid "No selections matched"
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:906
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
 #, c-format
-msgid "Some files are missing in the package file group `%s'"
+msgid "Regex compilation error - %s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:67
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB je bila oštećena, datoteka preimenovana u %s.old"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
 
-#: ftparchive/cachedb.cc:85
+#: apt-private/private-update.cc:96
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB je stara, pokušavam nadogradnju %s"
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ftparchive/cachedb.cc:96
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."
 msgstr ""
 
-#: ftparchive/cachedb.cc:101
-#, fuzzy, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
-#: apt-inst/extract.cc:216
+#: apt-private/private-show.cc:158
 #, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
-#: ftparchive/cachedb.cc:326
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Ne mogu ukloniti %s"
-
-#: ftparchive/cachedb.cc:359
-msgid "Archive has no control record"
-msgstr "Arhiva nema kontrolnog zapisa"
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ftparchive/cachedb.cc:526
-msgid "Unable to get a cursor"
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"
 msgstr ""
 
-#: ftparchive/writer.cc:104
-#, c-format
-msgid "W: Unable to read directory %s\n"
+#: apt-private/private-main.cc:34
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: ftparchive/writer.cc:109
+#: apt-private/private-download.cc:62
 #, c-format
-msgid "W: Unable to stat %s\n"
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
 msgstr ""
 
-#: ftparchive/writer.cc:165
-msgid "E: "
-msgstr ""
+#: apt-private/private-download.cc:94
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#: ftparchive/writer.cc:167
-msgid "W: "
+#: apt-private/private-download.cc:101
+msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:174
-msgid "E: Errors apply to file "
+#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
-#, c-format
-msgid "Failed to resolve %s"
+#: apt-private/private-download.cc:111
+msgid "Install these packages without verification?"
 msgstr ""
 
-#: ftparchive/writer.cc:205
-msgid "Tree walking failed"
+#: apt-private/private-download.cc:122
+msgid ""
+"There were unauthenticated packages and -y was used without --allow-"
+"unauthenticated"
 msgstr ""
 
-#: ftparchive/writer.cc:232
-#, c-format
-msgid "Failed to open %s"
-msgstr "Ne mogu otvoriti %s"
-
-#: ftparchive/writer.cc:291
+#: apt-private/private-download.cc:154
 #, c-format
-msgid " DeLink %s [%s]\n"
+msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:299
+#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
 #, c-format
-msgid "Failed to readlink %s"
+msgid "Couldn't determine free space in %s"
 msgstr ""
 
-#: ftparchive/writer.cc:303
+#: apt-private/private-download.cc:193
 #, c-format
-msgid "Failed to unlink %s"
+msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: ftparchive/writer.cc:311
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr ""
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Ne mogu otvoriti %s"
 
-#: ftparchive/writer.cc:321
+#: apt-private/private-sources.cc:70
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
+msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: ftparchive/writer.cc:427
-msgid "Archive had no package field"
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
 msgstr ""
 
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
+#. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
+#: apt-private/acqprogress.cc:74
 #, c-format
-msgid "  %s has no override entry\n"
+msgid "Hit:%lu %s"
 msgstr ""
 
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
+#. TRANSLATOR: Very short word to be displayed for files processed in 'apt-get update'
+#. Potentially replaced later by "Hit:", "Ign:" or "Err:" if something (bad) happens
+#: apt-private/acqprogress.cc:96
 #, c-format
-msgid "  %s maintainer is %s not %s\n"
+msgid "Get:%lu %s"
 msgstr ""
 
-#: ftparchive/writer.cc:712
+#. TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
+#. which failed to download, but the error is ignored (compare "Err:")
+#: apt-private/acqprogress.cc:126
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "Ign:%lu %s"
 msgstr ""
 
-#: ftparchive/writer.cc:716
+#. TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
+#. which failed to download and the error is critical (compare "Ign:")
+#: apt-private/acqprogress.cc:136
 #, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr ""
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
+msgid "Err:%lu %s"
 msgstr ""
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-private/acqprogress.cc:159
 #, c-format
-msgid "Unable to open %s"
+msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, c-format
-msgid "Malformed override %s line %llu (%s)"
+#: apt-private/acqprogress.cc:229
+msgid " [Working]"
 msgstr ""
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-private/acqprogress.cc:297
 #, c-format
-msgid "Failed to read the override file %s"
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press [Enter]\n"
 msgstr ""
 
-#: ftparchive/override.cc:166
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
+#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412
+#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
+#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
 #, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgid "Unable to read %s"
+msgstr "Ne mogu čitati %s"
 
-#: ftparchive/override.cc:178
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
-msgid "Malformed override %s line %llu #2"
+msgid "Unable to change to %s"
 msgstr ""
 
-#: ftparchive/override.cc:191
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:280
 #, c-format
-msgid "Malformed override %s line %llu #3"
+msgid "No mirror file '%s' found "
 msgstr ""
 
-#: ftparchive/multicompress.cc:73
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr ""
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:287
+#, fuzzy, c-format
+msgid "Can not read mirror file '%s'"
+msgstr "Ne mogu otvoriti %s"
+
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Ne mogu otvoriti %s"
 
-#: ftparchive/multicompress.cc:103
+#: methods/mirror.cc:445
 #, c-format
-msgid "Compressed output %s needs a compression set"
+msgid "[Mirror: %s]"
 msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
+#: methods/rsh.cc:109 ftparchive/multicompress.cc:170
+msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
+#: methods/rsh.cc:364
+msgid "Connection closed prematurely"
 msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
-msgstr ""
+#: dselect/install:33
+msgid "Bad default setting!"
+msgstr "Loša podrazumjevana postavka!"
 
-#: ftparchive/multicompress.cc:232
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr ""
+#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
+#: dselect/install:106 dselect/update:45
+#, fuzzy
+msgid "Press [Enter] to continue."
+msgstr "Pritisnite enter za nastavak."
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
+#: dselect/install:92
+msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
+#: dselect/install:102
+msgid "Some errors occurred while unpacking. Packages that were installed"
 msgstr ""
 
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
+#: dselect/install:103
+msgid "will be configured. This may result in duplicate errors"
 msgstr ""
 
-#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
-#, c-format
-msgid "Failed to rename %s to %s"
+#: dselect/install:104
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:51
+#: dselect/install:105
 msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:91
-msgid "Unknown package record!"
-msgstr "Nepoznat zapis paketa\""
-
-#: cmdline/apt-sortpkgs.cc:155
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
+#: dselect/update:30
+msgid "Merging available information"
+msgstr "Sastavljam dostupne informacije"
 
-#: apt-pkg/install-progress.cc:59
+#: apt-pkg/install-progress.cc:58
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:177
 msgid "Running dpkg"
 msgstr ""
 
-#: apt-pkg/init.cc:156
+#: apt-pkg/init.cc:176
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:172
+#: apt-pkg/init.cc:192
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:228 apt-pkg/indexcopy.cc:753
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
+#: apt-pkg/indexcopy.cc:230 apt-pkg/indexcopy.cc:755
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/indexcopy.cc:233 apt-pkg/indexcopy.cc:758
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:761
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/indexcopy.cc:498
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/indexcopy.cc:504
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:133
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:135
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:186
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:485
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-
-#: apt-pkg/cachefile.cc:94
+#: apt-pkg/cachefile.cc:101
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:98
+#: apt-pkg/cachefile.cc:105
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:116
+#: apt-pkg/cachefile.cc:123
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:163
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
+#: apt-pkg/pkgcache.cc:169 apt-pkg/pkgcache.cc:180
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:165
+#: apt-pkg/pkgcache.cc:174
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:168
+#: apt-pkg/pkgcache.cc:177
 msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:175
+#: apt-pkg/pkgcache.cc:184
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:185
+#: apt-pkg/pkgcache.cc:194
 #, c-format
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:319
 msgid "Depends"
 msgstr "Zavisi"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:319
 msgid "PreDepends"
 msgstr "Unaprijed zavisi"
 
-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:319
 msgid "Suggests"
 msgstr "Predlaže"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:320
 msgid "Recommends"
 msgstr "Preporučuje"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:320
 #, fuzzy
 msgid "Conflicts"
 msgstr "Sukobljava se sa"
 
-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:320
 msgid "Replaces"
 msgstr "Zamjenjuje"
 
-#: apt-pkg/pkgcache.cc:324
+#: apt-pkg/pkgcache.cc:321
 msgid "Obsoletes"
 msgstr "Zastarijeva"
 
-#: apt-pkg/pkgcache.cc:324
+#: apt-pkg/pkgcache.cc:321
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:324
+#: apt-pkg/pkgcache.cc:321
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:332
 msgid "important"
 msgstr "važno"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:332
 msgid "required"
 msgstr "zahtijevano"
 
-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:332
 msgid "standard"
 msgstr "standardno"
 
-#: apt-pkg/pkgcache.cc:336
+#: apt-pkg/pkgcache.cc:333
 msgid "optional"
 msgstr "opcionalno"
 
-#: apt-pkg/pkgcache.cc:336
+#: apt-pkg/pkgcache.cc:333
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
-msgid "Calculating upgrade"
-msgstr "Računam nadogradnju"
-
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/acquire-worker.cc:111
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Otvaram %s"
-
-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:371
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:375
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:416
-#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr ""
-
-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
-#, c-format
-msgid "Clean of %s is not supported"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-pkg/clean.cc:64
+#: apt-pkg/acquire-worker.cc:113
 #, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
+msgid "Is the package %s installed?"
 msgstr ""
 
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
+#: apt-pkg/acquire-worker.cc:164
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:591
+#: apt-pkg/acquire-worker.cc:536
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1196
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
-#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
-msgid "Reading package lists"
-msgstr "Čitam spiskove paketa"
-
-#: apt-pkg/pkgcachegen.cc:1301
-msgid "Collecting File Provides"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
-msgid "IO Error saving source cache"
-msgstr ""
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradim stablo zavisnosti"
 
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:140
+msgid "Candidate versions"
+msgstr "Verzije kandidata"
 
-#: apt-pkg/edsp.cc:244
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Stvaranje zavisnosti"
 
-#: apt-pkg/edsp.cc:323
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Sastavljam dostupne informacije"
 
-#: apt-pkg/edsp.cc:330
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:257
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/acquire-item.cc:98
+#: apt-pkg/acquire-item.cc:116
 msgid "Use --allow-insecure-repositories to force the update"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2161
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:240
+#: apt-pkg/acquire-item.cc:585
 msgid "Hash Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:590
 msgid "Size mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:595
 msgid "Invalid file format"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:600
 #, fuzzy
 msgid "Signature error"
 msgstr "Greška pri pisanju"
 
-#: apt-pkg/acquire-item.cc:259
-msgid "Does not start with a cleartext signature"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1584
+#: apt-pkg/acquire-item.cc:789
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
+"updated and the previous index files will be used. GPG error: %s: %s"
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1707
-#, c-format
-msgid "The repository '%s' is no longer signed."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1714
-msgid ""
-"This is normally not allowed, but the option Acquire::"
-"AllowDowngradeToInsecureRepositories was given to override it."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
-#, c-format
-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1956
+#: apt-pkg/acquire-item.cc:970
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1975
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#: apt-pkg/acquire-item.cc:1999
+#: apt-pkg/acquire-item.cc:1026
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2037
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formatted in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1066
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2059
+#: apt-pkg/acquire-item.cc:1107
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2078
+#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#, c-format
+msgid ""
+"The data from '%s' is not signed. Packages from that repository can not be "
+"authenticated."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1326
 #, c-format
 msgid ""
 "The repository '%s' does not have a Release file. This is deprecated, please "
 "contact the owner of the repository."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2249
+#: apt-pkg/acquire-item.cc:1459
+#, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1466
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2611
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2315
+#: apt-pkg/acquire-item.cc:2677
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2351
+#: apt-pkg/acquire-item.cc:2715
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/vendorlist.cc:83
+#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
+#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3054
+#, c-format
+msgid "Changelog unavailable for %s=%s"
+msgstr ""
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
+msgid "Clean of %s is not supported"
 msgstr ""
 
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1400 apt-pkg/pkgcachegen.cc:1526
+#: apt-pkg/pkgcachegen.cc:1552 apt-pkg/pkgcachegen.cc:1671
+msgid "Reading package lists"
+msgstr "Čitam spiskove paketa"
+
+#: apt-pkg/pkgcachegen.cc:1471 apt-pkg/pkgcachegen.cc:1478
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1570 apt-pkg/pkgcachegen.cc:1572
+#: apt-pkg/contrib/fileutl.cc:2151 cmdline/apt-extracttemplates.cc:263
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ne mogu zapisati na %s"
+
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr ""
@@ -2491,54 +2162,70 @@ msgstr "Ne mogu kreirati %s"
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:981
+#: apt-pkg/acquire.cc:1081
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:983
+#: apt-pkg/acquire.cc:1083
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Čitam spisak datoteke"
 
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+
 #: apt-pkg/srcrecords.cc:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/policy.cc:83
+#: apt-pkg/policy.cc:77
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
+#: apt-pkg/policy.cc:453
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:444
+#: apt-pkg/policy.cc:475
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:452
+#: apt-pkg/policy.cc:484
+#, c-format
+msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)"
+msgstr ""
+
+#: apt-pkg/policy.cc:491
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:983
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
+#: apt-pkg/packagemanager.cc:562 apt-pkg/packagemanager.cc:592
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/packagemanager.cc:643
+#: apt-pkg/packagemanager.cc:642
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2546,353 +2233,372 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/cdrom.cc:498
+#, c-format
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:571
+#: apt-pkg/cdrom.cc:572
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "Pogrešan CD"
 
-#: apt-pkg/cdrom.cc:586
+#: apt-pkg/cdrom.cc:587
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:599
+#: apt-pkg/cdrom.cc:600
 #, fuzzy
 msgid "Waiting for disc...\n"
 msgstr "Čekam na zaglavlja"
 
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:610
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:620
+#: apt-pkg/cdrom.cc:621
 msgid "Identifying... "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:662
+#: apt-pkg/cdrom.cc:663
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:680
+#: apt-pkg/cdrom.cc:681
 msgid "Scanning disc for index files...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:734
+#: apt-pkg/cdrom.cc:735
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:745
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:771
+#: apt-pkg/cdrom.cc:772
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:800
+#: apt-pkg/cdrom.cc:801
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:817
+#: apt-pkg/cdrom.cc:818
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:819
+#: apt-pkg/cdrom.cc:820
 #, fuzzy
 msgid "Copying package lists..."
 msgstr "Čitam spiskove paketa"
 
-#: apt-pkg/cdrom.cc:866
+#: apt-pkg/cdrom.cc:867
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:877
+#: apt-pkg/cdrom.cc:878
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Računam nadogradnju"
+
+#: apt-pkg/algorithms.cc:263
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1090
+#: apt-pkg/algorithms.cc:1080
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1092
+#: apt-pkg/algorithms.cc:1082
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Gradim stablo zavisnosti"
-
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Verzije kandidata"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Stvaranje zavisnosti"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "Sastavljam dostupne informacije"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""
 
-#: apt-pkg/depcache.cc:252
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Ne mogu otvoriti %s"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
 
-#: apt-pkg/depcache.cc:258
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ne mogu ukloniti %s"
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""
 
-#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
+#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
 #, c-format
 msgid "Unable to parse package file %s (%d)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:501
+#: apt-pkg/tagfile.cc:541 apt-pkg/tagfile.cc:544
+#, c-format
+msgid "Cannot convert %s to integer"
+msgstr ""
+
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
+#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
+#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
+#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
+#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
+#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:251
+#, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:355
+#, c-format
+msgid "Opening %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/sourcelist.cc:389
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:393
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
+#, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:429
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:500
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:504
+#: apt-pkg/cacheset.cc:503
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:629
+#: apt-pkg/cacheset.cc:738
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/cacheset.cc:635
+#: apt-pkg/cacheset.cc:744
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:641
+#: apt-pkg/cacheset.cc:750
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/cacheset.cc:680
+#: apt-pkg/cacheset.cc:789
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:719
+#: apt-pkg/cacheset.cc:828
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:727
+#: apt-pkg/cacheset.cc:836
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:735
+#: apt-pkg/cacheset.cc:844
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
+#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:132
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:145
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:164
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1290
+#: apt-pkg/contrib/strutl.cc:1279
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:196
+#: apt-pkg/contrib/fileutl.cc:197
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:201
+#: apt-pkg/contrib/fileutl.cc:202
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:224
+#: apt-pkg/contrib/fileutl.cc:225
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:229
+#: apt-pkg/contrib/fileutl.cc:230
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480
+#: apt-pkg/contrib/fileutl.cc:367 apt-pkg/contrib/fileutl.cc:481
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:400
+#: apt-pkg/contrib/fileutl.cc:401
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:418
+#: apt-pkg/contrib/fileutl.cc:419
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:427
+#: apt-pkg/contrib/fileutl.cc:428
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:862
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:848
+#: apt-pkg/contrib/fileutl.cc:864
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:227
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:220
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:952
+#: apt-pkg/contrib/fileutl.cc:987
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1140
+#: apt-pkg/contrib/fileutl.cc:1194
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
+#: apt-pkg/contrib/fileutl.cc:1253 apt-pkg/contrib/fileutl.cc:1300
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2176
 msgid "Failed to create subprocess IPC"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1412
+#: apt-pkg/contrib/fileutl.cc:1466
 msgid "Failed to exec compressor "
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1553
+#: apt-pkg/contrib/fileutl.cc:1607
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
+#: apt-pkg/contrib/fileutl.cc:1720 apt-pkg/contrib/fileutl.cc:1742
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1954
+#: apt-pkg/contrib/fileutl.cc:2008
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/contrib/fileutl.cc:1965
+#: apt-pkg/contrib/fileutl.cc:2019
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1976
+#: apt-pkg/contrib/fileutl.cc:2030
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1989
+#: apt-pkg/contrib/fileutl.cc:2043
 msgid "Problem syncing the file"
 msgstr ""
 
+#: apt-pkg/contrib/fileutl.cc:2146 cmdline/apt-extracttemplates.cc:258
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ne mogu kreirati %s"
+
 #: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Error!"
@@ -2971,74 +2677,78 @@ msgstr ""
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:246
+#: apt-pkg/contrib/cdromutl.cc:247
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:522
+#: apt-pkg/contrib/configuration.cc:516
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:636
+#: apt-pkg/contrib/configuration.cc:630
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:804
+#: apt-pkg/contrib/configuration.cc:798
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:823
+#: apt-pkg/contrib/configuration.cc:817
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:840
+#: apt-pkg/contrib/configuration.cc:834
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:880
+#: apt-pkg/contrib/configuration.cc:874
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:887
+#: apt-pkg/contrib/configuration.cc:881
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
+#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:900
+#: apt-pkg/contrib/configuration.cc:894
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:903
+#: apt-pkg/contrib/configuration.cc:897
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:953
+#: apt-pkg/contrib/configuration.cc:947
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
 #: apt-pkg/contrib/cmndline.cc:127
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
+msgid ""
+"Command line option '%c' [from %s] is not understood in combination with the "
+"other options."
 msgstr ""
 
 #: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
 #: apt-pkg/contrib/cmndline.cc:169
 #, c-format
-msgid "Command line option %s is not understood"
+msgid ""
+"Command line option %s is not understood in combination with the other "
+"options"
 msgstr ""
 
 #: apt-pkg/contrib/cmndline.cc:174
@@ -3076,93 +2786,131 @@ msgstr ""
 msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/deb/debmetaindex.cc:229
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: apt-pkg/deb/debmetaindex.cc:238
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/deb/debmetaindex.cc:278
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/deb/debmetaindex.cc:286
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: apt-pkg/deb/debmetaindex.cc:307
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
+#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
+#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
+#: apt-pkg/deb/debmetaindex.cc:485
+#, c-format
+msgid "Conflicting values set for option %s concerning source %s %s"
+msgstr ""
+
+#: apt-pkg/deb/debmetaindex.cc:480
+#, c-format
+msgid "Invalid value set for option %s concerning source %s %s (%s)"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:110
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1007
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Povezujem se sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1014
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:115
+#: apt-pkg/deb/dpkgpm.cc:113
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:116
+#: apt-pkg/deb/dpkgpm.cc:114
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:117
+#: apt-pkg/deb/dpkgpm.cc:115
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:839
+#: apt-pkg/deb/dpkgpm.cc:838
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#: apt-pkg/deb/dpkgpm.cc:853 apt-pkg/deb/dpkgpm.cc:875
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/deb/dpkgpm.cc:1000
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1007
+#: apt-pkg/deb/dpkgpm.cc:1006
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/deb/dpkgpm.cc:1008
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:1014
+#: apt-pkg/deb/dpkgpm.cc:1013
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1016
+#: apt-pkg/deb/dpkgpm.cc:1015
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Preporučuje"
 
-#: apt-pkg/deb/dpkgpm.cc:1021
+#: apt-pkg/deb/dpkgpm.cc:1020
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1022
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Ne mogu zapisati na %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
@@ -3208,30 +2956,358 @@ msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/deb/debsystem.cc:88
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/deb/debsystem.cc:107
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:128
+#: apt-pkg/deb/debsystem.cc:125
 msgid "Not locked"
 msgstr ""
 
+#: cmdline/apt-extracttemplates.cc:228
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+
+#: cmdline/apt-extracttemplates.cc:304
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr ""
+"Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
+
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:368
+msgid "Package extension list is too long"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:190 ftparchive/apt-ftparchive.cc:202
+#: ftparchive/apt-ftparchive.cc:225 ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:291 ftparchive/apt-ftparchive.cc:313
+#, c-format
+msgid "Error processing directory %s"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:279
+msgid "Source extension list is too long"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:394
+msgid "Error writing header to contents file"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:424
+#, c-format
+msgid "Error processing contents %s"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:616
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:892
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr ""
+
+#: ftparchive/cachedb.cc:68
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB je bila oštećena, datoteka preimenovana u %s.old"
+
+#: ftparchive/cachedb.cc:86
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB je stara, pokušavam nadogradnju %s"
+
+#: ftparchive/cachedb.cc:97
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:102
+#, fuzzy, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: ftparchive/cachedb.cc:185 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr ""
+
+#: ftparchive/cachedb.cc:327
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Ne mogu ukloniti %s"
+
+#: ftparchive/cachedb.cc:360
+msgid "Archive has no control record"
+msgstr "Arhiva nema kontrolnog zapisa"
+
+#: ftparchive/cachedb.cc:527
+msgid "Unable to get a cursor"
+msgstr ""
+
+#: ftparchive/writer.cc:104
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr ""
+
+#: ftparchive/writer.cc:109
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr ""
+
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr ""
+
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr ""
+
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr ""
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#, c-format
+msgid "Failed to resolve %s"
+msgstr ""
+
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr ""
+
+#: ftparchive/writer.cc:232
+#, c-format
+msgid "Failed to open %s"
+msgstr "Ne mogu otvoriti %s"
+
+#: ftparchive/writer.cc:291
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr ""
+
+#: ftparchive/writer.cc:299
+#, c-format
+msgid "Failed to readlink %s"
+msgstr ""
+
+#: ftparchive/writer.cc:303
+#, c-format
+msgid "Failed to unlink %s"
+msgstr ""
+
+#: ftparchive/writer.cc:311
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr ""
+
+#: ftparchive/writer.cc:321
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr ""
+
+#: ftparchive/writer.cc:426
+msgid "Archive had no package field"
+msgstr ""
+
+#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr ""
+
+#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr ""
+
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr ""
+
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr ""
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+msgid "realloc - Failed to allocate memory"
+msgstr ""
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr ""
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr ""
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr ""
+
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr ""
+
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr ""
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr ""
+
+#: ftparchive/multicompress.cc:72
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr ""
+
+#: ftparchive/multicompress.cc:102
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr ""
+
+#: ftparchive/multicompress.cc:193
+msgid "Failed to fork"
+msgstr ""
+
+#: ftparchive/multicompress.cc:206
+msgid "Compress child"
+msgstr ""
+
+#: ftparchive/multicompress.cc:229
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc:302
+msgid "IO to subprocess/file failed"
+msgstr ""
+
+#: ftparchive/multicompress.cc:340
+msgid "Failed to read while computing MD5"
+msgstr ""
+
+#: ftparchive/multicompress.cc:356
+#, c-format
+msgid "Problem unlinking %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr ""
+
+#: cmdline/apt-internal-solver.cc:50
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Nepoznat zapis paketa\""
+
+#: cmdline/apt-sortpkgs.cc:154
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+
 #: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr ""
@@ -3336,7 +3412,7 @@ msgstr ""
 msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:231
+#: apt-inst/deb/debfile.cc:227
 msgid "Unparsable control file"
 msgstr ""
 
@@ -3365,27 +3441,31 @@ msgstr "Arhiva je prekratka"
 msgid "Failed to read the archive headers"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:128
+#: apt-inst/contrib/extracttar.cc:123
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:155
+#: apt-inst/contrib/extracttar.cc:150
 msgid "Failed to exec gzip "
 msgstr "Ne mogu izvršiti gzip"
 
-#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
 msgid "Corrupted archive"
 msgstr "Oštećena arhiva"
 
-#: apt-inst/contrib/extracttar.cc:207
+#: apt-inst/contrib/extracttar.cc:202
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
 
-#: apt-inst/contrib/extracttar.cc:312
+#: apt-inst/contrib/extracttar.cc:307
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Unable to find hash sum for '%s' in Release file"
+#~ msgstr "Ne mogu otvoriti DB datoteku %s"
+
 #~ msgid "Done"
 #~ msgstr "Urađeno"
 
@@ -3396,13 +3476,6 @@ msgstr ""
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s nije ispravan DEB paket."
 
-#, fuzzy
-#~ msgid " [Not candidate version]"
-#~ msgstr "Verzije kandidata"
-
-#~ msgid "However the following packages replace it:"
-#~ msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
-
 #~ msgid "Reading file listing"
 #~ msgstr "Čitam spisak datoteke"