show item ID in Hit, Ign and Err lines as well

[apt.git] / po / bs.po

diff --git a/po/bs.po b/po/bs.po
index bca1b3b0eb48f260ddc5ee44a88adcd39246fb85..abb9a570a59526c8998ccccd31fb6e710c8621dd 100644 (file)
--- 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"
 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-05-05 16:26+0200\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"

 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"


@@ -14,157 +14,155 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

 
 #: cmdline/apt-cache.cc: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: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:277
+#: cmdline/apt-cache.cc:320

 msgid "Total package names: "
 msgstr "Ukupno naziva paketa:"
 
 msgid "Total package names: "
 msgstr "Ukupno naziva paketa:"
 

-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322

 #, fuzzy
 msgid "Total package structures: "
 msgstr "Ukupno naziva paketa:"
 
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Ukupno naziva paketa:"
 

-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362

 msgid "  Normal packages: "
 msgstr "  Normalni paketi:"
 
 msgid "  Normal packages: "
 msgstr "  Normalni paketi:"
 

-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363

 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuelni paketi:"
 
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuelni paketi:"
 

-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364

 msgid "  Single virtual packages: "
 msgstr "  Pojedinačni virutuelni paketi:"
 
 msgid "  Single virtual packages: "
 msgstr "  Pojedinačni virutuelni paketi:"
 

-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365

 msgid "  Mixed virtual packages: "
 msgstr "  Miješani virtuelni paketi:"
 
 msgid "  Mixed virtual packages: "
 msgstr "  Miješani virtuelni paketi:"
 

-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366

 msgid "  Missing: "
 msgstr "  Nedostajući:"
 
 msgid "  Missing: "
 msgstr "  Nedostajući:"
 

-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368

 msgid "Total distinct versions: "
 msgstr "Ukupno različitih verzija:"
 
 msgid "Total distinct versions: "
 msgstr "Ukupno različitih verzija:"
 

-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370

 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Ukupno različitih verzija:"
 
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Ukupno različitih verzija:"
 

-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372

 msgid "Total dependencies: "
 msgstr "Ukupno zavisnosti:"
 
 msgid "Total dependencies: "
 msgstr "Ukupno zavisnosti:"
 

-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375

 msgid "Total ver/file relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
 msgid "Total ver/file relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 

-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377

 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 

-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379

 msgid "Total Provides mappings: "
 msgstr ""
 
 msgid "Total Provides mappings: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433

 msgid "Total globbed strings: "
 msgstr ""
 
 msgid "Total globbed strings: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439

 msgid "Total slack space: "
 msgstr ""
 
 msgid "Total slack space: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454

 msgid "Total space accounted for: "
 msgstr ""
 
 msgid "Total space accounted for: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239

 #: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
 #: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 

-#: 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
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229

 #: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Paketi nisu pronađeni"
 
 #: 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:1254
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41

 msgid "You must give at least one search pattern"
 msgstr ""
 
 msgid "You must give at least one search pattern"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1505

 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 

-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653

 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ne mogu pronaći paket %s"
 
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ne mogu pronaći paket %s"
 

-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1630

 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 

-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728

 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins

-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1651

 msgid "Pinned packages:"
 msgstr ""
 
 msgid "Pinned packages:"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708

 msgid "(not found)"
 msgstr ""
 
 msgid "(not found)"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1671

 msgid "  Installed: "
 msgstr "  Instalirano:"
 
 msgid "  Installed: "
 msgstr "  Instalirano:"
 

-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1672

 msgid "  Candidate: "
 msgstr ""
 
 msgid "  Candidate: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698

 msgid "(none)"
 msgstr ""
 
 msgid "(none)"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1705

 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables

-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1714

 msgid "  Version table:"
 msgstr ""
 
 msgid "  Version table:"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: 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
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1749
+#: cmdline/apt-cache.cc:1834

 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"


@@ -201,20 +199,20 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77

 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92

 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140

 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Ne mogu otvoriti %s"
 
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Ne mogu otvoriti %s"
 

-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179

 msgid ""
 "No CD-ROM could be auto-detected or found using the default mount point.\n"
 "You may try the --cdrom option to set the CD-ROM mount point.\n"
 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"


@@ -222,7 +220,7 @@ msgid ""
 "mount point."
 msgstr ""
 
 "mount point."
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183

 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 


@@ -258,77 +256,78 @@ msgstr ""
 "  -c=? Pročitaj ovu konfiguracijsku datoteku\n"
 "  -o=? Podesi odgovarajuću konfiguracijsku opciju, npr. -o dir::cache=/tmp\n"
 
 "  -c=? Pročitaj ovu konfiguracijsku datoteku\n"
 "  -o=? Podesi odgovarajuću konfiguracijsku opciju, npr. -o dir::cache=/tmp\n"
 

-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224

 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 

-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311

 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 

-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314

 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 

-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:358

 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414

 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 

-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445

 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
+#: apt-private/private-install.cc:863

 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 

-#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80

 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ali se %s treba instalirati"
 
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "ali se %s treba instalirati"
 

-#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124

 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 

-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537

 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598

 msgid "Unable to lock the download directory"
 msgstr ""
 
 msgid "Unable to lock the download directory"
 msgstr ""
 

-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 

-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:780

 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:787
+#: cmdline/apt-get.cc:785

 #, c-format
 msgid ""
 "Please use:\n"
 #, c-format
 msgid ""
 "Please use:\n"


@@ -336,151 +335,150 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:874
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr ""
-

 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB

-#: cmdline/apt-get.cc:883
+#: cmdline/apt-get.cc:863

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB

-#: cmdline/apt-get.cc:888
+#: cmdline/apt-get.cc:868

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:874

 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:899

 msgid "Failed to fetch some archives."
 msgstr ""
 
 msgid "Failed to fetch some archives."
 msgstr ""
 

-#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289

 msgid "Download complete and in download only mode"
 msgstr ""
 
 msgid "Download complete and in download only mode"
 msgstr ""
 

-#: cmdline/apt-get.cc:942
+#: cmdline/apt-get.cc:929

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:942

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:943

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:971

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:990

 msgid "Child process failed"
 msgstr ""
 
 msgid "Child process failed"
 msgstr ""
 

-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1009

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 

-#: cmdline/apt-get.cc:1046
+#: cmdline/apt-get.cc:1030

 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 

-#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1109

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1263
+#: cmdline/apt-get.cc:1279

 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 

-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1297

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 

-#: cmdline/apt-get.cc:1304
+#: cmdline/apt-get.cc:1320

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 

-#: cmdline/apt-get.cc:1343
+#: cmdline/apt-get.cc:1359

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
 
 #, 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:1349
+#: cmdline/apt-get.cc:1365

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 

-#: cmdline/apt-get.cc:1372
+#: cmdline/apt-get.cc:1388

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:1387
+#: cmdline/apt-get.cc:1403

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 

-#: cmdline/apt-get.cc:1392
+#: cmdline/apt-get.cc:1408

 msgid "Failed to process build dependencies"
 msgstr ""
 
 msgid "Failed to process build dependencies"
 msgstr ""
 

-#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516

 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr ""
 

-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1615

 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 

-#: cmdline/apt-get.cc:1624
+#: cmdline/apt-get.cc:1656

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -526,15 +524,19 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 

-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49

 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 

-#: cmdline/apt-helper.cc:52
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79

 msgid "Download Failed"
 msgstr ""
 
 msgid "Download Failed"
 msgstr ""
 

-#: cmdline/apt-helper.cc:65
+#: cmdline/apt-helper.cc:93

 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"


@@ -543,56 +545,58 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"

+"   auto-detect-proxy - detect proxy using apt.conf\n"

 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 

-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65

 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ali nije instaliran"
 
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "ali nije instaliran"
 

-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71

 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 

-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73

 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "ali se %s treba instalirati"
 
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "ali se %s treba instalirati"
 

-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238

 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr ""
 
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr ""
 

-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240

 #, c-format
 msgid "%s was already not hold.\n"
 msgstr ""
 
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr ""
 

-#: 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
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
+#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303

 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 

-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380

 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "ali se %s treba instalirati"
 
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "ali se %s treba instalirati"
 

-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385

 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Ne mogu otvoriti %s"
 
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Ne mogu otvoriti %s"
 

-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403

 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 

-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450

 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"


@@ -667,16 +671,16 @@ 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"
 
 msgid "Disk not found."
 msgstr "Datoteka nije pronađena"
 

-#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281

 msgid "File not found"
 msgstr "Datoteka nije pronađena"
 
 msgid "File not found"
 msgstr "Datoteka nije pronađena"
 

-#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598

 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr ""
 
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr ""
 

-#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605

 msgid "Failed to set modification time"
 msgstr ""
 
 msgid "Failed to set modification time"
 msgstr ""
 


@@ -685,157 +689,157 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.

-#: methods/ftp.cc:177
+#: methods/ftp.cc:178

 msgid "Logging in"
 msgstr "Prijavljujem se"
 
 msgid "Logging in"
 msgstr "Prijavljujem se"
 

-#: methods/ftp.cc:183
+#: methods/ftp.cc:184

 msgid "Unable to determine the peer name"
 msgstr ""
 
 msgid "Unable to determine the peer name"
 msgstr ""
 

-#: methods/ftp.cc:188
+#: methods/ftp.cc:189

 msgid "Unable to determine the local name"
 msgstr ""
 
 msgid "Unable to determine the local name"
 msgstr ""
 

-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248

 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 

-#: methods/ftp.cc:225
+#: methods/ftp.cc:226

 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:232
+#: methods/ftp.cc:233

 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:252
+#: methods/ftp.cc:253

 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 

-#: methods/ftp.cc:280
+#: methods/ftp.cc:281

 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:306
+#: methods/ftp.cc:307

 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243

 msgid "Connection timeout"
 msgstr ""
 
 msgid "Connection timeout"
 msgstr ""
 

-#: methods/ftp.cc:350
+#: methods/ftp.cc:351

 msgid "Server closed the connection"
 msgstr "Server je zatvorio vezu"
 
 msgid "Server closed the connection"
 msgstr "Server je zatvorio vezu"
 

-#: 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
+#: methods/ftp.cc:354 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1515
+#: apt-pkg/contrib/fileutl.cc:1524 apt-pkg/contrib/fileutl.cc:1529
+#: apt-pkg/contrib/fileutl.cc:1531

 msgid "Read error"
 msgstr "Greška pri čitanju"
 
 msgid "Read error"
 msgstr "Greška pri čitanju"
 

-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209

 msgid "A response overflowed the buffer."
 msgstr ""
 
 msgid "A response overflowed the buffer."
 msgstr ""
 

-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390

 #, fuzzy
 msgid "Protocol corruption"
 msgstr "Oštećenje protokola"
 
 #, fuzzy
 msgid "Protocol corruption"
 msgstr "Oštećenje protokola"
 

-#: 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
+#: methods/ftp.cc:463 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:911
+#: apt-pkg/contrib/fileutl.cc:1637 apt-pkg/contrib/fileutl.cc:1646
+#: apt-pkg/contrib/fileutl.cc:1651 apt-pkg/contrib/fileutl.cc:1653
+#: apt-pkg/contrib/fileutl.cc:1678

 msgid "Write error"
 msgstr "Greška pri pisanju"
 
 msgid "Write error"
 msgstr "Greška pri pisanju"
 

-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743

 msgid "Could not create a socket"
 msgstr ""
 
 msgid "Could not create a socket"
 msgstr ""
 

-#: methods/ftp.cc:712
+#: methods/ftp.cc:713

 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 

-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:717 methods/connect.cc:116

 msgid "Failed"
 msgstr "Neuspješno"
 
 msgid "Failed"
 msgstr "Neuspješno"
 

-#: methods/ftp.cc:718
+#: methods/ftp.cc:719

 msgid "Could not connect passive socket."
 msgstr ""
 
 msgid "Could not connect passive socket."
 msgstr ""
 

-#: methods/ftp.cc:735
+#: methods/ftp.cc:736

 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 

-#: methods/ftp.cc:749
+#: methods/ftp.cc:750

 msgid "Could not bind a socket"
 msgstr ""
 
 msgid "Could not bind a socket"
 msgstr ""
 

-#: methods/ftp.cc:753
+#: methods/ftp.cc:754

 msgid "Could not listen on the socket"
 msgstr ""
 
 msgid "Could not listen on the socket"
 msgstr ""
 

-#: methods/ftp.cc:760
+#: methods/ftp.cc:761

 msgid "Could not determine the socket's name"
 msgstr ""
 
 msgid "Could not determine the socket's name"
 msgstr ""
 

-#: methods/ftp.cc:792
+#: methods/ftp.cc:793

 msgid "Unable to send PORT command"
 msgstr ""
 
 msgid "Unable to send PORT command"
 msgstr ""
 

-#: methods/ftp.cc:802
+#: methods/ftp.cc:803

 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 

-#: methods/ftp.cc:811
+#: methods/ftp.cc:812

 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:831
+#: methods/ftp.cc:832

 msgid "Data socket connect timed out"
 msgstr ""
 
 msgid "Data socket connect timed out"
 msgstr ""
 

-#: methods/ftp.cc:838
+#: methods/ftp.cc:839

 msgid "Unable to accept connection"
 msgstr ""
 
 msgid "Unable to accept connection"
 msgstr ""
 

-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319

 msgid "Problem hashing file"
 msgstr ""
 
 msgid "Problem hashing file"
 msgstr ""
 

-#: methods/ftp.cc:890
+#: methods/ftp.cc:892

 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 

-#: methods/ftp.cc:905 methods/rsh.cc:335
+#: methods/ftp.cc:907 methods/rsh.cc:338

 msgid "Data socket timed out"
 msgstr ""
 
 msgid "Data socket timed out"
 msgstr ""
 

-#: methods/ftp.cc:935
+#: methods/ftp.cc:944

 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information

-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027

 msgid "Query"
 msgstr ""
 
 msgid "Query"
 msgstr ""
 

-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141

 msgid "Unable to invoke "
 msgstr ""
 
 msgid "Unable to invoke "
 msgstr ""
 


@@ -871,7 +875,7 @@ msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going

-#: methods/connect.cc:154 methods/rsh.cc:439
+#: methods/connect.cc:154 methods/rsh.cc:442

 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se sa %s"
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se sa %s"


@@ -901,135 +905,126 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 
 msgid "Unable to connect to %s:%s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 

-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 

-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162

 msgid "At least one invalid signature was encountered."
 msgstr ""
 
 msgid "At least one invalid signature was encountered."
 msgstr ""
 

-#: methods/gpgv.cc:174
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:164
+msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"

 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'

-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170

 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 

-#: methods/gpgv.cc:184
-msgid "Unknown error executing gpgv"
+#: methods/gpgv.cc:174
+msgid "Unknown error executing apt-key"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214

 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 

-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 

-#: methods/gzip.cc:69
+#: methods/gzip.cc:79

 msgid "Empty files can't be valid archives"
 msgstr ""
 
 msgid "Empty files can't be valid archives"
 msgstr ""
 

-#: methods/http.cc:509
+#: methods/http.cc:517

 msgid "Error writing to the file"
 msgstr ""
 
 msgid "Error writing to the file"
 msgstr ""
 

-#: methods/http.cc:523
+#: methods/http.cc:531

 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 

-#: methods/http.cc:525
+#: methods/http.cc:533

 msgid "Error reading from server"
 msgstr ""
 
 msgid "Error reading from server"
 msgstr ""
 

-#: methods/http.cc:561
+#: methods/http.cc:569

 msgid "Error writing to file"
 msgstr ""
 
 msgid "Error writing to file"
 msgstr ""
 

-#: methods/http.cc:621
+#: methods/http.cc:629

 msgid "Select failed"
 msgstr ""
 
 msgid "Select failed"
 msgstr ""
 

-#: methods/http.cc:626
+#: methods/http.cc:634

 msgid "Connection timed out"
 msgstr ""
 
 msgid "Connection timed out"
 msgstr ""
 

-#: methods/http.cc:649
+#: methods/http.cc:657

 msgid "Error writing to output file"
 msgstr ""
 
 msgid "Error writing to output file"
 msgstr ""
 

-#: methods/server.cc:51
+#: methods/server.cc:52

 msgid "Waiting for headers"
 msgstr "Čekam na zaglavlja"
 
 msgid "Waiting for headers"
 msgstr "Čekam na zaglavlja"
 

-#: methods/server.cc:109
+#: methods/server.cc:111

 msgid "Bad header line"
 msgstr ""
 
 msgid "Bad header line"
 msgstr ""
 

-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:136 methods/server.cc:143

 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 

-#: methods/server.cc:171
+#: methods/server.cc:173

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 

-#: methods/server.cc:194
+#: methods/server.cc:193

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 

-#: methods/server.cc:196
+#: methods/server.cc:195

 msgid "This HTTP server has broken range support"
 msgstr ""
 
 msgid "This HTTP server has broken range support"
 msgstr ""
 

-#: methods/server.cc:220
+#: methods/server.cc:219

 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 

-#: methods/server.cc:489
+#: methods/server.cc:506

 msgid "Bad header data"
 msgstr ""
 
 msgid "Bad header data"
 msgstr ""
 

-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:523 methods/server.cc:617

 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 

-#: methods/server.cc:654
-msgid "Internal error"
-msgstr "Unutrašnja greška"
-
-#: 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"
+#: methods/server.cc:589
+#, c-format
+msgid ""
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Urađeno"
-
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
-msgid "Sorting"
-msgstr ""
+#: methods/server.cc:712
+msgid "Internal error"
+msgstr "Unutrašnja greška"

 
 

-#: apt-private/private-list.cc:131
+#: apt-private/private-list.cc:121

 msgid "Listing"
 msgstr ""
 
 msgid "Listing"
 msgstr ""
 

-#: apt-private/private-list.cc:164
+#: apt-private/private-list.cc:151

 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""


@@ -1037,163 +1032,163 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95

 msgid "Correcting dependencies..."
 msgstr "Ispravljam zavisnosti..."
 
 msgid "Correcting dependencies..."
 msgstr "Ispravljam zavisnosti..."
 

-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98

 msgid " failed."
 msgstr ""
 
 msgid " failed."
 msgstr ""
 

-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101

 msgid "Unable to correct dependencies"
 msgstr "Ne mogu ispraviti zavisnosti"
 
 msgid "Unable to correct dependencies"
 msgstr "Ne mogu ispraviti zavisnosti"
 

-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104

 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 

-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106

 msgid " Done"
 msgstr " Urađeno"
 
 msgid " Done"
 msgstr " Urađeno"
 

-#: apt-private/private-cachefile.cc:108
+#: apt-private/private-cachefile.cc:110

 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 

-#: apt-private/private-cachefile.cc:111
+#: apt-private/private-cachefile.cc:113

 msgid "Unmet dependencies. Try using -f."
 msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
 
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
 

-#: apt-private/private-output.cc:102 apt-private/private-show.cc:84
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84

 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 
 #: apt-private/private-show.cc:89
 msgid "unknown"
 msgstr ""
 

-#: apt-private/private-output.cc:232
+#: apt-private/private-output.cc:265

 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr "[Instalirano]"
 
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr "[Instalirano]"
 

-#: apt-private/private-output.cc:236
+#: apt-private/private-output.cc:268

 #, fuzzy
 msgid "[installed,local]"
 msgstr "[Instalirano]"
 
 #, fuzzy
 msgid "[installed,local]"
 msgstr "[Instalirano]"
 

-#: apt-private/private-output.cc:239
+#: apt-private/private-output.cc:270

 msgid "[installed,auto-removable]"
 msgstr ""
 
 msgid "[installed,auto-removable]"
 msgstr ""
 

-#: apt-private/private-output.cc:241
+#: apt-private/private-output.cc:272

 #, fuzzy
 msgid "[installed,automatic]"
 msgstr "[Instalirano]"
 
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr "[Instalirano]"
 

-#: apt-private/private-output.cc:243
+#: apt-private/private-output.cc:274

 #, fuzzy
 msgid "[installed]"
 msgstr "[Instalirano]"
 
 #, fuzzy
 msgid "[installed]"
 msgstr "[Instalirano]"
 

-#: apt-private/private-output.cc:247
+#: apt-private/private-output.cc:277

 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 

-#: apt-private/private-output.cc:251
+#: apt-private/private-output.cc:281

 msgid "[residual-config]"
 msgstr ""
 
 msgid "[residual-config]"
 msgstr ""
 

-#: apt-private/private-output.cc:351
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:441
+#: apt-private/private-output.cc:455

 #, c-format
 msgid "but %s is installed"
 msgstr "ali je %s instaliran"
 
 #, c-format
 msgid "but %s is installed"
 msgstr "ali je %s instaliran"
 

-#: apt-private/private-output.cc:443
+#: apt-private/private-output.cc:457

 #, c-format
 msgid "but %s is to be installed"
 msgstr "ali se %s treba instalirati"
 
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ali se %s treba instalirati"
 

-#: apt-private/private-output.cc:450
+#: apt-private/private-output.cc:464

 msgid "but it is not installable"
 msgstr "ali se ne može instalirati"
 
 msgid "but it is not installable"
 msgstr "ali se ne može instalirati"
 

-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:466

 msgid "but it is a virtual package"
 msgstr "ali je virtuelni paket"
 
 msgid "but it is a virtual package"
 msgstr "ali je virtuelni paket"
 

-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:469

 msgid "but it is not installed"
 msgstr "ali nije instaliran"
 
 msgid "but it is not installed"
 msgstr "ali nije instaliran"
 

-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:469

 msgid "but it is not going to be installed"
 msgstr "ali se neće instalirati"
 
 msgid "but it is not going to be installed"
 msgstr "ali se neće instalirati"
 

-#: apt-private/private-output.cc:460
+#: apt-private/private-output.cc:474

 msgid " or"
 msgstr " ili"
 
 msgid " or"
 msgstr " ili"
 

-#: apt-private/private-output.cc:489
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:523

 msgid "The following NEW packages will be installed:"
 msgstr "Slijedeći NOVI paketi će biti instalirani:"
 
 msgid "The following NEW packages will be installed:"
 msgstr "Slijedeći NOVI paketi će biti instalirani:"
 

-#: apt-private/private-output.cc:515
+#: apt-private/private-output.cc:549

 msgid "The following packages will be REMOVED:"
 msgstr "Slijedeći paketi će biti UKLONJENI:"
 
 msgid "The following packages will be REMOVED:"
 msgstr "Slijedeći paketi će biti UKLONJENI:"
 

-#: apt-private/private-output.cc:537
+#: apt-private/private-output.cc:571

 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Slijedeći paketi su zadržani:"
 
 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Slijedeći paketi su zadržani:"
 

-#: apt-private/private-output.cc:558
+#: apt-private/private-output.cc:592

 msgid "The following packages will be upgraded:"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 
 msgid "The following packages will be upgraded:"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 

-#: apt-private/private-output.cc:579
+#: apt-private/private-output.cc:613

 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 

-#: apt-private/private-output.cc:599
+#: apt-private/private-output.cc:633

 msgid "The following held packages will be changed:"
 msgstr ""
 
 msgid "The following held packages will be changed:"
 msgstr ""
 

-#: apt-private/private-output.cc:654
+#: apt-private/private-output.cc:688

 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 

-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:696

 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
 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:693
+#: apt-private/private-output.cc:727

 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 

-#: apt-private/private-output.cc:697
+#: apt-private/private-output.cc:731

 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 

-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:733

 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 

-#: apt-private/private-output.cc:701
+#: apt-private/private-output.cc:735

 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 

-#: apt-private/private-output.cc:705
+#: apt-private/private-output.cc:739

 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""


@@ -1202,7 +1197,7 @@ msgstr ""
 #. 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.
 #. 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
+#: apt-private/private-output.cc:761

 msgid "[Y/n]"
 msgstr ""
 
 msgid "[Y/n]"
 msgstr ""
 


@@ -1210,21 +1205,21 @@ msgstr ""
 #. 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.
 #. 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
+#: apt-private/private-output.cc:767

 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
 msgid "[y/N]"
 msgstr ""
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set

-#: apt-private/private-output.cc:744
+#: apt-private/private-output.cc:778

 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
 msgid "Y"
 msgstr ""
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set

-#: apt-private/private-output.cc:750
+#: apt-private/private-output.cc:784

 msgid "N"
 msgstr ""
 
 msgid "N"
 msgstr ""
 

-#: apt-private/private-output.cc:772 apt-pkg/cachefilter.cc:35
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""


@@ -1233,6 +1228,22 @@ msgstr ""
 msgid "The update command takes no arguments"
 msgstr ""
 
 msgid "The update command takes no arguments"
 msgstr ""
 

+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
+msgid "Sorting"
+msgstr ""
+

 #: apt-private/private-show.cc:156
 #, c-format
 msgid "There is %i additional record. Please use the '-a' switch to see it"
 #: apt-private/private-show.cc:156
 #, c-format
 msgid "There is %i additional record. Please use the '-a' switch to see it"


@@ -1245,6 +1256,14 @@ msgstr[1] ""
 msgid "not a real package (virtual)"
 msgstr ""
 
 msgid "not a real package (virtual)"
 msgstr ""
 

+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+

 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""


@@ -1289,26 +1308,21 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 

-#: apt-private/private-install.cc:199
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr ""
-
-#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117

 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 

-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213

 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
 #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
 #. careful with hard to type or special characters (like non-breaking spaces)
 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:219
+#: apt-private/private-install.cc:195

 msgid "Yes, do as I say!"
 msgstr "Da, uradi kako kažem!"
 
 msgid "Yes, do as I say!"
 msgstr "Da, uradi kako kažem!"
 

-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:197

 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"


@@ -1316,37 +1330,37 @@ msgid ""
 " ?] "
 msgstr ""
 
 " ?] "
 msgstr ""
 

-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221

 msgid "Abort."
 msgstr "Odustani."
 
 msgid "Abort."
 msgstr "Odustani."
 

-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:218

 msgid "Do you want to continue?"
 msgstr "Da li želite nastaviti?"
 
 msgid "Do you want to continue?"
 msgstr "Da li želite nastaviti?"
 

-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:288

 msgid "Some files failed to download"
 msgstr ""
 
 msgid "Some files failed to download"
 msgstr ""
 

-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:295

 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 

-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:299

 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 

-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:304

 msgid "Unable to correct missing packages."
 msgstr ""
 
 msgid "Unable to correct missing packages."
 msgstr ""
 

-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:305

 msgid "Aborting install."
 msgstr "Odustajem od instalacije."
 
 msgid "Aborting install."
 msgstr "Odustajem od instalacije."
 

-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:341

 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"


@@ -1356,15 +1370,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:345

 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 

-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:366

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:474

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."


@@ -1380,15 +1394,15 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
 #. "that package should be filed.") << std::endl;
 #. }
 #.

-#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627

 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 

-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:481

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 

-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:488

 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"


@@ -1398,7 +1412,7 @@ msgid_plural ""
 msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
 msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 

-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:492

 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""


@@ -1406,23 +1420,23 @@ msgid_plural ""
 msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
 msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
 msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 

-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:494

 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 
 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:612
+#: apt-private/private-install.cc:587

 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 

-#: apt-private/private-install.cc:614
+#: apt-private/private-install.cc:589

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 

-#: apt-private/private-install.cc:627
+#: apt-private/private-install.cc:612

 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 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"


@@ -1430,52 +1444,102 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
 "or been moved out of Incoming."
 msgstr ""
 

-#: apt-private/private-install.cc:648
+#: apt-private/private-install.cc:633

 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 
 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 

-#: apt-private/private-install.cc:701
+#: apt-private/private-install.cc:710

 msgid "The following extra packages will be installed:"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 

-#: apt-private/private-install.cc:791
+#: apt-private/private-install.cc:800

 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 
 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 

-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:801

 msgid "Recommended packages:"
 msgstr "Preporučeni paketi:"
 
 msgid "Recommended packages:"
 msgstr "Preporučeni paketi:"
 

-#: apt-private/private-main.cc:32
+#: apt-private/private-install.cc:823
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:827
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:839
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr ""
+
+#: apt-private/private-install.cc:892
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: apt-private/private-install.cc:897
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr ""
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+
+#: apt-private/private-install.cc:945
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr ""
+
+#: apt-private/private-download.cc:62
+#, c-format

 msgid ""
 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!"
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:31
+#: apt-private/private-download.cc:94

 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 

-#: apt-private/private-download.cc:35
+#: apt-private/private-download.cc:98

 msgid "Authentication warning overridden.\n"
 msgstr ""
 
 msgid "Authentication warning overridden.\n"
 msgstr ""
 

-#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110

 msgid "Some packages could not be authenticated"
 msgstr ""
 
 msgid "Some packages could not be authenticated"
 msgstr ""
 

-#: apt-private/private-download.cc:45
+#: apt-private/private-download.cc:108

 msgid "Install these packages without verification?"
 msgstr ""
 
 msgid "Install these packages without verification?"
 msgstr ""
 

-#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 

+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr ""
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr ""
+

 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "


@@ -1486,37 +1550,37 @@ msgstr "Ne mogu otvoriti %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 

-#: apt-private/private-search.cc:51
+#: apt-private/private-search.cc:69

 msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
 msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66

-msgid "Hit "
+msgid "Hit:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:90
-msgid "Get:"
+#: apt-private/acqprogress.cc:88
+msgid "Get:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:121
-msgid "Ign "
+#: apt-private/acqprogress.cc:119
+msgid "Ign:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:125
-msgid "Err "
+#: apt-private/acqprogress.cc:126
+msgid "Err:%lu %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:146
+#: apt-private/acqprogress.cc:150

 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 

-#: apt-private/acqprogress.cc:236
+#: apt-private/acqprogress.cc:240

 #, c-format
 msgid " [Working]"
 msgstr ""
 
 #, c-format
 msgid " [Working]"
 msgstr ""
 

-#: apt-private/acqprogress.cc:297
+#: apt-private/acqprogress.cc:301

 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"


@@ -1526,18 +1590,18 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 
 #. 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/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
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471

 #, c-format
 msgid "Unable to read %s"
 msgstr "Ne mogu čitati %s"
 
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ne mogu čitati %s"
 

-#: 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
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201

 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"


@@ -1571,7 +1635,7 @@ msgstr ""
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 

-#: methods/rsh.cc:343
+#: methods/rsh.cc:346

 msgid "Connection closed prematurely"
 msgstr ""
 
 msgid "Connection closed prematurely"
 msgstr ""
 


@@ -1609,210 +1673,383 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Sastavljam dostupne informacije"
 
 msgid "Merging available information"
 msgstr "Sastavljam dostupne informacije"
 

-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
+#: cmdline/apt-extracttemplates.cc:229
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr ""
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ne mogu kreirati %s"

 
 

-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr ""
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ne mogu zapisati na %s"

 
 

-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
+#: cmdline/apt-extracttemplates.cc:305
+msgid "Cannot get debconf version. Is debconf installed?"

 msgstr ""
 msgstr ""

+"Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"

 
 

-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+msgid "Package extension list is too long"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:506
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318

 #, c-format
 #, c-format

-msgid "Double add of diversion %s -> %s"
+msgid "Error processing directory %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
+#: ftparchive/apt-ftparchive.cc:280
+msgid "Source extension list is too long"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
-#, c-format
-msgid "The path %s is too long"
+#: ftparchive/apt-ftparchive.cc:400
+msgid "Error writing header to contents file"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:132
+#: ftparchive/apt-ftparchive.cc:430

 #, c-format
 #, c-format

-msgid "Unpacking %s more than once"
+msgid "Error processing contents %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:142
-#, c-format
-msgid "The directory %s is diverted"
+#: ftparchive/apt-ftparchive.cc:625
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:152
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
+#: ftparchive/apt-ftparchive.cc:821
+msgid "No selections matched"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
+#: ftparchive/apt-ftparchive.cc:906
+#, c-format
+msgid "Some files are missing in the package file group `%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:131
+#: ftparchive/cachedb.cc:67

 #, c-format
 #, c-format

-msgid "Failed to stat %s"
-msgstr ""
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "DB je bila oštećena, datoteka preimenovana u %s.old"

 
 

-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
+#: ftparchive/cachedb.cc:85

 #, c-format
 #, c-format

-msgid "Failed to rename %s to %s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "DB je stara, pokušavam nadogradnju %s"
+
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:249
+#: ftparchive/cachedb.cc:101
+#, fuzzy, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216

 #, c-format
 #, c-format

-msgid "The directory %s is being replaced by a non-directory"
+msgid "Failed to stat %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr ""
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Ne mogu ukloniti %s"

 
 

-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Putanja je preduga"
+#: ftparchive/cachedb.cc:359
+msgid "Archive has no control record"
+msgstr "Arhiva nema kontrolnog zapisa"

 
 

-#: apt-inst/extract.cc:421
-#, c-format
-msgid "Overwrite package match with no version for %s"
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:438
+#: ftparchive/writer.cc:104

 #, c-format
 #, c-format

-msgid "File %s/%s overwrites the one in the package %s"
+msgid "W: Unable to read directory %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/extract.cc:498
+#: ftparchive/writer.cc:109

 #, c-format
 #, c-format

-msgid "Unable to stat %s"
+msgid "W: Unable to stat %s\n"

 msgstr ""
 
 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"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr ""
+
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr ""

 
 

-#: apt-inst/dirstream.cc:105
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr ""
+
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224

 #, c-format
 #, c-format

-msgid "Failed to close file %s"
+msgid "Failed to resolve %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr ""
+
+#: ftparchive/writer.cc:232

 #, c-format
 #, c-format

-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "Failed to open %s"
+msgstr "Ne mogu otvoriti %s"
+
+#: ftparchive/writer.cc:291
+#, c-format
+msgid " DeLink %s [%s]\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:132
+#: ftparchive/writer.cc:299

 #, c-format
 #, c-format

-msgid "Internal error, could not locate member %s"
+msgid "Failed to readlink %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
+#: ftparchive/writer.cc:303
+#, c-format
+msgid "Failed to unlink %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
+#: ftparchive/writer.cc:311
+#, c-format
+msgid "*** Failed to link %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
+#: ftparchive/writer.cc:321
+#, c-format
+msgid " DeLink limit of %sB hit.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:96
+#: ftparchive/writer.cc:427
+msgid "Archive had no package field"
+msgstr ""
+
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698

 #, c-format
 #, c-format

-msgid "Invalid archive member header %s"
+msgid "  %s has no override entry\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
+#, c-format
+msgid "  %s maintainer is %s not %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arhiva je prekratka"
+#: ftparchive/writer.cc:712
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr ""

 
 

-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
+#: ftparchive/writer.cc:716
+#, c-format
+msgid "  %s has no binary override entry either\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Ne mogu izvršiti gzip"
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr ""

 
 

-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Oštećena arhiva"
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr ""

 
 

-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr ""

 
 

-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/override.cc:166

 #, c-format
 #, c-format

-msgid "Unknown TAR header type %u, member %s"
+msgid "Malformed override %s line %llu #1"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/clean.cc:61
+#: ftparchive/override.cc:178

 #, c-format
 #, c-format

-msgid "Unable to stat %s."
+msgid "Malformed override %s line %llu #2"
+msgstr ""
+
+#: ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr ""
+
+#: ftparchive/multicompress.cc:73
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr ""
+
+#: cmdline/apt-internal-solver.cc:51
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Nepoznat zapis paketa\""
+
+#: cmdline/apt-sortpkgs.cc:155
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/install-progress.cc:59

 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 

-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176

 msgid "Running dpkg"
 msgstr ""
 
 msgid "Running dpkg"
 msgstr ""
 

-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:156

 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 

-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:172

 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775

 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777

 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780

 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783

 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""


@@ -1827,22 +2064,22 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr ""
 
 msgid "Hash mismatch for: %s"
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/acquire-worker.cc:133

 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire-worker.cc:135

 #, c-format
 msgid "Is the package %s installed?"
 msgstr ""
 
 #, c-format
 msgid "Is the package %s installed?"
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:169
+#: apt-pkg/acquire-worker.cc:186

 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/acquire-worker.cc:485

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -1859,291 +2096,412 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr ""
 
 msgid "The list of sources could not be read."
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:155
+#: apt-pkg/pkgcache.cc:154

 msgid "Empty package cache"
 msgstr ""
 
 msgid "Empty package cache"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171

 msgid "The package cache file is corrupted"
 msgstr ""
 
 msgid "The package cache file is corrupted"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:165

 msgid "The package cache file is an incompatible version"
 msgstr ""
 
 msgid "The package cache file is an incompatible version"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:169
+#: apt-pkg/pkgcache.cc:168

 msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
 msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/pkgcache.cc:175

 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
 #, 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"
+#: apt-pkg/pkgcache.cc:185
+#, c-format
+msgid "The package cache was built for different architectures: %s vs %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322

 msgid "Depends"
 msgstr "Zavisi"
 
 msgid "Depends"
 msgstr "Zavisi"
 

-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322

 msgid "PreDepends"
 msgstr "Unaprijed zavisi"
 
 msgid "PreDepends"
 msgstr "Unaprijed zavisi"
 

-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc:322

 msgid "Suggests"
 msgstr "Predlaže"
 
 msgid "Suggests"
 msgstr "Predlaže"
 

-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323

 msgid "Recommends"
 msgstr "Preporučuje"
 
 msgid "Recommends"
 msgstr "Preporučuje"
 

-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323

 #, fuzzy
 msgid "Conflicts"
 msgstr "Sukobljava se sa"
 
 #, fuzzy
 msgid "Conflicts"
 msgstr "Sukobljava se sa"
 

-#: apt-pkg/pkgcache.cc:322
+#: apt-pkg/pkgcache.cc:323

 msgid "Replaces"
 msgstr "Zamjenjuje"
 
 msgid "Replaces"
 msgstr "Zamjenjuje"
 

-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324

 msgid "Obsoletes"
 msgstr "Zastarijeva"
 
 msgid "Obsoletes"
 msgstr "Zastarijeva"
 

-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324

 msgid "Breaks"
 msgstr ""
 
 msgid "Breaks"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:323
+#: apt-pkg/pkgcache.cc:324

 msgid "Enhances"
 msgstr ""
 
 msgid "Enhances"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335

 msgid "important"
 msgstr "važno"
 
 msgid "important"
 msgstr "važno"
 

-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335

 msgid "required"
 msgstr "zahtijevano"
 
 msgid "required"
 msgstr "zahtijevano"
 

-#: apt-pkg/pkgcache.cc:334
+#: apt-pkg/pkgcache.cc:335

 msgid "standard"
 msgstr "standardno"
 
 msgid "standard"
 msgstr "standardno"
 

-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336

 msgid "optional"
 msgstr "opcionalno"
 
 msgid "optional"
 msgstr "opcionalno"
 

-#: apt-pkg/pkgcache.cc:335
+#: apt-pkg/pkgcache.cc:336

 msgid "extra"
 msgstr "extra"
 
 msgid "extra"
 msgstr "extra"
 

+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Računam nadogradnju"
+

 #: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
 #: apt-pkg/pkgrecords.cc:38
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
+#: apt-pkg/sourcelist.cc:127
+#, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"

 msgstr ""
 
 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
+#: apt-pkg/sourcelist.cc:170

 #, c-format
 #, c-format

-msgid "Error occurred while processing %s (%s%d)"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:263
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:576
+#: apt-pkg/sourcelist.cc:206

 #, c-format
 #, c-format

-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Malformed line %lu in source list %s (URI)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-pkg/sourcelist.cc:208

 #, c-format
 #, c-format

-msgid "Couldn't stat source package list %s"
+msgid "Malformed line %lu in source list %s (dist)"

 msgstr ""
 
 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"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-pkg/sourcelist.cc:217

 #, c-format
 #, c-format

-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"
+msgid "Malformed line %lu in source list %s (absolute dist)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
-msgid "Send scenario to solver"
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:216
-msgid "Send request to solver"
-msgstr ""
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Otvaram %s"

 
 

-#: apt-pkg/edsp.cc:286
-msgid "Prepare for receiving solution"
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:293
-msgid "External solver failed without a proper error message"
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
-msgid "Execute external solver"
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2045
+#: apt-pkg/sourcelist.cc:416

 #, c-format
 #, c-format

-msgid "rename failed, %s (%s -> %s)."
+msgid "Type '%s' is not known on stanza %u in source list %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:163
-msgid "Hash Sum mismatch"
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:113
+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:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Čitam spiskove paketa"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:240
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:245

 msgid "Size mismatch"
 msgstr ""
 
 msgid "Size mismatch"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250

 msgid "Invalid file format"
 msgstr ""
 
 msgid "Invalid file format"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1579
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Greška pri pisanju"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, 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 ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
+#, c-format
+msgid ""
+"The data from '%s' is not signed. Packages from that repository can not be "
+"authenticated."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1956

 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1595
+#: apt-pkg/acquire-item.cc:1975

 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Ne mogu otvoriti DB datoteku %s"
 
 #, 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:1637
+#: apt-pkg/acquire-item.cc:1999

 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1675
+#: apt-pkg/acquire-item.cc:2037

 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1697
+#: apt-pkg/acquire-item.cc:2059

 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1727
+#: apt-pkg/acquire-item.cc:2078

 #, c-format
 msgid ""
 #, 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 ""
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
-#, c-format
-msgid "GPG error: %s: %s"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2249

 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1931
+#: apt-pkg/acquire-item.cc:2315

 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1989
+#: apt-pkg/acquire-item.cc:2351

 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 

-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83

 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 

-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832

 #, c-format
 msgid "List directory %spartial is missing."
 msgstr ""
 
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr ""
 

-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151

 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 

-#: apt-pkg/acquire.cc:99
+#: apt-pkg/acquire.cc:162

 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Ne mogu kreirati %s"
 
 #. only show the ETA if it makes sense
 #. two days
 #, 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
+#: apt-pkg/acquire.cc:981

 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 

-#: apt-pkg/acquire.cc:901
+#: apt-pkg/acquire.cc:983

 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Čitam spisak datoteke"
 
 #, 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 ""
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53

 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 


@@ -2168,19 +2526,19 @@ msgstr ""
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984

 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
 #, 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
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593

 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Ne mogu otvoriti %s"
 
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Ne mogu otvoriti %s"
 

-#: apt-pkg/packagemanager.cc:577
+#: apt-pkg/packagemanager.cc:643

 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "


@@ -2188,9 +2546,10 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 

-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
+#: 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/cdrom.cc:571
 msgstr ""
 
 #: apt-pkg/cdrom.cc:571


@@ -2259,11 +2618,11 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr "Čitam spiskove paketa"
 
 msgid "Copying package lists..."
 msgstr "Čitam spiskove paketa"
 

-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866

 msgid "Writing new source list\n"
 msgstr ""
 
 msgid "Writing new source list\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877

 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 


@@ -2273,13 +2632,13 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1090

 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1088
+#: apt-pkg/algorithms.cc:1092

 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 


@@ -2300,492 +2659,248 @@ msgstr "Stvaranje zavisnosti"
 msgid "Reading state information"
 msgstr "Sastavljam dostupne informacije"
 
 msgid "Reading state information"
 msgstr "Sastavljam dostupne informacije"
 

-#: apt-pkg/depcache.cc:250
+#: apt-pkg/depcache.cc:252

 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Ne mogu otvoriti %s"
 
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Ne mogu otvoriti %s"
 

-#: apt-pkg/depcache.cc:256
+#: apt-pkg/depcache.cc:258

 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Ne mogu ukloniti %s"
 
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Ne mogu ukloniti %s"
 

-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207

 #, c-format
 #, c-format

-msgid "Unable to parse package file %s (2)"
+msgid "Unable to parse package file %s (%d)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/cacheset.cc:501

 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/cacheset.cc:504

 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:603
+#: apt-pkg/cacheset.cc:629

 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Ne mogu otvoriti %s"
 
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Ne mogu otvoriti %s"
 

-#: apt-pkg/cacheset.cc:609
+#: apt-pkg/cacheset.cc:635

 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:615
+#: apt-pkg/cacheset.cc:641

 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Ne mogu otvoriti %s"
 
 #, fuzzy, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr "Ne mogu otvoriti %s"
 

-#: apt-pkg/cacheset.cc:626
+#: apt-pkg/cacheset.cc:680

 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-
-#: apt-pkg/cacheset.cc:647
+#: apt-pkg/cacheset.cc:719

 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/cacheset.cc:727

 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/cacheset.cc:735

 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:83

 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ne mogu otvoriti DB datoteku %s"
 
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Ne mogu otvoriti DB datoteku %s"
 

-#: apt-pkg/indexrecords.cc:86
+#: apt-pkg/indexrecords.cc:91

 #, c-format
 msgid "No sections in Release file %s"
 msgstr ""
 
 #, c-format
 msgid "No sections in Release file %s"
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:117
+#: apt-pkg/indexrecords.cc:132

 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:130
+#: apt-pkg/indexrecords.cc:145

 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:149
+#: apt-pkg/indexrecords.cc:164

 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ne mogu otvoriti DB datoteku %s"
 
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Ne mogu otvoriti DB datoteku %s"
 

-#: apt-pkg/sourcelist.cc:127
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425

 #, c-format
 #, c-format

-msgid "Malformed stanza %u in source list %s (URI parse)"
+msgid "%lid %lih %limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:170
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgid "%lih %limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:173
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([option] too short)"
+msgid "%limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:184
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgid "%lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/contrib/strutl.cc:1290

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgid "Selection %s not found"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/contrib/fileutl.cc:196

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgid "Not using locking for read only lock file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/contrib/fileutl.cc:201

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (URI)"
+msgid "Could not open lock file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:208
+#: apt-pkg/contrib/fileutl.cc:224

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (dist)"
+msgid "Not using locking for nfs mounted lock file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/contrib/fileutl.cc:229

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (URI parse)"
+msgid "Could not get lock %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (absolute dist)"
+msgid "List of files can't be created as '%s' is not a directory"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/contrib/fileutl.cc:400

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/contrib/fileutl.cc:418

 #, c-format
 #, c-format

-msgid "Opening %s"
-msgstr "Otvaram %s"
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""

 
 

-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/contrib/fileutl.cc:427

 #, c-format
 #, c-format

-msgid "Malformed line %u in source list %s (type)"
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/contrib/fileutl.cc:846

 #, c-format
 #, c-format

-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Sub-process %s received a segmentation fault."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/contrib/fileutl.cc:848

 #, c-format
 #, c-format

-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Sub-process %s received signal %u."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:95
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "  Instalirano:"
-
-#: 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/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr ""

 
 

-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205

 #, c-format
 #, c-format

-msgid "Noting disappearance of %s"
+msgid "Sub-process %s exited unexpectedly"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/contrib/fileutl.cc:952

 #, c-format
 #, c-format

-msgid "Running post-installation trigger %s"
+msgid "Problem closing the gzip file %s"

 msgstr ""
 
 msgstr ""
 

-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/contrib/fileutl.cc:1140

 #, c-format
 #, c-format

-msgid "Directory '%s' missing"
+msgid "Could not open file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Could not open file '%s'"
+msgid "Could not open file descriptor %d"

 msgstr "Ne mogu otvoriti %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 "Preparing to configure %s"
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
+msgid "Failed to create subprocess IPC"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:997
-#, fuzzy, c-format
-msgid "Installed %s"
-msgstr "  Instalirano:"
+#: apt-pkg/contrib/fileutl.cc:1412
+msgid "Failed to exec compressor "
+msgstr ""

 
 

-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:1553

 #, c-format
 #, c-format

-msgid "Preparing for removal of %s"
+msgid "read, still have %llu to read but none left"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1004
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Preporučuje"
-
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688

 #, c-format
 #, c-format

-msgid "Preparing to completely remove %s"
+msgid "write, still have %llu to write but couldn't"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/contrib/fileutl.cc:1954

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Completely removed %s"
+msgid "Problem closing the file %s"

 msgstr "Ne mogu ukloniti %s"
 
 msgstr "Ne mogu ukloniti %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
+#: apt-pkg/contrib/fileutl.cc:1965
+#, c-format
+msgid "Problem renaming the file %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: 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?"
+#: apt-pkg/contrib/fileutl.cc:1976
+#, c-format
+msgid "Problem unlinking the file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
+#: apt-pkg/contrib/fileutl.cc:1989
+msgid "Problem syncing the file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1568
-msgid "Operation was interrupted before it could finish"
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1630
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1635
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1643
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1650
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: 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/deb/dpkgpm.cc:1684
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:91
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:94
-#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: 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 "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1236
-#, c-format
-msgid "Selection %s not found"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:190
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:195
-#, c-format
-msgid "Could not open lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:218
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:223
-#, c-format
-msgid "Could not get lock %s"
-msgstr ""
-
-#: 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:394
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-
-#: 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:421
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:824
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:826
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr ""
-
-#: 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:832 apt-pkg/contrib/gpgv.cc:232
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:913
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1101
-#, c-format
-msgid "Could not open file %s"
-msgstr ""
-
-#: 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:1314
-msgid "Failed to create subprocess IPC"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1372
-msgid "Failed to exec compressor "
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1513
-#, c-format
-msgid "read, still have %llu to read but none left"
-msgstr ""
-
-#: 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:1913
-#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Ne mogu ukloniti %s"
-
-#: apt-pkg/contrib/fileutl.cc:1925
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1936
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:1949
-msgid "Problem syncing the file"
-msgstr ""
-
-#: 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"
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"

 msgstr ""
 
 #: apt-pkg/contrib/progress.cc:181
 msgstr ""
 
 #: apt-pkg/contrib/progress.cc:181


@@ -2860,434 +2975,424 @@ msgstr ""
 msgid "Failed to stat the cdrom"
 msgstr ""
 
 msgid "Failed to stat the cdrom"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/configuration.cc:522

 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/configuration.cc:636

 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:801
+#: apt-pkg/contrib/configuration.cc:804

 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:820
+#: apt-pkg/contrib/configuration.cc:823

 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:837
+#: apt-pkg/contrib/configuration.cc:840

 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:877
+#: apt-pkg/contrib/configuration.cc:880

 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:884
+#: apt-pkg/contrib/configuration.cc:887

 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896

 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:900

 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:900
+#: apt-pkg/contrib/configuration.cc:903

 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:950
+#: apt-pkg/contrib/configuration.cc:953

 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
 #, 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
+#: apt-pkg/contrib/cmndline.cc:127

 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
 #, 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
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169

 #, c-format
 msgid "Command line option %s is not understood"
 msgstr ""
 
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:168
+#: apt-pkg/contrib/cmndline.cc:174

 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr ""
 
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236

 #, c-format
 msgid "Option %s requires an argument."
 msgstr ""
 
 #, c-format
 msgid "Option %s requires an argument."
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255

 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:278
+#: apt-pkg/contrib/cmndline.cc:284

 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:309
+#: apt-pkg/contrib/cmndline.cc:315

 #, c-format
 msgid "Option '%s' is too long"
 msgstr ""
 
 #, c-format
 msgid "Option '%s' is too long"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/contrib/cmndline.cc:347

 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:391
+#: apt-pkg/contrib/cmndline.cc:397

 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 

-#: 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/deb/dpkgpm.cc:112
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "  Instalirano:"

 
 

-#: cmdline/apt-extracttemplates.cc:254
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Unable to mkstemp %s"
-msgstr "Ne mogu kreirati %s"
+msgid "Configuring %s"
+msgstr "Povezujem se sa %s"

 
 

-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"

 msgstr ""
 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-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"

 msgstr ""
 
 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
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839

 #, c-format
 #, c-format

-msgid "Error processing directory %s"
+msgid "Directory '%s' missing"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:271
-msgid "Source extension list is too long"
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:388
-msgid "Error writing header to contents file"
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "  Instalirano:"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:418
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "Preporučuje"
+
+#: apt-pkg/deb/dpkgpm.cc:1021

 #, c-format
 #, c-format

-msgid "Error processing contents %s"
+msgid "Preparing to completely remove %s"

 msgstr ""
 
 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-pkg/deb/dpkgpm.cc:1022
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Ne mogu zapisati na %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:812
-msgid "No selections matched"
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:890
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"

 msgstr ""
 
 msgstr ""
 

-#: 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"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""

 
 

-#: 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:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""

 
 

-#: ftparchive/cachedb.cc:80
+#: apt-pkg/deb/dpkgpm.cc:1731

 msgid ""
 msgid ""

-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"No apport report written because the error message indicates a disk full "
+"error"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:85
-#, fuzzy, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""

 
 

-#: ftparchive/cachedb.cc:253
-msgid "Archive has no control record"
-msgstr "Arhiva nema kontrolnog zapisa"
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""

 
 

-#: ftparchive/cachedb.cc:494
-msgid "Unable to get a cursor"
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:91
+#: apt-pkg/deb/debsystem.cc:91

 #, c-format
 #, c-format

-msgid "W: Unable to read directory %s\n"
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:96
+#: apt-pkg/deb/debsystem.cc:94

 #, c-format
 #, c-format

-msgid "W: Unable to stat %s\n"
+msgid "Unable to lock the administration directory (%s), are you root?"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:152
-msgid "E: "
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:154
-msgid "W: "
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
-msgstr "Ne mogu otvoriti %s"
-
-#: ftparchive/writer.cc:278
-#, c-format
-msgid " DeLink %s [%s]\n"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:286
+#: apt-inst/filelist.cc:477

 #, c-format
 #, c-format

-msgid "Failed to readlink %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:290
+#: apt-inst/filelist.cc:506

 #, c-format
 #, c-format

-msgid "Failed to unlink %s"
+msgid "Double add of diversion %s -> %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:298
+#: apt-inst/filelist.cc:549

 #, c-format
 #, c-format

-msgid "*** Failed to link %s to %s"
+msgid "Duplicate conf file %s/%s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:308
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172

 #, c-format
 #, c-format

-msgid " DeLink limit of %sB hit.\n"
+msgid "The path %s is too long"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:413
-msgid "Archive had no package field"
+#: apt-inst/extract.cc:132
+#, c-format
+msgid "Unpacking %s more than once"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#: apt-inst/extract.cc:142

 #, c-format
 #, c-format

-msgid "  %s has no override entry\n"
+msgid "The directory %s is diverted"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#: apt-inst/extract.cc:152

 #, c-format
 #, c-format

-msgid "  %s maintainer is %s not %s\n"
+msgid "The package is trying to write to the diversion target %s/%s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:721
-#, c-format
-msgid "  %s has no source override entry\n"
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/writer.cc:725
+#: apt-inst/extract.cc:249

 #, c-format
 #, c-format

-msgid "  %s has no binary override entry either\n"
+msgid "The directory %s is being replaced by a non-directory"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
-msgid "realloc - Failed to allocate memory"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:38 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr ""
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Putanja je preduga"

 
 

-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
+#: apt-inst/extract.cc:421

 #, c-format
 #, c-format

-msgid "Malformed override %s line %llu (%s)"
+msgid "Overwrite package match with no version for %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-inst/extract.cc:438

 #, c-format
 #, c-format

-msgid "Failed to read the override file %s"
+msgid "File %s/%s overwrites the one in the package %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:166
+#: apt-inst/extract.cc:498

 #, c-format
 #, c-format

-msgid "Malformed override %s line %llu #1"
+msgid "Unable to stat %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %llu #2"
-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"

 
 

-#: ftparchive/override.cc:191
+#: apt-inst/dirstream.cc:104

 #, c-format
 #, c-format

-msgid "Malformed override %s line %llu #3"
+msgid "Failed to close file %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:73
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63

 #, c-format
 #, c-format

-msgid "Unknown compression algorithm '%s'"
+msgid "This is not a valid DEB archive, missing '%s' member"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:103
+#: apt-inst/deb/debfile.cc:132

 #, c-format
 #, c-format

-msgid "Compressed output %s needs a compression set"
+msgid "Internal error, could not locate member %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:209
-msgid "Compress child"
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:232
+#: apt-inst/contrib/arfile.cc:96

 #, c-format
 #, c-format

-msgid "Internal error, failed to create %s"
+msgid "Invalid archive member header %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arhiva je prekratka"

 
 

-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"

 msgstr ""
 
 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-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Nepoznat zapis paketa\""
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Ne mogu izvršiti gzip"

 
 

-#: 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-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Oštećena arhiva"
+
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
+
+#: apt-inst/contrib/extracttar.cc:312
+#, c-format
+msgid "Unknown TAR header type %u, member %s"

 msgstr ""
 
 msgstr ""
 

+#~ msgid "Done"
+#~ msgstr "Urađeno"
+
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Odustajem od instalacije."
+

 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s nije ispravan DEB paket."
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s nije ispravan DEB paket."
 


@@ -3298,9 +3403,6 @@ msgstr ""
 #~ msgid "However the following packages replace it:"
 #~ msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
 
 #~ 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 "Reading file listing"
 #~ msgstr "Čitam spisak datoteke"
 
 #~ msgid "Reading file listing"
 #~ msgstr "Čitam spisak datoteke"