X-Git-Url: https://git.hcoop.net/ntk/apt.git/blobdiff_plain/5003325cb5ac9e95785fae32448bab4787b4d243..51da0c3587c9d36a3c04b3e28b99d8331a29b230:/po/bs.po

diff --git a/po/bs.po b/po/bs.po
index a7c3886c..d561b86d 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: 2014-06-18 14:12+0200\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"
@@ -15,155 +15,156 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\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:277
 msgid "Total package names: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
 msgid "  Normal packages: "
 msgstr "  Normalni paketi:"
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
 msgid "  Single virtual packages: "
 msgstr "  Pojedinačni virutuelni paketi:"
 
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
 msgid "  Mixed virtual packages: "
 msgstr "  Miješani virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
 msgid "  Missing: "
 msgstr "  Nedostajući:"
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
 msgid "Total distinct versions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
 msgid "Total dependencies: "
 msgstr "Ukupno zavisnosti:"
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
 msgid "Total ver/file relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
 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:506 cmdline/apt-cache.cc:1155
+#: 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:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: 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:1254
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1411
+#: cmdline/apt-cache.cc:1420
 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:1515 apt-pkg/cacheset.cc:596
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ne mogu pronaći paket %s"
 
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
 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:1566
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
 msgid "  Installed: "
 msgstr "  Instalirano:"
 
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
 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:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
+#: cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1740
+#: cmdline/apt-cache.cc:1749
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -200,19 +201,11 @@ 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:76
 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:91
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
@@ -221,7 +214,15 @@ msgstr ""
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Ne mogu otvoriti %s"
 
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:178
+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:182
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -257,77 +258,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:245
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:422
+#: cmdline/apt-get.cc:423
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
+#: apt-private/private-install.cc:865
 #, 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:461 cmdline/apt-mark.cc:83
 #, 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:469 cmdline/apt-mark.cc:127
 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:538 cmdline/apt-get.cc:546
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:722
+#: cmdline/apt-get.cc:726
 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:766 cmdline/apt-get.cc:1066
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:779
+#: cmdline/apt-get.cc:786
 #, 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:791
 #, c-format
 msgid ""
 "Please use:\n"
@@ -335,151 +337,151 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:843
 #, 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
+#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:882
 #, 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:891
 #, 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:896
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:902
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:920
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:950
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:962
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:963
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:981
+#: cmdline/apt-get.cc:991
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1001
+#: cmdline/apt-get.cc:1010
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1020
+#: cmdline/apt-get.cc:1029
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1045
+#: cmdline/apt-get.cc:1054
 #, 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:1078 cmdline/apt-get.cc:1081
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1101
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1262
+#: cmdline/apt-get.cc:1271
 #, 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:1289
 #, 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:1312
 #, 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:1351
 #, 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:1357
 #, 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:1380
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1395
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1400
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:1582
+#: cmdline/apt-get.cc:1591
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:1623
+#: cmdline/apt-get.cc:1632
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -525,53 +527,73 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+msgid "Must specify at least one pair url/filename"
+msgstr ""
+
+#: cmdline/apt-helper.cc:53
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:66
+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"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
 #, 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:74
 #, 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:76
 #, 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:241
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
 #, 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:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1202
+#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
 #, 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:273 cmdline/apt-mark.cc:322
 #, 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:275 cmdline/apt-mark.cc:327
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Ne mogu otvoriti %s"
 
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -581,6 +603,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 +620,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 +635,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 +668,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:278
 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:47 methods/gzip.cc:117 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:83 methods/gzip.cc:124 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:177
 msgid "Logging in"
 msgstr "Prijavljujem se"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
 msgid "Unable to determine the peer name"
 msgstr ""
 
-#: methods/ftp.cc:184
+#: methods/ftp.cc:188
 msgid "Unable to determine the local name"
 msgstr ""
 
-#: methods/ftp.cc:215 methods/ftp.cc:243
+#: methods/ftp.cc:219 methods/ftp.cc:247
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: methods/ftp.cc:221
+#: methods/ftp.cc:225
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:228
+#: methods/ftp.cc:232
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:248
+#: methods/ftp.cc:252
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
-#: methods/ftp.cc:276
+#: methods/ftp.cc:280
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:302
+#: methods/ftp.cc:306
 #, 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:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
 msgid "Connection timeout"
 msgstr ""
 
-#: methods/ftp.cc:346
+#: methods/ftp.cc:350
 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:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
+#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
+#: apt-pkg/contrib/fileutl.cc:1492
 msgid "Read error"
 msgstr "Greška pri čitanju"
 
-#: methods/ftp.cc:356 methods/rsh.cc:206
+#: methods/ftp.cc:360 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr ""
 
-#: methods/ftp.cc:373 methods/ftp.cc:385
+#: methods/ftp.cc:377 methods/ftp.cc:389
 #, 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:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
+#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
+#: apt-pkg/contrib/fileutl.cc:1639
 msgid "Write error"
 msgstr "Greška pri pisanju"
 
-#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
 msgid "Could not create a socket"
 msgstr ""
 
-#: methods/ftp.cc:708
+#: methods/ftp.cc:712
 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:716 methods/connect.cc:116
 msgid "Failed"
 msgstr "Neuspješno"
 
-#: methods/ftp.cc:714
+#: methods/ftp.cc:718
 msgid "Could not connect passive socket."
 msgstr ""
 
-#: methods/ftp.cc:731
+#: methods/ftp.cc:735
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
 msgid "Could not bind a socket"
 msgstr ""
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:753
 msgid "Could not listen on the socket"
 msgstr ""
 
-#: methods/ftp.cc:756
+#: methods/ftp.cc:760
 msgid "Could not determine the socket's name"
 msgstr ""
 
-#: methods/ftp.cc:788
+#: methods/ftp.cc:792
 msgid "Unable to send PORT command"
 msgstr ""
 
-#: methods/ftp.cc:798
+#: methods/ftp.cc:802
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: methods/ftp.cc:807
+#: methods/ftp.cc:811
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: methods/ftp.cc:827
+#: methods/ftp.cc:831
 msgid "Data socket connect timed out"
 msgstr ""
 
-#: methods/ftp.cc:834
+#: methods/ftp.cc:838
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
 msgid "Problem hashing file"
 msgstr ""
 
-#: methods/ftp.cc:886
+#: methods/ftp.cc:890
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
-#: methods/ftp.cc:901 methods/rsh.cc:332
+#: methods/ftp.cc:905 methods/rsh.cc:335
 msgid "Data socket timed out"
 msgstr ""
 
-#: methods/ftp.cc:931
+#: methods/ftp.cc:935
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
-#: methods/ftp.cc:1008
+#: methods/ftp.cc:1014
 msgid "Query"
 msgstr ""
 
-#: methods/ftp.cc:1120
+#: methods/ftp.cc:1128
 msgid "Unable to invoke "
 msgstr ""
 
@@ -841,7 +872,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:439
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se sa %s"
@@ -871,182 +902,422 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 
-#: methods/gpgv.cc:167
+#: methods/gpgv.cc:168
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:172
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:173
+#: methods/gpgv.cc:174
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:180
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:184
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:216 methods/gpgv.cc:223
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: methods/gpgv.cc:230
+#: methods/gpgv.cc:231
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:519
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:533
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:535
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:571
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:631
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:636
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:659
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/server.cc:56
+#: methods/server.cc:51
 msgid "Waiting for headers"
 msgstr "Čekam na zaglavlja"
 
-#: methods/server.cc:114
+#: methods/server.cc:109
 msgid "Bad header line"
 msgstr ""
 
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/server.cc:176
+#: methods/server.cc:171
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/server.cc:199
+#: methods/server.cc:194
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/server.cc:201
+#: methods/server.cc:196
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/server.cc:225
+#: methods/server.cc:220
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
-#: methods/server.cc:490
+#: methods/server.cc:489
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:507 methods/server.cc:564
+#: methods/server.cc:506 methods/server.cc:562
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/server.cc:656
+#: methods/server.cc:654
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
-#: apt-private/private-list.cc:147
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Računam nadogradnju..."
+
+#: apt-private/private-upgrade.cc:28
+msgid "Done"
+msgstr "Urađeno"
+
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-list.cc:131
 msgid "Listing"
 msgstr ""
 
-#: apt-private/private-install.cc:93
+#: apt-private/private-list.cc:164
+#, 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:93
+msgid "Correcting dependencies..."
+msgstr "Ispravljam zavisnosti..."
+
+#: apt-private/private-cachefile.cc:96
+msgid " failed."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:99
+msgid "Unable to correct dependencies"
+msgstr "Ne mogu ispraviti zavisnosti"
+
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid " Done"
+msgstr " Urađeno"
+
+#: apt-private/private-cachefile.cc:108
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:111
+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:233
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:237
+#, fuzzy
+msgid "[installed,local]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:240
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:242
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:244
+#, fuzzy
+msgid "[installed]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:248
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:252
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:434
+#, c-format
+msgid "but %s is installed"
+msgstr "ali je %s instaliran"
+
+#: apt-private/private-output.cc:436
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ali se %s treba instalirati"
+
+#: apt-private/private-output.cc:443
+msgid "but it is not installable"
+msgstr "ali se ne može instalirati"
+
+#: apt-private/private-output.cc:445
+msgid "but it is a virtual package"
+msgstr "ali je virtuelni paket"
+
+#: apt-private/private-output.cc:448
+msgid "but it is not installed"
+msgstr "ali nije instaliran"
+
+#: apt-private/private-output.cc:448
+msgid "but it is not going to be installed"
+msgstr "ali se neće instalirati"
+
+#: apt-private/private-output.cc:453
+msgid " or"
+msgstr " ili"
+
+#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:502
+msgid "The following NEW packages will be installed:"
+msgstr "Slijedeći NOVI paketi će biti instalirani:"
+
+#: apt-private/private-output.cc:528
+msgid "The following packages will be REMOVED:"
+msgstr "Slijedeći paketi će biti UKLONJENI:"
+
+#: apt-private/private-output.cc:550
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Slijedeći paketi su zadržani:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages will be upgraded:"
+msgstr "Slijedeći paketi će biti nadograđeni:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+
+#: apt-private/private-output.cc:612
+msgid "The following held packages will be changed:"
+msgstr ""
+
+#: apt-private/private-output.cc:667
+#, c-format
+msgid "%s (due to %s) "
+msgstr ""
+
+#: apt-private/private-output.cc:675
+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:706
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr ""
+
+#: apt-private/private-output.cc:710
+#, c-format
+msgid "%lu reinstalled, "
+msgstr ""
+
+#: apt-private/private-output.cc:712
+#, c-format
+msgid "%lu downgraded, "
+msgstr ""
+
+#: apt-private/private-output.cc:714
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr ""
+
+#: apt-private/private-output.cc:718
+#, 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:740
+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:746
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:757
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:763
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:785 apt-pkg/cachefilter.cc:35
+#, 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:90
+#, 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:94
+msgid "All packages are up to date."
+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-install.cc:82
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:91
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: apt-private/private-install.cc:121
+#: apt-private/private-install.cc:110
 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:148
+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:155
 #, 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:160
 #, 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:167
 #, 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:172
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: apt-private/private-install.cc:211
+#: apt-private/private-install.cc:200
 #, 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:210 apt-private/private-download.cc:59
 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:216 apt-private/private-install.cc:238
 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:220
 msgid "Yes, do as I say!"
 msgstr "Da, uradi kako kažem!"
 
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:222
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1054,37 +1325,37 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
 msgid "Abort."
 msgstr "Odustani."
 
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:243
 msgid "Do you want to continue?"
 msgstr "Da li želite nastaviti?"
 
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:313
 msgid "Some files failed to download"
 msgstr ""
 
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:320
 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:324
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: apt-private/private-install.cc:340
+#: apt-private/private-install.cc:329
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:330
 msgid "Aborting install."
 msgstr "Odustajem od instalacije."
 
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:366
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1094,15 +1365,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:370
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:391
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:499
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1118,15 +1389,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:502 apt-private/private-install.cc:653
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: apt-private/private-install.cc:517
+#: apt-private/private-install.cc:506
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:513
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1136,7 +1407,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:517
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1144,23 +1415,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:519
 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:612
 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:614
 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:638
 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 +1439,134 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:659
 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:712
 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:802
 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:803
 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:825
+#, 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:829
+#, 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:841
+#, 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:846
 #, c-format
-msgid "Failed to fetch %s  %s\n"
+msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:200
-msgid "installed,upgradable to: "
+#: apt-private/private-install.cc:894
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr ""
 
-#: apt-private/private-output.cc:206
-#, fuzzy
-msgid "[installed,local]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:209
-msgid "[installed,auto-removable]"
+#: apt-private/private-install.cc:899
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr ""
 
-#: apt-private/private-output.cc:211
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:213
-#, fuzzy
-msgid "[installed]"
-msgstr "[Instalirano]"
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:941
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
 
-#: apt-private/private-output.cc:219
-msgid "[upgradable from: "
+#: apt-private/private-install.cc:947
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 
-#: apt-private/private-output.cc:225
-msgid "[residual-config]"
+#: 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-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
+#: apt-private/private-download.cc:36
 #, 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:"
+msgid "WARNING: The following packages cannot be authenticated!"
 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!"
-msgstr ""
-
-#: apt-private/private-output.cc:658
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
-
-#: apt-private/private-output.cc:662
-#, c-format
-msgid "%lu reinstalled, "
-msgstr ""
-
-#: apt-private/private-output.cc:664
-#, c-format
-msgid "%lu downgraded, "
-msgstr ""
-
-#: apt-private/private-output.cc:666
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ""
-
-#: apt-private/private-output.cc:670
-#, 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:692
-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:698
-msgid "[y/N]"
+#: apt-private/private-download.cc:40
+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:45 apt-private/private-download.cc:52
+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:50
+msgid "Install these packages without verification?"
 msgstr ""
 
-#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
+#: apt-private/private-download.cc:91 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"
-msgstr ""
-
-#: apt-private/private-show.cc:105
-msgid "not a real package (virtual)"
-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!"
+msgid "Failed to fetch %s  %s\n"
 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
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
 msgid "Hit "
 msgstr ""
 
-#: apt-private/acqprogress.cc:84
+#: apt-private/acqprogress.cc:90
 msgid "Get:"
 msgstr ""
 
-#: apt-private/acqprogress.cc:115
+#: apt-private/acqprogress.cc:121
 msgid "Ign "
 msgstr ""
 
-#: apt-private/acqprogress.cc:119
+#: apt-private/acqprogress.cc:125
 msgid "Err "
 msgstr ""
 
-#: apt-private/acqprogress.cc:140
+#: apt-private/acqprogress.cc:146
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
-#: apt-private/acqprogress.cc:230
+#: apt-private/acqprogress.cc:236
 #, c-format
 msgid " [Working]"
 msgstr ""
 
-#: apt-private/acqprogress.cc:291
+#: apt-private/acqprogress.cc:297
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1473,19 +1576,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-inst/extract.cc:471 apt-pkg/clean.cc:40
+#: apt-pkg/init.cc:103 apt-pkg/init.cc:111 apt-pkg/acquire.cc:491
+#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
+#: apt-pkg/contrib/cdromutl.cc:205
 #, 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:46
+#: apt-pkg/clean.cc:64 apt-pkg/clean.cc:127 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
@@ -1514,11 +1617,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:343
 msgid "Connection closed prematurely"
 msgstr ""
 
@@ -1556,1674 +1659,1692 @@ 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
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ne mogu zapisati na %s"
-
-#: cmdline/apt-extracttemplates.cc:308
-msgid "Cannot get debconf version. Is debconf installed?"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
 msgstr ""
-"Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
 
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
-msgid "Package extension list is too long"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 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
-#, c-format
-msgid "Error processing directory %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:262
-msgid "Source extension list is too long"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:379
-msgid "Error writing header to contents file"
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:409
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Error processing contents %s"
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:597
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:803
-msgid "No selections matched"
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#, c-format
+msgid "The path %s is too long"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:881
+#: apt-inst/extract.cc:132
 #, c-format
-msgid "Some files are missing in the package file group `%s'"
+msgid "Unpacking %s more than once"
 msgstr ""
 
-#: ftparchive/cachedb.cc:47
+#: apt-inst/extract.cc:142
 #, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB je bila oštećena, datoteka preimenovana u %s.old"
+msgid "The directory %s is diverted"
+msgstr ""
 
-#: ftparchive/cachedb.cc:65
+#: apt-inst/extract.cc:152
 #, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "DB je stara, pokušavam nadogradnju %s"
-
-#: ftparchive/cachedb.cc:76
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:81
-#, fuzzy, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr ""
 
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:182
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:249
-msgid "Archive has no control record"
-msgstr "Arhiva nema kontrolnog zapisa"
-
-#: ftparchive/cachedb.cc:490
-msgid "Unable to get a cursor"
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#, c-format
+msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:82
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "W: Unable to read directory %s\n"
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: ftparchive/writer.cc:87
-#, c-format
-msgid "W: Unable to stat %s\n"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: ftparchive/writer.cc:143
-msgid "E: "
-msgstr ""
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Putanja je preduga"
 
-#: ftparchive/writer.cc:145
-msgid "W: "
+#: apt-inst/extract.cc:421
+#, c-format
+msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: ftparchive/writer.cc:152
-msgid "E: Errors apply to file "
+#: apt-inst/extract.cc:438
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: apt-inst/extract.cc:498
 #, c-format
-msgid "Failed to resolve %s"
+msgid "Unable to stat %s"
 msgstr ""
 
-#: ftparchive/writer.cc:183
-msgid "Tree walking failed"
+#: 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:105
+#, c-format
+msgid "Failed to close file %s"
 msgstr ""
 
-#: ftparchive/writer.cc:210
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Failed to open %s"
-msgstr "Ne mogu otvoriti %s"
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#: ftparchive/writer.cc:269
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid " DeLink %s [%s]\n"
+msgid "Internal error, could not locate member %s"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:227
+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 ""
 
-#: ftparchive/writer.cc:277
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "Failed to readlink %s"
+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 ""
 
-#: ftparchive/writer.cc:281
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
+msgstr ""
+
+#: apt-inst/contrib/extracttar.cc:151
+msgid "Failed to exec gzip "
+msgstr "Ne mogu izvršiti gzip"
+
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
+msgid "Corrupted archive"
+msgstr "Oštećena arhiva"
+
+#: apt-inst/contrib/extracttar.cc:203
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
+
+#: apt-inst/contrib/extracttar.cc:308
 #, c-format
-msgid "Failed to unlink %s"
+msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#: ftparchive/writer.cc:289
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "*** Failed to link %s to %s"
+msgid "Unable to stat %s."
 msgstr ""
 
-#: ftparchive/writer.cc:299
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid " DeLink limit of %sB hit.\n"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: ftparchive/writer.cc:404
-msgid "Archive had no package field"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "  %s has no override entry\n"
+msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: ftparchive/writer.cc:712
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "  %s has no source override entry\n"
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:716
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "  %s has no binary override entry either\n"
+msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
-msgid "realloc - Failed to allocate memory"
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
 #, c-format
-msgid "Unable to open %s"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: ftparchive/override.cc:61 ftparchive/override.cc:167
+#: apt-pkg/indexcopy.cc:515
 #, c-format
-msgid "Malformed override %s line %llu #1"
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: ftparchive/override.cc:75 ftparchive/override.cc:179
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Malformed override %s line %llu #2"
+msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: ftparchive/override.cc:89 ftparchive/override.cc:192
+#: apt-pkg/acquire-worker.cc:116
 #, c-format
-msgid "Malformed override %s line %llu #3"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: ftparchive/override.cc:128 ftparchive/override.cc:202
+#: apt-pkg/acquire-worker.cc:118
 #, c-format
-msgid "Failed to read the override file %s"
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: ftparchive/multicompress.cc:70
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Unknown compression algorithm '%s'"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: ftparchive/multicompress.cc:100
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Compressed output %s needs a compression set"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: ftparchive/multicompress.cc:189
-msgid "Failed to create FILE*"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to fork"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: ftparchive/multicompress.cc:206
-msgid "Compress child"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
 msgstr ""
 
-#: ftparchive/multicompress.cc:229
-#, c-format
-msgid "Internal error, failed to create %s"
+#: apt-pkg/pkgcache.cc:155
+msgid "Empty package cache"
 msgstr ""
 
-#: ftparchive/multicompress.cc:304
-msgid "IO to subprocess/file failed"
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
 msgstr ""
 
-#: ftparchive/multicompress.cc:342
-msgid "Failed to read while computing MD5"
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: ftparchive/multicompress.cc:358
-#, c-format
-msgid "Problem unlinking %s"
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: apt-pkg/pkgcache.cc:174
 #, c-format
-msgid "Failed to rename %s to %s"
+msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:38
-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Nepoznat zapis paketa\""
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Zavisi"
 
-#: cmdline/apt-sortpkgs.cc:153
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Unaprijed zavisi"
 
-#: apt-inst/contrib/extracttar.cc:116
-msgid "Failed to create pipes"
-msgstr ""
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Predlaže"
 
-#: apt-inst/contrib/extracttar.cc:143
-msgid "Failed to exec gzip "
-msgstr "Ne mogu izvršiti gzip"
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Preporučuje"
 
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
-msgid "Corrupted archive"
-msgstr "Oštećena arhiva"
+#: apt-pkg/pkgcache.cc:322
+#, fuzzy
+msgid "Conflicts"
+msgstr "Sukobljava se sa"
 
-#: apt-inst/contrib/extracttar.cc:195
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Zamjenjuje"
 
-#: apt-inst/contrib/extracttar.cc:300
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr ""
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Zastarijeva"
 
-#: apt-inst/contrib/arfile.cc:74
-msgid "Invalid archive signature"
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:82
-msgid "Error reading archive member header"
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:94
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "važno"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "required"
+msgstr "zahtijevano"
+
+#: apt-pkg/pkgcache.cc:334
+msgid "standard"
+msgstr "standardno"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "optional"
+msgstr "opcionalno"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "extra"
+msgstr "extra"
+
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Invalid archive member header %s"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:106
-msgid "Invalid archive member header"
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
 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"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 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:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
 msgstr ""
 
-#: apt-inst/filelist.cc:382
-msgid "DropNode called on still linked node"
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-inst/filelist.cc:414
-msgid "Failed to locate the hash element!"
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-inst/filelist.cc:461
-msgid "Failed to allocate diversion"
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-inst/filelist.cc:466
-msgid "Internal error in AddDiversion"
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-inst/filelist.cc:479
+#: apt-pkg/pkgcachegen.cc:576
 #, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-inst/filelist.cc:508
+#: apt-pkg/pkgcachegen.cc:1211
 #, c-format
-msgid "Double add of diversion %s -> %s"
+msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-inst/filelist.cc:551
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr ""
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
+msgid "Reading package lists"
+msgstr "Čitam spiskove paketa"
 
-#: 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-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
+msgstr ""
 
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
 #, c-format
-msgid "Failed to close file %s"
+msgid "Unable to write to %s"
+msgstr "Ne mogu zapisati na %s"
+
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
-#, c-format
-msgid "The path %s is too long"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-inst/extract.cc:125
-#, c-format
-msgid "Unpacking %s more than once"
+#: apt-pkg/edsp.cc:241
+msgid "Send request to solver"
 msgstr ""
 
-#: apt-inst/extract.cc:135
-#, c-format
-msgid "The directory %s is diverted"
+#: apt-pkg/edsp.cc:320
+msgid "Prepare for receiving solution"
 msgstr ""
 
-#: apt-inst/extract.cc:145
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+#: apt-pkg/edsp.cc:327
+msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
-msgid "The diversion path is too long"
+#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
+msgid "Execute external solver"
 msgstr ""
 
-#: apt-inst/extract.cc:242
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
+msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-inst/extract.cc:282
-msgid "Failed to locate node in its hash bucket"
+#: apt-pkg/acquire-item.cc:163
+msgid "Hash Sum mismatch"
 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/acquire-item.cc:168
+msgid "Size mismatch"
 msgstr ""
 
-#: apt-inst/extract.cc:431
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+#: apt-pkg/acquire-item.cc:173
+msgid "Invalid file format"
 msgstr ""
 
-#: apt-inst/extract.cc:491
+#: apt-pkg/acquire-item.cc:1581
 #, c-format
-msgid "Unable to stat %s"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
 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"
+#: apt-pkg/acquire-item.cc:1597
+#, 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:1639
+msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:119
+#: apt-pkg/acquire-item.cc:1677
 #, c-format
-msgid "Internal error, could not locate member %s"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:213
-msgid "Unparsable control file"
+#: apt-pkg/acquire-item.cc:1699
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
+#: apt-pkg/acquire-item.cc:1729
+#, 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"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:111
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1739 apt-pkg/acquire-item.cc:1744
 #, c-format
-msgid "Couldn't duplicate file descriptor %i"
+msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:119
+#: apt-pkg/acquire-item.cc:1867
 #, c-format
-msgid "Couldn't make mmap of %llu bytes"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/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
+#: apt-pkg/acquire-item.cc:1933
 #, c-format
-msgid "Couldn't make mmap of %lu bytes"
+msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Ne mogu ukloniti %s"
-
-#: apt-pkg/contrib/mmap.cc:341
+#: apt-pkg/acquire-item.cc:1991
 #, c-format
 msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
+"The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:440
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:443
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#, c-format
+msgid "List directory %spartial is missing."
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "%lid %lih %limin %lis"
+msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Ne mogu kreirati %s"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid "%lih %limin %lis"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
-#, c-format
-msgid "%limin %lis"
+#: apt-pkg/acquire.cc:901
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Čitam spisak datoteke"
+
+#: 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 ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lis"
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-pkg/policy.cc:83
 #, c-format
-msgid "Selection %s not found"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:503
+#: apt-pkg/policy.cc:422
 #, c-format
-msgid "Unrecognized type abbreviation: '%c'"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:617
+#: apt-pkg/policy.cc:444
 #, c-format
-msgid "Opening configuration file %s"
+msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:785
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:804
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
 #, c-format
-msgid "Syntax error %s:%u: Malformed tag"
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:821
+#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/packagemanager.cc:583
 #, c-format
-msgid "Syntax error %s:%u: Extra junk after 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/contrib/configuration.cc:861
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
 #, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:868
+#: apt-pkg/cdrom.cc:571
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "Pogrešan CD"
+
+#: apt-pkg/cdrom.cc:586
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
+msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
+#: 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/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/cdrom.cc:662
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:934
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/cdrom.cc:734
 #, c-format
-msgid "%c%s... Error!"
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:148
+#: 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/cdrom.cc:771
 #, c-format
-msgid "%c%s... Done"
+msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
+#: apt-pkg/cdrom.cc:800
+msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#: apt-pkg/cdrom.cc:817
 #, c-format
-msgid "%c%s... %u%%"
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:116
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
+#: apt-pkg/cdrom.cc:819
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Čitam spiskove paketa"
+
+#: apt-pkg/cdrom.cc:863
+msgid "Writing new source list\n"
 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/cdrom.cc:874
+msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Command line option %s is not boolean"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
-#, c-format
-msgid "Option %s requires an argument."
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:273
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradim stablo zavisnosti"
+
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Verzije kandidata"
+
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Stvaranje zavisnosti"
+
+#: 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/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/tagfile.cc:140
 #, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:304
+#: apt-pkg/tagfile.cc:237
 #, c-format
-msgid "Option '%s' is too long"
+msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:336
+#: apt-pkg/cacheset.cc:489
 #, c-format
-msgid "Sense %s is not understood, try true or false."
+msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:386
+#: apt-pkg/cacheset.cc:492
 #, c-format
-msgid "Invalid operation %s"
+msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Unable to stat the mount point %s"
+msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:225
-msgid "Failed to stat the cdrom"
-msgstr ""
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/contrib/fileutl.cc:95
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Problem closing the gzip file %s"
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
-msgid "Not using locking for read only lock file %s"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:233
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Could not open lock file %s"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Not using locking for nfs mounted lock file %s"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:261
+#: apt-pkg/cacheset.cc:663
 #, c-format
-msgid "Could not get lock %s"
+msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/indexrecords.cc:78
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: apt-pkg/indexrecords.cc:86
 #, c-format
-msgid "List of files can't be created as '%s' is not a directory"
+msgid "No sections in Release file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/indexrecords.cc:117
 #, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/indexrecords.cc:130
 #, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/indexrecords.cc:149
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgid "Malformed stanza %u in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Sub-process %s received signal %u."
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/sourcelist.cc:190
 #, c-format
-msgid "Sub-process %s exited unexpectedly"
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1016
+#: apt-pkg/sourcelist.cc:193
 #, c-format
-msgid "Could not open file %s"
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1093
-#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Ne mogu otvoriti %s"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1178
-msgid "Failed to create subprocess IPC"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1233
-msgid "Failed to exec compressor "
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "read, still have %llu to read but none left"
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "write, still have %llu to write but couldn't"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1726
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Ne mogu ukloniti %s"
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Otvaram %s"
 
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/sourcelist.cc:371
 #, c-format
-msgid "Problem renaming the file %s to %s"
+msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/sourcelist.cc:375
 #, c-format
-msgid "Problem unlinking the file %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1762
-msgid "Problem syncing the file"
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
+#: apt-pkg/deb/dpkgpm.cc:95
 #, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Odustajem od instalacije."
+msgid "Installing %s"
+msgstr "  Instalirano:"
 
-#: apt-pkg/pkgcache.cc:148
-msgid "Empty package cache"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Povezujem se sa %s"
 
-#: apt-pkg/pkgcache.cc:154
-msgid "The package cache file is corrupted"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Otvaram %s"
 
-#: apt-pkg/pkgcache.cc:159
-msgid "The package cache file is an incompatible version"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/pkgcache.cc:162
-msgid "The package cache file is corrupted, it is too small"
+#: apt-pkg/deb/dpkgpm.cc:99
+#, c-format
+msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:167
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
+msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:172
-msgid "The package cache was built for a different architecture"
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:827
+#, c-format
+msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:314
-msgid "Depends"
-msgstr "Zavisi"
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/pkgcache.cc:314
-msgid "PreDepends"
-msgstr "Unaprijed zavisi"
+#: apt-pkg/deb/dpkgpm.cc:989
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Otvaram %s"
 
-#: apt-pkg/pkgcache.cc:314
-msgid "Suggests"
-msgstr "Predlaže"
+#: apt-pkg/deb/dpkgpm.cc:990
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Otvaram %s"
 
-#: apt-pkg/pkgcache.cc:315
-msgid "Recommends"
-msgstr "Preporučuje"
+#: apt-pkg/deb/dpkgpm.cc:995
+#, c-format
+msgid "Preparing to configure %s"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:315
-#, fuzzy
-msgid "Conflicts"
-msgstr "Sukobljava se sa"
+#: apt-pkg/deb/dpkgpm.cc:997
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "  Instalirano:"
 
-#: apt-pkg/pkgcache.cc:315
-msgid "Replaces"
-msgstr "Zamjenjuje"
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:316
-msgid "Obsoletes"
-msgstr "Zastarijeva"
+#: apt-pkg/deb/dpkgpm.cc:1004
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "Preporučuje"
 
-#: apt-pkg/pkgcache.cc:316
-msgid "Breaks"
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:316
-msgid "Enhances"
+#: apt-pkg/deb/dpkgpm.cc:1010
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1066
+msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
-msgid "important"
-msgstr "važno"
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Ne mogu zapisati na %s"
 
-#: apt-pkg/pkgcache.cc:327
-msgid "required"
-msgstr "zahtijevano"
+#: apt-pkg/deb/dpkgpm.cc:1069
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:327
-msgid "standard"
-msgstr "standardno"
+#: apt-pkg/deb/dpkgpm.cc:1090
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:328
-msgid "optional"
-msgstr "opcionalno"
+#: apt-pkg/deb/dpkgpm.cc:1569
+msgid "Operation was interrupted before it could finish"
+msgstr ""
 
-#: apt-pkg/pkgcache.cc:328
-msgid "extra"
-msgstr "extra"
+#: apt-pkg/deb/dpkgpm.cc:1631
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
 
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-msgid "Building dependency tree"
-msgstr "Gradim stablo zavisnosti"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1636
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
 
-#: apt-pkg/depcache.cc:133
-msgid "Candidate versions"
-msgstr "Verzije kandidata"
+#: apt-pkg/deb/dpkgpm.cc:1638
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
 
-#: apt-pkg/depcache.cc:162
-msgid "Dependency generation"
-msgstr "Stvaranje zavisnosti"
+#: apt-pkg/deb/dpkgpm.cc:1644
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
 
-#: 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/deb/dpkgpm.cc:1651
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
 
-#: apt-pkg/depcache.cc:244
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Ne mogu otvoriti %s"
+#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
 
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ne mogu ukloniti %s"
+#: apt-pkg/deb/dpkgpm.cc:1685
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
 
-#: apt-pkg/tagfile.cc:138
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Unable to parse package file %s (1)"
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:231
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Unable to parse package file %s (2)"
+msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:84
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:144
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:147
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
 #, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:158
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:164
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:167
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:180
+#: apt-pkg/contrib/strutl.cc:1243
 #, c-format
-msgid "Malformed line %lu in source list %s (URI)"
+msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:182
+#: apt-pkg/contrib/fileutl.cc:190
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
+msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:185
+#: apt-pkg/contrib/fileutl.cc:195
 #, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
+msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/contrib/fileutl.cc:218
 #, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:198
+#: apt-pkg/contrib/fileutl.cc:223
 #, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
 #, c-format
-msgid "Opening %s"
-msgstr "Otvaram %s"
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: apt-pkg/contrib/fileutl.cc:394
 #, c-format
-msgid "Line %u too long in source list %s."
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:345
+#: apt-pkg/contrib/fileutl.cc:412
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:349
+#: apt-pkg/contrib/fileutl.cc:421
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:386
+#: apt-pkg/contrib/fileutl.cc:824
 #, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
+#: apt-pkg/contrib/fileutl.cc:826
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Sub-process %s received signal %u."
 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/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr ""
 
-#: apt-pkg/packagemanager.cc:570
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
 #, 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."
+msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/contrib/fileutl.cc:913
 #, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:266
+#: apt-pkg/contrib/fileutl.cc:1101
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1068
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/contrib/fileutl.cc:1315
+msgid "Failed to create subprocess IPC"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1070
-msgid "Unable to correct problems, you have held broken packages."
+#: apt-pkg/contrib/fileutl.cc:1373
+msgid "Failed to exec compressor "
 msgstr ""
 
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/contrib/fileutl.cc:1514
 #, c-format
-msgid "List directory %spartial is missing."
+msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/acquire.cc:85
+#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
 #, c-format
-msgid "Archives directory %spartial is missing."
+msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/acquire.cc:93
+#: apt-pkg/contrib/fileutl.cc:1915
 #, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Ne mogu kreirati %s"
+msgid "Problem closing the file %s"
+msgstr "Ne mogu ukloniti %s"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:893
+#: apt-pkg/contrib/fileutl.cc:1927
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
+msgid "Problem renaming the file %s to %s"
 msgstr ""
 
-#: apt-pkg/acquire.cc:895
-#, fuzzy, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Čitam spisak datoteke"
-
-#: apt-pkg/acquire-worker.cc:112
+#: apt-pkg/contrib/fileutl.cc:1938
 #, c-format
-msgid "The method driver %s could not be found."
+msgid "Problem unlinking the file %s"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:161
-#, c-format
-msgid "Method %s did not start correctly"
+#: apt-pkg/contrib/fileutl.cc:1951
+msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:447
+#: apt-pkg/contrib/progress.cc:148
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "%c%s... Error!"
 msgstr ""
 
-#: apt-pkg/init.cc:143
+#: apt-pkg/contrib/progress.cc:150
 #, c-format
-msgid "Packaging system '%s' is not supported"
+msgid "%c%s... Done"
 msgstr ""
 
-#: apt-pkg/init.cc:159
-msgid "Unable to determine a suitable packaging system type"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
 msgstr ""
 
-#: apt-pkg/clean.cc:57
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, c-format
-msgid "Unable to stat %s."
+msgid "%c%s... %u%%"
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:47
-msgid "You must put some 'source' URIs in your sources.list"
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:87
-msgid "The package lists or status file could not be parsed or opened."
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:91
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:109
-msgid "The list of sources could not be read."
-msgstr ""
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Ne mogu kreirati %s"
 
-#: apt-pkg/policy.cc:75
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Ne mogu kreirati %s"
 
-#: apt-pkg/policy.cc:414
+#: apt-pkg/contrib/mmap.cc:290
 #, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/policy.cc:436
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/contrib/mmap.cc:341
 #, c-format
-msgid "Did not understand pin type %s"
+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/policy.cc:444
-msgid "No priority (or zero) specified for pin"
+#: 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/pkgcachegen.cc:87
-msgid "Cache has an incompatible versioning system"
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
 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/contrib/cdromutl.cc:65
 #, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:251
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:254
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/contrib/configuration.cc:519
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1199
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid "Syntax error %s:%u: Malformed tag"
 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/configuration.cc:837
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
-msgid "IO Error saving source cache"
+#: apt-pkg/contrib/configuration.cc:877
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:139
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
+msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:154
-msgid "Hash Sum mismatch"
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:159
-msgid "Size mismatch"
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:164
-msgid "Invalid file format"
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/contrib/configuration.cc:950
 #, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1577
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
 #, 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"
-msgstr ""
+msgid "No keyring installed in %s."
+msgstr "Odustajem od instalacije."
 
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/contrib/cmndline.cc:121
 #, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
+msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgid "Command line option %s is not understood"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/contrib/cmndline.cc:168
 #, 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 "Command line option %s is not boolean"
 msgstr ""
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
 #, c-format
-msgid "GPG error: %s: %s"
+msgid "Option %s requires an argument."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
 #, 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 "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/contrib/cmndline.cc:278
 #, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
+msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/contrib/cmndline.cc:309
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Option '%s' is too long"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:73
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/contrib/cmndline.cc:341
 #, c-format
-msgid "No sections in Release file %s"
+msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
-msgid "No Hash entry in Release file %s"
+msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:125
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
+#: cmdline/apt-extracttemplates.cc:224
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:144
+#: cmdline/apt-extracttemplates.cc:254
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#: apt-pkg/vendorlist.cc:78
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
+msgid "Unable to mkstemp %s"
+msgstr "Ne mogu kreirati %s"
 
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
+#: cmdline/apt-extracttemplates.cc:300
+msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
+"Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
 
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
 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
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
 #, c-format
-msgid "Using CD-ROM mount point %s\n"
+msgid "Error processing directory %s"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:660
-msgid "Unmounting CD-ROM\n"
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
 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"
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:693
-msgid "Scanning disc for index files..\n"
+#: ftparchive/apt-ftparchive.cc:431
+#, c-format
+msgid "Error processing contents %s"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:744
-#, c-format
+#: ftparchive/apt-ftparchive.cc:626
 msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
-msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
+#: ftparchive/apt-ftparchive.cc:841
+msgid "No selections matched"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:782
+#: ftparchive/apt-ftparchive.cc:919
 #, c-format
-msgid "Found label '%s'\n"
+msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:811
-msgid "That is not a valid name, try again.\n"
-msgstr ""
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB je bila oštećena, datoteka preimenovana u %s.old"
 
-#: apt-pkg/cdrom.cc:828
+#: ftparchive/cachedb.cc:83
 #, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB je stara, pokušavam nadogradnju %s"
+
+#: ftparchive/cachedb.cc:94
 msgid ""
-"This disc is called: \n"
-"'%s'\n"
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:830
+#: ftparchive/cachedb.cc:99
+#, fuzzy, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: ftparchive/cachedb.cc:332
 #, fuzzy
-msgid "Copying package lists..."
-msgstr "Čitam spiskove paketa"
+msgid "Failed to read .dsc"
+msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/cdrom.cc:865
-msgid "Writing new source list\n"
-msgstr ""
+#: ftparchive/cachedb.cc:365
+msgid "Archive has no control record"
+msgstr "Arhiva nema kontrolnog zapisa"
 
-#: apt-pkg/cdrom.cc:873
-msgid "Source list entries for this disc are:\n"
+#: ftparchive/cachedb.cc:594
+msgid "Unable to get a cursor"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: ftparchive/writer.cc:91
 #, c-format
-msgid "Wrote %i records.\n"
+msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
+#: ftparchive/writer.cc:96
 #, c-format
-msgid "Wrote %i records with %i missing files.\n"
+msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+#: ftparchive/writer.cc:152
+msgid "E: "
 msgstr ""
 
-#: 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"
+#: ftparchive/writer.cc:154
+msgid "W: "
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
 #, c-format
-msgid "Hash mismatch for: %s"
+msgid "Failed to resolve %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:467
-#, c-format
-msgid "Release '%s' for '%s' was not found"
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:470
+#: ftparchive/writer.cc:219
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:581
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
+msgid "Failed to open %s"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/cacheset.cc:587
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:598
+#: ftparchive/writer.cc:278
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612
+#: ftparchive/writer.cc:286
 #, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+msgid "Failed to readlink %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:619
+#: ftparchive/writer.cc:290
 #, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgid "Failed to unlink %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:627
+#: ftparchive/writer.cc:298
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:635
+#: ftparchive/writer.cc:308
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:209
-msgid "Send request to solver"
+msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: apt-pkg/edsp.cc:279
-msgid "Prepare for receiving solution"
+#: ftparchive/writer.cc:417
+msgid "Archive had no package field"
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "External solver failed without a proper error message"
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+#, c-format
+msgid "  %s has no override entry\n"
 msgstr ""
 
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
-msgid "Execute external solver"
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:51
+#: ftparchive/writer.cc:706
 #, c-format
-msgid "Progress: [%3i%%]"
+msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
-msgid "Running dpkg"
+#: ftparchive/writer.cc:710
+#, c-format
+msgid "  %s has no binary override entry either\n"
 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."
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:91
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "  Instalirano:"
-
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978
-#, fuzzy, c-format
-msgid "Configuring %s"
-msgstr "Povezujem se sa %s"
-
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985
-#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Otvaram %s"
-
-#: apt-pkg/deb/dpkgpm.cc:94
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Ne mogu ukloniti %s"
-
-#: apt-pkg/deb/dpkgpm.cc:95
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
 #, c-format
-msgid "Noting disappearance of %s"
+msgid "Unable to open %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
 #, c-format
-msgid "Running post-installation trigger %s"
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:809
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
-msgid "Directory '%s' missing"
+msgid "Failed to read the override file %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/deb/dpkgpm.cc:971
-#, fuzzy, c-format
-msgid "Preparing %s"
-msgstr "Otvaram %s"
-
-#: apt-pkg/deb/dpkgpm.cc:972
-#, fuzzy, c-format
-msgid "Unpacking %s"
-msgstr "Otvaram %s"
-
-#: apt-pkg/deb/dpkgpm.cc:977
+#: ftparchive/override.cc:166
 #, c-format
-msgid "Preparing to configure %s"
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:979
-#, fuzzy, c-format
-msgid "Installed %s"
-msgstr "  Instalirano:"
-
-#: apt-pkg/deb/dpkgpm.cc:984
+#: ftparchive/override.cc:178
 #, c-format
-msgid "Preparing for removal of %s"
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:986
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Preporučuje"
-
-#: apt-pkg/deb/dpkgpm.cc:991
+#: ftparchive/override.cc:191
 #, c-format
-msgid "Preparing to completely remove %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:992
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Ne mogu ukloniti %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Ne mogu zapisati na %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1045
-msgid "Is /dev/pts mounted?"
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "Is stdout a terminal?"
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1549
-msgid "Operation was interrupted before it could finish"
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1611
-msgid "No apport report written because MaxReports is reached already"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
 msgstr ""
 
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
-msgid "dependency problems - leaving unconfigured"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1618
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1624
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1631
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1665
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:84
-#, c-format
+#: cmdline/apt-internal-solver.cc:49
 msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:87
-#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Nepoznat zapis paketa\""
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:103
-#, c-format
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:121
-msgid "Not locked"
-msgstr ""
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "%s nije ispravan DEB paket."
 
 #, fuzzy
 #~ msgid " [Not candidate version]"
@@ -3232,12 +3353,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"