merged from the mvo branch

author: Michael Vogt <michael.vogt@ubuntu.com> 2011-12-08 18:08:06 +0100
committer: Michael Vogt <michael.vogt@ubuntu.com> 2011-12-08 18:08:06 +0100
commit: 2b0f6ff05d2c6937c1160c497cfb76b43f11f2db (patch)
tree: a87e2639df12481e2046b835996628b53ec6325c
parent: b0995cca556668a4eced03e40e3edbc7362c2a10 (diff)
parent: 350bb4a03d6562ddba12fbb0a34610aac7706b3c (diff)
download: python-apt-2b0f6ff05d2c6937c1160c497cfb76b43f11f2db.tar.gz
29 files changed, 726 insertions, 465 deletions
diff --git a/apt/cache.py b/apt/cache.py
index be137b76..96b38a57 100644
--- a/apt/cache.py
+++ b/apt/cache.py
@@ -46,8 +46,13 @@ class LockFailedException(IOError):
 class Cache(object):
     """Dictionary-like package cache.
 
-    This class has all the packages that are available in it's
-    dictionary.
+    The APT cache file contains a hash table mapping names of binary
+    packages to their metadata. A Cache object is the in-core
+    representation of the same. It provides access to APTs idea of the
+    list of available packages.
+
+    The cache can be used like a mapping from package names to Package
+    objects (although only getting items is supported). 
 
     Keyword arguments:
     progress -- a OpProgress object
@@ -84,6 +89,10 @@ class Cache(object):
             apt_pkg.config.set("Dir", rootdir)
             apt_pkg.config.set("Dir::State::status",
                                rootdir + "/var/lib/dpkg/status")
+            # also set dpkg to the rootdir path so that its called for the
+            # --print-foreign-architectures call
+            apt_pkg.config.set("Dir::bin::dpkg", 
+                               os.path.join(rootdir, "usr", "bin", "dpkg"))
             # create required dirs/files when run with special rootdir
             # automatically
             self._check_and_create_required_dirs(rootdir)
@@ -112,7 +121,7 @@ class Cache(object):
                ]
         for d in dirs:
             if not os.path.exists(rootdir + d):
-                print "creating: ", rootdir + d
+                #print "creating: ", rootdir + d
                 os.makedirs(rootdir + d)
         for f in files:
             if not os.path.exists(rootdir + f):
@@ -507,7 +516,7 @@ class Cache(object):
         self._callbacks[name].append(callback)
 
     def actiongroup(self):
-        """Return an ActionGroup() object for the current cache.
+        """Return an `ActionGroup` object for the current cache.
 
         Action groups can be used to speedup actions. The action group is
         active as soon as it is created, and disabled when the object is
@@ -520,7 +529,7 @@ class Cache(object):
                 for package in my_selected_packages:
                     package.mark_install()
 
-        This way, the ActionGroup is automatically released as soon as the
+        This way, the action group is automatically released as soon as the
         with statement block is left. It also has the benefit of making it
         clear which parts of the code run with a action group and which
         don't.
diff --git a/apt/debfile.py b/apt/debfile.py
index d0f41def..17f1dbd9 100644
--- a/apt/debfile.py
+++ b/apt/debfile.py
@@ -53,6 +53,7 @@ class DebPackage(object):
         self.pkgname = ""
         self._sections = {}
         self._need_pkgs = []
+        self._check_was_run = False
         self._failure_string = ""
         if filename:
             self.open(filename)
@@ -68,7 +69,8 @@ class DebPackage(object):
         control = self._debfile.control.extractdata("control")
         self._sections = apt_pkg.TagSection(control)
         self.pkgname = self._sections["Package"]
-
+        self._check_was_run = False
+        
     def __getitem__(self, key):
         return self._sections[key]
 
@@ -308,6 +310,7 @@ class DebPackage(object):
         size = float(len(self._cache))
         steps = max(int(size/50), 1)
         debver = self._sections["Version"]
+        debarch = self._sections["Architecture"]
         # store what we provide so that we can later check against that
         provides = [ x[0][0] for x in self.provides]
         for (i, pkg) in enumerate(self._cache):
@@ -336,7 +339,7 @@ class DebPackage(object):
             if "Conflicts" in ver.depends_list:
                 for conflicts_ver_list in ver.depends_list["Conflicts"]:
                     for c_or in conflicts_ver_list:
-                        if c_or.target_pkg.name == self.pkgname:
+                        if c_or.target_pkg.name == self.pkgname and c_or.target_pkg.architecture == debarch:
                             if apt_pkg.check_dep(debver, c_or.comp_type, c_or.target_ver):
                                 self._dbg(2, "would break (conflicts) %s" % pkg.name)
 				# TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation
@@ -393,6 +396,8 @@ class DebPackage(object):
         """Check if the package is installable."""
         self._dbg(3, "check")
 
+        self._check_was_run = True
+
         # check arch
         if not "Architecture" in self._sections:
             self._dbg(1, "ERROR: no architecture field")
@@ -472,8 +477,8 @@ class DebPackage(object):
     def missing_deps(self):
         """Return missing dependencies."""
         self._dbg(1, "Installing: %s" % self._need_pkgs)
-        if self._need_pkgs is None:
-            self.check()
+        if not self._check_was_run:
+            raise AttributeError("property only available after check() was run")
         return self._need_pkgs
 
     @property
@@ -485,6 +490,8 @@ class DebPackage(object):
         install = []
         remove = []
         unauthenticated = []
+        if not self._check_was_run:
+            raise AttributeError("property only available after check() was run")
         for pkg in self._cache:
             if pkg.marked_install or pkg.marked_upgrade:
                 install.append(pkg.name)
@@ -524,11 +531,20 @@ class DebPackage(object):
     @staticmethod
     def to_strish(in_data):
         s = ""
-        for c in in_data:
-            if ord(c) < 10 or ord(c) > 127:
-                s += " "
-            else:
-                s += c
+        # py2 compat, in_data is type string
+        if type(in_data) == str:
+            for c in in_data:
+                if ord(c) < 10 or ord(c) > 127:
+                    s += " "
+                else:
+                    s += c
+        # py3 compat, in_data is type bytes
+        else:
+            for b in in_data:
+                if b < 10 or b > 127:
+                    s += " "
+                else:
+                    s += chr(b)
         return s
         
     def _get_content(self, part, name, auto_decompress=True, auto_hex=True):
@@ -639,7 +655,8 @@ class DscSrcPackage(DebPackage):
               "source package '%s' that builds %s\n") % (self.pkgname,
               " ".join(self.binaries))
         self._sections["Description"] = s
-
+        self._check_was_run = False
+        
     def check(self):
         """Check if the package is installable.."""
         if not self.check_conflicts():
@@ -647,6 +664,8 @@ class DscSrcPackage(DebPackage):
                 if self._cache[pkgname]._pkg.essential:
                     raise Exception(_("An essential package would be removed"))
                 self._cache[pkgname].mark_delete()
+        # properties are ok now
+        self._check_was_run = True
         # FIXME: a additional run of the check_conflicts()
         #        after _satisfy_depends() should probably be done
         return self._satisfy_depends(self.depends)
diff --git a/apt/package.py b/apt/package.py
index 4104f93e..81f33a8b 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -94,7 +94,7 @@ class BaseDependency(object):
         preDepend = AttributeDeprecatedBy('pre_depend')
 
 
-class Dependency(object):
+class Dependency(list):
     """Represent an Or-group of dependencies.
 
     Attributes defined here:
@@ -102,11 +102,12 @@ class Dependency(object):
     """
 
     def __init__(self, alternatives):
-        self.or_dependencies = alternatives
-
-    def __repr__(self):
-        return repr(self.or_dependencies)
+        super(Dependency, self).__init__()
+        self.extend(alternatives)
 
+    @property
+    def or_dependencies(self):
+        return self
 
 class DeprecatedProperty(property):
     """A property which gives DeprecationWarning on access.
@@ -455,6 +456,11 @@ class Version(object):
         return self.get_dependencies("Recommends")
 
     @property
+    def suggests(self):
+        """Return the suggests of the package version."""
+        return self.get_dependencies("Suggests")
+
+    @property
     def origins(self):
         """Return a list of origins for the package version."""
         origins = []
@@ -707,6 +713,9 @@ class Package(object):
         return '<Package: name:%r architecture=%r id:%r>' % (self._pkg.name,
                  self._pkg.architecture, self._pkg.id)
 
+    def __lt__(self, other):
+        return self.name < other.name
+
     def candidate(self):
         """Return the candidate version of the package.
 
diff --git a/apt/progress/base.py b/apt/progress/base.py
index 97375431..4943978c 100644
--- a/apt/progress/base.py
+++ b/apt/progress/base.py
@@ -27,6 +27,7 @@ import fcntl
 import os
 import re
 import select
+import sys
 
 import apt_pkg
 
@@ -196,7 +197,8 @@ class InstallProgress(object):
                 os._exit(os.spawnlp(os.P_WAIT, "dpkg", "dpkg", "--status-fd",
                                     str(self.write_stream.fileno()), "-i",
                                     obj))
-            except Exception:
+            except Exception as e:
+                sys.stderr.write("%s\n" % e)
                 os._exit(apt_pkg.PackageManager.RESULT_FAILED)
 
         self.child_pid = pid
diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py
index 208b0175..40a0379b 100644
--- a/aptsources/sourceslist.py
+++ b/aptsources/sourceslist.py
@@ -374,7 +374,7 @@ class SourcesList(object):
                     source = SourceEntry(line, file)
                     self.list.append(source)
         except:
-            sys.stderr.write("could not open file '%s'\n" % file)
+            logging.warn("could not open file '%s'\n" % file)
 
     def save(self):
         """ save the current sources """
diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in
index 9e62c0fa..3a9562f4 100644
--- a/data/templates/Ubuntu.info.in
+++ b/data/templates/Ubuntu.info.in
@@ -13,10 +13,10 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 12.04 'Precise Pangolin'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -131,10 +131,10 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 11.10 'Oneiric Ocelot'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -250,10 +250,10 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 11.04 'Natty Narwhal'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -368,10 +368,10 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 10.10 'Maverick Meerkat'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -451,10 +451,10 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 10.04 'Lucid Lynx'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -514,10 +514,10 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 9.10 'Karmic Koala'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -577,10 +577,10 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 9.04 'Jaunty Jackalope'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -639,10 +639,10 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 8.10 'Intrepid Ibex'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -703,10 +703,10 @@ MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 8.04 'Hardy Heron'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -768,10 +768,10 @@ MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 7.10 'Gutsy Gibbon'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -832,10 +832,10 @@ MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 7.04 'Feisty Fawn'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -893,10 +893,10 @@ MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 6.10 'Edgy Eft'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
@@ -954,10 +954,10 @@ MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 6.06 LTS 'Dapper Drake'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: Canonical-supported Open Source software
+_CompDescriptionLong: Canonical-supported free and open-source software
 Component: universe
 _CompDescription: Community-maintained (universe)
-_CompDescriptionLong: Community-maintained Open Source software
+_CompDescriptionLong: Community-maintained free and open-source software
 Component: restricted
 _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
diff --git a/debian/changelog b/debian/changelog
index f5a2beae..49d8dd7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,65 @@
+python-apt (0.8.3) UNRELEASED; urgency=low
+
+  [ Alexey Feldgendler ] 
+  * handle architecture-specific conflicts correctly (LP: #829138)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 08 Dec 2011 17:26:37 +0100
+
+python-apt (0.8.2) unstable; urgency=low
+
+  [ Michael Vogt ]
+  * merged from ubuntu:
+    - use logging instead of print
+    - update distro template Ubuntu.info.in
+    - add xz compression support
+  * po/python-apt.pot:
+    - refreshed
+  * po/pt_BR.po:
+    - updated, thanks to Sergio Cipolla (closes: #628398)
+  * po/da.po:
+    - updated, thanks to Joe Dalton (closes: #631309)
+  * po/sr.po:
+    - updated, thanks to Nikola Nenadic (closes: #638308)
+  * python/apt_pkgmodule.cc:
+    - add apt_pkg.get_architectures() call
+  * apt/cache.py:
+    - remove "print" when creating dirs in apt.Cache(rootdir=dir),
+      thanks to Martin Pitt
+    - add __lt__ to apt.Package so that sort() sorts by name
+      on list of package objects
+  * debian/control:
+    - add recommends to xz-lzma to ensure we have the unlzma command
+  * apt/cache.py:
+    - set Dir::bin::dpkg if a alternate rootdir is given
+      (LP: #885895)
+  * build fixes for the apt in experimental
+  * apt/debfile.py: 
+    - raise error when accessing require_changes and 
+      missing_deps without calling check() before, thanks to 
+      Tshepang Lekhonkhobe (closes: #624379)
+  * apt/package.py:
+    - add new "suggests" property, thanks to Christop Groth
+    - allow Dependency object to be iteratable, this allows to write
+      code like:
+      for or_dep_group in pkg.candidate.dependencies:
+          for dep in or_dep_group: 
+              do_something()
+      (thanks to Christop Groth)
+  * apt/progress/base.py:
+    - write exception text to stderr to avoid hidding exceptions
+      like "pre-configure failed" from libapt (thanks to Jean-Baptiste
+      Lallement)
+  
+  [ Tshepang Lekhonkhobe ]
+  * rm usage of camelcase in cache.py doc (closes: #626617)
+  * grammar fix in the cache.py doc (closes: #626610)
+
+  [ Nikola Pavlović ]
+  * fixed a typo, changed "Open Source software" to 
+    "free and open-source software"  (LP: #500940)
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 01 Dec 2011 14:14:42 +0100
+
 python-apt (0.8.1ubuntu1) precise; urgency=low
 
   * aptsources/sourceslist.py:
diff --git a/debian/control b/debian/control
index b34007cd..31ca4d35 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ XS-Python-Version: >= 2.6
 X-Python3-Version: >= 3.1
 Build-Depends: apt-utils,
                debhelper (>= 7.3.5),
-               libapt-pkg-dev (>= 0.8.16~exp5),
+               libapt-pkg-dev (>= 0.8.11),
                python-all-dev (>= 2.6.6-3~),
                python-all-dbg,
                python3-all-dev (>= 3.1.2-10~),
@@ -17,13 +17,14 @@ Build-Depends: apt-utils,
                python-distutils-extra (>= 2.0),
                python-sphinx (>= 0.5),
                python-debian
+Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/python-apt/ubuntu
 XS-Debian-Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid
 XS-Debian-Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes
 
 Package: python-apt
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common
-Recommends: lsb-release, iso-codes
+Recommends: lsb-release, iso-codes, python2.6, xz-lzma
 Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4),
         computer-janitor (<< 1.14.1-1+),
         debdelta (<< 0.41+),
diff --git a/debian/rules b/debian/rules
index 5f1132f1..52f8aaeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,8 @@
 #!/usr/bin/make -f
 # Should be include-links, but that somehow fails.
 export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-
+# For compatibility, add -DCOMPAT_0_7
 export CFLAGS=-Wno-write-strings -DCOMPAT_0_7
-
 export PATH := $(CURDIR)/utils:$(PATH)
 export pyversions := $(CURDIR)/utils/pyversions
 
@@ -30,7 +29,7 @@ override_dh_installdocs:
 override_dh_strip:
 	dh_strip -p python-apt --dbg-package=python-apt-dbg
 	dh_strip -p python3-apt --dbg-package=python3-apt-dbg
-
+	
 override_dh_compress:
 	dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv
 
diff --git a/po/da.po b/po/da.po
index 8e361052..5195389c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,21 +1,23 @@
-# Danish translation for update-manager
-# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
-# This file is distributed under the same license as the update-manager package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+# Danish translation python-apt.
+# Copyright (C) 2011 python-apt & nedenstående oversætttere.
+# This file is distributed under the same license as the python-apt package.
+# Mads Bille Lundby <lundbymads@gmail.com>, 2009.
+# AJenbo <anders@jenbo.dk>, 2011.
+# Ask, 2011.
+# Joe Hansen <joedalton2@yahoo.dk>, 2011.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: update-manager\n"
+"Project-Id-Version: python-apt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2006-10-16 15:55+0000\n"
-"Last-Translator: Lasse Bang Mikkelsen <lbm@fatalerror.dk>\n"
-"Language-Team: Danish <da@li.org>\n"
+"PO-Revision-Date: 2011-06-22 14:44+0200\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -25,75 +27,63 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:13
-#, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr "Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Ubuntu 9.10 \"Karmic Koala\""
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:31
-#, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Cd-rom med Ubuntu 9.10 \"Karmic Koala\""
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:74
-#, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Ubuntu 9.04 \"Jaunty Jackalope\""
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:92
-#, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Cd-rom med Ubuntu 9.04 \"Jaunty Jackalope\""
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:135
-#, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Ubuntu 8.10 \"Intrepid Ibex\""
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:153
-#, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Cd-rom med Ubuntu 8.10 \"Intrepid Ibex\""
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:197
-#, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Ubuntu 8.04 \"Hardy Heron\""
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:215
-#, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Cd-rom med Ubuntu 8.04 \"Hardy Heron\""
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:252
-#, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 5.04 sikkerhedsopdateringer"
+msgstr "Ubuntu 7.10 \"Gutsy Gibbon\""
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Cd-rom med Ubuntu 7.10 \"Gutsy Gibbon\""
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:305
-#, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 5.04 sikkerhedsopdateringer"
+msgstr "Ubuntu 7.04 \"Feisty Fawn\""
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Cd-rom med Ubuntu 7.04 \"Feisty Fawn\""
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:357
@@ -102,7 +92,6 @@ msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
 msgid "Community-maintained"
 msgstr "Vedligeholdt af fællesskabet"
 
@@ -123,21 +112,18 @@ msgstr "Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. CompDescriptionLong
 #: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
 msgid "Canonical-supported Open Source software"
-msgstr "Fri software understøttet af Canonical"
+msgstr "Canonical-understøttet software med åben kildekode"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Vedligeholdt af fællesskabet (universe)"
 
 #. CompDescriptionLong
 #: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
 msgid "Community-maintained Open Source software"
-msgstr "Fri software vedligeholdt af fællesskabet"
+msgstr "Software med åben kildekode vedligeholdt af fællesskabet"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:417
@@ -176,15 +162,13 @@ msgstr "Anbefalede opdateringer"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
 msgid "Pre-released updates"
-msgstr "Foreslåede opdateringer"
+msgstr "Ikke-frigivne opdateringer"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
 msgid "Unsupported updates"
-msgstr "Tilbageporterede opdateringer"
+msgstr "Ikke-understøttede opdateringer"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:461
@@ -248,9 +232,8 @@ msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
 msgid "Community-maintained (Universe)"
-msgstr "Vedligeholdt af fællesskabet (universe)"
+msgstr "Vedligeholdt af fællesskabet (Universe)"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:554
@@ -295,25 +278,21 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-#, fuzzy
 msgid "Debian 6.0 'Squeeze' "
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 6.0 \"Squeeze\" "
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-#, fuzzy
 msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 5.0 \"Lenny\" "
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-#, fuzzy
 msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 4.0 \"Etch\""
 
 #. Description
 #: ../data/templates/Debian.info.in:83
-#, fuzzy
 msgid "Debian 3.1 'Sarge'"
 msgstr "Debian 3.1 \"Sarge\""
 
@@ -324,26 +303,23 @@ msgstr "Foreslåede opdateringer"
 
 #. Description
 #: ../data/templates/Debian.info.in:101
-#, fuzzy
 msgid "Security updates"
-msgstr "Vigtige sikkerhedsopdateringer"
+msgstr "Sikkerhedsopdateringer"
 
 #. Description
 #: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Debian aktuel stabil udgivelse"
 
 #. Description
 #: ../data/templates/Debian.info.in:121
-#, fuzzy
 msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian tester"
 
 #. Description
 #: ../data/templates/Debian.info.in:146
-#, fuzzy
 msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian \"Sid\" (ustabil)"
 
 #. CompDescription
 #: ../data/templates/Debian.info.in:150
@@ -390,16 +366,16 @@ msgstr "Detaljer"
 
 #: ../apt/progress/gtk2.py:367
 msgid "Starting..."
-msgstr ""
+msgstr "Starter..."
 
 #: ../apt/progress/gtk2.py:373
 msgid "Complete"
-msgstr ""
+msgstr "Færdig"
 
 #: ../apt/package.py:301
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
+msgstr "Ugyldig unicode i beskrivelsen af \"%s\" (%s). Se venligst rapport."
 
 #: ../apt/package.py:937 ../apt/package.py:1043
 msgid "The list of changes is not available"
@@ -413,6 +389,10 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"Listen over ændringer er ikke tilgængelig endnu\n"
+"\n"
+"Se venligst http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"indtil ændringerne bliver tilgængelige eller prøv igen senere."
 
 #: ../apt/package.py:1053
 msgid ""
@@ -425,76 +405,75 @@ msgstr ""
 #: ../apt/debfile.py:56
 #, python-format
 msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler \"%s-medlem\""
 
 #: ../apt/debfile.py:81
 #, python-format
 msgid "List of files for '%s'could not be read"
-msgstr ""
+msgstr "Listen over filer for \"%s\" kunne ikke læses"
 
 #: ../apt/debfile.py:149
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Afhængighed kan ikke opfyldes; %s\n"
 
 #: ../apt/debfile.py:173
 #, python-format
 msgid "Conflicts with the installed package '%s'"
-msgstr ""
+msgstr "I konflikt med den installerede pakke \"%s\""
 
 #: ../apt/debfile.py:319
 #, python-format
 msgid "Wrong architecture '%s'"
-msgstr ""
+msgstr "Forkert arkitektur \"%s\""
 
 #. the deb is older than the installed
 #: ../apt/debfile.py:325
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Der er allerede installeret en senere version"
 
 #: ../apt/debfile.py:345
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Kunne ikke opfylde alle afhængigheder (beskadiget cache)"
 
 #: ../apt/debfile.py:376
-#, fuzzy, python-format
+#, python-format
 msgid "Cannot install '%s'"
 msgstr "Kan ikke installere \"%s\""
 
 #: ../apt/debfile.py:484
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
+msgstr "Installér bygge-afhængigheder til kildepakke \"%s\" der bygger %s\n"
 
 #: ../apt/debfile.py:494
-#, fuzzy
 msgid "An essential package would be removed"
-msgstr "Det ville være nødvendigt at fjerne en vital pakke"
+msgstr "En nødvendig pakke vil blive fjernet"
 
 #: ../apt/progress/text.py:81
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Færdig"
 
 #: ../apt/progress/text.py:118
 msgid "Hit "
-msgstr ""
+msgstr "Tjekkede "
 
 #: ../apt/progress/text.py:126
 msgid "Ign "
-msgstr ""
+msgstr "Ign "
 
 #: ../apt/progress/text.py:128
 msgid "Err "
-msgstr ""
+msgstr "Fejl "
 
 #: ../apt/progress/text.py:138
 msgid "Get:"
-msgstr ""
+msgstr "Henter:"
 
 #: ../apt/progress/text.py:198
 msgid " [Working]"
-msgstr ""
+msgstr " [Arbejder]"
 
 #: ../apt/progress/text.py:208
 #, python-format
@@ -503,21 +482,26 @@ msgid ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Medieskift: Indsæt disken med navnet\n"
+" '%s'\n"
+"i drevet '%s' og tryk retur\n"
 
 #. Trick for getting a translation from apt
 #: ../apt/progress/text.py:216
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
+msgstr "Hentede %sB på %s (%sB/s)\n"
 
 #: ../apt/progress/text.py:229
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'"
 
 #: ../apt/progress/text.py:241
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Indsæt en disk i drevet og tryk retur"
 
 #: ../apt/cache.py:96
 msgid "Building data structures"
-msgstr ""
+msgstr "Opbygger datastrukturer"
+
+
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7f95b222..fb350b10 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,14 +1,16 @@
-# Portuguese Brazilian translation for update-manager
+# Brazilian Portuguese translation for python-apt.
 # This file is distributed under the same licence as the update-manager package.
+# Sérgio Cipolla <secipolla@gmail.com>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2010-08-19 17:13-0300\n"
+"POT-Creation-Date: 2011-05-28 13:01-0300\n"
+"PO-Revision-Date: 2011-05-28 13:25-0300\n"
 "Last-Translator: Sérgio Cipolla <secipolla@gmail.com>\n"
-"Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n"
+"Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,247 +26,297 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:13
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD-ROM com o Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:43
+msgid "Canonical Partners"
+msgstr "Parceiros da Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:45
+msgid "Software packaged by Canonical for their partners"
+msgstr "Aplicativos empacotados pela Canonical para os seus parceiros"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:46
+msgid "This software is not part of Ubuntu."
+msgstr "Estes aplicativos não são parte do Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:53
+msgid "Independent"
+msgstr "Independentes"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:55
+msgid "Provided by third-party software developers"
+msgstr "Fornecidos por desenvolvedores de software terceiros"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:56
+msgid "Software offered by third party developers."
+msgstr "Aplicativos oferecidos por desenvolvedores terceiros."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:94
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:112
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD-ROM com o Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:155
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:173
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD-ROM com o Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:216
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:234
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD-ROM com o Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:277
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:295
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD-ROM com o Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:339
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD-ROM com o Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:402
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD-ROM com o Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:465
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:483
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD-ROM com o Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:525
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Community-maintained"
 msgstr "Mantido pela comunidade"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:536
 msgid "Restricted software"
 msgstr "Aplicativos restritos"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:543
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD-ROM com o Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:585
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:588
 msgid "Canonical-supported Open Source software"
-msgstr "Aplicativo de Código Aberto suportado pela Canonical"
+msgstr "Aplicativo de código aberto suportado pela Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:590
 msgid "Community-maintained (universe)"
 msgstr "Mantido pela comunidade (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:591
 msgid "Community-maintained Open Source software"
-msgstr "Aplicativo de Código Aberto mantido pela comunidade"
+msgstr "Aplicativo de código aberto mantido pela comunidade"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:593
 msgid "Non-free drivers"
 msgstr "Drivers não-livres"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:594
 msgid "Proprietary drivers for devices"
 msgstr "Drivers proprietários para dispositivos"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:596
 msgid "Restricted software (Multiverse)"
 msgstr "Aplicativos restritos (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:597
 msgid "Software restricted by copyright or legal issues"
 msgstr "Aplicativos restritos por copyright ou questões legais"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:603
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "CD-ROM com o Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:619
 msgid "Important security updates"
 msgstr "Atualizações de segurança importantes"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:624
 msgid "Recommended updates"
 msgstr "Atualizações recomendadas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:629
 msgid "Pre-released updates"
 msgstr "Atualizações de pré-lançamento"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:634
 msgid "Unsupported updates"
 msgstr "Atualizações não suportadas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:645
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:659
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD-ROM com o Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:675
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Atualizações de segurança do Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:680
 msgid "Ubuntu 5.10 Updates"
 msgstr "Atualizações do Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:685
 msgid "Ubuntu 5.10 Backports"
 msgstr "Backports do Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:696
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:710
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD-ROM com o Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521
-#: ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:713
+#: ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Suportados oficialmente"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:726
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Atualizações de segurança do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:731
 msgid "Ubuntu 5.04 Updates"
 msgstr "Atualizações do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:736
 msgid "Ubuntu 5.04 Backports"
 msgstr "Backports do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:742
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:748
 msgid "Community-maintained (Universe)"
 msgstr "Mantido pela comunidade (universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:750
 msgid "Non-free (Multiverse)"
 msgstr "Não-livres (multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:756
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD-ROM com o Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:759
 msgid "No longer officially supported"
 msgstr "Não mais suportado oficialmente"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:761
 msgid "Restricted copyright"
 msgstr "Copyright restrito"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:768
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Atualizações de segurança do Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:773
 msgid "Ubuntu 4.10 Updates"
 msgstr "Atualizações do Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:778
 msgid "Ubuntu 4.10 Backports"
 msgstr "Backports do Ubuntu 4.10"
 
@@ -315,23 +367,23 @@ msgid "Debian testing"
 msgstr "Debian testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian 'Sid' (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Aplicativos compatíveis com a DFSG mas com dependências não-livres"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Aplicativos não compatíveis com a DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208
-#: ../aptsources/distro.py:423
+#: ../aptsources/distro.py:209
+#: ../aptsources/distro.py:427
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor - %s"
@@ -339,50 +391,52 @@ msgstr "Servidor - %s"
 #. More than one server is used. Since we don't handle this case
 #. in the user interface we set "custom servers" to true and
 #. append a list of all used servers
-#: ../aptsources/distro.py:226
-#: ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
+#: ../aptsources/distro.py:227
+#: ../aptsources/distro.py:233
+#: ../aptsources/distro.py:249
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:253
 msgid "Custom servers"
 msgstr "Servidores personalizados"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:260
+#: ../apt/progress/gtk2.py:316
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Baixando arquivo %(current)li de %(total)li a %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:266
+#: ../apt/progress/gtk2.py:322
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Baixando arquivo %(current)li de %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:342
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:430
 msgid "Starting..."
 msgstr "Iniciando..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:436
 msgid "Complete"
 msgstr "Completo"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:358
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr "Unicode inválido na descrição de '%s' (%s). Por favor, relate o erro."
 
-#: ../apt/package.py:937
-#: ../apt/package.py:1043
+#: ../apt/package.py:1065
+#: ../apt/package.py:1171
 msgid "The list of changes is not available"
 msgstr "A lista de alterações não está disponível"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1177
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -395,7 +449,7 @@ msgstr ""
 "Por favor, utilize http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "até que as alterações estejam disponíveis ou tente novamente mais tarde."
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1184
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -403,80 +457,112 @@ msgstr ""
 "Falha ao baixar a lista de alterações. \n"
 "Por favor verifique sua conexão com a Internet."
 
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Este não é um arquivo DEB válido, membro '%s' faltando"
-
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:82
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of files for '%s' could not be read"
 msgstr "A lista de arquivos de '%s' não pôde ser lida"
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:167
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr "A dependência não é contentável: %s\n"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:188
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr "Conflita com o pacote instalado '%s'"
 
-#: ../apt/debfile.py:319
+#. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation
+#: ../apt/debfile.py:327
+#, python-format
+msgid "Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)s %(depversion)s)"
+msgstr "Quebra o pacote existente '%(pkgname)s', dependência %(depname)s (%(deprelation)s %(depversion)s)"
+
+#. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation
+#: ../apt/debfile.py:343
+#, python-format
+msgid "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s %(targetver)s)"
+msgstr "Quebra o pacote existente '%(pkgname)s', conflito: %(targetpkg)s (%(comptype)s %(targetver)s)"
+
+#: ../apt/debfile.py:353
+#, python-format
+msgid "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But the '%(debfile)s' provides it via: '%(provides)s'"
+msgstr "Quebra o pacote existente '%(pkgname)s' que conflita com '%(targetpkg)s'. Mas '%(debfile)s' o provê via '%(provides)s'"
+
+#: ../apt/debfile.py:399
+msgid "No Architecture field in the package"
+msgstr "Sem campo de arquitetura no pacote"
+
+#: ../apt/debfile.py:404
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr "Arquitetura incorreta '%s'"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:411
 msgid "A later version is already installed"
 msgstr "Uma versão mais atual já está instalada"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:436
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr "Falha na satisfação de todas as dependências (cache quebrado)"
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:466
 #, python-format
 msgid "Cannot install '%s'"
 msgstr "Incapaz de instalar '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:508
+msgid "Python-debian module not available"
+msgstr "Módulo python-debian não disponível"
+
+#: ../apt/debfile.py:542
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Descompactado automaticamente:\n"
+"\n"
+
+#: ../apt/debfile.py:548
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Convertido automaticamente para ascii imprimível:\n"
+
+#: ../apt/debfile.py:638
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr "Instalar Dependências-Construtivas para o pacote fonte '%s' que constrói %s\n"
+msgstr "Instalar dependências construtivas para o pacote fonte '%s' que constrói %s\n"
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:648
 msgid "An essential package would be removed"
 msgstr "Um pacote essencial teria de ser removido"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr "%c%s... Feito"
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
-msgstr "Atingido"
+msgstr "Atingido "
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
-msgstr "Ignorado"
+msgstr "Ignorando "
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
-msgstr "Erro"
+msgstr "Erro "
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr "Obter:"
+msgstr "Obtendo:"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr " [Trabalhando]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -488,20 +574,32 @@ msgstr ""
 "no drive '%s' e tecle Enter\n"
 
 #. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
+#: ../apt/progress/text.py:223
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Obtidos %sB em %s (%sB/s)\n"
 
-#: ../apt/progress/text.py:229
+#: ../apt/progress/text.py:239
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr "Por favor, forneça um nome para este disco, como 'Debian 2.1r1 Disco 1'"
+msgstr "Por favor, forneça um nome para este disco, como 'Debian 6.0.1 Disco 1'"
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Por favor, insira um disco no drive e tecle Enter"
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:149
 msgid "Building data structures"
 msgstr "Construindo estruturas de dados"
 
+#. std::cout << "something is wrong!" << std::endl;
+#: ../python/depcache.cc:136
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Falha ao buscar %s,  %s\n"
+
+#: ../python/depcache.cc:143
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing e troca de mídia não são suportados atualmente"
+
+#~ msgid "This is not a valid DEB archive, missing '%s' member"
+#~ msgstr "Este não é um arquivo DEB válido, membro '%s' faltando"
diff --git a/po/python-apt.pot b/po/python-apt.pot
index 78f1fd11..8772e88b 100644
--- a/po/python-apt.pot
+++ b/po/python-apt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-01 09:30+0200\n"
+"POT-Creation-Date: 2011-12-01 13:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,317 +24,327 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:32
+#: ../data/templates/Ubuntu.info.in:33
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:40
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:151
 msgid "Ubuntu 11.10 'Oneiric Ocelot'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:39
+#: ../data/templates/Ubuntu.info.in:158
 msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:150
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Ubuntu 11.04 'Natty Narwhal'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:157
+#: ../data/templates/Ubuntu.info.in:277
 msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Ubuntu 10.10 'Maverick Meerkat'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:267
+#: ../data/templates/Ubuntu.info.in:388
 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:279
+#: ../data/templates/Ubuntu.info.in:400
 msgid "Canonical Partners"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:281
+#: ../data/templates/Ubuntu.info.in:402
 msgid "Software packaged by Canonical for their partners"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:282
+#: ../data/templates/Ubuntu.info.in:403
 msgid "This software is not part of Ubuntu."
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:289
+#: ../data/templates/Ubuntu.info.in:410
 msgid "Independent"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:291
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Provided by third-party software developers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:292
+#: ../data/templates/Ubuntu.info.in:413
 msgid "Software offered by third party developers."
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:330
+#: ../data/templates/Ubuntu.info.in:451
 msgid "Ubuntu 10.04 'Lucid Lynx'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:349
+#: ../data/templates/Ubuntu.info.in:471
 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:392
+#: ../data/templates/Ubuntu.info.in:514
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:411
+#: ../data/templates/Ubuntu.info.in:534
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:473
+#: ../data/templates/Ubuntu.info.in:596
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:516
+#: ../data/templates/Ubuntu.info.in:639
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:659
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:579
+#: ../data/templates/Ubuntu.info.in:703
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:598
+#: ../data/templates/Ubuntu.info.in:723
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:643
+#: ../data/templates/Ubuntu.info.in:768
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:662
+#: ../data/templates/Ubuntu.info.in:787
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:707
+#: ../data/templates/Ubuntu.info.in:832
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:726
+#: ../data/templates/Ubuntu.info.in:851
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:768
+#: ../data/templates/Ubuntu.info.in:893
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:773
+#: ../data/templates/Ubuntu.info.in:898
 msgid "Community-maintained"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:779
+#: ../data/templates/Ubuntu.info.in:904
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:787
+#: ../data/templates/Ubuntu.info.in:912
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:829
+#: ../data/templates/Ubuntu.info.in:954
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:832
-msgid "Canonical-supported Open Source software"
+#: ../data/templates/Ubuntu.info.in:957
+msgid "Canonical-supported free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:834
+#: ../data/templates/Ubuntu.info.in:959
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:835
-msgid "Community-maintained Open Source software"
+#: ../data/templates/Ubuntu.info.in:960
+msgid "Community-maintained free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:837
+#: ../data/templates/Ubuntu.info.in:962
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:838
+#: ../data/templates/Ubuntu.info.in:963
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:840
+#: ../data/templates/Ubuntu.info.in:965
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:841
+#: ../data/templates/Ubuntu.info.in:966
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:848
+#: ../data/templates/Ubuntu.info.in:973
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:864
+#: ../data/templates/Ubuntu.info.in:989
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:869
+#: ../data/templates/Ubuntu.info.in:994
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:874
+#: ../data/templates/Ubuntu.info.in:999
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:879
+#: ../data/templates/Ubuntu.info.in:1004
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:890
+#: ../data/templates/Ubuntu.info.in:1015
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:905
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:921
+#: ../data/templates/Ubuntu.info.in:1046
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:926
+#: ../data/templates/Ubuntu.info.in:1051
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:931
+#: ../data/templates/Ubuntu.info.in:1056
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:942
+#: ../data/templates/Ubuntu.info.in:1067
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:957
+#: ../data/templates/Ubuntu.info.in:1082
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:960 ../data/templates/Debian.info.in:149
+#: ../data/templates/Ubuntu.info.in:1085 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:973
+#: ../data/templates/Ubuntu.info.in:1098
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:978
+#: ../data/templates/Ubuntu.info.in:1103
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:983
+#: ../data/templates/Ubuntu.info.in:1108
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:989
+#: ../data/templates/Ubuntu.info.in:1114
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:995
+#: ../data/templates/Ubuntu.info.in:1120
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:997
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1004
+#: ../data/templates/Ubuntu.info.in:1129
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1007
+#: ../data/templates/Ubuntu.info.in:1132
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1009
+#: ../data/templates/Ubuntu.info.in:1134
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1016
+#: ../data/templates/Ubuntu.info.in:1141
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1021
+#: ../data/templates/Ubuntu.info.in:1146
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1026
+#: ../data/templates/Ubuntu.info.in:1151
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -400,7 +410,7 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:210 ../aptsources/distro.py:428
+#: ../aptsources/distro.py:210 ../aptsources/distro.py:438
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -417,39 +427,39 @@ msgstr ""
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:260 ../apt/progress/gtk2.py:316
+#: ../apt/progress/gtk2.py:261 ../apt/progress/gtk2.py:317
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:266 ../apt/progress/gtk2.py:322
+#: ../apt/progress/gtk2.py:267 ../apt/progress/gtk2.py:323
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:342
+#: ../apt/progress/gtk2.py:343
 msgid "Details"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:430
+#: ../apt/progress/gtk2.py:431
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:436
+#: ../apt/progress/gtk2.py:437
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:358
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:1065 ../apt/package.py:1171
+#: ../apt/package.py:1074 ../apt/package.py:1180
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../apt/package.py:1177
+#: ../apt/package.py:1186
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -458,29 +468,29 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1184
+#: ../apt/package.py:1193
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
 
-#: ../apt/debfile.py:82
+#: ../apt/debfile.py:84
 #, python-format
 msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:167
+#: ../apt/debfile.py:169
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:188
+#: ../apt/debfile.py:190
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
 #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation
-#: ../apt/debfile.py:327
+#: ../apt/debfile.py:329
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' dependency %(depname)s "
@@ -488,63 +498,63 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation
-#: ../apt/debfile.py:343
+#: ../apt/debfile.py:345
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
 "%(targetver)s)"
 msgstr ""
 
-#: ../apt/debfile.py:353
+#: ../apt/debfile.py:355
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
 "the '%(debfile)s' provides it via: '%(provides)s'"
 msgstr ""
 
-#: ../apt/debfile.py:399
+#: ../apt/debfile.py:403
 msgid "No Architecture field in the package"
 msgstr ""
 
-#: ../apt/debfile.py:404
+#: ../apt/debfile.py:408
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:411
+#: ../apt/debfile.py:415
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:436
+#: ../apt/debfile.py:440
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:466
+#: ../apt/debfile.py:470
 #, python-format
 msgid "Cannot install '%s'"
 msgstr ""
 
-#: ../apt/debfile.py:508
+#: ../apt/debfile.py:514
 msgid "Python-debian module not available"
 msgstr ""
 
-#: ../apt/debfile.py:542
+#: ../apt/debfile.py:557
 msgid ""
 "Automatically decompressed:\n"
 "\n"
 msgstr ""
 
-#: ../apt/debfile.py:548
+#: ../apt/debfile.py:563
 msgid "Automatically converted to printable ascii:\n"
 msgstr ""
 
-#: ../apt/debfile.py:638
+#: ../apt/debfile.py:653
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:648
+#: ../apt/debfile.py:664
 msgid "An essential package would be removed"
 msgstr ""
 
@@ -595,6 +605,6 @@ msgstr ""
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:149
+#: ../apt/cache.py:158
 msgid "Building data structures"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 905c0041..c99341a4 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-07-19 15:59+0200\n"
 "PO-Revision-Date: 2006-10-16 04:17+0000\n"
-"Last-Translator: Vladimir Samardzic <vladosam@hotmail.com>\n"
+"Last-Translator: Nikola Nenadic <nikola.nenadic@gmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,319 +22,319 @@ msgstr ""
 #: ../data/templates/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:13
 msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
+msgstr "Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:31
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:74
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
+msgstr "Ubuntu 9.04 'Jaunty Jackalope"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:92
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 9.04 'Jaunty Jackalope"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:135
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
+msgstr "Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:153
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:197
 msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
+msgstr "Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
+msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
+msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
-msgstr ""
+msgstr "Одржаван од стране заједнице"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
-msgstr ""
+msgstr "Ограничени софтвер"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
-msgstr ""
+msgstr "Canonical-подржава софтвер отвореног кода"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
-msgstr ""
+msgstr "Одржаван од стране заједнице"
 
 #. CompDescriptionLong
 #: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
-msgstr ""
+msgstr "Заједница урећује софтвер отвореног кода"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
-msgstr ""
+msgstr "Не слободни драјвери"
 
 #. CompDescriptionLong
 #: ../data/templates/Ubuntu.info.in:418
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Власнички драјвери за уређаје"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
-msgstr ""
+msgstr "Ограничени софтвер"
 
 #. CompDescriptionLong
 #: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
-msgstr ""
+msgstr "Софтвер ограничен ауторским правом или правним регулативама"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
-msgstr ""
+msgstr "Важне сигурносне исправке"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
-msgstr ""
+msgstr "Препоручено ажурирање"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
-msgstr ""
+msgstr "Унапријед објављене исправке"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
-msgstr ""
+msgstr "Некомпитабилна ажурирања"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 сигурносне исправке"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 исправке"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 Backports"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
-msgstr ""
+msgstr "Званично подржани"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
+msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
-msgstr ""
+msgstr "Ubuntu 5.04 Исправке"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
-msgstr ""
+msgstr "Ubuntu 5.04 Backports"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Ubuntu 4.10 'Warty Warthog"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
-msgstr ""
+msgstr "Одржаван од стране заједнице"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
-msgstr ""
+msgstr "Не слободни драјвери"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
-msgstr ""
+msgstr "Званично није више подржано"
 
 #. CompDescription
 #: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
-msgstr ""
+msgstr "Ограничена права"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
+msgstr "Ubuntu 4.10 сигурносне исправке"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
-msgstr ""
+msgstr "Ubuntu 4.10 Исправке"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
-msgstr ""
+msgstr "Ubuntu 4.10 Backports"
 
 #. ChangelogURI
 #: ../data/templates/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
+msgid "Debian 6.0 'Squeeze'"
+msgstr "Debian 6.0 'Squeeze'"
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
+msgid "Debian 5.0 'Lenny'"
+msgstr "Debian 5.0 'Lenny'"
 
 #. Description
 #: ../data/templates/Debian.info.in:58
 msgid "Debian 4.0 'Etch'"
-msgstr ""
+msgstr "Debian 4.0 'Etch'"
 
 #. Description
 #: ../data/templates/Debian.info.in:83
 msgid "Debian 3.1 'Sarge'"
-msgstr ""
+msgstr "Debian 3.1 'Sarge'"
 
 #. Description
 #: ../data/templates/Debian.info.in:94
 msgid "Proposed updates"
-msgstr ""
+msgstr "Предложене исправке (ажурирања)"
 
 #. Description
 #: ../data/templates/Debian.info.in:101
 msgid "Security updates"
-msgstr ""
+msgstr "Сигурносне исправке"
 
 #. Description
 #: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Дебиан-тренутно стабилно издање"
 
 #. Description
 #: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
-msgstr ""
+msgstr "Дебиан-тестирање"
 
 #. Description
 #: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
-msgstr ""
+msgstr "Debian 'Sid' (нестабилно)"
 
 #. CompDescription
 #: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "DFSG-компитабилан са не слободним софтвером"
 
 #. CompDescription
 #: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Непостоји-DFSG компитабилног софтвера"
 
 #. TRANSLATORS: %s is a country
 #: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Сервер за %s"
 
 #. More than one server is used. Since we don't handle this case
 #. in the user interface we set "custom servers" to true and
@@ -342,21 +342,21 @@ msgstr ""
 #: ../aptsources/distro.py:226 ../aptsources/distro.py:232
 #: ../aptsources/distro.py:248
 msgid "Main server"
-msgstr ""
+msgstr "Главни сервер"
 
 #: ../aptsources/distro.py:252
 msgid "Custom servers"
-msgstr ""
+msgstr "Прилагођени сервер"
 
 #: ../apt/progress/gtk2.py:259
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
+msgstr "Преужимам фајл %(current)li од %(total)li са %(speed)s/s"
 
 #: ../apt/progress/gtk2.py:265
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
+msgstr "Преужимам фајл %(current)li од %(total)li"
 
 #. Setup some child widgets
 #: ../apt/progress/gtk2.py:285
@@ -365,20 +365,20 @@ msgstr "Детаљи"
 
 #: ../apt/progress/gtk2.py:367
 msgid "Starting..."
-msgstr ""
+msgstr "Покретање..."
 
 #: ../apt/progress/gtk2.py:373
 msgid "Complete"
-msgstr ""
+msgstr "Крај"
 
 #: ../apt/package.py:301
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
+msgstr "Неважећи unicode у опису за '%s' (%s). Молим извјештај"
 
 #: ../apt/package.py:937 ../apt/package.py:1043
 msgid "The list of changes is not available"
-msgstr ""
+msgstr "Листа промјена није доступна"
 
 #: ../apt/package.py:1047
 #, python-format
@@ -388,85 +388,91 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"Листа промјена није још доступна.\n"
+"Молимо искористите http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"док промјене не постану доступне или покушајте поново касније."
+
 
 #: ../apt/package.py:1053
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
+"Преузиманје листе промјена неуспјешно. \n"
+"Молимо провјерите своју конекцију са интернетом."
 
 #: ../apt/debfile.py:56
 #, python-format
 msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgstr "Ово није валидна DEB архива, недостаје '% с' члан"
 
 #: ../apt/debfile.py:81
 #, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Листа фајлова за '%s' не може да се прочита"
 
 #: ../apt/debfile.py:149
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Зависнот није задовољена: %s\n"
 
 #: ../apt/debfile.py:173
 #, python-format
 msgid "Conflicts with the installed package '%s'"
-msgstr ""
+msgstr "Сукоби међу инсталираним пакетима"
 
 #: ../apt/debfile.py:319
 #, python-format
 msgid "Wrong architecture '%s'"
-msgstr ""
+msgstr "Погрешна архитектура '%s'"
 
 #. the deb is older than the installed
 #: ../apt/debfile.py:325
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Новија верзија је већ инсталирана"
 
 #: ../apt/debfile.py:345
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Није успео да задовољи све зависности (грешка у кешу)"
 
 #: ../apt/debfile.py:376
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
-msgstr "Инсталирај %s"
+msgstr "Не могу да се инсталирају %s"
 
 #: ../apt/debfile.py:484
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
+msgstr "Инсталирајте Build-Dependencies за кодни пакет '%s' који гради %s\n"
 
 #: ../apt/debfile.py:494
 msgid "An essential package would be removed"
-msgstr ""
+msgstr "Битан пакет би био уклоњен"
 
 #: ../apt/progress/text.py:81
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Крај"
 
 #: ../apt/progress/text.py:118
 msgid "Hit "
-msgstr ""
+msgstr "Погодак"
 
 #: ../apt/progress/text.py:126
 msgid "Ign "
-msgstr ""
+msgstr "Игнорисано"
 
 #: ../apt/progress/text.py:128
 msgid "Err "
-msgstr ""
+msgstr "Грешка"
 
 #: ../apt/progress/text.py:138
 msgid "Get:"
-msgstr ""
+msgstr "УзимамЧ"
 
 #: ../apt/progress/text.py:198
 msgid " [Working]"
-msgstr ""
+msgstr "[Радим]"
 
 #: ../apt/progress/text.py:208
 #, python-format
@@ -475,21 +481,23 @@ msgid ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Молимо вас да убаците означени диск\n "
+"у оптички диск '%s' и притиснете enter\n"
 
 #. Trick for getting a translation from apt
 #: ../apt/progress/text.py:216
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
+msgstr "Преузето %sB in %s (%sB/s)\n"
 
 #: ../apt/progress/text.py:229
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Молимо обезбједите име за диск, као нпр. 'Debian 2.1r1 Disk 1'"
 
 #: ../apt/progress/text.py:241
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Молимо Вас да убаците диск у оптички уређај и притиснете enter"
 
 #: ../apt/cache.py:96
 msgid "Building data structures"
-msgstr ""
+msgstr "Изградња структуре података"
diff --git a/pre-build.sh b/pre-build.sh
index a150272d..026a491e 100755
--- a/pre-build.sh
+++ b/pre-build.sh
@@ -7,5 +7,5 @@ if [ -n "$https_proxy" ]; then
 fi
 utils/get_ubuntu_mirrors_from_lp.py > data/templates/Ubuntu.mirrors
 
-#echo "updating Debian mirror list"
-#utils/get_debian_mirrors.py > data/templates/Debian.mirrors
+echo "updating Debian mirror list"
+utils/get_debian_mirrors.py > data/templates/Debian.mirrors
diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index e8490b4e..acfdf019 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -25,6 +25,8 @@
 #include <apt-pkg/init.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/orderlist.h>
+#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/fileutl.h>
 
 #include <sys/stat.h>
 #include <libintl.h>
@@ -184,11 +186,11 @@ static const char *parse_src_depends_doc =
 "only contains those dependencies for the architecture set in the\n"
 "configuration variable APT::Architecture";
 static PyObject *RealParseDepends(PyObject *Self,PyObject *Args,
-                                  bool ParseArchFlags, string name,
+                                  bool ParseArchFlags, std::string name,
                                   bool debStyle=false)
 {
-   string Package;
-   string Version;
+   std::string Package;
+   std::string Version;
    unsigned int Op;
    bool StripMultiArch=true;
 
@@ -393,6 +395,30 @@ static PyObject *sha256sum(PyObject *Self,PyObject *Args)
    return 0;
 }
 									/*}}}*/
+// get_architectures - return the list of architectures			/*{{{*/
+// ---------------------------------------------------------------------
+static const char *doc_GetArchitectures =
+    "get_architectures() -> list\n\n"
+    "Return the list of supported architectures on this system. On a \n"
+    "multiarch system this can be more than one. The main architectures\n"
+    "is the first item in the list.";;
+static PyObject *GetArchitectures(PyObject *Self,PyObject *Args)
+{
+   PyObject *Obj;
+   if (PyArg_ParseTuple(Args,"",&Obj) == 0)
+      return 0;
+
+   PyObject *List = PyList_New(0);
+   std::vector<std::string> arches = APT::Configuration::getArchitectures();
+   std::vector<std::string>::const_iterator I;
+   for (I = arches.begin(); I != arches.end(); I++) 
+   {
+      PyList_Append(List, CppPyString(*I));
+   }
+
+   return List;
+}
+									/*}}}*/
 // init - 3 init functions						/*{{{*/
 // ---------------------------------------------------------------------
 static char *doc_Init =
@@ -539,6 +565,9 @@ static PyMethodDef methods[] =
    {"sha1sum",sha1sum,METH_VARARGS,doc_sha1sum},
    {"sha256sum",sha256sum,METH_VARARGS,doc_sha256sum},
 
+   // multiarch
+   {"get_architectures", GetArchitectures, METH_VARARGS, doc_GetArchitectures},
+
    // Strings
    {"check_domain_list",StrCheckDomainList,METH_VARARGS,
     "check_domain_list(host: str, domains: str) -> bool\n\n"
diff --git a/python/apt_pkgmodule.h b/python/apt_pkgmodule.h
index b3534a30..85c34130 100644
--- a/python/apt_pkgmodule.h
+++ b/python/apt_pkgmodule.h
@@ -24,6 +24,7 @@
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/cdrom.h>
 #include <apt-pkg/algorithms.h>
+#include <apt-pkg/metaindex.h>
 #include "generic.h"
 
 // Configuration Stuff
diff --git a/python/arfile.cc b/python/arfile.cc
index c31ea35e..44cd3c82 100644
--- a/python/arfile.cc
+++ b/python/arfile.cc
@@ -204,7 +204,7 @@ static PyObject *_extract(FileFd &Fd, const ARArchive::Member *member,
     if (!Fd.Seek(member->Start))
         return HandleErrors();
 
-    string outfile_str = flCombine(dir,member->Name);
+    std::string outfile_str = flCombine(dir,member->Name);
     char *outfile = (char*)outfile_str.c_str();
 
     // We are not using FileFd here, because we want to raise OSErrror with
@@ -539,8 +539,8 @@ static PyObject *debfile_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     for (std::vector<std::string>::const_iterator t = types.begin(); 
          t != types.end(); ++t) 
     {
-       string member = string("data.tar.").append(*t);
-       string comp = _config->Find(string("Acquire::CompressionTypes::").append(*t));
+       std::string member = std::string("data.tar.").append(*t);
+       std::string comp = _config->Find(std::string("Acquire::CompressionTypes::").append(*t));
        self->data = _gettar(self, self->Object->FindMember(member.c_str()),
                             comp.c_str());
        if (self->data)
@@ -548,7 +548,7 @@ static PyObject *debfile_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     }
     // no data found, we need to 
     if (!self->data) {
-       string error;
+       std::string error;
        for (std::vector<std::string>::const_iterator t = types.begin(); 
             t != types.end(); ++t) 
           error.append(*t + ",");
diff --git a/python/cdrom.cc b/python/cdrom.cc
index 6ac16d59..46bb769c 100644
--- a/python/cdrom.cc
+++ b/python/cdrom.cc
@@ -67,7 +67,7 @@ static PyObject *cdrom_ident(PyObject *Self,PyObject *Args)
     PyCdromProgress progress;
     progress.setCallbackInst(pyCdromProgressInst);
 
-    string ident;
+    std::string ident;
     bool res = Cdrom.Ident(ident, &progress);
 
     if (res)
@@ -94,7 +94,7 @@ static PyObject *cdrom_ident_old(PyObject *Self,PyObject *Args)
     PyCdromProgress progress;
     progress.setCallbackInst(pyCdromProgressInst);
 
-    string ident;
+    std::string ident;
     bool res = Cdrom.Ident(ident, &progress);
 
     PyObject *boolres = PyBool_FromLong(res);
diff --git a/python/configuration.cc b/python/configuration.cc
index 9000f71f..3e634901 100644
--- a/python/configuration.cc
+++ b/python/configuration.cc
@@ -262,7 +262,7 @@ static PyObject *CnfDump(PyObject *Self,PyObject *Args)
    if (PyArg_ParseTuple(Args,"") == 0)
       return 0;
 
-   stringstream ss;
+   std::stringstream ss;
    GetSelf(Self).Dump(ss);
    return CppPyString(ss.str());
 }
diff --git a/python/depcache.cc b/python/depcache.cc
index e6113429..73993c82 100644
--- a/python/depcache.cc
+++ b/python/depcache.cc
@@ -22,6 +22,7 @@
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/acquire-item.h>
+#include <apt-pkg/fileutl.h>
 #include <Python.h>
 
 #include <iostream>
diff --git a/python/lock.cc b/python/lock.cc
index 2c957df1..38a2bc74 100644
--- a/python/lock.cc
+++ b/python/lock.cc
@@ -21,6 +21,8 @@
 #include <Python.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/pkgsystem.h>
 #include "generic.h"
 
 static PyObject *systemlock_exit(PyObject *self, PyObject *args)
diff --git a/python/metaindex.cc b/python/metaindex.cc
index a00cf04e..9e330d3d 100644
--- a/python/metaindex.cc
+++ b/python/metaindex.cc
@@ -33,8 +33,8 @@ static PyObject *MetaIndexGetIsTrusted(PyObject *Self,void*) {
 static PyObject *MetaIndexGetIndexFiles(PyObject *Self,void*) {
     metaIndex *meta = GetCpp<metaIndex*>(Self);
     PyObject *List = PyList_New(0);
-    vector<pkgIndexFile *> *indexFiles = meta->GetIndexFiles();
-    for (vector<pkgIndexFile *>::const_iterator I = indexFiles->begin();
+    std::vector<pkgIndexFile *> *indexFiles = meta->GetIndexFiles();
+    for (std::vector<pkgIndexFile *>::const_iterator I = indexFiles->begin();
         I != indexFiles->end(); I++)
     {
         CppPyObject<pkgIndexFile*> *Obj;
diff --git a/python/progress.cc b/python/progress.cc
index bd3c2ad6..a7fd7ae1 100644
--- a/python/progress.cc
+++ b/python/progress.cc
@@ -127,7 +127,7 @@ PyObject *PyFetchProgress::GetDesc(pkgAcquire::ItemDesc *item) {
     return pyDesc;
 }
 
-bool PyFetchProgress::MediaChange(string Media, string Drive)
+bool PyFetchProgress::MediaChange(std::string Media, std::string Drive)
 {
    PyCbObj_END_ALLOW_THREADS
    //std::cout << "MediaChange" << std::endl;
@@ -485,7 +485,7 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm)
       PyObject *v = PyObject_GetAttrString(callbackInst, "writefd");
       if(v) {
 	 int fd = PyObject_AsFileDescriptor(v);
-	 cout << "got fd: " << fd << endl;
+         std::cout << "got fd: " << fd << std::endl;
 	 res = pm->DoInstall(fd);
       } else {
 	 res = pm->DoInstall();
@@ -542,7 +542,7 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm)
 //-----------------------------------------------------------------------------
 // apt-cdrom interface
 
-void PyCdromProgress::Update(string text, int current)
+void PyCdromProgress::Update(std::string text, int current)
 {
    PyObject *arglist = Py_BuildValue("(si)", text.c_str(), current);
    setattr(callbackInst, "total_steps", "i", totalSteps);
@@ -569,7 +569,7 @@ bool PyCdromProgress::ChangeCdrom()
 }
 
 
-bool PyCdromProgress::AskCdromName(string &Name)
+bool PyCdromProgress::AskCdromName(std::string &Name)
 {
    PyObject *arglist = Py_BuildValue("()");
    const char *new_name;
@@ -582,7 +582,7 @@ bool PyCdromProgress::AskCdromName(string &Name)
       if(!PyArg_Parse(result, "(bs)", &res, &new_name))
          std::cerr << "AskCdromName: result could not be parsed" << std::endl;
       // set the new name
-      Name = string(new_name);
+      Name =std:: string(new_name);
       return res;
    }
    // New style: String on success, None on failure.
@@ -593,7 +593,7 @@ bool PyCdromProgress::AskCdromName(string &Name)
         if(!PyArg_Parse(result, "s", &new_name))
             std::cerr << "ask_cdrom_name: result could not be parsed" << std::endl;
         else
-            Name = string(new_name);
-            return true;
+           Name = std::string(new_name);
+        return true;
   }
 }
diff --git a/python/progress.h b/python/progress.h
index 4e66c771..af8e3acc 100644
--- a/python/progress.h
+++ b/python/progress.h
@@ -72,7 +72,7 @@ struct PyFetchProgress : public pkgAcquireStatus, public PyCallbackObj
 
    void UpdateStatus(pkgAcquire::ItemDesc & Itm, int status);
 
-   virtual bool MediaChange(string Media, string Drive);
+   virtual bool MediaChange(std::string Media, std::string Drive);
 
    void setPyAcquire(PyObject *o) {
       Py_CLEAR(pyAcquire);
@@ -107,11 +107,11 @@ struct PyInstallProgress : public PyCallbackObj
 struct PyCdromProgress : public pkgCdromStatus, public PyCallbackObj
 {
    // update steps, will be called regularly as a "pulse"
-   virtual void Update(string text="", int current=0);
+   virtual void Update(std::string text="", int current=0);
    // ask for cdrom insert
    virtual bool ChangeCdrom();
    // ask for cdrom name
-   virtual bool AskCdromName(string &Name);
+   virtual bool AskCdromName(std::string &Name);
 
    PyCdromProgress() : PyCallbackObj() {};
 };
diff --git a/python/tag.cc b/python/tag.cc
index 94554400..3996af8e 100644
--- a/python/tag.cc
+++ b/python/tag.cc
@@ -26,6 +26,7 @@
 #include "apt_pkgmodule.h"
 
 #include <apt-pkg/tagfile.h>
+#include <apt-pkg/fileutl.h>
 
 #include <stdio.h>
 #include <iostream>
diff --git a/python/tarfile.cc b/python/tarfile.cc
index cdfe0a7c..bd903b57 100644
--- a/python/tarfile.cc
+++ b/python/tarfile.cc
@@ -348,7 +348,7 @@ static const char *tarfile_extractall_doc =
     "can be used to change the target directory.";
 static PyObject *tarfile_extractall(PyObject *self, PyObject *args)
 {
-    string cwd = SafeGetCWD();
+    std::string cwd = SafeGetCWD();
     char *rootdir = 0;
     if (PyArg_ParseTuple(args,"|s:extractall",&rootdir) == 0)
         return 0;
diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py
index db68ec63..6ec04ed5 100644
--- a/tests/test_apt_cache.py
+++ b/tests/test_apt_cache.py
@@ -55,8 +55,8 @@ class TestAptCache(unittest.TestCase):
         # that is possible and does not crash
         for pkg in cache:
             if pkg.candidate:
-                for or_dep in pkg.candidate.dependencies:
-                    for dep in or_dep.or_dependencies:
+                for or_deps in pkg.candidate.dependencies:
+                    for dep in or_deps:
                         self.assertTrue(dep.name)
                         self.assertTrue(isinstance(dep.relation, str))
                         self.assertTrue(dep.pre_depend in (True, False))
@@ -181,5 +181,21 @@ class TestAptCache(unittest.TestCase):
         apt_pkg.config.set("dir::etc::sourcelist", old_source_list)
         apt_pkg.config.set("dir::etc::sourceparts", old_source_parts)
 
+    def test_package_cmp(self):
+        cache = apt.Cache(rootdir="/")
+        l = []
+        l.append(cache["libc6"])
+        l.append(cache["xterm"])
+        l.append(cache["apt"])
+        l.sort()
+        self.assertEqual([p.name for p in l],
+                         ["apt", "libc6", "xterm"])
+
+    def test_get_architectures(self):
+        main_arch = apt.apt_pkg.config.get("APT::Architecture")
+        arches = apt_pkg.get_architectures()
+        self.assertTrue(main_arch in arches)
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_debfile.py b/tests/test_debfile.py
index 951c2afe..af04af26 100644
--- a/tests/test_debfile.py
+++ b/tests/test_debfile.py
@@ -87,12 +87,7 @@ class TestDebfilee(unittest.TestCase):
         self.assertEqual(deb["Maintainer"],
                          "Samuel Lidén Borell <samuel@slbdata.se>")
 
-    def testContent(self):
-        # no python-debian for python3 yet, so fail gracefully
-        try:
-            import debian
-        except ImportError:
-            return
+    def test_content(self):
         # normal
         deb = apt.debfile.DebPackage(cache=self.cache)
         deb.open(os.path.join("data", "test_debs", "gdebi-test11.deb"))
@@ -119,6 +114,12 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading
         deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb")
         self.assertEqual(deb.filelist, ["./", "usr/", "usr/bin/"])
 
+    def test_check_exception(self):
+        deb = apt.debfile.DebPackage("./data/test_debs/data-tar-xz.deb")
+        self.assertRaises(AttributeError, lambda: deb.missing_deps)
+        deb.check()
+        deb.missing_deps
+
     def test_no_supported_data_tar(self):
         # ensure that a unknown data.tar.xxx raises a exception
         raised = False
@@ -130,6 +131,16 @@ Description: testpackage for gdebi - contains usr/bin/binary for file reading
 	# we need to support python2.6
         self.assertTrue(raised)
 
+    def test_multiarch_deb(self):
+        if apt_pkg.get_architectures() != ["amd64", "i386"]:
+            logging.warn("skipping test because running on a non-multiarch system")
+            return
+        deb = apt.debfile.DebPackage("./data/test_debs/multiarch-test1_i386.deb")
+        res = deb.check()
+        # FIXME: do something sensible with the multiarch test
+
+
+
 if __name__ == "__main__":
     #logging.basicConfig(level=logging.DEBUG)
     unittest.main()
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 23511f32..26ee0bff 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -7,7 +7,6 @@
 # notice and this notice are preserved.
 
 import sys
-sys.path.insert(0, "..")
 import apt_pkg
 import apt.utils
 import datetime
author	Michael Vogt <michael.vogt@ubuntu.com>	2011-12-08 18:08:06 +0100
committer	Michael Vogt <michael.vogt@ubuntu.com>	2011-12-08 18:08:06 +0100
commit	2b0f6ff05d2c6937c1160c497cfb76b43f11f2db (patch)
tree	a87e2639df12481e2046b835996628b53ec6325c
parent	b0995cca556668a4eced03e40e3edbc7362c2a10 (diff)
parent	350bb4a03d6562ddba12fbb0a34610aac7706b3c (diff)
download	python-apt-2b0f6ff05d2c6937c1160c497cfb76b43f11f2db.tar.gz