Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	configure.ac
	debian/apt.dirs
	debian/changelog

1 files changed, 1118 insertions, 1119 deletions

diff --git a/po/bs.po b/po/bs.po
index 3568b5938..bca1b3b0e 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-04-25 13:52+0200\n"
+"POT-Creation-Date: 2014-05-05 16:26+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"
@@ -112,7 +112,7 @@ msgstr ""
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594
+#: 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"
@@ -156,7 +156,7 @@ msgid "  Version table:"
 msgstr ""
 
 #: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1581 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
 #: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
 #: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
 #: cmdline/apt-sortpkgs.cc:147
@@ -476,11 +476,11 @@ msgstr ""
 msgid "Changelog for %s (%s)"
 msgstr ""
 
-#: cmdline/apt-get.cc:1586
+#: cmdline/apt-get.cc:1583
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:1627
+#: cmdline/apt-get.cc:1624
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -572,9 +572,8 @@ msgstr ""
 msgid "%s was already not hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
-#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1201
+#: 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 ""
@@ -737,9 +736,9 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr "Server je zatvorio vezu"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1478
-#: apt-pkg/contrib/fileutl.cc:1487 apt-pkg/contrib/fileutl.cc:1492
-#: apt-pkg/contrib/fileutl.cc:1494
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
 msgid "Read error"
 msgstr "Greška pri čitanju"
 
@@ -752,10 +751,10 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr "Oštećenje protokola"
 
-#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:875
-#: apt-pkg/contrib/fileutl.cc:1600 apt-pkg/contrib/fileutl.cc:1609
-#: apt-pkg/contrib/fileutl.cc:1614 apt-pkg/contrib/fileutl.cc:1616
-#: apt-pkg/contrib/fileutl.cc:1641
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
 msgid "Write error"
 msgstr "Greška pri pisanju"
 
@@ -942,31 +941,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:508
+#: methods/http.cc:509
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:522
+#: methods/http.cc:523
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:524
+#: methods/http.cc:525
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:560
+#: methods/http.cc:561
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:620
+#: methods/http.cc:621
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:625
+#: methods/http.cc:626
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:648
+#: methods/http.cc:649
 msgid "Error writing to output file"
 msgstr ""
 
@@ -1010,39 +1009,33 @@ msgstr "Povezivanje neuspješno"
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr ""
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr ""
+#: apt-private/private-upgrade.cc:25
+msgid "Calculating upgrade... "
+msgstr "Računam nadogradnju..."
 
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
+#: apt-private/private-upgrade.cc:30
+msgid "Internal error, Upgrade broke stuff"
 msgstr ""
 
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr ""
+#: apt-private/private-upgrade.cc:32
+msgid "Done"
+msgstr "Urađeno"
 
-#: apt-private/acqprogress.cc:146
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
+msgid "Sorting"
 msgstr ""
 
-#: apt-private/acqprogress.cc:236
-#, c-format
-msgid " [Working]"
+#: apt-private/private-list.cc:131
+msgid "Listing"
 msgstr ""
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/private-list.cc:164
 #, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
+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..."
@@ -1072,34 +1065,184 @@ msgstr ""
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
-msgid "Sorting"
+#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
 msgstr ""
 
-#: apt-private/private-download.cc:31
+#: apt-private/private-output.cc:232
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:236
 #, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
+msgid "[installed,local]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:239
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:241
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:243
+#, fuzzy
+msgid "[installed]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:247
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:251
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:351
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:441
+#, c-format
+msgid "but %s is installed"
+msgstr "ali je %s instaliran"
+
+#: apt-private/private-output.cc:443
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ali se %s treba instalirati"
+
+#: apt-private/private-output.cc:450
+msgid "but it is not installable"
+msgstr "ali se ne može instalirati"
+
+#: apt-private/private-output.cc:452
+msgid "but it is a virtual package"
+msgstr "ali je virtuelni paket"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not installed"
+msgstr "ali nije instaliran"
+
+#: apt-private/private-output.cc:455
+msgid "but it is not going to be installed"
+msgstr "ali se neće instalirati"
+
+#: apt-private/private-output.cc:460
+msgid " or"
+msgstr " ili"
+
+#: apt-private/private-output.cc:489
+msgid "The following NEW packages will be installed:"
+msgstr "Slijedeći NOVI paketi će biti instalirani:"
+
+#: apt-private/private-output.cc:515
+msgid "The following packages will be REMOVED:"
+msgstr "Slijedeći paketi će biti UKLONJENI:"
+
+#: apt-private/private-output.cc:537
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Slijedeći paketi su zadržani:"
+
+#: apt-private/private-output.cc:558
+msgid "The following packages will be upgraded:"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#: apt-private/private-download.cc:35
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-output.cc:579
+msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
-msgid "Some packages could not be authenticated"
+#: apt-private/private-output.cc:599
+msgid "The following held packages will be changed:"
 msgstr ""
 
-#: apt-private/private-download.cc:45
-msgid "Install these packages without verification?"
+#: apt-private/private-output.cc:654
+#, c-format
+msgid "%s (due to %s) "
 msgstr ""
 
-#: apt-private/private-download.cc:54 apt-private/private-install.cc:209
-msgid "There are problems and -y was used without --force-yes"
+#: apt-private/private-output.cc:662
+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-download.cc:86 apt-pkg/update.cc:77
+#: apt-private/private-output.cc:693
 #, c-format
-msgid "Failed to fetch %s  %s\n"
+msgid "%lu upgraded, %lu newly installed, "
+msgstr ""
+
+#: apt-private/private-output.cc:697
+#, c-format
+msgid "%lu reinstalled, "
+msgstr ""
+
+#: apt-private/private-output.cc:699
+#, c-format
+msgid "%lu downgraded, "
+msgstr ""
+
+#: apt-private/private-output.cc:701
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr ""
+
+#: apt-private/private-output.cc:705
+#, 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:727
+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:733
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:744
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:750
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:772 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-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:81
@@ -1151,6 +1294,10 @@ msgstr ""
 msgid "You don't have enough free space in %s."
 msgstr ""
 
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
+msgid "There are problems and -y was used without --force-yes"
+msgstr ""
+
 #: apt-private/private-install.cc:215 apt-private/private-install.cc:237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
@@ -1299,19 +1446,7 @@ msgstr "Predloženi paketi:"
 msgid "Recommended packages:"
 msgstr "Preporučeni paketi:"
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: 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-main.cc:23
+#: apt-private/private-main.cc:32
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1319,226 +1454,90 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: apt-private/private-output.cc:81 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:211
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:215
-#, fuzzy
-msgid "[installed,local]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:218
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:220
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:222
-#, fuzzy
-msgid "[installed]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:226
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:230
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:330
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:420
-#, c-format
-msgid "but %s is installed"
-msgstr "ali je %s instaliran"
-
-#: apt-private/private-output.cc:422
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ali se %s treba instalirati"
-
-#: apt-private/private-output.cc:429
-msgid "but it is not installable"
-msgstr "ali se ne može instalirati"
-
-#: apt-private/private-output.cc:431
-msgid "but it is a virtual package"
-msgstr "ali je virtuelni paket"
-
-#: apt-private/private-output.cc:434
-msgid "but it is not installed"
-msgstr "ali nije instaliran"
-
-#: apt-private/private-output.cc:434
-msgid "but it is not going to be installed"
-msgstr "ali se neće instalirati"
-
-#: apt-private/private-output.cc:439
-msgid " or"
-msgstr " ili"
-
-#: apt-private/private-output.cc:468
-msgid "The following NEW packages will be installed:"
-msgstr "Slijedeći NOVI paketi će biti instalirani:"
-
-#: apt-private/private-output.cc:494
-msgid "The following packages will be REMOVED:"
-msgstr "Slijedeći paketi će biti UKLONJENI:"
-
-#: apt-private/private-output.cc:516
+#: apt-private/private-download.cc:31
 #, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Slijedeći paketi su zadržani:"
-
-#: apt-private/private-output.cc:537
-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:558
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: apt-private/private-output.cc:578
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%s (due to %s) "
+#: apt-private/private-download.cc:35
+msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: apt-private/private-output.cc:641
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
+msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: apt-private/private-output.cc:672
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
+#: apt-private/private-download.cc:45
+msgid "Install these packages without verification?"
 msgstr ""
 
-#: apt-private/private-output.cc:676
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
 #, c-format
-msgid "%lu reinstalled, "
+msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: apt-private/private-output.cc:678
-#, c-format
-msgid "%lu downgraded, "
-msgstr ""
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-private/private-output.cc:680
+#: apt-private/private-sources.cc:70
 #, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
+msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-output.cc:684
-#, c-format
-msgid "%lu not fully installed or removed.\n"
+#: apt-private/private-search.cc:51
+msgid "Full Text Search"
 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:706
-msgid "[Y/n]"
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
 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:712
-msgid "[y/N]"
+#: apt-private/acqprogress.cc:90
+msgid "Get:"
 msgstr ""
 
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:723
-msgid "Y"
+#: apt-private/acqprogress.cc:121
+msgid "Ign "
 msgstr ""
 
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:729
-msgid "N"
+#: apt-private/acqprogress.cc:125
+msgid "Err "
 msgstr ""
 
-#: apt-private/private-output.cc:751 apt-pkg/cachefilter.cc:35
+#: apt-private/acqprogress.cc:146
 #, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
-#: apt-private/private-show.cc:156
+#: apt-private/acqprogress.cc:236
 #, 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)"
+msgid " [Working]"
 msgstr ""
 
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-private/private-sources.cc:70
+#: apt-private/acqprogress.cc:297
 #, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Računam nadogradnju..."
-
-#: apt-private/private-upgrade.cc:30
-msgid "Internal error, Upgrade broke stuff"
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
 msgstr ""
 
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Urađeno"
-
 #. 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:471 apt-pkg/acquire.cc:491
-#: apt-pkg/clean.cc:40 apt-pkg/init.cc:103 apt-pkg/init.cc:111
+#: 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/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:371
-#: apt-pkg/contrib/fileutl.cc:484
+#: 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/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: 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"
@@ -1610,525 +1609,427 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sastavljam dostupne informacije"
 
-#: 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 ""
-
-#: cmdline/apt-extracttemplates.cc:254
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Ne mogu kreirati %s"
-
-#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ne mogu zapisati na %s"
-
-#: cmdline/apt-extracttemplates.cc:300
-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:180 ftparchive/apt-ftparchive.cc:358
-msgid "Package extension list is too long"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
-#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
-#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
-#, c-format
-msgid "Error processing directory %s"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:271
-msgid "Source extension list is too long"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:388
-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:418
+#: apt-inst/filelist.cc:506
 #, c-format
-msgid "Error processing contents %s"
+msgid "Double add of diversion %s -> %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:606
-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:812
-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:890
+#: 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:51
+#: 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:69
+#: 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:80
-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:85
-#, 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:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
-#: apt-inst/extract.cc:216
+#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc:131
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:253
-msgid "Archive has no control record"
-msgstr "Arhiva nema kontrolnog zapisa"
-
-#: ftparchive/cachedb.cc:494
-msgid "Unable to get a cursor"
-msgstr ""
-
-#: ftparchive/writer.cc:91
+#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
 #, c-format
-msgid "W: Unable to read directory %s\n"
+msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:96
+#: apt-inst/extract.cc:249
 #, c-format
-msgid "W: Unable to stat %s\n"
+msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
-#: ftparchive/writer.cc:152
-msgid "E: "
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr ""
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Putanja je preduga"
 
-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
+#: apt-inst/extract.cc:421
+#, c-format
+msgid "Overwrite package match with no version for %s"
 msgstr ""
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: apt-inst/extract.cc:438
 #, c-format
-msgid "Failed to resolve %s"
+msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
+#: apt-inst/extract.cc:498
+#, c-format
+msgid "Unable to stat %s"
 msgstr ""
 
-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
-msgstr "Ne mogu otvoriti %s"
+#: 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"
 
-#: ftparchive/writer.cc:278
+#: apt-inst/dirstream.cc:105
 #, c-format
-msgid " DeLink %s [%s]\n"
+msgid "Failed to close file %s"
 msgstr ""
 
-#: ftparchive/writer.cc:286
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
 #, c-format
-msgid "Failed to readlink %s"
+msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
-#: ftparchive/writer.cc:290
+#: apt-inst/deb/debfile.cc:132
 #, c-format
-msgid "Failed to unlink %s"
+msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: ftparchive/writer.cc:298
-#, c-format
-msgid "*** Failed to link %s to %s"
+#: apt-inst/deb/debfile.cc:227
+msgid "Unparsable control file"
 msgstr ""
 
-#: ftparchive/writer.cc:308
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
 msgstr ""
 
-#: ftparchive/writer.cc:413
-msgid "Archive had no package field"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
 msgstr ""
 
-#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#: apt-inst/contrib/arfile.cc:96
 #, c-format
-msgid "  %s has no override entry\n"
+msgid "Invalid archive member header %s"
 msgstr ""
 
-#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
 msgstr ""
 
-#: ftparchive/writer.cc:721
-#, c-format
-msgid "  %s has no source override entry\n"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arhiva je prekratka"
 
-#: ftparchive/writer.cc:725
-#, c-format
-msgid "  %s has no binary override entry either\n"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
 msgstr ""
 
-#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
-msgid "realloc - Failed to allocate memory"
+#: apt-inst/contrib/extracttar.cc:124
+msgid "Failed to create pipes"
 msgstr ""
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: 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 "Unable to open %s"
+msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-pkg/clean.cc:61
 #, c-format
-msgid "Malformed override %s line %llu (%s)"
+msgid "Unable to stat %s."
 msgstr ""
 
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/install-progress.cc:57
 #, c-format
-msgid "Failed to read the override file %s"
+msgid "Progress: [%3i%%]"
 msgstr ""
 
-#: ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %llu #1"
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+msgid "Running dpkg"
 msgstr ""
 
-#: ftparchive/override.cc:178
+#: apt-pkg/init.cc:146
 #, c-format
-msgid "Malformed override %s line %llu #2"
+msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %llu #3"
+#: apt-pkg/init.cc:162
+msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: ftparchive/multicompress.cc:73
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
 #, c-format
-msgid "Unknown compression algorithm '%s'"
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#: ftparchive/multicompress.cc:103
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "Compressed output %s needs a compression set"
+msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:232
+#: apt-pkg/indexcopy.cc:521
 #, c-format
-msgid "Internal error, failed to create %s"
+msgid "Hash mismatch for: %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
+#: apt-pkg/acquire-worker.cc:116
+#, c-format
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
 msgstr ""
 
-#: ftparchive/multicompress.cc:359
+#: apt-pkg/acquire-worker.cc:169
 #, c-format
-msgid "Problem unlinking %s"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#: apt-pkg/acquire-worker.cc:455
 #, c-format
-msgid "Failed to rename %s to %s"
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:46
-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/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Nepoznat zapis paketa\""
-
-#: 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"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
-#, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "Ne mogu ukloniti %s"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr ""
 
-#: apt-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
+#: apt-pkg/pkgcache.cc:155
+msgid "Empty package cache"
 msgstr ""
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
-#, c-format
-msgid "The path %s is too long"
+#: apt-pkg/pkgcache.cc:161
+msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-inst/extract.cc:132
-#, c-format
-msgid "Unpacking %s more than once"
+#: apt-pkg/pkgcache.cc:166
+msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-inst/extract.cc:142
-#, c-format
-msgid "The directory %s is diverted"
+#: apt-pkg/pkgcache.cc:169
+msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: apt-inst/extract.cc:152
+#: apt-pkg/pkgcache.cc:174
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-inst/extract.cc:249
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
+#: apt-pkg/pkgcache.cc:321
+msgid "Depends"
+msgstr "Zavisi"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr ""
+#: apt-pkg/pkgcache.cc:321
+msgid "PreDepends"
+msgstr "Unaprijed zavisi"
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Putanja je preduga"
+#: apt-pkg/pkgcache.cc:321
+msgid "Suggests"
+msgstr "Predlaže"
 
-#: apt-inst/extract.cc:421
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr ""
+#: apt-pkg/pkgcache.cc:322
+msgid "Recommends"
+msgstr "Preporučuje"
 
-#: apt-inst/extract.cc:438
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr ""
+#: apt-pkg/pkgcache.cc:322
+#, fuzzy
+msgid "Conflicts"
+msgstr "Sukobljava se sa"
 
-#: apt-inst/extract.cc:498
-#, c-format
-msgid "Unable to stat %s"
-msgstr ""
+#: apt-pkg/pkgcache.cc:322
+msgid "Replaces"
+msgstr "Zamjenjuje"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr ""
+#: apt-pkg/pkgcache.cc:323
+msgid "Obsoletes"
+msgstr "Zastarijeva"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
+#: apt-pkg/pkgcache.cc:323
+msgid "Breaks"
 msgstr ""
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
+#: apt-pkg/pkgcache.cc:323
+msgid "Enhances"
 msgstr ""
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr ""
+#: apt-pkg/pkgcache.cc:334
+msgid "important"
+msgstr "važno"
 
-#: apt-inst/filelist.cc:477
+#: 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 "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
+#: apt-pkg/pkgcachegen.cc:93
+msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-inst/filelist.cc:549
+#. 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 "Duplicate conf file %s/%s"
+msgid "Error occurred while processing %s (%s%d)"
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:96
-#, c-format
-msgid "Invalid archive member header %s"
+#: apt-pkg/pkgcachegen.cc:263
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
+#: apt-pkg/pkgcachegen.cc:266
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 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"
+#: apt-pkg/pkgcachegen.cc:576
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
+#: apt-pkg/pkgcachegen.cc:1211
+#, c-format
+msgid "Couldn't stat source package list %s"
 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-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/contrib/extracttar.cc:308
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
+#: apt-pkg/pkgcachegen.cc:1316
+msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "Unable to write to %s"
+msgstr "Ne mogu zapisati na %s"
 
-#: apt-inst/deb/debfile.cc:132
-#, c-format
-msgid "Internal error, could not locate member %s"
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
+msgid "IO Error saving source cache"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
+msgid "Send scenario to solver"
 msgstr ""
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816
-#, c-format
-msgid "List directory %spartial is missing."
+#: apt-pkg/edsp.cc:216
+msgid "Send request to solver"
 msgstr ""
 
-#: apt-pkg/acquire.cc:91
-#, c-format
-msgid "Archives directory %spartial is missing."
+#: apt-pkg/edsp.cc:286
+msgid "Prepare for receiving solution"
 msgstr ""
 
-#: 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 "Retrieving file %li of %li (%s remaining)"
+#: apt-pkg/edsp.cc:293
+msgid "External solver failed without a proper error message"
 msgstr ""
 
-#: apt-pkg/acquire.cc:901
-#, fuzzy, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Čitam spisak datoteke"
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
+msgid "Execute external solver"
+msgstr ""
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2054
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
@@ -2204,104 +2105,87 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/vendorlist.cc:85
 #, c-format
-msgid "The method driver %s could not be found."
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
 #, c-format
-msgid "Is the package %s installed?"
+msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/acquire.cc:91
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:455
-#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
+#: apt-pkg/acquire.cc:99
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Ne mogu kreirati %s"
 
-#: apt-pkg/algorithms.cc:265
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:899
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
+#: apt-pkg/acquire.cc:901
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Čitam spisak datoteke"
 
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:487
+#: apt-pkg/policy.cc:83
 #, c-format
-msgid "Release '%s' for '%s' was 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/cacheset.cc:490
+#: apt-pkg/policy.cc:422
 #, c-format
-msgid "Version '%s' for '%s' was not found"
+msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:601
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/cacheset.cc:607
+#: apt-pkg/policy.cc:444
 #, c-format
-msgid "Couldn't find any package by regex '%s'"
+msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:613
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/cacheset.cc:624
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
 #, c-format
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:645
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:653
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/cacheset.cc:661
+#: apt-pkg/packagemanager.cc:577
 #, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+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/cdrom.cc:497 apt-pkg/sourcelist.cc:347
@@ -2309,83 +2193,94 @@ msgstr ""
 msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:577
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893
+#: apt-pkg/cdrom.cc:571
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "Pogrešan CD"
 
-#: apt-pkg/cdrom.cc:592
+#: apt-pkg/cdrom.cc:586
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:599
 #, fuzzy
 msgid "Waiting for disc...\n"
 msgstr "Čekam na zaglavlja"
 
-#: apt-pkg/cdrom.cc:602
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:610
+#: apt-pkg/cdrom.cc:620
 msgid "Identifying... "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:648
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:672
+#: apt-pkg/cdrom.cc:680
 msgid "Scanning disc for index files...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:734
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:733
+#: 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:760
+#: apt-pkg/cdrom.cc:771
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:789
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:806
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:808
+#: apt-pkg/cdrom.cc:819
 #, fuzzy
 msgid "Copying package lists..."
 msgstr "Čitam spiskove paketa"
 
-#: apt-pkg/cdrom.cc:843
+#: apt-pkg/cdrom.cc:863
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:851
+#: apt-pkg/cdrom.cc:874
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Unable to stat %s."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+
+#: apt-pkg/algorithms.cc:1086
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+
+#: apt-pkg/algorithms.cc:1088
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
 #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
@@ -2415,54 +2310,66 @@ msgstr "Ne mogu otvoriti %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
-msgid "Send scenario to solver"
+#: apt-pkg/tagfile.cc:140
+#, c-format
+msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/edsp.cc:216
-msgid "Send request to solver"
+#: apt-pkg/tagfile.cc:237
+#, c-format
+msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/edsp.cc:286
-msgid "Prepare for receiving solution"
+#: apt-pkg/cacheset.cc:489
+#, c-format
+msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/edsp.cc:293
-msgid "External solver failed without a proper error message"
+#: apt-pkg/cacheset.cc:492
+#, c-format
+msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/cacheset.cc:603
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/cacheset.cc:609
 #, c-format
-msgid "Wrote %i records.\n"
+msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/cacheset.cc:615
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/cacheset.cc:626
 #, c-format
-msgid "Wrote %i records with %i missing files.\n"
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-pkg/cacheset.cc:647
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/cacheset.cc:655
 #, c-format
-msgid "Can't find authentication record for: %s"
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:521
+#: apt-pkg/cacheset.cc:663
 #, c-format
-msgid "Hash mismatch for: %s"
+msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:78
@@ -2490,210 +2397,6 @@ msgstr ""
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ne mogu otvoriti DB datoteku %s"
 
-#: apt-pkg/init.cc:146
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/init.cc:162
-msgid "Unable to determine a suitable packaging system type"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:57
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/packagemanager.cc:577
-#, 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."
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:169
-msgid "The package cache file is corrupted, it is too small"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:174
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Zavisi"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Unaprijed zavisi"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Predlaže"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Preporučuje"
-
-#: apt-pkg/pkgcache.cc:322
-#, fuzzy
-msgid "Conflicts"
-msgstr "Sukobljava se sa"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Zamjenjuje"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Zastarijeva"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
-
-#: 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/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc: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-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %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-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr ""
-
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/policy.cc:83
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:422
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-
-#: apt-pkg/policy.cc:444
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr ""
-
-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
-msgstr ""
-
 #: apt-pkg/sourcelist.cc:127
 #, c-format
 msgid "Malformed stanza %u in source list %s (URI parse)"
@@ -2769,259 +2472,331 @@ msgstr ""
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:95
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "  Instalirano:"
 
-#: apt-pkg/tagfile.cc:140
+#: 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/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/deb/dpkgpm.cc:98
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/deb/dpkgpm.cc:99
 #, c-format
-msgid "Unable to parse package file %s (1)"
+msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/deb/dpkgpm.cc:100
 #, c-format
-msgid "Unable to parse package file %s (2)"
+msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:827
+#, c-format
+msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/vendorlist.cc:85
+#: 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/deb/dpkgpm.cc:989
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/deb/dpkgpm.cc:990
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/deb/dpkgpm.cc:995
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
+msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:65
+#: apt-pkg/deb/dpkgpm.cc:997
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "  Instalirano:"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
-msgid "Unable to stat the mount point %s"
+msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:246
-msgid "Failed to stat the cdrom"
-msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:1004
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "Preporučuje"
 
-#: apt-pkg/contrib/cmndline.cc:121
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, c-format
-msgid "Command line option '%c' [from %s] is not known."
+msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not understood"
+#: 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/contrib/cmndline.cc:168
-#, c-format
-msgid "Command line option %s is not boolean"
+#: 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/deb/dpkgpm.cc:1069
+msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
-#, c-format
-msgid "Option %s requires an argument."
+#: apt-pkg/deb/dpkgpm.cc:1090
+msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+#: apt-pkg/deb/dpkgpm.cc:1568
+msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:278
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+#: apt-pkg/deb/dpkgpm.cc:1630
+msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:309
-#, c-format
-msgid "Option '%s' is too long"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1635
+msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:341
-#, c-format
-msgid "Sense %s is not understood, try true or false."
+#: apt-pkg/deb/dpkgpm.cc:1637
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:391
-#, c-format
-msgid "Invalid operation %s"
+#: apt-pkg/deb/dpkgpm.cc:1643
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:519
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
+#: apt-pkg/deb/dpkgpm.cc:1650
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:633
-#, c-format
-msgid "Opening configuration file %s"
+#: apt-pkg/deb/dpkgpm.cc:1657 apt-pkg/deb/dpkgpm.cc:1663
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:801
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
+#: apt-pkg/deb/dpkgpm.cc:1684
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:820
+#: apt-pkg/deb/debsystem.cc:91
 #, c-format
-msgid "Syntax error %s:%u: Malformed tag"
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:837
+#: apt-pkg/deb/debsystem.cc:94
 #, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
+msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:877
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
 #, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:406
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:413
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:897
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:900
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:950
+#: apt-pkg/contrib/strutl.cc:1236
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
+msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:193
+#: apt-pkg/contrib/fileutl.cc:190
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:198
+#: apt-pkg/contrib/fileutl.cc:195
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:221
+#: apt-pkg/contrib/fileutl.cc:218
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:226
+#: apt-pkg/contrib/fileutl.cc:223
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:363 apt-pkg/contrib/fileutl.cc:477
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:397
+#: apt-pkg/contrib/fileutl.cc:394
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:415
+#: apt-pkg/contrib/fileutl.cc:412
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:424
+#: apt-pkg/contrib/fileutl.cc:421
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:827
+#: apt-pkg/contrib/fileutl.cc:824
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:829
+#: apt-pkg/contrib/fileutl.cc:826
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:833 apt-pkg/contrib/gpgv.cc:239
+#: 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/contrib/fileutl.cc:835 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:916
+#: apt-pkg/contrib/fileutl.cc:913
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1104
+#: apt-pkg/contrib/fileutl.cc:1101
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1163 apt-pkg/contrib/fileutl.cc:1210
+#: 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:1317
+#: apt-pkg/contrib/fileutl.cc:1314
 msgid "Failed to create subprocess IPC"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1375
+#: apt-pkg/contrib/fileutl.cc:1372
 msgid "Failed to exec compressor "
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1516
+#: apt-pkg/contrib/fileutl.cc:1513
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1629 apt-pkg/contrib/fileutl.cc:1651
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1922
+#: apt-pkg/contrib/fileutl.cc:1913
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/contrib/fileutl.cc:1934
+#: apt-pkg/contrib/fileutl.cc:1925
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1945
+#: apt-pkg/contrib/fileutl.cc:1936
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:1958
+#: apt-pkg/contrib/fileutl.cc:1949
 msgid "Problem syncing the file"
 msgstr ""
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Odustajem od instalacije."
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr ""
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr ""
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, c-format
+msgid "%c%s... %u%%"
+msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3076,217 +2851,441 @@ msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "%c%s... Error!"
+msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:150
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr ""
+
+#: apt-pkg/contrib/configuration.cc:519
 #, c-format
-msgid "%c%s... Done"
+msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:181
-msgid "..."
+#: apt-pkg/contrib/configuration.cc:633
+#, c-format
+msgid "Opening configuration file %s"
 msgstr ""
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:197
+#: apt-pkg/contrib/configuration.cc:801
 #, c-format
-msgid "%c%s... %u%%"
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
+#: apt-pkg/contrib/configuration.cc:820
 #, c-format
-msgid "%lid %lih %limin %lis"
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
+#: apt-pkg/contrib/configuration.cc:837
 #, c-format
-msgid "%lih %limin %lis"
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
+#: apt-pkg/contrib/configuration.cc:877
 #, c-format
-msgid "%limin %lis"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
-msgid "%lis"
+msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
 #, c-format
-msgid "Selection %s not found"
+msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:897
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr ""
+
+#: apt-pkg/contrib/configuration.cc:900
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+
+#: apt-pkg/contrib/configuration.cc:950
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:72
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Odustajem od instalacije."
+
+#: apt-pkg/contrib/cmndline.cc:121
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr ""
+
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr ""
+
+#: apt-pkg/contrib/cmndline.cc:168
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr ""
+
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#, c-format
+msgid "Option %s requires an argument."
+msgstr ""
+
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr ""
+
+#: apt-pkg/contrib/cmndline.cc:278
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr ""
+
+#: apt-pkg/contrib/cmndline.cc:309
+#, c-format
+msgid "Option '%s' is too long"
+msgstr ""
+
+#: apt-pkg/contrib/cmndline.cc:341
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr ""
+
+#: apt-pkg/contrib/cmndline.cc:391
 #, c-format
+msgid "Invalid operation %s"
+msgstr ""
+
+#: cmdline/apt-extracttemplates.cc:224
 msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+"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/deb/debsystem.cc:94
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ne mogu kreirati %s"
+
+#: 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?"
+
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+msgid "Package extension list is too long"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
+msgid "Error processing directory %s"
 msgstr ""
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: ftparchive/apt-ftparchive.cc:271
+msgid "Source extension list is too long"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:388
+msgid "Error writing header to contents file"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:418
 #, c-format
+msgid "Error processing contents %s"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc:606
 msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+"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/deb/debsystem.cc:128
-msgid "Not locked"
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:95
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "  Instalirano:"
+#: ftparchive/apt-ftparchive.cc:890
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
-#, fuzzy, c-format
-msgid "Configuring %s"
-msgstr "Povezujem se sa %s"
+#: ftparchive/cachedb.cc:51
+#, 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/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
-#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Otvaram %s"
+#: ftparchive/cachedb.cc:69
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB je stara, pokušavam nadogradnju %s"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: ftparchive/cachedb.cc:80
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:85
 #, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Ne mogu ukloniti %s"
+msgid "Unable to open DB file %s: %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: ftparchive/cachedb.cc:253
+msgid "Archive has no control record"
+msgstr "Arhiva nema kontrolnog zapisa"
+
+#: ftparchive/cachedb.cc:494
+msgid "Unable to get a cursor"
+msgstr ""
+
+#: ftparchive/writer.cc:91
 #, c-format
-msgid "Noting disappearance of %s"
+msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: ftparchive/writer.cc:96
 #, c-format
-msgid "Running post-installation trigger %s"
+msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: ftparchive/writer.cc:152
+msgid "E: "
+msgstr ""
+
+#: ftparchive/writer.cc:154
+msgid "W: "
+msgstr ""
+
+#: ftparchive/writer.cc:161
+msgid "E: Errors apply to file "
+msgstr ""
+
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
 #, c-format
-msgid "Directory '%s' missing"
+msgid "Failed to resolve %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
+#: ftparchive/writer.cc:192
+msgid "Tree walking failed"
+msgstr ""
+
+#: ftparchive/writer.cc:219
+#, c-format
+msgid "Failed to open %s"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:989
-#, fuzzy, c-format
-msgid "Preparing %s"
-msgstr "Otvaram %s"
+#: ftparchive/writer.cc:278
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:990
-#, fuzzy, c-format
-msgid "Unpacking %s"
-msgstr "Otvaram %s"
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "Failed to readlink %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: ftparchive/writer.cc:290
 #, c-format
-msgid "Preparing to configure %s"
+msgid "Failed to unlink %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:997
-#, fuzzy, c-format
-msgid "Installed %s"
-msgstr "  Instalirano:"
+#: ftparchive/writer.cc:298
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: ftparchive/writer.cc:308
 #, c-format
-msgid "Preparing for removal of %s"
+msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Preporučuje"
+#: ftparchive/writer.cc:413
+msgid "Archive had no package field"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
 #, c-format
-msgid "Preparing to completely remove %s"
+msgid "  %s has no override entry\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Ne mogu ukloniti %s"
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1065
-msgid "ioctl(TIOCGWINSZ) failed"
+#: ftparchive/writer.cc:721
+#, c-format
+msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Ne mogu zapisati na %s"
+#: ftparchive/writer.cc:725
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1068
-msgid "Is /dev/pts mounted?"
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+msgid "realloc - Failed to allocate memory"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1089
-msgid "Is stdout a terminal?"
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1567
-msgid "Operation was interrupted before it could finish"
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1629
-msgid "No apport report written because MaxReports is reached already"
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
 msgstr ""
 
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1634
-msgid "dependency problems - leaving unconfigured"
+#: ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %llu #1"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1636
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %llu #2"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1642
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1649
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr ""
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr ""
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr ""
+
+#: ftparchive/multicompress.cc:209
+msgid "Compress child"
+msgstr ""
+
+#: ftparchive/multicompress.cc:232
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr ""
+
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr ""
+
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr ""
+
+#: ftparchive/multicompress.cc:359
+#, c-format
+msgid "Problem unlinking %s"
+msgstr ""
+
+#: cmdline/apt-internal-solver.cc:46
 msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+"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/dpkgpm.cc:1683
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Nepoznat zapis paketa\""
+
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+"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 ""
 
 #~ msgid "%s not a valid DEB package."