* merge of the debian-expermental-ma branch

  
* debian/control:
  - add dependency on zlib-dev for libapt-pkg-dev
* apt-pkg/cacheset.cc:
  - [ABI BREAK] add an ErrorType option to CacheSetHelper
* cmdline/apt-cache.cc:
  - use Notice instead of Error in the CacheSetHelper messages
    for compat reasons. Otherwise tools like sbuild blow up
  - return success in show if a virtual package was given
* debian/control:
  - remove libcurl3-gnutls-dev alternative as the package is gone
  - increase needed version of libcurl4-gnutls-dev to >= 7.19.0
    as we use CURLOPT_{ISSUERCERT,CRLFILE} (Closes: #589642)
* apt-pkg/deb/dpkgpm.cc:
  - Write architecture information to history file.
  - Add to history whether a change was automatic or not.
* apt-pkg/contrib/fileutl.cc:
  - Add FileFd::OpenDescriptor() (needed for python-apt's #383617).
* cmdline/apt-get.cc:
  - Support large filesystems by using statvfs64() instead of statvfs()
    and statfs64() instead of statfs() (Closes: #590513).
* apt-pkg/cdrom.cc:
  - Use link() instead of rename() for creating the CD database backup;
    otherwise there would be a short time without any database.
* apt-pkg/depcache.cc:
  - handle "circular" conflicts for "all" packages correctly
* cmdline/apt-cache.cc:
  - be able to omit dependency types in (r)depends (Closes: #319006)
  - show in (r)depends the canidate per default instead of newest
  - share the (r)depends code instead of codecopy
* apt-pkg/cacheset.cc:
  - move them back to the library as they look stable now
  - add a 'newest' pseudo target release as in pkg/newest
* apt-pkg/pkgcache.cc:
  - prefer non-virtual packages in FindPreferredPkg (Closes: #590041)
* test/integration/*:
  - add with bug#590041 testcase a small test "framework"
* apt-pkg/orderlist.cc:
  - try to install another or-group member in DepRemove before
    breaking the or group (Closes: #590438)
  - configure also the replacement before remove by adding Immediate flag

* apt-pkg/contrib/error.{cc,h}
  - docstring cleanup
  - add inline DumpError() to avoid subtle API break
* apt-pkg/contrib/error.{cc,h}:
  - remove constness of va_list parameter to fix build on amd64 and co
    Thanks Eric Valette! (Closes: #588610)
* apt-pkg/deb/debmetaindex.cc:
  - do not query each architecture for flat file archives
  - fix typo preventing display of architecture in Info()
* methods/bzip2.cc:
  - add a copycat of the old gzip.cc as we need it for bzip2 and lzma
* debian/rules:
  - Make DEB_BUILD_OPTIONS=noopt actually work by passing the right
    CXXFLAGS.
* apt-pkg/contrib/fileutl.{h,cc}:
  - Add support for reading of gzipped files with the new "ReadOnlyGzip"
    OpenMode. (Closes: #188407)
  - Link against zlib (in apt-pkg/makefile) and add zlib build dependency.
  - [ABI BREAK] This adds a new private member to FileFd, but its
    initialization is in the public header file.
* configure.in:
  - Check for zlib library and headers.
* apt-pkg/acquire-item.cc, apt-pkg/deb/debindexfile.cc,
  apt-pkg/deb/debrecords.cc, apt-pkg/deb/debsrcrecords.h,
  cmdline/apt-cache.cc:
  - Open Packages, Sources, and Translations indexes in "ReadOnlyGzip" mode.
* apt-pkg/deb/debindexfile.cc:
  - If we do not find uncompressed package/source/translation indexes, look
    for gzip compressed ones.
* apt-pkg/acquire-item.cc:
  - If the Acquire::GzipIndexes option is true and we download a gzipped
    index file, keep it as it is (and rename to .gz) instead of
    uncompressing it.
* doc/apt.conf.5.xml:
  - Document the new Acquire::GzipIndexes option.
* doc/po/apt-doc.pot, doc/po/de.po:
  - German translation of new Acquire::GzipIndexes option.
* Add test/test-indexes.sh:
  - Test behaviour of index retrieval and usage, in particular with
    uncompressed and gzip compressed indexes.
* methods/gzip.cc: With FileFd now being able to read gzipped files, there
  is no need for the gzip method any more to spawn an external gzip process.
  Rewrite it to use FileFd directly, which makes the code a lot simpler, and
  also using less memory and overhead.
* doc/apt.conf.5.xml:
  - add and document APT::Cache-{Start,Grow,Limit} options for mmap control
* apt-pkg/contrib/fileutl.cc:
  - do not fail von double close()
* cmdline/cacheset.cc:
  - doesn't include it in the library for now as it is too volatile
  - get the candidate either from an already built depcache
    or use the policy which is a bit faster than depcache generation
  - get packages by task^ with FromTask()
  - only print errors if all tries to get a package by string failed
  - factor out code to get a single package FromName()
  - check in Grouped* first without modifier interpretation
* cmdline/apt-get.cc:
  - use the cachsets in the install commands
  - make the specify order of packages irrelevant (Closes: #196021)
* apt-pkg/orderlist.cc:
  - untouched packages are never missing
* apt-pkg/packagemanager.cc:
  - packages that are not touched doesn't need to be unpacked
* debian/control:
  - remove intltool's dependency as it is an ubuntu artefact
* apt-pkg/depcache.cc:
  - SetCandidateVer for all pseudo packages
  - SetReInstall for the "all" package of a pseudo package
  - use the new MatchAgainstConfig for the DefaultRootSetFunc
  - always mark the all package if a pseudo package is marked for install
* apt-pkg/contrib/error.{cc,h}:
  - complete rewrite but use the same API
  - add NOTICE and DEBUG as new types of a message
  - add a simple stack handling to be able to delay error handling
* apt-pkg/aptconfiguration.cc:
  - show a deprecation notice for APT::Acquire::Translation
* apt-pkg/contrib/configuration.{cc,h}:
  - add a wrapper to match strings against configurable regex patterns
* apt-pkg/contrib/fileutl.cc:
  - show notice about ignored file instead of being always silent
  - add a Dir::Ignore-Files-Silently list option to control the notice
* apt-pkg/policy.h:
  - add another round of const& madness as the previous round accidentally
    NOT overrides the virtual GetCandidateVer() method (Closes: #587725)
* apt-pkg/pkgcachegen.{cc,h}:
  - make the used MMap moveable (and therefore dynamic resizeable) by
    applying (some) mad pointer magic (Closes: #195018)
* apt-pkg/deb/dpkgpm.cc:
  - make the apt/term.log output unbuffered (thanks to Matt Zimmerman)
* methods/ftp.h:
  - Handle different logins on the same server (Closes: #586904).
* apt-pkg/deb/deblistparser.cc:
  - Handle architecture wildcards (Closes: #547724).
* apt-pkg/versionmatch.cc:
  - Support matching pins by regular expressions or glob() like patterns,
    regular expressions have to be put between to slashes; for example,
    /.*/.
* apt-pkg/contrib/fileutl.cc:
  - Make FileFd replace files atomically in WriteTemp mode (for cache, etc).
* debian/control:
  - Set Standards-Version to 3.9.0
* apt-pkg/cachefile.h:
  - make pkgPolicy public again, libapt-pkg-perl (and probably
    others) get unhappy without that
* merge the remaining Ubuntu change:
  - on gpg verification failure warn and restore the last known
    good state
  - on failure display the IP of the server (useful for servers
    that use round robin DNS)
  - support Original-Maintainer in RewritePackageOrder
  - enable cdrom autodetection via libudev by default
  - show message about Vcs in use when apt-get source is run for
    packages maintained in a Vcs
  - better support transitional packages with mark auto-installed. 
    when the transitional package is in "oldlibs" the new package
    is not marked auto installed (same is true for section
    metapackages)
  - provide new "deb mirror://archive.foo/mirrors.list sid main"
    method expects a list of mirrors (generated on the server e.g.
    via geoip) and will use that, including cycle on failure
  - write apport crash file on package failure (disabled by default
    on debian until apport is available)
  - support mirror failure reporting (disabled by default on debian)

* apt-pkg/deb/dpkgpm.cc:
  - write Disappeared also to the history.log
  - forward manual-installed bit on package disappearance
* apt-pkg/deb/debsystem.cc:
  - add better config item for extended_states file
* apt-pkg/pkgcache.h:
  - switch {,Install-}Size to unsigned long long
* apt-pkg/depcache.cc:
  - do the autoremove mark process also for required packages to handle
    these illegally depending on lower priority packages (Closes: #583517)
  - try harder to find the other pseudo versions for autoremove multiarch
  - correct "Dangerous iterator usage" pointed out by cppcheck
  - deal with long long, not with int to remove 2GB Limit (LP: #250909)
  - deprecate AddSize with Multiplier as it is unused and switch to
    boolean instead to handle the sizes more gracefully.
  - switch i{Download,Usr}Size from double to (un)signed long long
* apt-pkg/aptconfiguration.cc:
  - remove duplicate architectures in getArchitectures()
* apt-pkg/indexrecords.{cc,h}:
  - backport forgotten Valid-Until patch from the obsolete experimental
    branch to prevent replay attacks better, thanks to Thomas Viehmann
    for the initial patch! (Closes: #499897)
  - add a constant Exists check for MetaKeys
* apt-pkg/acquire-item.cc:
  - do not try PDiff if it is not listed in the Meta file
  - sent Last-Modified header also for Translation files
* apt-pkg/cacheiterator.h:
  - let pkgCache::Iterator inherent std::iterator
* ftparchive/writer.h:
  - add a virtual destructor to FTWScanner class (for cppcheck)
* apt-pkg/cacheset.{cc,h}:
  - add simple wrapper around std::set for cache structures
  - move regex magic from apt-get to new FromRegEx method
  - move cmdline parsing from apt-cache to new FromCommandLine method
  - support special release-modifier 'installed' and 'candidate'
* apt-pkg/contrib/cmdline.cc:
  - fix segfault in SaveInConfig caused by writing over char[] sizes
* apt-pkg/pkgcache.cc:
  - get the best matching arch package from a group with FindPreferredPkg
* cmdline/apt-cache.cc:
  - make the search multiarch compatible by using GrpIterator instead
  - use pkgCacheFile and the new CacheSets all over the place
  - add --target-release option (Closes: #115520)
  - accept pkg/release and pkg=version in show and co. (Closes: #236270)
  - accept package versions in the unmet command
* cmdline/apt-get.cc:
  - use unsigned long long instead of double to store values it gets
* apt-pkg/cachefile.{cc,h}:
  - split Open() into submethods to be able to build only parts
  - make the OpProgress optional in the Cache buildprocess
  - store also the SourceList we use internally for export
* doc/apt.conf.5.xml:
  - document the new Valid-Until related options
* apt-pkg/contrib/strutl.cc:
  - split StrToTime() into HTTP1.1 and FTP date parser methods and
    use strptime() instead of some self-made scanf mangling
  - use the portable timegm shown in his manpage instead of a strange
    looking code copycat from wget
* ftparchive/writer.cc:
  - add ValidTime option to generate a Valid-Until header in Release file
* apt-pkg/policy.cc:
  - get the candidate right for a not-installed pseudo package if
    his non-pseudo friend is installed
* apt-pkg/indexcopy.cc:
  - move the gpg codecopy to a new method and use it also in methods/gpgv.cc
* cmdline/apt-get.cc:
  - rerun dpkg-source in source if --fix-broken is given (Closes: #576752)
  - don't suggest held packages as they are installed (Closes: #578135)
  - handle multiple --{tar,diff,dsc}-only options correctly
  - show at the end of the install process a list of disappeared packages
* cmdline/apt-cache.cc:
  - use GroupCount for package names in stats and add a package struct line
* methods/rred.cc:
  - use the patchfile modification time instead of the one from the
    "old" file - thanks to Philipp Weis for noticing! (Closes: #571541)
* debian/rules:
  - remove targets referring to CVS or arch as they are useless
  - use $(CURDIR) instead of $(pwd)
  - use dpkg-buildflags if available for CXXFLAGS
* README.arch:
  - remove the file completely as it has no use nowadays
* apt-pkg/depcache.cc:
  - be doublesure that the killer query is empty before starting reinstall
* methods/gpgv.cc:
  - remove the keyrings count limit by using vector magic
* contrib/mmap.cc:
  - clarify "MMap reached size limit" error message, thanks Ivan Masár!
* doc/apt.ent
  - add entities for the current oldstable/stable/testing codenames
* doc/sources.list.5.xml:
  - use stable-codename instead of stable in the examples (Closes: #531492)
* doc/apt_preferences.5.xml:
  - adapt some examples here to use current codenames as well
  - add "NotAutomatic: yes" handling, thanks Osamu Aoki (Closes: #490347)
* debian/libapt-pkg-doc.doc-base.cache:
  - remove yet another reference to the removed cache.sgml
* doc/apt-get.8.xml:
  - do not say explicit target_release_{name,version,codename}, it should
    be clear by itself and 'man' can break lines again (Closes: #566166)
  - remove the gnome-apt reference as it is removed from unstable
* apt-pkg/deb/dpkgpm.cc:
  - add 'disappear' to the known processing states, thanks Jonathan Nieder
* apt-pkg/packagemanager.h:
  - export info about disappeared packages with GetDisappearedPackages()
* methods/http.{cc,h}:
  - code cleanup, use enums instead of magic ints

* debian/rules:
  - spell out some less known options to reduce manpage consultation-rate
  - Use POSIX command substitution: $(<command sequence>)
  - Remove EOL whitespace (Closes: #577804)
* apt-pkg/acquire-item.cc:
  - Fix pkgAcqFile::Custom600Headers() to always return something.

* apt-pkg/depcache.cc:
  - rewrite the pseudo package reinstaller to be more intelligent
    in his package choices
* apt-pkg/packagemanager.cc:
  - don't try to "unpack" pseudo packages twice
* apt-pkg/contrib/fileutl.cc:
  - add a parent-guarded "mkdir -p" as CreateDirectory()
* apt-pkg/acquire.{cc,h}:
  - add a delayed constructor with Setup() for success reporting
  - check for and create directories in Setup if needed instead of
    error out unfriendly in the Constructor (Closes: #523920, #525783)
  - optional handle a lock file in Setup()
* apt-pkg/acquire-item.cc:
  - Acquire::ForceHash to force method for expected hash
* cmdline/apt-get.cc:
  - remove the lock file handling and let Acquire take care of it instead
  - display MD5Sum in --print-uris if not forced to use another method
    instead of displaying the strongest available (Closes: #576420)
  - regex for package names executed on Grp- not PkgIterator
  - show non-candidates as fallback for virtual packages (Closes: #578385)
  - set also "all" to this version for pseudo packages in TryToChangeVer
* apt-pkg/deb/dpkgpm.cc:
  - remove Chroot-Directory from files passed to install commands.
    Thanks to Kel Modderman for report & patch! (Closes: #577226)
* ftparchive/writer.cc:
  - remove 999 chars Files and Checksums rewrite limit (Closes: #577759)
* cmdline/apt-cache.cc:
  - align Installed and Candidate Version in policy so they can be compared
    easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657)
* doc/apt.ent:
  - Add a note about APT_CONFIG in the -c description (Closes: #578267)
* doc/po/de.po:
  - correct typos in german apt_preferences manpage, thanks Chris Leick!
* apt-pkg/sourcelist.cc:
  - be less strict and accept [option=value] as well
* apt-pkg/contrib/configuration.cc:
  - error out if #clear directive has no argument
* doc/files.sgml:
  - sync documentation with status quo, regarding files/directories in
    use, extended_states and uri schemes.
* doc/cache.sgml:
  - drop the file in favor of inplace documentation with doxygen
* apt-pkg/pkgcache.h:
  - enhance the Groups ABI by providing a ID as the other structs does
  - check also the size of the Group struct then checking for the others
* cmdline/apt-get.cc:
  - replace backticks with single quotes around fix-broken command
    in the broken packages message. (Closes: #577168)
* dselect/install:
  - modernize if-statements not to use 'x' (Closes: #577117)
  - replace backticks with POSIX $() (Closes: #577116)
* cmdline/apt-get.cc:
  - fix crash when pkg.VersionList() is empty
  - install html doxygen in libapt-pkg-doc 
* debian/control:
  - build-depend on doxygen
* apt-pkg/contrib/weakptr.h:
  - add a class WeakPointable which allows one to register weak pointers to
    an object which will be set to NULL when the object is deallocated.
* [ABI break] apt-pkg/acquire{-worker,-item,}.h:
  - subclass pkgAcquire::{Worker,Item,ItemDesc} from WeakPointable.
* apt-pkg/pkgcache.cc:
  - Merge fix from David to correct handling in single-arch environments.
* cmdline/apt-cache.cc:
  - Add a showauto command to apt-cache.
* cmdline/apt-get.cc:
  - Add apt-get markauto and unmarkauto commands.
* [BREAK] merge MultiArch-ABI. We don't support MultiArch,
  but we support the usage of the new ABI so libapt users
  can start to prepare for MultiArch (Closes: #536029)
* Ignore :qualifiers after package name in build dependencies
  in the library by default, but try to honour them in apt-get
  as we have some sort of MultiArch support ready (Closes: #558103)
* add translation of the manpages to PT (portuguese)
  Thanks to Américo Monteiro!
* Switch to dpkg-source 3.0 (native) format
* apt-pkg/depcache.cc:
  - remove Auto-Installed information from extended_states
    together with the package itself (Closes: #572364)
* cmdline/apt-mark:
  - don't crash if no arguments are given (Closes: #570962)
* debian/control:
  - remove some years old and obsolete Replaces
  - add automake/conf build-depends/conflicts as recommend by
    the autotools-dev README (Closes: #572615)
* apt-pkg/contrib/mmap.{h,cc}:
  - add char[] fallback for filesystems without shared writable
    mmap() like JFFS2. Thanks to Marius Vollmer for writing
    and to Loïc Minier for pointing to the patch! (Closes: #314334)
* doc/apt_preferences.5.xml:
  - fix two typos and be more verbose in the novice warning.
    Thanks to Osamu Aoki for pointing it out! (Closes: #567669)
  - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt!
  - origin can be used to match a hostname (Closes: #352667)
  - remove wrong pin-priority is optional remark (Closes: #574944)
* apt-pkg/deb/dpkgpm.cc:
  - fix error message construction in OpenLog()
  - if available store the Commandline in the history
* cmdline/apt-get.cc:
  - add a --only-upgrade flag to install command (Closes: #572259)
  - fix memory leaks in error conditions in DoSource()
  - try version match in FindSrc first exact than fuzzy (LP: #551178)
* apt-pkg/contrib/cmndline.cc:
  - save Commandline in Commandline::AsString for logging
* apt-pkg/deb/debversion.cc:
  - consider absent of debian revision equivalent to 0 (Closes: #573592)
* doc/makefile, doc/*:
  - generate subdirectories for building the manpages in on the fly
    depending on the po files we have.
* apt-pkg/pkgcachegen.cc:
  - merge versions correctly even if multiple different versions
    with the same version number are available.
    Thanks to Magnus Holmgren for the patch! (Closes: #351056)
* ftparchive/writer.cc:
  - write LongDescriptions if they shouldn't be included in Packages
    file into i18n/Translation-en by default.
* doc/po/de.po:
  - correct a few typos in the german manpage translation.
    Thanks to Chris Leick and Georg Koppen! (Closes: #574962)
* apt-pkg/contrib/strutl.cc:
  - convert all toupper calls to tolower_ascii for a little speedup
* apt-pkg/contrib/strutl.cc:
  - always escape '%' (LP: #130289) (Closes: #500560)
  - unescape '%' sequence only if followed by 2 hex digit
  - username/password are urlencoded in proxy string (RFC 3986)

1 files changed, 448 insertions, 372 deletions

diff --git a/po/bs.po b/po/bs.po
index 7b2316bdb..1d77c7f74 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-11 15:17+0100\n"
+"POT-Creation-Date: 2010-05-04 13:37+0200\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -19,9 +19,10 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n"
 
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
-#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
+#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
+#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
+#: cmdline/apt-cache.cc:1606
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ne mogu pronaći paket %s"
@@ -30,129 +31,132 @@ msgstr "Ne mogu pronaći paket %s"
 msgid "Total package names: "
 msgstr "Ukupno naziva paketa:"
 
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:247
+#, fuzzy
+msgid "Total package structures: "
+msgstr "Ukupno naziva paketa:"
+
+#: cmdline/apt-cache.cc:287
 msgid "  Normal packages: "
 msgstr "  Normalni paketi:"
 
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:288
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:289
 msgid "  Single virtual packages: "
 msgstr "  Pojedinačni virutuelni paketi:"
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:290
 msgid "  Mixed virtual packages: "
 msgstr "  Miješani virtuelni paketi:"
 
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:291
 msgid "  Missing: "
 msgstr "  Nedostajući:"
 
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct versions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:295
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Ukupno različitih verzija:"
 
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:297
 msgid "Total dependencies: "
 msgstr "Ukupno zavisnosti:"
 
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:300
 msgid "Total ver/file relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:302
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Ukupno Verzija/Datoteka odnosa:"
 
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:304
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:316
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:330
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:335
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:343
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
+#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1297
+#: cmdline/apt-cache.cc:1299
 msgid "You must give exactly one pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1451
+#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
 msgid "No packages found"
 msgstr "Paketi nisu pronađeni"
 
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1548
 msgid "Package files:"
 msgstr "Datoteke paketa:"
 
-#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
+#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1549
+#: cmdline/apt-cache.cc:1569
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
+#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
 msgid "(not found)"
 msgstr ""
 
-#. Installed version
-#: cmdline/apt-cache.cc:1582
+#: cmdline/apt-cache.cc:1590
 msgid "  Installed: "
 msgstr "  Instalirano:"
 
-#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
-msgid "(none)"
+#: cmdline/apt-cache.cc:1591
+msgid "  Candidate: "
 msgstr ""
 
-#. Candidate Version
-#: cmdline/apt-cache.cc:1589
-msgid "  Candidate: "
+#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1599
+#: cmdline/apt-cache.cc:1634
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1608
+#: cmdline/apt-cache.cc:1643
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
+#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1725
+#: cmdline/apt-cache.cc:1761
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -199,7 +203,12 @@ msgstr ""
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:114
+#: cmdline/apt-cdrom.cc:127
+#, fuzzy, c-format
+msgid "Failed to mount '%s' to '%s'"
+msgstr "Ne mogu otvoriti %s"
+
+#: cmdline/apt-cdrom.cc:162
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -254,7 +263,7 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ne mogu zapisati na %s"
@@ -264,31 +273,31 @@ msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 "Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
 
-#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
+#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:345
 msgid "Package extension list is too long"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
-#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
-#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
+#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:187
+#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:274 ftparchive/apt-ftparchive.cc:296
 #, c-format
 msgid "Error processing directory %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:251
+#: ftparchive/apt-ftparchive.cc:258
 msgid "Source extension list is too long"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:368
+#: ftparchive/apt-ftparchive.cc:375
 msgid "Error writing header to contents file"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:398
+#: ftparchive/apt-ftparchive.cc:405
 #, c-format
 msgid "Error processing contents %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:553
+#: ftparchive/apt-ftparchive.cc:590
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -330,11 +339,11 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:759
+#: ftparchive/apt-ftparchive.cc:796
 msgid "No selections matched"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:832
+#: ftparchive/apt-ftparchive.cc:874
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
@@ -374,87 +383,87 @@ msgstr "Arhiva nema kontrolnog zapisa"
 msgid "Unable to get a cursor"
 msgstr ""
 
-#: ftparchive/writer.cc:76
+#: ftparchive/writer.cc:73
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:81
+#: ftparchive/writer.cc:78
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:132
+#: ftparchive/writer.cc:134
 msgid "E: "
 msgstr ""
 
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:136
 msgid "W: "
 msgstr ""
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "E: Errors apply to file "
 msgstr ""
 
-#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
 #, c-format
 msgid "Failed to resolve %s"
 msgstr ""
 
-#: ftparchive/writer.cc:170
+#: ftparchive/writer.cc:174
 msgid "Tree walking failed"
 msgstr ""
 
-#: ftparchive/writer.cc:195
+#: ftparchive/writer.cc:201
 #, c-format
 msgid "Failed to open %s"
 msgstr "Ne mogu otvoriti %s"
 
-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:260
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: ftparchive/writer.cc:262
+#: ftparchive/writer.cc:268
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:266
+#: ftparchive/writer.cc:272
 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:283
+#: ftparchive/writer.cc:289
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:389
+#: ftparchive/writer.cc:393
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
+#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
+#: ftparchive/writer.cc:464 ftparchive/writer.cc:790
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:638
+#: ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:642
+#: ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
@@ -558,7 +567,7 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
@@ -597,181 +606,177 @@ msgstr "ali se neće instalirati"
 msgid " or"
 msgstr " ili"
 
-#: cmdline/apt-get.cc:382
+#: cmdline/apt-get.cc:384
 msgid "The following NEW packages will be installed:"
 msgstr "Slijedeći NOVI paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:408
+#: cmdline/apt-get.cc:412
 msgid "The following packages will be REMOVED:"
 msgstr "Slijedeći paketi će biti UKLONJENI:"
 
-#: cmdline/apt-get.cc:430
+#: cmdline/apt-get.cc:434
 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Slijedeći paketi su zadržani:"
 
-#: cmdline/apt-get.cc:451
+#: cmdline/apt-get.cc:457
 msgid "The following packages will be upgraded:"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#: cmdline/apt-get.cc:472
+#: cmdline/apt-get.cc:480
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:492
+#: cmdline/apt-get.cc:500
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:553
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:561
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
-#: cmdline/apt-get.cc:584
+#: cmdline/apt-get.cc:595
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: cmdline/apt-get.cc:588
+#: cmdline/apt-get.cc:599
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: cmdline/apt-get.cc:590
+#: cmdline/apt-get.cc:601
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: cmdline/apt-get.cc:592
+#: cmdline/apt-get.cc:603
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:596
+#: cmdline/apt-get.cc:607
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:669
+#: cmdline/apt-get.cc:680
 msgid "Correcting dependencies..."
 msgstr "Ispravljam zavisnosti..."
 
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:683
 msgid " failed."
 msgstr ""
 
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:686
 msgid "Unable to correct dependencies"
 msgstr "Ne mogu ispraviti zavisnosti"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:689
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:691
 msgid " Done"
 msgstr " Urađeno"
 
-#: cmdline/apt-get.cc:684
-msgid "You might want to run `apt-get -f install' to correct these."
+#: cmdline/apt-get.cc:695
+msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:698
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
 
-#: cmdline/apt-get.cc:712
+#: cmdline/apt-get.cc:723
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "Slijedeći paketi će biti nadograđeni:"
 
-#: cmdline/apt-get.cc:716
+#: cmdline/apt-get.cc:727
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:734
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:736
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: cmdline/apt-get.cc:775
+#: cmdline/apt-get.cc:786
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:795
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:806
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
-msgid "Unable to lock the download directory"
-msgstr ""
-
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
+#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: cmdline/apt-get.cc:836
+#: cmdline/apt-get.cc:846
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:841
+#: cmdline/apt-get.cc:851
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:854
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:859
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:852
+#: cmdline/apt-get.cc:862
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2311
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:880
+#: cmdline/apt-get.cc:890
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:898
+#: cmdline/apt-get.cc:908
 msgid "Yes, do as I say!"
 msgstr "Da, uradi kako kažem!"
 
-#: cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:910
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -779,75 +784,85 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
+#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
 msgid "Abort."
 msgstr "Odustani."
 
-#: cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:931
 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "Da li želite nastaviti? [Y/n]"
 
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1011
+#: cmdline/apt-get.cc:1021
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1028
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1032
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1037
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1038
 msgid "Aborting install."
 msgstr "Odustajem od instalacije."
 
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1096
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1107
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1115
+#: cmdline/apt-get.cc:1117
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1135
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1126
+#: cmdline/apt-get.cc:1146
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1138
+#: cmdline/apt-get.cc:1159
 msgid " [Installed]"
 msgstr "[Instalirano]"
 
-#: cmdline/apt-get.cc:1143
+#: cmdline/apt-get.cc:1168
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Verzije kandidata"
+
+#: cmdline/apt-get.cc:1170
 msgid "You should explicitly select one to install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1148
+#: cmdline/apt-get.cc:1175
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -855,85 +870,87 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1167
+#: cmdline/apt-get.cc:1194
 msgid "However the following packages replace it:"
 msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
 
-#: cmdline/apt-get.cc:1170
+#: cmdline/apt-get.cc:1197
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:1190
+#: cmdline/apt-get.cc:1217
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1198
+#: cmdline/apt-get.cc:1225
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1227
+#: cmdline/apt-get.cc:1254
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1229
+#: cmdline/apt-get.cc:1256
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1262
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1321
+#: cmdline/apt-get.cc:1363
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1352
+#: cmdline/apt-get.cc:1395
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1433
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1449
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1418
-msgid "Unable to lock the list directory"
-msgstr ""
-
-#: cmdline/apt-get.cc:1474
+#: cmdline/apt-get.cc:1514
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1562
 #, fuzzy
 msgid ""
+"The following package is automatically installed and is no longer required:"
+msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr "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:"
 
-#: cmdline/apt-get.cc:1525
+#: cmdline/apt-get.cc:1566
 #, fuzzy, c-format
-msgid "%lu packages were automatically installed and are no longer required.\n"
-msgstr "Slijedeći NOVI paketi će biti instalirani:"
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
+msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1568
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1531
+#: cmdline/apt-get.cc:1573
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -949,49 +966,49 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
+#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1580
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1599
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1612
+#: cmdline/apt-get.cc:1654
 #, c-format
 msgid "Couldn't find task %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
+#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1750
+#: cmdline/apt-get.cc:1795
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1781
+#: cmdline/apt-get.cc:1828
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:1794
-msgid "You might want to run `apt-get -f install' to correct these:"
+#: cmdline/apt-get.cc:1841
+msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1797
+#: cmdline/apt-get.cc:1844
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1809
+#: cmdline/apt-get.cc:1856
 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"
@@ -999,152 +1016,156 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1827
+#: cmdline/apt-get.cc:1874
 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1903
 msgid "The following extra packages will be installed:"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:1945
+#: cmdline/apt-get.cc:1992
 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 
-#: cmdline/apt-get.cc:1946
+#: cmdline/apt-get.cc:1993
 msgid "Recommended packages:"
 msgstr "Preporučeni paketi:"
 
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2022
 msgid "Calculating upgrade... "
 msgstr "Računam nadogradnju..."
 
-#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
 msgid "Failed"
 msgstr "Neuspješno"
 
-#: cmdline/apt-get.cc:1983
+#: cmdline/apt-get.cc:2030
 msgid "Done"
 msgstr "Urađeno"
 
-#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
+#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2158
+#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+msgid "Unable to lock the download directory"
+msgstr ""
+
+#: cmdline/apt-get.cc:2205
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
+#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2286
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2272
+#: cmdline/apt-get.cc:2321
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2278
+#: cmdline/apt-get.cc:2327
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2281
+#: cmdline/apt-get.cc:2330
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2287
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2369
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2346
+#: cmdline/apt-get.cc:2398
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2358
+#: cmdline/apt-get.cc:2410
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2411
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2376
+#: cmdline/apt-get.cc:2428
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2395
+#: cmdline/apt-get.cc:2448
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2464
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2439
+#: cmdline/apt-get.cc:2494
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2459
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2511
+#: cmdline/apt-get.cc:2566
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2564
+#: cmdline/apt-get.cc:2619
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:2600
+#: cmdline/apt-get.cc:2655
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2627
+#: cmdline/apt-get.cc:2682
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2643
+#: cmdline/apt-get.cc:2698
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2648
+#: cmdline/apt-get.cc:2703
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2680
+#: cmdline/apt-get.cc:2734
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:2721
+#: cmdline/apt-get.cc:2775
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1188,7 +1209,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2944
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1418,10 +1439,10 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
-#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
-#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
-#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
+#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
+#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ne mogu čitati %s"
@@ -1451,9 +1472,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
 #. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
-#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
-#: apt-pkg/pkgcachegen.cc:1008
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
+#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
+#: apt-pkg/pkgcachegen.cc:1181
 msgid "Reading package lists"
 msgstr "Čitam spiskove paketa"
 
@@ -1553,18 +1574,18 @@ msgstr ""
 msgid "Unparsable control file"
 msgstr ""
 
-#: methods/cdrom.cc:200
+#: methods/cdrom.cc:199
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr ""
 
-#: methods/cdrom.cc:209
+#: methods/cdrom.cc:208
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
 
-#: methods/cdrom.cc:219
+#: methods/cdrom.cc:218
 #, fuzzy
 msgid "Wrong CD-ROM"
 msgstr "Pogrešan CD"
@@ -1648,7 +1669,7 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr "Server je zatvorio vezu"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Greška pri čitanju"
 
@@ -1661,7 +1682,7 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr "Oštećenje protokola"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Greška pri pisanju"
 
@@ -1715,7 +1736,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1767,34 +1788,34 @@ msgstr ""
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: methods/connect.cc:119
+#: methods/connect.cc:122
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:147 methods/rsh.cc:425
+#: methods/connect.cc:150 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se sa %s"
 
-#: methods/connect.cc:166 methods/connect.cc:185
+#: methods/connect.cc:169 methods/connect.cc:188
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
-#: methods/connect.cc:191
+#: methods/connect.cc:194
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:194
+#: methods/connect.cc:197
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
-#: methods/connect.cc:241
+#: methods/connect.cc:244
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Ne mogu se povezati sa %s %s:"
@@ -1885,68 +1906,83 @@ msgstr ""
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
-#: methods/http.cc:791
+#: methods/http.cc:793
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:796
+#: methods/http.cc:798
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:819
+#: methods/http.cc:821
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:850
+#: methods/http.cc:852
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:878
+#: methods/http.cc:880
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:892
+#: methods/http.cc:894
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:894
+#: methods/http.cc:896
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Ne mogu ukloniti %s"
 
-#: methods/http.cc:1150
+#: methods/http.cc:1156
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1167 methods/http.cc:1222
+#: methods/http.cc:1173 methods/http.cc:1228
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/http.cc:1314
+#: methods/http.cc:1320
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
-#: apt-pkg/contrib/mmap.cc:76
+#: apt-pkg/contrib/mmap.cc:77
 msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:89
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:124
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Ne mogu kreirati %s"
+
+#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Ne mogu kreirati %s"
+
+#: apt-pkg/contrib/mmap.cc:300
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:347
+#: apt-pkg/contrib/mmap.cc:395
 #, c-format
 msgid ""
 "The size of a MMap has already reached the defined limit of %lu bytes,abort "
@@ -1954,30 +1990,30 @@ msgid ""
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:346
+#: apt-pkg/contrib/strutl.cc:371
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:353
+#: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:360
+#: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:365
+#: apt-pkg/contrib/strutl.cc:390
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1040
+#: apt-pkg/contrib/strutl.cc:1083
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
@@ -2027,7 +2063,12 @@ msgstr ""
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:825
+#: apt-pkg/contrib/configuration.cc:777
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+
+#: apt-pkg/contrib/configuration.cc:827
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
@@ -2058,32 +2099,32 @@ msgstr ""
 msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
 #, c-format
 msgid "Option %s requires an argument."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:234
+#: apt-pkg/contrib/cmndline.cc:236
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:265
+#: apt-pkg/contrib/cmndline.cc:267
 #, c-format
 msgid "Option '%s' is too long"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:298
+#: apt-pkg/contrib/cmndline.cc:300
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:348
+#: apt-pkg/contrib/cmndline.cc:350
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
@@ -2093,193 +2134,198 @@ msgstr ""
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
-#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
+#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196
+#: apt-pkg/acquire.cc:477 apt-pkg/acquire.cc:502 apt-pkg/clean.cc:39
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:195
+#: apt-pkg/contrib/cdromutl.cc:204
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:151
+#: apt-pkg/contrib/fileutl.cc:152
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:156
+#: apt-pkg/contrib/fileutl.cc:157
 #, c-format
 msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:174
+#: apt-pkg/contrib/fileutl.cc:175
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:178
+#: apt-pkg/contrib/fileutl.cc:179
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:568
+#: apt-pkg/contrib/fileutl.cc:615
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:580
+#: apt-pkg/contrib/fileutl.cc:627
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:582
+#: apt-pkg/contrib/fileutl.cc:629
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:586
+#: apt-pkg/contrib/fileutl.cc:633
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:588
+#: apt-pkg/contrib/fileutl.cc:635
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:632
+#: apt-pkg/contrib/fileutl.cc:679
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:688
+#: apt-pkg/contrib/fileutl.cc:735
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:718
+#: apt-pkg/contrib/fileutl.cc:765
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:793
+#: apt-pkg/contrib/fileutl.cc:840
 msgid "Problem closing the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:799
+#: apt-pkg/contrib/fileutl.cc:846
 msgid "Problem unlinking the file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:810
+#: apt-pkg/contrib/fileutl.cc:857
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:133
+#: apt-pkg/pkgcache.cc:139
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:145
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:144
+#: apt-pkg/pkgcache.cc:150
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:155
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:160
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:287
 msgid "Depends"
 msgstr "Zavisi"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:287
 msgid "PreDepends"
 msgstr "Unaprijed zavisi"
 
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:287
 msgid "Suggests"
 msgstr "Predlaže"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:288
 msgid "Recommends"
 msgstr "Preporučuje"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:288
 #, fuzzy
 msgid "Conflicts"
 msgstr "Sukobljava se sa"
 
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:288
 msgid "Replaces"
 msgstr "Zamjenjuje"
 
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:289
 msgid "Obsoletes"
 msgstr "Zastarijeva"
 
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:289
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:289
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:300
 msgid "important"
 msgstr "važno"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:300
 msgid "required"
 msgstr "zahtijevano"
 
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:300
 msgid "standard"
 msgstr "standardno"
 
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:301
 msgid "optional"
 msgstr "opcionalno"
 
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:301
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
+#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
 msgid "Building dependency tree"
 msgstr "Gradim stablo zavisnosti"
 
-#: apt-pkg/depcache.cc:124
+#: apt-pkg/depcache.cc:125
 msgid "Candidate versions"
 msgstr "Verzije kandidata"
 
-#: apt-pkg/depcache.cc:153
+#: apt-pkg/depcache.cc:154
 msgid "Dependency generation"
 msgstr "Stvaranje zavisnosti"
 
-#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
 #, fuzzy
 msgid "Reading state information"
 msgstr "Sastavljam dostupne informacije"
 
-#: apt-pkg/depcache.cc:223
+#: apt-pkg/depcache.cc:236
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Ne mogu otvoriti %s"
 
-#: apt-pkg/depcache.cc:229
+#: apt-pkg/depcache.cc:242
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Ne mogu ukloniti %s"
 
+#: apt-pkg/depcache.cc:851
+#, c-format
+msgid "Internal error, group '%s' has no installable pseudo package"
+msgstr ""
+
 #: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (1)"
@@ -2290,64 +2336,84 @@ msgstr ""
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:83
+#: apt-pkg/sourcelist.cc:92
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:95
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:106
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:112
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:115
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:128
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:85
+#: apt-pkg/sourcelist.cc:130
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:133
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:94
+#: apt-pkg/sourcelist.cc:139
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:146
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:244
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc:281
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
-#, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
 #, 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:440
+#: apt-pkg/packagemanager.cc:452
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2355,7 +2421,7 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:478
+#: apt-pkg/packagemanager.cc:495
 #, c-format
 msgid ""
 "Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2367,46 +2433,51 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:248
+#: apt-pkg/algorithms.cc:292
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1138
+#: apt-pkg/algorithms.cc:1182
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1140
+#: apt-pkg/algorithms.cc:1184
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
+#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: apt-pkg/acquire.cc:60
+#: apt-pkg/acquire.cc:79
 #, c-format
-msgid "Lists directory %spartial is missing."
+msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:64
+#: apt-pkg/acquire.cc:83
 #, c-format
-msgid "Archive directory %spartial is missing."
+msgid "Archives directory %spartial is missing."
 msgstr ""
 
+#: apt-pkg/acquire.cc:91
+#, 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:826
+#: apt-pkg/acquire.cc:878
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:880
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Čitam spisak datoteke"
@@ -2426,12 +2497,12 @@ msgstr ""
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: apt-pkg/init.cc:133
+#: apt-pkg/init.cc:135
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/init.cc:149
+#: apt-pkg/init.cc:151
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
@@ -2452,110 +2523,110 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: apt-pkg/policy.cc:316
+#: apt-pkg/policy.cc:333
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
-#: apt-pkg/policy.cc:338
+#: apt-pkg/policy.cc:355
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
-#: apt-pkg/policy.cc:346
+#: apt-pkg/policy.cc:363
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:75
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:131
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:146
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:166
+#: apt-pkg/pkgcachegen.cc:180
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:191
+#: apt-pkg/pkgcachegen.cc:210
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:195
+#: apt-pkg/pkgcachegen.cc:214
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:226
+#: apt-pkg/pkgcachegen.cc:234
 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:230
+#: apt-pkg/pkgcachegen.cc:238
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:242
 #, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:258
+#: apt-pkg/pkgcachegen.cc:266
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:264
+#: apt-pkg/pkgcachegen.cc:273
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:267
+#: apt-pkg/pkgcachegen.cc:276
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:270
+#: apt-pkg/pkgcachegen.cc:279
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:282
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:310
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:314
+#: apt-pkg/pkgcachegen.cc:323
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:320
+#: apt-pkg/pkgcachegen.cc:329
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:706
+#: apt-pkg/pkgcachegen.cc:860
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:808
+#: apt-pkg/pkgcachegen.cc:962
 msgid "Collecting File Provides"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
+#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
 msgid "IO Error saving source cache"
 msgstr ""
 
@@ -2568,7 +2639,7 @@ msgstr ""
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469
 msgid "Hash Sum mismatch"
 msgstr ""
 
@@ -2590,13 +2661,13 @@ msgid ""
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1360
+#: apt-pkg/acquire-item.cc:1374
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1447
+#: apt-pkg/acquire-item.cc:1461
 msgid "Size mismatch"
 msgstr ""
 
@@ -2620,89 +2691,89 @@ msgstr ""
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:518
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615
 msgid "Identifying.. "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:559
+#: apt-pkg/cdrom.cc:552
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
+#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "Pogrešan CD"
 
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:578
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:596
 msgid "Unmounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:600
 #, fuzzy
 msgid "Waiting for disc...\n"
 msgstr "Čekam na zaglavlja"
 
 #. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:608
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:626
 msgid "Scanning disc for index files..\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:673
+#: apt-pkg/cdrom.cc:666
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
 "zu signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:677
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:703
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:739
+#: apt-pkg/cdrom.cc:732
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:748
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:759
+#: apt-pkg/cdrom.cc:752
 #, fuzzy
 msgid "Copying package lists..."
 msgstr "Čitam spiskove paketa"
 
-#: apt-pkg/cdrom.cc:785
+#: apt-pkg/cdrom.cc:778
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:794
+#: apt-pkg/cdrom.cc:787
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
@@ -2746,12 +2817,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Povezujem se sa %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Otvaram %s"
@@ -2766,56 +2837,61 @@ msgstr "Ne mogu ukloniti %s"
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:558
+#: apt-pkg/deb/dpkgpm.cc:581
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/deb/dpkgpm.cc:730
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/deb/dpkgpm.cc:731
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Otvaram %s"
 
-#: apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:736
 #, c-format
 msgid "Preparing to configure %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:662
+#: apt-pkg/deb/dpkgpm.cc:738
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Instalirano:"
 
-#: apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:743
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:669
+#: apt-pkg/deb/dpkgpm.cc:745
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Preporučuje"
 
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:750
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:675
+#: apt-pkg/deb/dpkgpm.cc:751
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Ne mogu ukloniti %s"
 
-#: apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/deb/dpkgpm.cc:955
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:909
+#: apt-pkg/deb/dpkgpm.cc:986
 msgid "Running dpkg"
 msgstr ""