X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/f744c64c591cec9e5aa489a9af55e1ed6d1871d1..76b580bed96aaf0174ca81ba8ed2c4b54226ad85:/po/bs.po

diff --git a/po/bs.po b/po/bs.po
index a7c3886c1..abb9a570a 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: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\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"
@@ -14,156 +14,155 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n"
 
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Normalni paketi:"
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Pojedinačni virutuelni paketi:"
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Miješani virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Nedostajući:"
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:370
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Ukupno zavisnosti:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:377
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:353
-msgid "Total dependency version space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
+#: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: 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
 msgid "No packages found"
 msgstr "Paketi nisu pronađeni"
 
-#: cmdline/apt-cache.cc:1245
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ne mogu pronaći paket %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Instalirano:"
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: 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:1740
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -200,28 +199,28 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:77
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:92
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:179
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:183
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -257,77 +256,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:244
+#: cmdline/apt-get.cc:224
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:311
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:314
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:358
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
+#: apt-private/private-install.cc:863
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:452 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:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:460 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:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:722
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:779
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -335,151 +335,150 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:874
-#, c-format
-msgid "You don't have enough free space in %s"
-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:883
+#: cmdline/apt-get.cc:863
 #, 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:888
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:981
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1001
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1020
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1045
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1262
+#: cmdline/apt-get.cc:1279
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1280
+#: cmdline/apt-get.cc:1297
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1303
+#: cmdline/apt-get.cc:1320
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1359
 #, 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:1348
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:1371
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:1582
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:1623
+#: cmdline/apt-get.cc:1656
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -525,53 +524,79 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
+msgid "Must specify at least one pair url/filename"
+msgstr ""
+
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:93
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:65
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ali nije instaliran"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:71
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:73
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:238
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:240
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: 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
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Ne mogu otvoriti %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:450
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -581,6 +606,11 @@ msgid ""
 "Commands:\n"
 "   auto - Mark the given packages as automatically installed\n"
 "   manual - Mark the given packages as manually installed\n"
+"   hold - Mark a package as held back\n"
+"   unhold - Unset a package set as held back\n"
+"   showauto - Print the list of automatically installed packages\n"
+"   showmanual - Print the list of manually installed packages\n"
+"   showhold - Print the list of package on hold\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -593,7 +623,7 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
 msgid ""
 "Usage: apt [options] command\n"
 "\n"
@@ -608,7 +638,9 @@ msgid ""
 " install - install packages\n"
 " remove  - remove packages\n"
 "\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+" full-upgrade - upgrade the system by removing/installing/upgrading "
+"packages\n"
 "\n"
 " edit-sources - edit the source information file\n"
 msgstr ""
@@ -639,173 +671,175 @@ 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:82 methods/rsh.cc:275
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281
 msgid "File not found"
 msgstr "Datoteka nije pronađena"
 
-#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
+#: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr ""
 
-#: methods/file.cc:47
+#: methods/file.cc:48
 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:173
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Prijavljujem se"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:184
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:215 methods/ftp.cc:243
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:221
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:228
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:248
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:276
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:302
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr ""
 
-#: methods/ftp.cc:346
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Server je zatvorio vezu"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: 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
 msgid "Read error"
 msgstr "Greška pri čitanju"
 
-#: methods/ftp.cc:356 methods/rsh.cc:206
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:373 methods/ftp.cc:385
+#: methods/ftp.cc:378 methods/ftp.cc:390
 #, fuzzy
 msgid "Protocol corruption"
 msgstr "Oštećenje protokola"
 
-#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: 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
 msgid "Write error"
 msgstr "Greška pri pisanju"
 
-#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:708
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Neuspješno"
 
-#: methods/ftp.cc:714
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:731
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:756
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:788
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:798
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:807
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:827
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:834
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:886
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
-#: methods/ftp.cc:901 methods/rsh.cc:332
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:931
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1008
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr ""
 
-#: methods/ftp.cc:1120
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr ""
 
@@ -841,7 +875,7 @@ 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:435
+#: methods/connect.cc:154 methods/rsh.cc:442
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se sa %s"
@@ -871,182 +905,424 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 
-#: methods/gpgv.cc:167
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:173
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:164
+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:179
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:183
-msgid "Unknown error executing gpgv"
+#: methods/gpgv.cc:174
+msgid "Unknown error executing apt-key"
 msgstr ""
 
-#: methods/gpgv.cc:216 methods/gpgv.cc:223
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: methods/gpgv.cc:230
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:519
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:533
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:535
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:571
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:631
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:636
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:659
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/server.cc:56
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Čekam na zaglavlja"
 
-#: methods/server.cc:114
+#: methods/server.cc:111
 msgid "Bad header line"
 msgstr ""
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:136 methods/server.cc:143
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/server.cc:176
+#: methods/server.cc:173
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/server.cc:199
+#: methods/server.cc:193
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/server.cc:201
+#: methods/server.cc:195
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/server.cc:225
+#: methods/server.cc:219
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
-#: methods/server.cc:490
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:507 methods/server.cc:564
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/server.cc:656
+#: methods/server.cc:589
+#, c-format
+msgid ""
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
+msgstr ""
+
+#: methods/server.cc:712
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-list.cc:121
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:151
+#, 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"
+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."
+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"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, 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 ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:274
+#, 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 ""
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr ""
+
+#: apt-private/private-output.cc:688
+#, 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!"
+msgstr ""
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr ""
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr ""
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr ""
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr ""
+
+#: apt-private/private-output.cc:739
+#, 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"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+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."
+msgstr ""
+
+#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
+msgid "Sorting"
+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)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+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 ""
+
+#: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:109
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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:166
+#: apt-private/private-install.cc:154
 #, 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:171
+#: apt-private/private-install.cc:159
 #, 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:178
+#: apt-private/private-install.cc:166
 #, 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:183
+#: apt-private/private-install.cc:171
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:211
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr ""
-
-#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+#: 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:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
 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:231
+#: apt-private/private-install.cc:195
 msgid "Yes, do as I say!"
 msgstr "Da, uradi kako kažem!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:197
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1054,37 +1330,37 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
 msgid "Abort."
 msgstr "Odustani."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:218
 msgid "Do you want to continue?"
 msgstr "Da li želite nastaviti?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:288
 msgid "Some files failed to download"
 msgstr ""
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:295
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:299
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:304
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:305
 msgid "Aborting install."
 msgstr "Odustajem od instalacije."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:341
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1094,15 +1370,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:345
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:366
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:474
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1118,15 +1394,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:481
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:488
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1136,7 +1412,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:528
+#: apt-private/private-install.cc:492
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1144,23 +1420,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:530
+#: apt-private/private-install.cc:494
 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:624
+#: apt-private/private-install.cc:587
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 
-#: apt-private/private-install.cc:626
+#: apt-private/private-install.cc:589
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:612
 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"
@@ -1168,302 +1444,143 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:633
 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:710
 msgid "The following extra packages will be installed:"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:800
 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:801
 msgid "Recommended packages:"
 msgstr "Preporučeni paketi:"
 
-#: apt-private/private-download.cc:32
-#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "Slijedeći paketi će biti nadograđeni:"
-
-#: apt-private/private-download.cc:36
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
-msgid "Some packages could not be authenticated"
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 
-#: apt-private/private-download.cc:46
-msgid "Install these packages without verification?"
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-install.cc:844
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr ""
-
-#: apt-private/private-output.cc:200
-msgid "installed,upgradable to: "
-msgstr ""
-
-#: apt-private/private-output.cc:206
-#, fuzzy
-msgid "[installed,local]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:209
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:211
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:213
-#, fuzzy
-msgid "[installed]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:219
-msgid "[upgradable from: "
-msgstr ""
-
-#: apt-private/private-output.cc:225
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:316
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:406
-#, c-format
-msgid "but %s is installed"
-msgstr "ali je %s instaliran"
-
-#: apt-private/private-output.cc:408
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ali se %s treba instalirati"
-
-#: apt-private/private-output.cc:415
-msgid "but it is not installable"
-msgstr "ali se ne može instalirati"
-
-#: apt-private/private-output.cc:417
-msgid "but it is a virtual package"
-msgstr "ali je virtuelni paket"
-
-#: apt-private/private-output.cc:420
-msgid "but it is not installed"
-msgstr "ali nije instaliran"
-
-#: apt-private/private-output.cc:420
-msgid "but it is not going to be installed"
-msgstr "ali se neće instalirati"
-
-#: apt-private/private-output.cc:425
-msgid " or"
-msgstr " ili"
-
-#: apt-private/private-output.cc:454
-msgid "The following NEW packages will be installed:"
-msgstr "Slijedeći NOVI paketi će biti instalirani:"
-
-#: apt-private/private-output.cc:480
-msgid "The following packages will be REMOVED:"
-msgstr "Slijedeći paketi će biti UKLONJENI:"
-
-#: apt-private/private-output.cc:502
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Slijedeći paketi su zadržani:"
-
-#: apt-private/private-output.cc:523
-msgid "The following packages will be upgraded:"
-msgstr "Slijedeći paketi će biti nadograđeni:"
-
-#: apt-private/private-output.cc:544
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: apt-private/private-output.cc:564
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: apt-private/private-output.cc:619
-#, c-format
-msgid "%s (due to %s) "
-msgstr ""
-
-#: apt-private/private-output.cc:627
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
+msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:658
+#: apt-private/private-install.cc:892
 #, c-format
-msgid "%lu upgraded, %lu newly installed, "
+msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: apt-private/private-output.cc:662
+#: apt-private/private-install.cc:897
 #, c-format
-msgid "%lu reinstalled, "
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
-#: apt-private/private-output.cc:664
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
 #, c-format
-msgid "%lu downgraded, "
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
 
-#: apt-private/private-output.cc:666
+#: apt-private/private-install.cc:945
 #, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
+msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 
-#: apt-private/private-output.cc:670
+#: apt-private/private-download.cc:62
 #, c-format
-msgid "%lu not fully installed or removed.\n"
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
 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:692
-msgid "[Y/n]"
-msgstr ""
+#: apt-private/private-download.cc:94
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#. 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:698
-msgid "[y/N]"
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:709
-msgid "Y"
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
 msgstr ""
 
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:715
-msgid "N"
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
 msgstr ""
 
-#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:87
-msgid "Correcting dependencies..."
-msgstr "Ispravljam zavisnosti..."
-
-#: apt-private/private-cachefile.cc:90
-msgid " failed."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:93
-msgid "Unable to correct dependencies"
-msgstr "Ne mogu ispraviti zavisnosti"
-
-#: apt-private/private-cachefile.cc:96
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:98
-msgid " Done"
-msgstr " Urađeno"
-
-#: apt-private/private-cachefile.cc:102
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:105
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
-
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
-msgid "Sorting"
-msgstr ""
-
-#: apt-private/private-update.cc:45
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: apt-private/private-upgrade.cc:18
-msgid "Calculating upgrade... "
-msgstr "Računam nadogradnju..."
-
-#: apt-private/private-upgrade.cc:23
-msgid "Internal error, Upgrade broke stuff"
-msgstr ""
-
-#: apt-private/private-upgrade.cc:25
-msgid "Done"
-msgstr "Urađeno"
-
-#: apt-private/private-search.cc:61
-msgid "Full Text Search"
+msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: apt-private/private-show.cc:105
-msgid "not a real package (virtual)"
+#: 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-main.cc:19
-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!"
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/acqprogress.cc:60
-msgid "Hit "
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/acqprogress.cc:84
-msgid "Get:"
+#: apt-private/acqprogress.cc:66
+msgid "Hit:%lu %s"
 msgstr ""
 
-#: apt-private/acqprogress.cc:115
-msgid "Ign "
+#: apt-private/acqprogress.cc:88
+msgid "Get:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:119
-msgid "Err "
+msgid "Ign:%lu %s"
+msgstr ""
+
+#: apt-private/acqprogress.cc:126
+msgid "Err:%lu %s"
 msgstr ""
 
-#: apt-private/acqprogress.cc:140
+#: apt-private/acqprogress.cc:150
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
-#: apt-private/acqprogress.cc:230
+#: apt-private/acqprogress.cc:240
 #, c-format
 msgid " [Working]"
 msgstr ""
 
-#: apt-private/acqprogress.cc:291
+#: apt-private/acqprogress.cc:301
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1473,19 +1590,19 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: 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
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ne mogu čitati %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: 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 ""
@@ -1514,11 +1631,11 @@ msgstr "Ne mogu otvoriti %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
-#: methods/rsh.cc:340
+#: methods/rsh.cc:346
 msgid "Connection closed prematurely"
 msgstr ""
 
@@ -1556,12 +1673,7 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sastavljam dostupne informacije"
 
-#: cmdline/apt-extracttemplates.cc:100
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s nije ispravan DEB paket."
-
-#: cmdline/apt-extracttemplates.cc:234
+#: cmdline/apt-extracttemplates.cc:229
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -1575,41 +1687,47 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
+#: 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
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ne mogu zapisati na %s"
 
-#: cmdline/apt-extracttemplates.cc:308
+#: cmdline/apt-extracttemplates.cc:305
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 "Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
 
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
 msgid "Package extension list is too long"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
+#: 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
 #, c-format
 msgid "Error processing directory %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:262
+#: ftparchive/apt-ftparchive.cc:280
 msgid "Source extension list is too long"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:379
+#: ftparchive/apt-ftparchive.cc:400
 msgid "Error writing header to contents file"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:409
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
 msgid "Error processing contents %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:597
+#: ftparchive/apt-ftparchive.cc:625
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1651,121 +1769,126 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:803
+#: ftparchive/apt-ftparchive.cc:821
 msgid "No selections matched"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:881
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 
-#: ftparchive/cachedb.cc:47
+#: 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"
 
-#: ftparchive/cachedb.cc:65
+#: ftparchive/cachedb.cc:85
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB je stara, pokušavam nadogradnju %s"
 
-#: ftparchive/cachedb.cc:76
+#: 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."
 msgstr ""
 
-#: ftparchive/cachedb.cc:81
+#: 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:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:184 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:249
+#: 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"
 
-#: ftparchive/cachedb.cc:490
+#: ftparchive/cachedb.cc:526
 msgid "Unable to get a cursor"
 msgstr ""
 
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:104
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:109
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:165
 msgid "E: "
 msgstr ""
 
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:167
 msgid "W: "
 msgstr ""
 
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:174
 msgid "E: Errors apply to file "
 msgstr ""
 
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
 msgid "Failed to resolve %s"
 msgstr ""
 
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:205
 msgid "Tree walking failed"
 msgstr ""
 
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:232
 #, c-format
 msgid "Failed to open %s"
 msgstr "Ne mogu otvoriti %s"
 
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:291
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:299
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:303
 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:289
+#: ftparchive/writer.cc:311
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:321
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:404
+#: ftparchive/writer.cc:427
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
@@ -1780,81 +1903,88 @@ msgstr ""
 msgid "  %s has no binary override entry either\n"
 msgstr ""
 
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
 msgid "realloc - Failed to allocate memory"
 msgstr ""
 
-#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: ftparchive/override.cc:61 ftparchive/override.cc:167
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
 #, c-format
-msgid "Malformed override %s line %llu #1"
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#: ftparchive/override.cc:75 ftparchive/override.cc:179
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
-msgid "Malformed override %s line %llu #2"
+msgid "Failed to read the override file %s"
 msgstr ""
 
-#: ftparchive/override.cc:89 ftparchive/override.cc:192
+#: ftparchive/override.cc:166
 #, c-format
-msgid "Malformed override %s line %llu #3"
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: ftparchive/override.cc:128 ftparchive/override.cc:202
+#: ftparchive/override.cc:178
 #, c-format
-msgid "Failed to read the override file %s"
+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:70
+#: ftparchive/multicompress.cc:73
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:103
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:192
 msgid "Failed to create FILE*"
 msgstr ""
 
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:195
 msgid "Failed to fork"
 msgstr ""
 
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:209
 msgid "Compress child"
 msgstr ""
 
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:232
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:304
+#: ftparchive/multicompress.cc:305
 msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: ftparchive/multicompress.cc:342
+#: ftparchive/multicompress.cc:343
 msgid "Failed to read while computing MD5"
 msgstr ""
 
-#: ftparchive/multicompress.cc:358
+#: ftparchive/multicompress.cc:359
 #, c-format
 msgid "Problem unlinking %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:38
+#: cmdline/apt-internal-solver.cc:51
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1868,11 +1998,11 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
 msgid "Unknown package record!"
 msgstr "Nepoznat zapis paketa\""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1886,1345 +2016,1386 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:116
-msgid "Failed to create pipes"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:143
-msgid "Failed to exec gzip "
-msgstr "Ne mogu izvršiti gzip"
-
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
-msgid "Corrupted archive"
-msgstr "Oštećena arhiva"
-
-#: apt-inst/contrib/extracttar.cc:195
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
-
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-pkg/install-progress.cc:59
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
+msgid "Running dpkg"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:94
+#: apt-pkg/init.cc:156
 #, c-format
-msgid "Invalid archive member header %s"
+msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
+#: apt-pkg/init.cc:172
+msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:135
-msgid "Archive is too short"
-msgstr "Arhiva je prekratka"
-
-#: apt-inst/contrib/arfile.cc:139
-msgid "Failed to read the archive headers"
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#, c-format
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:382
-msgid "DropNode called on still linked node"
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:414
-msgid "Failed to locate the hash element!"
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:461
-msgid "Failed to allocate diversion"
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: apt-inst/filelist.cc:466
-msgid "Internal error in AddDiversion"
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:479
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:508
+#: apt-pkg/acquire-worker.cc:133
 #, c-format
-msgid "Double add of diversion %s -> %s"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: apt-inst/filelist.cc:551
+#: apt-pkg/acquire-worker.cc:135
 #, c-format
-msgid "Duplicate conf file %s/%s"
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "Ne mogu ukloniti %s"
-
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#: apt-pkg/acquire-worker.cc:186
 #, c-format
-msgid "Failed to close file %s"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-pkg/acquire-worker.cc:485
 #, c-format
-msgid "The path %s is too long"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-inst/extract.cc:125
-#, c-format
-msgid "Unpacking %s more than once"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: apt-inst/extract.cc:135
-#, c-format
-msgid "The directory %s is diverted"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-inst/extract.cc:145
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
 msgstr ""
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
-msgid "The diversion path is too long"
+#: apt-pkg/pkgcache.cc:154
+msgid "Empty package cache"
 msgstr ""
 
-#: apt-inst/extract.cc:242
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
+msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-inst/extract.cc:282
-msgid "Failed to locate node in its hash bucket"
+#: apt-pkg/pkgcache.cc:165
+msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-inst/extract.cc:286
-msgid "The path is too long"
-msgstr "Putanja je preduga"
-
-#: apt-inst/extract.cc:414
-#, c-format
-msgid "Overwrite package match with no version for %s"
+#: apt-pkg/pkgcache.cc:168
+msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: apt-inst/extract.cc:431
+#: apt-pkg/pkgcache.cc:175
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-inst/extract.cc:491
+#: apt-pkg/pkgcache.cc:185
 #, c-format
-msgid "Unable to stat %s"
+msgid "The package cache was built for different architectures: %s vs %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
-#: apt-inst/deb/debfile.cc:54
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+#: apt-pkg/pkgcache.cc:322
+msgid "Depends"
+msgstr "Zavisi"
 
-#: apt-inst/deb/debfile.cc:119
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr ""
+#: apt-pkg/pkgcache.cc:322
+msgid "PreDepends"
+msgstr "Unaprijed zavisi"
 
-#: apt-inst/deb/debfile.cc:213
-msgid "Unparsable control file"
-msgstr ""
+#: apt-pkg/pkgcache.cc:322
+msgid "Suggests"
+msgstr "Predlaže"
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr ""
+#: apt-pkg/pkgcache.cc:323
+msgid "Recommends"
+msgstr "Preporučuje"
 
-#: apt-pkg/contrib/mmap.cc:111
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
+#: apt-pkg/pkgcache.cc:323
+#, fuzzy
+msgid "Conflicts"
+msgstr "Sukobljava se sa"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Replaces"
+msgstr "Zamjenjuje"
+
+#: apt-pkg/pkgcache.cc:324
+msgid "Obsoletes"
+msgstr "Zastarijeva"
+
+#: apt-pkg/pkgcache.cc:324
+msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:119
-#, c-format
-msgid "Couldn't make mmap of %llu bytes"
+#: apt-pkg/pkgcache.cc:324
+msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Ne mogu kreirati %s"
+#: apt-pkg/pkgcache.cc:335
+msgid "important"
+msgstr "važno"
 
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Ne mogu kreirati %s"
+#: apt-pkg/pkgcache.cc:335
+msgid "required"
+msgstr "zahtijevano"
 
-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
+#: apt-pkg/pkgcache.cc:335
+msgid "standard"
+msgstr "standardno"
 
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Ne mogu ukloniti %s"
+#: apt-pkg/pkgcache.cc:336
+msgid "optional"
+msgstr "opcionalno"
 
-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
+#: apt-pkg/pkgcache.cc:336
+msgid "extra"
+msgstr "extra"
 
-#: apt-pkg/contrib/mmap.cc:440
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Računam nadogradnju"
 
-#: apt-pkg/contrib/mmap.cc:443
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "%lid %lih %limin %lis"
+msgid "Malformed stanza %u in source list %s (URI parse)"
 msgstr ""
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "%lih %limin %lis"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "%limin %lis"
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "%lis"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-pkg/sourcelist.cc:190
 #, c-format
-msgid "Selection %s not found"
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:503
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "Unrecognized type abbreviation: '%c'"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:617
+#: apt-pkg/sourcelist.cc:206
 #, c-format
-msgid "Opening configuration file %s"
+msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:785
+#: apt-pkg/sourcelist.cc:208
 #, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:804
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid "Syntax error %s:%u: Malformed tag"
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:821
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:861
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:868
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr ""
+msgid "Opening %s"
+msgstr "Otvaram %s"
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/sourcelist.cc:371
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:934
+#: apt-pkg/sourcelist.cc:416
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
+msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
 #, c-format
-msgid "%c%s... Error!"
+msgid "Clean of %s is not supported"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid "%c%s... Done"
+msgid "Unable to stat %s."
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#. 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
 #, c-format
-msgid "%c%s... %u%%"
+msgid "Error occurred while processing %s (%s%d)"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
-#, c-format
-msgid "Command line option %s is not understood"
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not boolean"
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#: apt-pkg/pkgcachegen.cc:591
 #, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:273
+#: apt-pkg/pkgcachegen.cc:1196
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:304
-#, c-format
-msgid "Option '%s' is too long"
+#: 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"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:336
-#, c-format
-msgid "Sense %s is not understood, try true or false."
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:386
-#, c-format
-msgid "Invalid operation %s"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
-msgid "Unable to stat the mount point %s"
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:95
-#, c-format
-msgid "Problem closing the gzip file %s"
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:228
-#, c-format
-msgid "Not using locking for read only lock file %s"
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:233
-#, c-format
-msgid "Could not open lock file %s"
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
+msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:261
-#, c-format
-msgid "Could not get lock %s"
+#: apt-pkg/acquire-item.cc:240
+msgid "Hash Sum mismatch"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
+#: apt-pkg/acquire-item.cc:245
+msgid "Size mismatch"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:432
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+#: apt-pkg/acquire-item.cc:250
+msgid "Invalid file format"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:450
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+#: apt-pkg/acquire-item.cc:255
+#, 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/contrib/fileutl.cc:459
+#: apt-pkg/acquire-item.cc:1584
 #, c-format
 msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+"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"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:862
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
+msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/acquire-item.cc:1707
 #, c-format
-msgid "Sub-process %s received signal %u."
+msgid "The repository '%s' is no longer signed."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
+#: 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/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
+msgid ""
+"The data from '%s' is not signed. Packages from that repository can not be "
+"authenticated."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/acquire-item.cc:1956
 #, c-format
-msgid "Could not open file %s"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/acquire-item.cc:1975
 #, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
-msgstr ""
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Ne mogu otvoriti DB datoteku %s"
 
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
+#: apt-pkg/acquire-item.cc:1999
+msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
-msgid "read, still have %llu to read but none left"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
-msgid "write, still have %llu to write but couldn't"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1726
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Ne mogu ukloniti %s"
-
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
-msgid "Problem renaming the file %s to %s"
+msgid ""
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/acquire-item.cc:2249
 #, c-format
-msgid "Problem unlinking the file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1762
-msgid "Problem syncing the file"
+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 ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Odustajem od instalacije."
-
-#: apt-pkg/pkgcache.cc:148
-msgid "Empty package cache"
+#: apt-pkg/acquire-item.cc:2315
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:154
-msgid "The package cache file is corrupted"
+#: apt-pkg/acquire-item.cc:2351
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:159
-msgid "The package cache file is an incompatible version"
+#: apt-pkg/vendorlist.cc:83
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:162
-msgid "The package cache file is corrupted, it is too small"
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
+#, c-format
+msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
+msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:172
-msgid "The package cache was built for a different architecture"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:314
-msgid "Depends"
-msgstr "Zavisi"
-
-#: apt-pkg/pkgcache.cc:314
-msgid "PreDepends"
-msgstr "Unaprijed zavisi"
-
-#: apt-pkg/pkgcache.cc:314
-msgid "Suggests"
-msgstr "Predlaže"
-
-#: apt-pkg/pkgcache.cc:315
-msgid "Recommends"
-msgstr "Preporučuje"
-
-#: apt-pkg/pkgcache.cc:315
-#, fuzzy
-msgid "Conflicts"
-msgstr "Sukobljava se sa"
-
-#: apt-pkg/pkgcache.cc:315
-msgid "Replaces"
-msgstr "Zamjenjuje"
-
-#: apt-pkg/pkgcache.cc:316
-msgid "Obsoletes"
-msgstr "Zastarijeva"
-
-#: apt-pkg/pkgcache.cc:316
-msgid "Breaks"
-msgstr ""
+#: apt-pkg/acquire.cc:162
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Ne mogu kreirati %s"
 
-#: apt-pkg/pkgcache.cc:316
-msgid "Enhances"
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:981
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
-msgid "important"
-msgstr "važno"
-
-#: apt-pkg/pkgcache.cc:327
-msgid "required"
-msgstr "zahtijevano"
-
-#: apt-pkg/pkgcache.cc:327
-msgid "standard"
-msgstr "standardno"
-
-#: apt-pkg/pkgcache.cc:328
-msgid "optional"
-msgstr "opcionalno"
-
-#: apt-pkg/pkgcache.cc:328
-msgid "extra"
-msgstr "extra"
-
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Gradim stablo zavisnosti"
-
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Verzije kandidata"
-
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Stvaranje zavisnosti"
-
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-#, fuzzy
-msgid "Reading state information"
-msgstr "Sastavljam dostupne informacije"
-
-#: apt-pkg/depcache.cc:244
+#: apt-pkg/acquire.cc:983
 #, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ne mogu ukloniti %s"
+msgid "Retrieving file %li of %li"
+msgstr "Čitam spisak datoteke"
 
-#: apt-pkg/tagfile.cc:138
-#, c-format
-msgid "Unable to parse package file %s (1)"
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:231
+#: apt-pkg/policy.cc:83
 #, c-format
-msgid "Unable to parse package file %s (2)"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:84
+#: apt-pkg/policy.cc:422
 #, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:144
+#: apt-pkg/policy.cc:444
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:147
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:158
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:164
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/sourcelist.cc:167
+#: apt-pkg/packagemanager.cc:643
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:180
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
+#: 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."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/cdrom.cc:571
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "Pogrešan CD"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
+msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:185
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
+#: apt-pkg/cdrom.cc:599
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Čekam na zaglavlja"
+
+#: apt-pkg/cdrom.cc:609
+msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/cdrom.cc:662
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:309
-#, c-format
-msgid "Opening %s"
-msgstr "Otvaram %s"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/cdrom.cc:734
 #, c-format
-msgid "Line %u too long in source list %s."
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:345
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
+#: apt-pkg/cdrom.cc:744
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/cdrom.cc:771
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:386
-#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+#: apt-pkg/cdrom.cc:800
+msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+"This disc is called: \n"
+"'%s'\n"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Ne mogu otvoriti %s"
+#: apt-pkg/cdrom.cc:819
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Čitam spiskove paketa"
 
-#: apt-pkg/packagemanager.cc:570
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
+#: apt-pkg/cdrom.cc:866
+msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:34
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: apt-pkg/cdrom.cc:877
+msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:266
+#: apt-pkg/algorithms.cc:265
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1068
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1070
+#: apt-pkg/algorithms.cc:1092
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr ""
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradim stablo zavisnosti"
 
-#: apt-pkg/acquire.cc:85
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Verzije kandidata"
 
-#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Ne mogu kreirati %s"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Stvaranje zavisnosti"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-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/acquire.cc:895
+#: apt-pkg/depcache.cc:252
 #, fuzzy, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Čitam spisak datoteke"
+msgid "Failed to open StateFile %s"
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/acquire-worker.cc:112
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr ""
+#: apt-pkg/depcache.cc:258
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/acquire-worker.cc:161
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "Unable to parse package file %s (%d)"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:447
+#: apt-pkg/cacheset.cc:501
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/init.cc:143
+#: apt-pkg/cacheset.cc:504
 #, c-format
-msgid "Packaging system '%s' is not supported"
+msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
-msgstr ""
+#: apt-pkg/cacheset.cc:629
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/clean.cc:57
+#: apt-pkg/cacheset.cc:635
 #, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
+msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
+#: apt-pkg/cacheset.cc:641
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-pkg/cacheset.cc:680
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
+#: apt-pkg/cacheset.cc:719
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/policy.cc:75
+#: apt-pkg/cacheset.cc:727
 #, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/policy.cc:414
+#: apt-pkg/cacheset.cc:735
 #, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/policy.cc:436
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
 #, c-format
-msgid "Did not understand pin type %s"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:444
-msgid "No priority (or zero) specified for pin"
-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/pkgcachegen.cc:87
-msgid "Cache has an incompatible versioning system"
+#: apt-pkg/indexrecords.cc:91
+#, c-format
+msgid "No sections in Release file %s"
 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:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: apt-pkg/indexrecords.cc:132
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:251
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/indexrecords.cc:145
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:254
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
+#: apt-pkg/indexrecords.cc:164
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:570
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1199
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
-msgid "Reading package lists"
-msgstr "Čitam spiskove paketa"
-
-#: apt-pkg/pkgcachegen.cc:1304
-msgid "Collecting File Provides"
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
-msgid "IO Error saving source cache"
+#: apt-pkg/contrib/fileutl.cc:196
+#, c-format
+msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
+msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:154
-msgid "Hash Sum mismatch"
+#: apt-pkg/contrib/fileutl.cc:224
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:159
-msgid "Size mismatch"
+#: apt-pkg/contrib/fileutl.cc:229
+#, c-format
+msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:164
-msgid "Invalid file format"
+#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1577
-#, 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:1619
-msgid "There is no public key available for the following key IDs:\n"
+#: apt-pkg/contrib/fileutl.cc:418
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/contrib/fileutl.cc:848
 #, 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"
+msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
-msgid "GPG error: %s: %s"
+msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, 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)"
+msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/contrib/fileutl.cc:952
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:73
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
+msgid "Could not open file descriptor %d"
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/indexrecords.cc:81
-#, c-format
-msgid "No sections in Release file %s"
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
+msgid "Failed to create subprocess IPC"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/contrib/fileutl.cc:1412
+msgid "Failed to exec compressor "
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1553
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
+msgid "Problem closing the file %s"
+msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/contrib/fileutl.cc:1965
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
+msgid "Problem renaming the file %s to %s"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:576
+#: apt-pkg/contrib/fileutl.cc:1976
 #, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
+msgid "Problem unlinking the file %s"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
+#: apt-pkg/contrib/fileutl.cc:1989
+msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:613
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Stored label: %s\n"
+msgid "%c%s... Error!"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "Pogrešan CD"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Using CD-ROM mount point %s\n"
+msgid "%c%s... Done"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:660
-msgid "Unmounting CD-ROM\n"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:665
-#, fuzzy
-msgid "Waiting for disc...\n"
-msgstr "Čekam na zaglavlja"
-
-#: apt-pkg/cdrom.cc:674
-msgid "Mounting CD-ROM...\n"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, c-format
+msgid "%c%s... %u%%"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:693
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/contrib/mmap.cc:111
 #, c-format
-msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
+msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
-msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Ne mogu kreirati %s"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Ne mogu kreirati %s"
+
+#: apt-pkg/contrib/mmap.cc:290
 #, c-format
-msgid "Found label '%s'\n"
+msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:811
-msgid "That is not a valid name, try again.\n"
-msgstr ""
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/contrib/mmap.cc:341
 #, c-format
 msgid ""
-"This disc is called: \n"
-"'%s'\n"
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:830
-#, fuzzy
-msgid "Copying package lists..."
-msgstr "Čitam spiskove paketa"
-
-#: apt-pkg/cdrom.cc:865
-msgid "Writing new source list\n"
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:873
-msgid "Source list entries for this disc are:\n"
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "Wrote %i records.\n"
+msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/contrib/configuration.cc:804
 #, c-format
-msgid "Can't find authentication record for: %s"
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
-msgid "Hash mismatch for: %s"
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/contrib/configuration.cc:840
 #, c-format
-msgid "Release '%s' for '%s' was not found"
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:470
+#: apt-pkg/contrib/configuration.cc:880
 #, c-format
-msgid "Version '%s' for '%s' was not found"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:581
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/cacheset.cc:587
+#: apt-pkg/contrib/configuration.cc:887
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
+msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:598
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:619
+#: apt-pkg/contrib/configuration.cc:903
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:627
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:635
+#: apt-pkg/contrib/cmndline.cc:127
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
+#: 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"
 msgstr ""
 
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
+#: apt-pkg/contrib/cmndline.cc:174
+#, c-format
+msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
+#, c-format
+msgid "Option %s requires an argument."
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
+#: apt-pkg/contrib/cmndline.cc:284
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/contrib/cmndline.cc:315
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "Option '%s' is too long"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
+#: apt-pkg/contrib/cmndline.cc:347
+#, c-format
+msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/contrib/cmndline.cc:397
+#, c-format
+msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/deb/dpkgpm.cc:112
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Povezujem se sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:117
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:809
+#: apt-pkg/deb/dpkgpm.cc:839
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:972
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:979
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Preporučuje"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:992
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Ne mogu zapisati na %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1718
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
+#: apt-pkg/deb/debsystem.cc:94
 #, 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:103
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
+#: apt-pkg/deb/debsystem.cc:128
 msgid "Not locked"
 msgstr ""
 
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr ""
+
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr ""
+
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr ""
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr ""
+
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr ""
+
+#: apt-inst/filelist.cc:506
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr ""
+
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr ""
+
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#, c-format
+msgid "The path %s is too long"
+msgstr ""
+
+#: apt-inst/extract.cc:132
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr ""
+
+#: apt-inst/extract.cc:142
+#, c-format
+msgid "The directory %s is diverted"
+msgstr ""
+
+#: apt-inst/extract.cc:152
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr ""
+
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr ""
+
+#: apt-inst/extract.cc:249
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr ""
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr ""
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Putanja je preduga"
+
+#: apt-inst/extract.cc:421
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr ""
+
+#: apt-inst/extract.cc:438
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr ""
+
+#: apt-inst/extract.cc:498
+#, c-format
+msgid "Unable to stat %s"
+msgstr ""
+
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-inst/dirstream.cc:104
+#, c-format
+msgid "Failed to close file %s"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:132
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:96
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arhiva je prekratka"
+
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr ""
+
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr ""
+
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Ne mogu izvršiti gzip"
+
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Oštećena arhiva"
+
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
+
+#: apt-inst/contrib/extracttar.cc:312
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr ""
+
+#~ msgid "Done"
+#~ msgstr "Urađeno"
+
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Odustajem od instalacije."
+
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "%s nije ispravan DEB paket."
+
 #, fuzzy
 #~ msgid " [Not candidate version]"
 #~ msgstr "Verzije kandidata"
@@ -3232,12 +3403,6 @@ msgstr ""
 #~ msgid "However the following packages replace it:"
 #~ msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Ne mogu ukloniti %s"
-
-#~ msgid "Unable to create %s"
-#~ msgstr "Ne mogu kreirati %s"
-
 #~ msgid "Reading file listing"
 #~ msgstr "Čitam spisak datoteke"