merged from the debian-sid tree

129 files changed, 15702 insertions, 15450 deletions

diff --git a/apt/auth.py b/apt/auth.py
new file mode 100644
index 00000000..5d4b1cd6
--- /dev/null
+++ b/apt/auth.py
@@ -0,0 +1,180 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# auth - authentication key management
+#
+#  Copyright (c) 2004 Canonical
+#  Copyright (c) 2012 Sebastian Heinlein
+#
+#  Author: Michael Vogt <mvo@debian.org>
+#          Sebastian Heinlein <devel@glatzor.de>
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+#  USA
+"""Handle GnuPG keys used to trust signed repositories."""
+
+import atexit
+import os
+import os.path
+import subprocess
+import tempfile
+
+import apt_pkg
+from apt_pkg import gettext as _
+
+
+class TrustedKey(object):
+
+    """Represents a trusted key."""
+
+    def __init__(self, name, keyid, date):
+        self.raw_name = name
+        # Allow to translated some known keys
+        self.name = _(name)
+        self.keyid = keyid
+        self.date = date
+
+    def __str__(self):
+        return "%s\n%s %s" % (self.name, self.keyid, self.date)
+
+
+def _call_apt_key_script(*args, **kwargs):
+    """Run the apt-key script with the given arguments."""
+    conf = None
+    cmd = [apt_pkg.config.find_file("Dir::Bin::Apt-Key", "/usr/bin/apt-key")]
+    cmd.extend(args)
+    env = os.environ.copy()
+    env["LANG"] = "C"
+    try:
+        if apt_pkg.config.find_dir("Dir") != "/":
+            # If the key is to be installed into a chroot we have to export the
+            # configuration from the chroot to the apt-key script by using
+            # a temporary APT_CONFIG file. The apt-key script uses apt-config
+            # shell internally
+            conf = tempfile.NamedTemporaryFile(prefix="apt-key", suffix=".conf")
+            conf.write(apt_pkg.config.dump().encode("UTF-8"))
+            conf.flush()
+            env["APT_CONFIG"] = conf.name
+        proc = subprocess.Popen(cmd, env=env, universal_newlines=True,
+                                stdin=subprocess.PIPE,
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.STDOUT)
+
+        content = kwargs.get("stdin", None)
+        if isinstance(content, unicode):
+            content = content.encode("utf-8")
+
+        output, stderr = proc.communicate(content)
+
+        assert stderr == None
+
+        if proc.returncode:
+            raise SystemError("The apt-key script failed with return code %s:\n"
+                              "%s\n%s" % (proc.returncode, " ".join(cmd),
+                                          output))
+        return output.strip()
+    finally:
+        if conf is not None:
+            conf.close()
+
+def add_key_from_file(filename):
+    """Import a GnuPG key file to trust repositores signed by it.
+
+    Keyword arguments:
+    filename -- the absolute path to the public GnuPG key file
+    """
+    if not os.path.abspath(filename):
+        raise SystemError("An absolute path is required: %s" % filename)
+    if not os.access(filename, os.R_OK):
+        raise SystemError("Key file cannot be accessed: %s" % filename)
+    _call_apt_key_script("add", filename)
+
+def add_key_from_keyserver(keyid, keyserver):
+    """Import a GnuPG key file to trust repositores signed by it.
+
+    Keyword arguments:
+    keyid -- the identifier of the key, e.g. 0x0EB12DSA
+    keyserver -- the URL or hostname of the key server
+    """
+    _call_apt_key_script("adv", "--quiet", "--keyserver", keyserver,
+                         "--recv", keyid)
+
+def add_key(content):
+    """Import a GnuPG key to trust repositores signed by it.
+
+    Keyword arguments:
+    content -- the content of the GnuPG public key
+    """
+    _call_apt_key_script("adv", "--quiet", "--batch",
+                         "--import", "-", stdin=content)
+
+def remove_key(fingerprint):
+    """Remove a GnuPG key to no longer trust repositores signed by it.
+
+    Keyword arguments:
+    fingerprint -- the fingerprint identifying the key
+    """
+    _call_apt_key_script("rm", fingerprint)
+
+def export_key(fingerprint):
+    """Return the GnuPG key in text format.
+
+    Keyword arguments:
+    fingerprint -- the fingerprint identifying the key
+    """
+    return _call_apt_key_script("export", fingerprint)
+
+def update():
+    """Update the local keyring with the archive keyring and remove from
+    the local keyring the archive keys which are no longer valid. The
+    archive keyring is shipped in the archive-keyring package of your
+    distribution, e.g. the debian-archive-keyring package in Debian.
+    """
+    return _call_apt_key_script("update")
+
+def net_update():
+    """Work similar to the update command above, but get the archive
+    keyring from an URI instead and validate it against a master key.
+    This requires an installed wget(1) and an APT build configured to
+    have a server to fetch from and a master keyring to validate. APT
+    in Debian does not support this command and relies on update
+    instead, but Ubuntu's APT does.
+    """
+    return _call_apt_key_script("net-update")
+
+def list_keys():
+    """Returns a list of TrustedKey instances for each key which is
+    used to trust repositories.
+    """
+    # The output of `apt-key list` is difficult to parse since the
+    # --with-colons parameter isn't user
+    output = _call_apt_key_script("adv", "--with-colons", "--batch",
+                                  "--list-keys")
+    res = []
+    for line in output.split("\n"):
+        fields = line.split(":")
+        if fields[0] == "pub":
+            key = TrustedKey(fields[9], fields[4][-8:], fields[5])
+            res.append(key)
+    return res
+
+if __name__ == "__main__":
+    # Add some known keys we would like to see translated so that they get
+    # picked up by gettext
+    lambda: _("Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>")
+    lambda: _("Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>")
+
+    apt_pkg.init()
+    for trusted_key in list_keys():
+        print(trusted_key)
diff --git a/apt/cache.py b/apt/cache.py
index be137b76..86a788bb 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):
@@ -143,8 +152,7 @@ class Cache(object):
         self._sorted_set = None
         self._weakref.clear()
 
-        self._have_multi_arch = bool(apt_pkg.config.value_list("APT::" +
-                                                               "Architectures"))
+        self._have_multi_arch = len(apt_pkg.get_architectures()) > 1
 
         progress.op = _("Building data structures")
         i = last = 0
@@ -507,7 +515,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 +528,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..2eb807b8 100644
--- a/apt/debfile.py
+++ b/apt/debfile.py
@@ -40,9 +40,6 @@ class DebPackage(object):
      VERSION_SAME, 
      VERSION_NEWER) = range(4)
 
-    _supported_data_members = ("data.tar.gz", "data.tar.bz2", "data.tar.lzma",
-                               "data.tar.xz")
-
     debug = 0
 
     def __init__(self, filename=None, cache=None):
@@ -53,7 +50,9 @@ class DebPackage(object):
         self.pkgname = ""
         self._sections = {}
         self._need_pkgs = []
+        self._check_was_run = False
         self._failure_string = ""
+        self._multiarch = None
         if filename:
             self.open(filename)
 
@@ -68,7 +67,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]
 
@@ -79,10 +79,52 @@ class DebPackage(object):
         try:
             self._debfile.data.go(lambda item, data: files.append(item.name))
         except SystemError:
-            return [_("List of files for '%s' could not be read" %
-                          self.filename)]
+            return [_("List of files for '%s' could not be read") %
+                    self.filename]
         return files
 
+    @property
+    def control_filelist(self):
+        """ return the list of files in control.tar.gt """
+        control = []
+        try:
+            self._debfile.control.go(lambda item, data: control.append(item.name))
+        except SystemError:
+            return [_("List of control files for '%s' could not be read") %
+                    self.filename]
+        return sorted(control)
+
+
+    # helper that will return a pkgname with a multiarch suffix if needed
+    def _maybe_append_multiarch_suffix(self, pkgname, 
+                                       in_conflict_checking=False):
+        # trivial cases
+        if not self._multiarch:
+            return pkgname
+        elif self._cache.is_virtual_package(pkgname):
+            return pkgname
+        elif (pkgname in self._cache and 
+              self._cache[pkgname].candidate.architecture == "all"):
+            return pkgname
+        # now do the real multiarch checking
+        multiarch_pkgname = "%s:%s" % (pkgname, self._multiarch)
+        # the upper layers will handle this
+        if not multiarch_pkgname in self._cache:
+            return multiarch_pkgname
+        # now check the multiarch state
+        cand = self._cache[multiarch_pkgname].candidate._cand
+        #print pkgname, multiarch_pkgname, cand.multi_arch
+        # the default is to add the suffix, unless its a pkg that can satify
+        # foreign dependencies
+        if cand.multi_arch & cand.MULTI_ARCH_FOREIGN:
+            return pkgname
+        # for conflicts we need a special case here, any not multiarch enabled
+        # package has a implicit conflict
+        if (in_conflict_checking and 
+            not (cand.multi_arch & cand.MULTI_ARCH_SAME)):
+            return pkgname
+        return multiarch_pkgname
+
     def _is_or_group_satisfied(self, or_group):
         """Return True if at least one dependency of the or-group is satisfied.
 
@@ -96,6 +138,9 @@ class DebPackage(object):
             ver = dep[1]
             oper = dep[2]
 
+            # multiarch
+            depname = self._maybe_append_multiarch_suffix(depname)
+
             # check for virtual pkgs
             if not depname in self._cache:
                 if self._cache.is_virtual_package(depname):
@@ -124,13 +169,12 @@ class DebPackage(object):
 
     def _satisfy_or_group(self, or_group):
         """Try to satisfy the or_group."""
-
-        or_found = False
-        virtual_pkg = None
-
         for dep in or_group:
             depname, ver, oper = dep
 
+            # multiarch
+            depname = self._maybe_append_multiarch_suffix(depname)
+
             # if we don't have it in the cache, it may be virtual
             if not depname in self._cache:
                 if not self._cache.is_virtual_package(depname):
@@ -194,15 +238,16 @@ class DebPackage(object):
     def _check_conflicts_or_group(self, or_group):
         """Check the or-group for conflicts with installed pkgs."""
         self._dbg(2, "_check_conflicts_or_group(): %s " % (or_group))
-
-        or_found = False
-        virtual_pkg = None
-
         for dep in or_group:
             depname = dep[0]
             ver = dep[1]
             oper = dep[2]
 
+            # FIXME: is this good enough? i.e. will apt always populate
+            #        the cache with conflicting pkgnames for our arch?
+            depname = self._maybe_append_multiarch_suffix(
+                depname, in_conflict_checking=True)
+
             # check conflicts with virtual pkgs
             if not depname in self._cache:
                 # FIXME: we have to check for virtual replaces here as
@@ -308,6 +353,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 +382,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 +439,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")
@@ -400,9 +448,14 @@ class DebPackage(object):
             return False
         arch = self._sections["Architecture"]
         if  arch != "all" and arch != apt_pkg.config.find("APT::Architecture"):
-            self._dbg(1, "ERROR: Wrong architecture dude!")
-            self._failure_string = _("Wrong architecture '%s'") % arch
-            return False
+            if arch in apt_pkg.get_architectures():
+                self._multiarch = arch
+                self.pkgname = "%s:%s" % (self.pkgname, self._multiarch)
+                self._dbg(1, "Found multiarch arch: '%s'" % arch)
+            else:
+                self._dbg(1, "ERROR: Wrong architecture dude!")
+                self._failure_string = _("Wrong architecture '%s'") % arch
+                return False
 
         # check version
         if self.compare_to_version_in_cache() == self.VERSION_OUTDATED:
@@ -462,7 +515,7 @@ class DebPackage(object):
         for pkg in self._need_pkgs:
             try:
                 self._cache[pkg].mark_install(from_user=False)
-            except SystemError as e:
+            except SystemError:
                 self._failure_string = _("Cannot install '%s'") % pkg
                 self._cache.clear()
                 return False
@@ -472,8 +525,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 +538,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)
@@ -499,19 +554,6 @@ class DebPackage(object):
                 remove.append(pkg.name)
         return (install, remove, unauthenticated)
 
-    @property
-    def control_filelist(self):
-        """ return the list of files in control.tar.gt """
-        try:
-            from debian.debfile import DebFile
-        except:
-            raise Exception(_("Python-debian module not available"))
-        content = []
-        for name in DebFile(self.filename).control:
-            if name and name != ".":
-                content.append(name)
-        return sorted(content)
-
     @staticmethod
     def to_hex(in_data):
         hex = ""
@@ -524,11 +566,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):
@@ -544,7 +595,7 @@ class DebPackage(object):
         # auto-convert to hex
         try:
             data = unicode(data, "utf-8")
-        except Exception as e:
+        except Exception:
             new_data = _("Automatically converted to printable ascii:\n")
             new_data += self.to_strish(data)
             return new_data
@@ -639,7 +690,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 +699,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)
@@ -654,7 +708,7 @@ class DscSrcPackage(DebPackage):
 def _test():
     """Test function"""
     from apt.cache import Cache
-    from apt.progress import DpkgInstallProgress
+    from apt.progress.base import InstallProgress
 
     cache = Cache()
 
@@ -676,7 +730,7 @@ def _test():
     print d.filelist
 
     print "Installing ..."
-    ret = d.install(DpkgInstallProgress())
+    ret = d.install(InstallProgress())
     print ret
 
     #s = DscSrcPackage(cache, "../tests/3ddesktop_0.2.9-6.dsc")
diff --git a/apt/package.py b/apt/package.py
index 9223ed22..29eec909 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.
@@ -408,6 +409,17 @@ class Version(object):
         return self._cand.priority_str
 
     @property
+    def policy_priority(self):
+        """Return the internal policy priority as a number.
+           See apt_preferences(5) for more information about what it means.
+        """
+        priority = 0
+        policy = self.package._pcache._depcache.policy
+        for (packagefile, _) in self._cand.file_list:
+            priority = max(priority, policy.get_priority(packagefile))
+        return priority
+
+    @property
     def record(self):
         """Return a Record() object for this version.
 
@@ -455,6 +467,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 = []
@@ -528,7 +545,10 @@ class Version(object):
 
         .. versionadded:: 0.7.10
         """
-        return iter(self._uris()).next()
+        try:
+            return iter(self._uris()).next()
+        except StopIteration:
+            return None
 
     def fetch_binary(self, destdir='', progress=None):
         """Fetch the binary version of the package.
@@ -545,8 +565,8 @@ class Version(object):
         base = os.path.basename(self._records.filename)
         destfile = os.path.join(destdir, base)
         if _file_is_same(destfile, self.size, self._records.md5_hash):
-            print 'Ignoring already existing file:', destfile
-            return
+            print('Ignoring already existing file: %s' % destfile)
+            return os.path.abspath(destfile)
         acq = apt_pkg.Acquire(progress or apt.progress.text.AcquireProgress())
         acqfile = apt_pkg.AcquireFile(acq, self.uri, self._records.md5_hash,
                                       self.size, base, destfile=destfile)
@@ -555,7 +575,7 @@ class Version(object):
         if acqfile.status != acqfile.STAT_DONE:
             raise FetchError("The item %r could not be fetched: %s" %
                              (acqfile.destfile, acqfile.error_text))
-        print self._records.filename
+
         return os.path.abspath(destfile)
 
     def fetch_source(self, destdir="", progress=None, unpack=True):
@@ -594,7 +614,7 @@ class Version(object):
             if type_ == 'dsc':
                 dsc = destfile
             if _file_is_same(destfile, size, md5):
-                print 'Ignoring already existing file:', destfile
+                print('Ignoring already existing file: %s' % destfile)
                 continue
             files.append(apt_pkg.AcquireFile(acq, src.index.archive_uri(path),
                          md5, size, base, destfile=destfile))
@@ -707,6 +727,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.
 
@@ -973,8 +996,8 @@ class Package(object):
         another package, and if no packages depend on it anymore, the package
         is no longer required.
         """
-        return self.is_installed and \
-               self._pcache._depcache.is_garbage(self._pkg)
+        return ((self.is_installed or self.marked_install) and
+                self._pcache._depcache.is_garbage(self._pkg))
 
     @property
     def is_auto_installed(self):
diff --git a/apt/progress/base.py b/apt/progress/base.py
index 97375431..ab57dd82 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
 
@@ -141,6 +142,7 @@ class InstallProgress(object):
 
     def __init__(self):
         (self.statusfd, self.writefd) = os.pipe()
+        # These will leak fds, but fixing this safely requires API changes.
         self.write_stream = os.fdopen(self.writefd, "w")
         self.status_stream = os.fdopen(self.statusfd, "r")
         fcntl.fcntl(self.statusfd, fcntl.F_SETFL, os.O_NONBLOCK)
@@ -196,7 +198,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/apt/progress/gtk2.py b/apt/progress/gtk2.py
index 9137ef76..c2635ca0 100644
--- a/apt/progress/gtk2.py
+++ b/apt/progress/gtk2.py
@@ -22,9 +22,6 @@
 #  USA
 """GObject-powered progress classes and a GTK+ status widget."""
 
-import os
-import time
-
 import pygtk
 pygtk.require('2.0')
 import gtk
@@ -34,6 +31,7 @@ except ImportError:
     import gobject as glib
 import gobject
 import pango
+import time
 import vte
 
 import apt_pkg
@@ -127,16 +125,15 @@ class GInstallProgress(gobject.GObject, base.InstallProgress):
         self.apt_status = -1
         self.time_last_update = time.time()
         self.term = term
-        reaper = vte.reaper_get()
-        reaper.connect("child-exited", self.child_exited)
+        self.term.connect("child-exited", self.child_exited)
         self.env = ["VTE_PTY_KEEP_FD=%s" % self.writefd,
                     "DEBIAN_FRONTEND=gnome",
                     "APT_LISTCHANGES_FRONTEND=gtk"]
         self._context = glib.main_context_default()
 
-    def child_exited(self, term, pid, status):
+    def child_exited(self, term):
         """Called when a child process exits"""
-        self.apt_status = os.WEXITSTATUS(status)
+        self.apt_status = term.get_child_exit_status()
         self.finished = True
 
     def error(self, pkg, errormsg):
@@ -204,6 +201,7 @@ class GInstallProgress(gobject.GObject, base.InstallProgress):
         """Wait for the child process to exit."""
         while not self.finished:
             self.update_interface()
+            time.sleep(0.02)
         return self.apt_status
 
     if apt_pkg._COMPAT_0_7:
diff --git a/apt/utils.py b/apt/utils.py
index 4b3da39f..08140258 100644
--- a/apt/utils.py
+++ b/apt/utils.py
@@ -28,11 +28,13 @@ def get_maintenance_end_date(release_date, m_months):
     ends. Needs the data of the release and the number of months that
     its is supported as input
     """
-    years = m_months / 12
+    # calc end date
+    years = m_months // 12
     months = m_months % 12
     support_end_year = (release_date.year + years +
-                        (release_date.month + months)/12)
+                        (release_date.month + months)//12)
     support_end_month = (release_date.month + months) % 12
+    # special case: this happens when e.g. doing 2010-06 + 18 months
     if support_end_month == 0:
         support_end_month = 12
         support_end_year -= 1
@@ -46,7 +48,7 @@ def get_release_date_from_release_file(path):
     if not path or not os.path.exists(path):
         return None
     tag = apt_pkg.TagFile(open(path))
-    section = tag.next()
+    section = next(tag)
     if not "Date" in section:
         return None
     date = section["Date"]
diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py
index 48a72719..e0ee915d 100644
--- a/aptsources/distinfo.py
+++ b/aptsources/distinfo.py
@@ -21,20 +21,17 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 
+from __future__ import print_function
+
 import errno
+import logging
 import os
-import gettext
-from os import getenv
 from subprocess import Popen, PIPE
-import ConfigParser
 import re
 
 import apt_pkg
 
-
-def _(s):
-    return gettext.dgettext("python-apt", s)
-
+from apt_pkg import gettext as _
 
 class Template(object):
 
@@ -56,7 +53,7 @@ class Template(object):
 
     def has_component(self, comp):
         ''' Check if the distribution provides the given component '''
-        return comp in map(lambda c: c.name, self.components)
+        return comp in (c.name for c in self.components)
 
     def is_mirror(self, url):
         ''' Check if a given url of a repository is a valid mirror '''
@@ -69,10 +66,17 @@ class Template(object):
 
 class Component(object):
 
-    def __init__(self, name, desc=None, long_desc=None):
+    def __init__(self, name, desc=None, long_desc=None, parent_component=None):
         self.name = name
         self.description = desc
         self.description_long = long_desc
+        self.parent_component = parent_component
+
+    def get_parent_component(self):
+        return self.parent_component
+
+    def set_parent_component(self, parent):
+        self.parent_component = parent
 
     def get_description(self):
         if self.description_long is not None:
@@ -105,7 +109,7 @@ class Mirror(object):
         self.repositories.append(Repository(proto, dir))
 
     def get_repositories_for_proto(self, proto):
-        return filter(lambda r: r.proto == proto, self.repositories)
+        return [r for r in self.repositories if r.proto == proto]
 
     def has_repository(self, proto, dir):
         if dir is None:
@@ -116,7 +120,7 @@ class Mirror(object):
         return False
 
     def get_repo_urls(self):
-        return map(lambda r: r.get_url(self.hostname), self.repositories)
+        return [r.get_url(self.hostname) for r in self.repositories]
 
     def get_location(self):
         return self.location
@@ -158,7 +162,7 @@ class DistInfo(object):
         location = None
         match_loc = re.compile(r"^#LOC:(.+)$")
         match_mirror_line = re.compile(
-            r"^(#LOC:.+)|(((http)|(ftp)|(rsync)|(file)|(https))://"
+            r"^(#LOC:.+)|(((http)|(ftp)|(rsync)|(file)|(mirror)|(https))://"
             r"[A-Za-z0-9/\.:\-_@]+)$")
         #match_mirror_line = re.compile(r".+")
 
@@ -166,9 +170,9 @@ class DistInfo(object):
             try:
                 dist = Popen(["lsb_release", "-i", "-s"],
                              stdout=PIPE).communicate()[0].strip()
-            except OSError, exc:
+            except OSError as exc:
                 if exc.errno != errno.ENOENT:
-                    print 'WARNING: lsb_release failed, using defaults:', exc
+                    logging.warn('lsb_release failed, using defaults:' % exc)
                 dist = "Debian"
 
         self.dist = dist
@@ -177,9 +181,6 @@ class DistInfo(object):
 
         dist_fname = "%s/%s.info" % (base_dir, dist)
         with open(dist_fname) as dist_file:
-
-
-
             template = None
             component = None
             for line in dist_file:
@@ -231,11 +232,11 @@ class DistInfo(object):
                         mirror_set = {}
                         try:
                             with open(value) as value_f:
-                                mirror_data = filter(match_mirror_line.match,
-                                                     [x.strip() for x in
-                                                      value_f])
+                                mirror_data = list(filter(
+                                    match_mirror_line.match,
+                                    [x.strip() for x in value_f]))
                         except Exception:
-                            print "WARNING: Failed to read mirror file"
+                            print("WARNING: Failed to read mirror file")
                             mirror_data = []
                         for line in mirror_data:
                             if line.startswith("#LOC:"):
@@ -260,6 +261,8 @@ class DistInfo(object):
                     component.set_description(_(value))
                 elif field == 'CompDescriptionLong':
                     component.set_description_long(_(value))
+                elif field == 'ParentComponent':
+                    component.set_parent_component(value)
             self.finish_template(template, component)
             template=None
             component=None
@@ -290,17 +293,17 @@ class DistInfo(object):
 
 if __name__ == "__main__":
     d = DistInfo("Ubuntu", "/usr/share/python-apt/templates")
-    print d.changelogs_uri
+    logging.info(d.changelogs_uri)
     for template in d.templates:
-        print "\nSuite: %s" % template.name
-        print "Desc: %s" % template.description
-        print "BaseURI: %s" % template.base_uri
-        print "MatchURI: %s" % template.match_uri
+        logging.info("\nSuite: %s" % template.name)
+        logging.info("Desc: %s" % template.description)
+        logging.info("BaseURI: %s" % template.base_uri)
+        logging.info("MatchURI: %s" % template.match_uri)
         if template.mirror_set != {}:
-            print "Mirrors: %s" % template.mirror_set.keys()
+            logging.info("Mirrors: %s" % list(template.mirror_set.keys()))
         for comp in template.components:
-            print " %s -%s -%s" % (comp.name,
-                                   comp.description,
-                                   comp.description_long)
+            logging.info(" %s -%s -%s" % (comp.name,
+                                          comp.description,
+                                          comp.description_long))
         for child in template.children:
-            print "  %s" % child.description
+            logging.info("  %s" % child.description)
diff --git a/aptsources/distro.py b/aptsources/distro.py
index 15806c5c..ca87a919 100644
--- a/aptsources/distro.py
+++ b/aptsources/distro.py
@@ -22,16 +22,13 @@
 #  USA
 
 import gettext
+import logging
 import re
 import os
-import sys
 
 from xml.etree.ElementTree import ElementTree
-import gettext
-
 
-def _(s):
-    return gettext.dgettext("python-apt", s)
+from apt_pkg import gettext as _
 
 
 class NoDistroTemplateException(Exception):
@@ -95,7 +92,7 @@ class Distribution(object):
         comps = []
         cdrom_comps = []
         enabled_comps = []
-        source_code = []
+        #source_code = []
         for source in self.sourceslist.list:
             if (source.invalid == False and
                 self.is_codename(source.dist) and
@@ -290,6 +287,16 @@ class Distribution(object):
 
         comp:         the component that should be enabled
         """
+        comps = set([comp])
+        # look for parent components that we may have to add
+        for source in self.main_sources:
+            for c in source.template.components:
+                if c.name == comp and c.parent_component:
+                    comps.add(c.parent_component)
+        for c in comps:
+            self._enable_component(c)
+
+    def _enable_component(self, comp):
 
         def add_component_only_once(source, comps_per_dist):
             """
@@ -297,12 +304,12 @@ class Distribution(object):
             a repository could be splitted into different apt lines. If not
             add the component
             """
-            # if we don't that distro, just reutnr (can happen for e.g.
+            # if we don't have that distro, just return (can happen for e.g.
             # dapper-update only in deb-src
             if source.dist not in comps_per_dist:
                 return
             # if we have seen this component already for this distro,
-            # return (nothing to do
+            # return (nothing to do)
             if comp in comps_per_dist[source.dist]:
                 return
             # add it
@@ -320,12 +327,14 @@ class Distribution(object):
             if s.type == self.binary_type:
                 if s.dist not in comps_per_dist:
                     comps_per_dist[s.dist] = set()
-                map(comps_per_dist[s.dist].add, s.comps)
+                for c in s.comps:
+                    comps_per_dist[s.dist].add(c)
         for s in self.source_code_sources:
             if s.type == self.source_type:
                 if s.dist not in comps_per_sdist:
                     comps_per_sdist[s.dist] = set()
-                map(comps_per_sdist[s.dist].add, s.comps)
+                for c in s.comps:
+                    comps_per_sdist[s.dist].add(c)
 
         # check if there is a main source at all
         if len(self.main_sources) < 1:
@@ -454,9 +463,9 @@ def _lsb_release():
         # Convert to unicode string, needed for Python 3.1
         out = out.decode("utf-8")
         result.update(l.split(":\t") for l in out.split("\n") if ':\t' in l)
-    except OSError, exc:
+    except OSError as exc:
         if exc.errno != errno.ENOENT:
-            print 'WARNING: lsb_release failed, using defaults:', exc
+            logging.warn('lsb_release failed, using defaults:' % exc)
     return result
 
 
diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py
index 353cce2d..61b75f75 100644
--- a/aptsources/sourceslist.py
+++ b/aptsources/sourceslist.py
@@ -23,17 +23,19 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 
-import gettext
+from __future__ import absolute_import
+
 import glob
+import logging
 import os.path
 import re
 import shutil
-import sys
 import time
 
 import apt_pkg
-from aptsources.distinfo import DistInfo
+from .distinfo import DistInfo
 from apt.deprecation import function_deprecated_by
+#from apt_pkg import gettext as _
 
 
 # some global helpers
@@ -373,7 +375,7 @@ class SourcesList(object):
                     source = SourceEntry(line, file)
                     self.list.append(source)
         except:
-            print "could not open file '%s'" % file
+            logging.warn("could not open file '%s'\n" % file)
 
     def save(self):
         """ save the current sources """
@@ -445,11 +447,13 @@ class SourceEntryMatcher(object):
 
     def match(self, source):
         """Add a matching template to the source"""
-        _ = gettext.gettext
         found = False
         for template in self.templates:
             if (re.search(template.match_uri, source.uri) and
-                re.match(template.match_name, source.dist)):
+                re.match(template.match_name, source.dist) and
+                # deb is a valid fallback for deb-src (if that is not
+                # definied, see #760035
+                (source.type == template.type or template.type == "deb")):
                 found = True
                 source.template = template
                 break
@@ -467,14 +471,14 @@ if __name__ == "__main__":
     sources = SourcesList()
 
     for entry in sources:
-        print entry.str()
+        logging.info("entry %s" % entry.str())
         #print entry.uri
 
     mirror = is_mirror("http://archive.ubuntu.com/ubuntu/",
                        "http://de.archive.ubuntu.com/ubuntu/")
-    print "is_mirror(): %s" % mirror
+    logging.info("is_mirror(): %s" % mirror)
 
-    print is_mirror("http://archive.ubuntu.com/ubuntu",
-                    "http://de.archive.ubuntu.com/ubuntu/")
-    print is_mirror("http://archive.ubuntu.com/ubuntu/",
-                    "http://de.archive.ubuntu.com/ubuntu")
+    logging.info(is_mirror("http://archive.ubuntu.com/ubuntu",
+                    "http://de.archive.ubuntu.com/ubuntu/"))
+    logging.info(is_mirror("http://archive.ubuntu.com/ubuntu/",
+                    "http://de.archive.ubuntu.com/ubuntu"))
diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in
index b9f70940..3ffe174d 100644
--- a/data/templates/Debian.info.in
+++ b/data/templates/Debian.info.in
@@ -1,5 +1,35 @@
 _ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog
 
+Suite: wheezy
+RepositoryType: deb
+BaseURI: http://http.us.debian.org/debian/
+MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org
+MirrorsFile: Debian.mirrors
+_Description: Debian 7.0 'Wheezy' 
+Component: main
+_CompDescription: Officially supported
+Component: contrib
+_CompDescription: DFSG-compatible Software with Non-Free Dependencies
+Component: non-free
+_CompDescription: Non-DFSG-compatible Software
+
+Suite: wheezy/updates
+RepositoryType: deb
+BaseURI: http://security.debian.org/
+MatchURI: security\.debian\.org
+ParentSuite: wheezy
+_Description: Security updates
+
+Suite: wheezy-updates
+RepositoryType: deb
+ParentSuite: wheezy
+_Description: Recommended updates
+
+Suite: wheezy-proposed-updates
+RepositoryType: deb
+ParentSuite: wheezy
+_Description: Proposed updates
+
 Suite: squeeze
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in
index a9b539af..2aba269e 100644
--- a/data/templates/Ubuntu.info.in
+++ b/data/templates/Ubuntu.info.in
@@ -1,5 +1,478 @@
 _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog
 
+Suite: quantal
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu
+MatchURI-i386: archive.ubuntu.com/ubuntu
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
+_Description: Ubuntu 12.04 'Precise Pangolin'
+Component: main
+_CompDescription: Officially supported
+_CompDescriptionLong: Canonical-supported free and open-source software
+Component: universe
+_CompDescription: Community-maintained
+_CompDescriptionLong: Community-maintained free and open-source software
+Component: restricted
+_CompDescription: Non-free drivers
+_CompDescriptionLong: Proprietary drivers for devices
+Component: multiverse
+ParentComponent: universe
+_CompDescription: Restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
+
+Suite: quantal
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Ubuntu 12.04 'Precise Pangolin'
+
+Suite: quantal
+RepositoryType: deb
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*12.04
+MatchURI: cdrom:\[Ubuntu.*12.04
+_Description: Cdrom with Ubuntu 12.04 'Precise Pangolin'
+Available: False
+Component: main
+_CompDescription: Officially supported
+Component: restricted
+_CompDescription: Restricted copyright
+
+Suite: quantal
+Official: false
+RepositoryType: deb
+BaseURI: http://archive.canonical.com
+MatchURI: archive.canonical.com
+_Description: Canonical Partners
+Component: partner
+_CompDescription: Software packaged by Canonical for their partners
+_CompDescriptionLong: This software is not part of Ubuntu.
+
+Suite: quantal
+Official: false
+RepositoryType: deb
+BaseURI: http://extras.ubuntu.com
+MatchURI: extras.ubuntu.com
+_Description: Independent
+Component: main
+_CompDescription: Provided by third-party software developers
+_CompDescriptionLong: Software offered by third party developers.
+
+Suite: quantal-security
+ParentSuite: quantal
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
+_Description: Important security updates
+
+Suite: quantal-security
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com
+_Description: Important security updates
+
+Suite: quantal-updates
+ParentSuite: quantal
+RepositoryType: deb
+_Description: Recommended updates
+
+Suite: quantal-updates
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Recommended updates
+
+Suite: quantal-proposed
+ParentSuite: quantal
+RepositoryType: deb
+_Description: Pre-released updates
+
+Suite: quantal-proposed
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Pre-released updates
+
+Suite: quantal-backports
+ParentSuite: quantal
+RepositoryType: deb
+_Description: Unsupported updates
+
+Suite: quantal-backports
+ParentSuite: quantal
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Unsupported updates
+
+Suite: precise
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu
+MatchURI-i386: archive.ubuntu.com/ubuntu
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
+_Description: Ubuntu 12.04 'Precise Pangolin'
+Component: main
+_CompDescription: Officially supported
+_CompDescriptionLong: Canonical-supported free and open-source software
+Component: universe
+_CompDescription: Community-maintained
+_CompDescriptionLong: Community-maintained free and open-source software
+Component: restricted
+_CompDescription: Non-free drivers
+_CompDescriptionLong: Proprietary drivers for devices
+Component: multiverse
+ParentComponent: universe
+_CompDescription: Restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
+
+Suite: precise
+ParentSuite: precise
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Ubuntu 12.04 'Precise Pangolin'
+
+Suite: precise
+RepositoryType: deb
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*12.04
+MatchURI: cdrom:\[Ubuntu.*12.04
+_Description: Cdrom with Ubuntu 12.04 'Precise Pangolin'
+Available: False
+Component: main
+_CompDescription: Officially supported
+Component: restricted
+_CompDescription: Restricted copyright
+
+Suite: precise
+Official: false
+RepositoryType: deb
+BaseURI: http://archive.canonical.com
+MatchURI: archive.canonical.com
+_Description: Canonical Partners
+Component: partner
+_CompDescription: Software packaged by Canonical for their partners
+_CompDescriptionLong: This software is not part of Ubuntu.
+
+Suite: precise
+Official: false
+RepositoryType: deb
+BaseURI: http://extras.ubuntu.com
+MatchURI: extras.ubuntu.com
+_Description: Independent
+Component: main
+_CompDescription: Provided by third-party software developers
+_CompDescriptionLong: Software offered by third party developers.
+
+Suite: precise-security
+ParentSuite: precise
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
+_Description: Important security updates
+
+Suite: precise-security
+ParentSuite: precise
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com
+_Description: Important security updates
+
+Suite: precise-updates
+ParentSuite: precise
+RepositoryType: deb
+_Description: Recommended updates
+
+Suite: precise-updates
+ParentSuite: precise
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Recommended updates
+
+Suite: precise-proposed
+ParentSuite: precise
+RepositoryType: deb
+_Description: Pre-released updates
+
+Suite: precise-proposed
+ParentSuite: precise
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Pre-released updates
+
+Suite: precise-backports
+ParentSuite: precise
+RepositoryType: deb
+_Description: Unsupported updates
+
+Suite: precise-backports
+ParentSuite: precise
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Unsupported updates
+
+Suite: oneiric
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu
+MatchURI-i386: archive.ubuntu.com/ubuntu
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
+_Description: Ubuntu 11.10 'Oneiric Ocelot'
+Component: main
+_CompDescription: Officially supported
+_CompDescriptionLong: Canonical-supported free and open-source software
+Component: universe
+_CompDescription: Community-maintained
+_CompDescriptionLong: Community-maintained free and open-source software
+Component: restricted
+_CompDescription: Non-free drivers
+_CompDescriptionLong: Proprietary drivers for devices
+Component: multiverse
+ParentComponent: universe
+_CompDescription: Restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
+
+Suite: oneiric
+ParentSuite: oneiric
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Ubuntu 11.10 'Oneiric Ocelot'
+
+Suite: oneiric
+RepositoryType: deb
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*11.10
+MatchURI: cdrom:\[Ubuntu.*11.10
+_Description: Cdrom with Ubuntu 11.10 'Oneiric Ocelot'
+Available: False
+Component: main
+_CompDescription: Officially supported
+Component: restricted
+_CompDescription: Restricted copyright
+
+Suite: oneiric
+Official: false
+RepositoryType: deb
+BaseURI: http://archive.canonical.com
+MatchURI: archive.canonical.com
+_Description: Canonical Partners
+Component: partner
+_CompDescription: Software packaged by Canonical for their partners
+_CompDescriptionLong: This software is not part of Ubuntu.
+
+Suite: oneiric
+Official: false
+RepositoryType: deb
+BaseURI: http://extras.ubuntu.com
+MatchURI: extras.ubuntu.com
+_Description: Independent
+Component: main
+_CompDescription: Provided by third-party software developers
+_CompDescriptionLong: Software offered by third party developers.
+
+Suite: oneiric-security
+ParentSuite: oneiric
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
+_Description: Important security updates
+
+Suite: oneiric-security
+ParentSuite: oneiric
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com
+_Description: Important security updates
+
+Suite: oneiric-updates
+ParentSuite: oneiric
+RepositoryType: deb
+_Description: Recommended updates
+
+Suite: oneiric-updates
+ParentSuite: oneiric
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Recommended updates
+
+Suite: oneiric-proposed
+ParentSuite: oneiric
+RepositoryType: deb
+_Description: Pre-released updates
+
+Suite: oneiric-proposed
+ParentSuite: oneiric
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Pre-released updates
+
+Suite: oneiric-backports
+ParentSuite: oneiric
+RepositoryType: deb
+_Description: Unsupported updates
+
+Suite: oneiric-backports
+ParentSuite: oneiric
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Unsupported updates
+
+
+Suite: natty
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu
+MatchURI-i386: archive.ubuntu.com/ubuntu
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
+_Description: Ubuntu 11.04 'Natty Narwhal'
+Component: main
+_CompDescription: Officially supported
+_CompDescriptionLong: Canonical-supported free and open-source software
+Component: universe
+_CompDescription: Community-maintained
+_CompDescriptionLong: Community-maintained free and open-source software
+Component: restricted
+_CompDescription: Non-free drivers
+_CompDescriptionLong: Proprietary drivers for devices
+Component: multiverse
+ParentComponent: universe
+_CompDescription: Restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
+
+Suite: natty
+ParentSuite: natty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Ubuntu 11.04 'Natty Narwhal'
+
+Suite: natty
+RepositoryType: deb
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*11.04
+MatchURI: cdrom:\[Ubuntu.*11.04
+_Description: Cdrom with Ubuntu 11.04 'Natty Narwhal'
+Available: False
+Component: main
+_CompDescription: Officially supported
+Component: restricted
+_CompDescription: Restricted copyright
+
+Suite: natty
+Official: false
+RepositoryType: deb
+BaseURI: http://archive.canonical.com
+MatchURI: archive.canonical.com
+_Description: Canonical Partners
+Component: partner
+_CompDescription: Software packaged by Canonical for their partners
+_CompDescriptionLong: This software is not part of Ubuntu.
+
+Suite: natty
+Official: false
+RepositoryType: deb
+BaseURI: http://extras.ubuntu.com
+MatchURI: extras.ubuntu.com
+_Description: Independent
+Component: main
+_CompDescription: Provided by third-party software developers
+_CompDescriptionLong: Software offered by third party developers.
+
+Suite: natty-security
+ParentSuite: natty
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
+_Description: Important security updates
+
+Suite: natty-security
+ParentSuite: natty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com
+_Description: Important security updates
+
+Suite: natty-updates
+ParentSuite: natty
+RepositoryType: deb
+_Description: Recommended updates
+
+Suite: natty-updates
+ParentSuite: natty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Recommended updates
+
+Suite: natty-proposed
+ParentSuite: natty
+RepositoryType: deb
+_Description: Pre-released updates
+
+Suite: natty-proposed
+ParentSuite: natty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Pre-released updates
+
+Suite: natty-backports
+ParentSuite: natty
+RepositoryType: deb
+_Description: Unsupported updates
+
+Suite: natty-backports
+ParentSuite: natty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Unsupported updates
+
 Suite: maverick
 RepositoryType: deb
 BaseURI: http://ports.ubuntu.com/ubuntu-ports/
@@ -13,18 +486,20 @@ 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
 Component: multiverse
+ParentComponent: universe
 _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: maverick
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*10.10
 MatchURI: cdrom:\[Ubuntu.*10.10
@@ -94,18 +569,20 @@ 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
 Component: multiverse
+ParentComponent: universe
 _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: lucid
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*10.04
 MatchURI: cdrom:\[Ubuntu.*10.04
@@ -155,18 +632,20 @@ 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
 Component: multiverse
+ParentComponent: universe
 _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: karmic
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*9.10
 MatchURI: cdrom:\[Ubuntu.*9.10
@@ -216,10 +695,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
@@ -228,6 +707,7 @@ _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: jaunty
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*9.04
 MatchURI: cdrom:\[Ubuntu.*9.04
@@ -277,18 +757,20 @@ 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
 Component: multiverse
+ParentComponent: universe
 _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: intrepid
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*8.10
 MatchURI: cdrom:\[Ubuntu.*8.10
@@ -339,18 +821,20 @@ 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
 Component: multiverse
+ParentComponent: universe
 _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: hardy
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*8.04
 MatchURI: cdrom:\[Ubuntu.*8.04
@@ -402,10 +886,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
@@ -414,6 +898,7 @@ _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: gutsy
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*7.10
 MatchURI: cdrom:\[Ubuntu.*7.10
@@ -465,10 +950,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
@@ -477,6 +962,7 @@ _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: feisty
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*7.04
 MatchURI: cdrom:\[Ubuntu.*7.04
@@ -525,10 +1011,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
@@ -537,6 +1023,7 @@ _CompDescription: Restricted software
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: edgy
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*6.10
 MatchURI: cdrom:\[Ubuntu.*6.10
@@ -585,10 +1072,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
@@ -597,6 +1084,7 @@ _CompDescription: Restricted software (Multiverse)
 _CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: dapper
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*6.06
 MatchURI: cdrom:\[Ubuntu.*6.06
@@ -653,6 +1141,7 @@ Component: multiverse
 _CompDescription: Non-free (Multiverse)
 
 Suite: breezy
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*5.10
 MatchURI: cdrom:\[Ubuntu.*5.10
@@ -704,6 +1193,7 @@ Component: multiverse
 _CompDescription: Non-free (Multiverse)
 
 Suite: hoary
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*5.04
 MatchURI: cdrom:\[Ubuntu.*5.04
@@ -750,6 +1240,7 @@ Component: multiverse
 _CompDescription: Non-free (Multiverse)
 
 Suite: warty
+RepositoryType: deb
 MatchName: .*
 BaseURI: cdrom:\[Ubuntu.*4.10
 MatchURI: cdrom:\[Ubuntu.*4.10
diff --git a/debian/changelog b/debian/changelog
index 2270c43a..59845f0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,245 @@
+python-apt (0.8.6) UNRELEASED; urgency=low
+
+  [ Michael Vogt ]
+  * debian/control:
+    - add build-dep for apt (>= 0.9.6) to make test_auth.py test
+      work reliable
+
+  [ Julian Andres Klode ]
+  * apt/auth.py:
+    - Use tempfile.NamedTemporaryFile to create temporary file
+    - Use Popen.communicate() instead of stdin, stdout
+  * tests/fakeroot-apt-key:
+    - exec apt-key, otherwise we ignore the return value
+  * debian/control:
+    - Build-depend on fakeroot, needed for the apt.auth tests
+  * data/templates/Debian.info.in:
+    - Add wheezy
+    - Add wheezy-updates as Recommended Updates
+    - Order wheezy-proposed-updates after wheezy/updates and wheezy-updates
+  * po:
+    - Fixup the translations for wheezy again
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 25 Jun 2012 13:41:02 +0200
+
+python-apt (0.8.5) unstable; urgency=low
+
+  [ Michael Vogt ]
+  * python/cache.cc:
+    - ensure that pkgApplyStatus is called when the cache is opened
+      (thanks to Sebastian Heinlein for finding this bug), LP: #659438
+
+  [ Stéphane Graber ]
+  * data/templates/Ubuntu.info.in:
+    - add quantal
+
+  [ Steve Langasek ]
+  * utils/get_ubuntu_mirrors_from_lp.py: move this script to python3
+  * pre-build.sh: call dpkg-checkbuilddeps with the list of our 
+    source-build-dependencies; this may save someone else an hour down the
+    line scratching their head over gratuitous test-suite failures...
+  
+  [ Sebastian Heinlein ]
+  * lp:~glatzor/python-apt/auth:
+    - this is a port of the software-properties AptAuth module to python-apt
+      with some cleanups. It provides a wrapper API for the apt-key command
+
+  [ David Prévot ]
+  * po/*.po: update PO files against current POT file
+  * po/be.po: Belarusian translation by Viktar Siarheichyk (closes: #678286)
+  * po/de.po: German translation updated by Holger Wansing (closes: #677916)
+  * po/el.po: Greek translation updated by Thomas Vasileiou (closes: #677331)
+  * po/en_GB.po: Remove useless file <20120610190618.GA1387@burratino>
+  * po/eo.po: Esperanto translation by Kristjan Schmidt and Michael Moroni
+  * po/fi.po: Finnish translation updated by Timo Jyrinki
+  * po/fr.po: French translation updated (closes: #567765)
+  * po/hu.po: Hungarian translation updated by Gabor Kelemen
+  * po/id.po: Indonesian translation by Andika Triwidada (closes: #676960)
+  * po/nl.po: Dutch translation updated by Jeroen Schot (closes: #652335)
+  * po/pt_BR.po: Brazilian translation updated by Sérgio Cipolla
+  * po/ru.po: incomplete Russian translation updated by Andrey
+  * po/sk.po: Slovak translation updated by Ivan Masár (closes: #676973)
+  * po/sl.po: Slovenian translation updated by Matej Urbančič
+  * po/sr.po: incomplete Serbian translation updated by Nikola Nenadic
+  * po/tl.po: Tagalog translation updated by Ariel S. Betan
+  * po/am.po po/br.po po/et.po po/eu.po po/fa.po po/fur.po po/hi.po
+    po/mr.po po/ms.po po/nn.po po/pa.po po/ps.po po/qu.po po/rw.po po/ta.po
+    po/ur.po po/xh.po: remove useless (empty) translations
+
+  [ Julian Andres Klode ]
+  * Merge patch from Colin Watson to handle non-UTF8 tag files in
+    Python 3, by using bytes instead of str when requested; and
+    document this in the RST documentation (Closes: #656288)
+  * debian/control:
+    - Drop Recommends on python2.6 (Closes: #645970)
+    - Replace xz-lzma Recommends by xz-utils (Closes: #677934)
+  * python/configuration.cc:
+    - Handle the use of "del" on configuration values. Those are represented
+      by calling the setter with NULL, which we did not handle before, causing
+      a segmentation fault (Closes: #661062)
+  * python/tag.cc:
+    - Correctly handle file descriptor 0 aka stdin (Closes: #669458)
+  * python/acquire.cc:
+    - Use pkgAcquire::Setup() to setup the acquire class and handle errors
+      from this (Closes: #629624)
+  * debian/control:
+    - Set Standards-Version to 3.9.3
+  * utils/get_ubuntu_mirrors_from_lp.py:
+    - Revert move to Python 3, python3-feedparser is not in the archive yet
+  * tests:
+    - Fix new tests from Sebastian to work with Python 2.6
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 22 Jun 2012 10:37:23 +0200
+
+python-apt (0.8.4) unstable; urgency=low
+
+  [ Michael Vogt ]
+  * doc/examples/build-deps.py:
+    - update the build-deps.py example to use the apt API more
+  * add support for apt_pkg.Policy.get_priority(PkgFileIterator)
+  * apt/debfile.py:
+    - use apt_inst for reading the control_filelist
+  * debian/control:
+    - remove no longer needed dependency on python-debian
+  * tests/test_tagfile.py:
+    - add test for apt_pkg.TagFile() both for compressed/uncompressed
+      files
+  * python/tag.cc, tests/test_tagfile.py:
+    - add support a filename argument in apt_pkg.TagFile() (in addition
+      to the file object currently supported)
+  * apt/package.py:
+    - if there is no Version.uri return None
+  * apt/cache.py:
+    - fix _have_multi_arch flag (thanks to Sebastian Heinlein)
+  * build against apt 0.9.0
+
+  [Julian Andres Klode ]
+  * python/apt_pkgmodule.cc:
+    - Fix apt_pkg.Dependency.TYPE_RECOMMENDS, had Suggests value previously
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 16 Apr 2012 19:06:48 +0200
+
+python-apt (0.8.4~exp1) experimental; urgency=low
+
+  * tests/test_apt_cache.py:
+    - fix tests on kfreebsd/ia64
+  * apt/debfile.py: 
+    - fix crash in dep multiarch handling
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 24 Jan 2012 14:02:46 +0100
+
+python-apt (0.8.3ubuntu9) UNRELEASED; urgency=low
+
+  [ Steve Langasek ]
+  * Don't leak file descriptors.
+
+  [ Colin Watson ]
+  * aptsources/*.py, setup.py: Make aptsources modules work directly in
+    either Python 2 or 3, and exclude the "future" 2to3 fixer so that 2to3
+    doesn't need to modify them.  This makes life a little easier for the
+    strange tricks update-manager plays with its dist-upgrader tarball.
+
+ -- Evan Dandrea <ev@ubuntu.com>  Mon, 11 Jun 2012 17:00:37 +0100
+
+python-apt (0.8.3) unstable; urgency=low
+
+  [ Alexey Feldgendler ] 
+  * handle architecture-specific conflicts correctly (LP: #829138)
+  
+  [ Michael Vogt ]
+  * lp:~mvo/python-apt/debfile-multiarch:
+    - add multiarch support to the debfile.py code
+  * tests/test_apt_cache.py:
+    - add additional check if provides test can actually be run
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 08 Dec 2011 20:31:52 +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.1) unstable; urgency=low
+
+  [ Julian Andres Klode ]
+  * Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512)
+  
+  [ Michael Vogt ]
+  * python/arfile.cc:
+    - use APT::Configuration::getCompressionTypes() instead of duplicating
+      the supported methods here
+  * tests/test_debfile.py:
+    - add test for raise on unknown data.tar.xxx
+  * tests/test_aptsources_ports.py, tests/test_aptsources.py:
+    - use tmpdir during the tests to fix test failure with apt from
+      experimental
+  * tests/test_apt_cache.py:
+    - fix test by providing proper fixture data
+    - fix test if sources.list is not readable (as is the case on some
+      PPA buildds)
+  * apt/package.py:
+    - fix py3 compatiblity with print
+  * tests/test_all.py:
+    - skip all tests if sources.list is not readable (as is the case on
+      some builds)
+    - packages in marked_install state can also be auto-removable
+  * add concept of "ParentComponent" for e.g. ubuntu/multiverse
+    that needs universe enabled as well (plus add test)
+  * apt/progress/gtk2.py:
+    - update to the latest vte API for child-exited (LP: #865388)
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2011 16:39:13 +0200
+
 python-apt (0.8.0) unstable; urgency=low
 
   * Upload to unstable
diff --git a/debian/control b/debian/control
index 98506aec..ca32cb3b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,13 @@ Section: python
 Priority: standard
 Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 XS-Python-Version: >= 2.6
 X-Python3-Version: >= 3.1
-Build-Depends: apt-utils,
+Build-Depends: apt (>= 0.9.6),
+               apt-utils,
                debhelper (>= 7.3.5),
+               fakeroot,
                libapt-pkg-dev (>= 0.8.11),
                python-all-dev (>= 2.6.6-3~),
                python-all-dbg,
@@ -22,12 +24,11 @@ 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, python2.6
+Recommends: lsb-release, iso-codes, xz-utils
 Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4),
         computer-janitor (<< 1.14.1-1+),
         debdelta (<< 0.41+),
         python-dogtail (<< 0.6.1-3.1+),
-        python-debian (<< 0.1.18+),
         python-software-properties (<< 0.70.debian-1+),
         aptdaemon (<< 0.11+bzr343-1~),
         apt-forktracer (<< 0.3),
@@ -38,7 +39,7 @@ Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4),
         bcfg2 (<< 1.0.1),
         bzr-builddeb (<< 2.4),
         debpartial-mirror (<< 0.2.98),
-        debsecan (<< 0.4.14),
+        debsecan (<< 0.4.15),
         gdebi (<< 0.6.1),
         germinate (<< 1.21),
         gnome-codec-install (<< 0.4.5),
diff --git a/doc/examples/build-deps-old.py b/doc/examples/build-deps-old.py
new file mode 100755
index 00000000..656f1361
--- /dev/null
+++ b/doc/examples/build-deps-old.py
@@ -0,0 +1,73 @@
+#!/usr/bin/python
+# this is a example how to access the build dependencies of a package
+
+import apt_pkg
+import sys
+
+
+def get_source_pkg(pkg, records, depcache):
+    """ get the source package name of a given package """
+    version = depcache.GetCandidateVer(pkg)
+    if not version:
+        return None
+    file, index = version.FileList.pop(0)
+    records.Lookup((file, index))
+    if records.SourcePkg != "":
+        srcpkg = records.SourcePkg
+    else:
+        srcpkg = pkg.Name
+    return srcpkg
+
+
+# main
+apt_pkg.init()
+cache = apt_pkg.Cache()
+depcache = apt_pkg.DepCache(cache)
+depcache.Init()
+records = apt_pkg.PackageRecords(cache)
+srcrecords = apt_pkg.SourceRecords()
+
+# base package that we use for build-depends calculation
+if len(sys.argv) < 2:
+    print "need a package name as argument"
+    sys.exit(1)
+try:
+    pkg = base = cache[sys.argv[1]]
+except KeyError:
+    print "No package %s found" % sys.argv[1]
+    sys.exit(1)
+all_build_depends = set()
+
+# get the build depdends for the package itself
+srcpkg_name = get_source_pkg(base, records, depcache)
+print "srcpkg_name: %s " % srcpkg_name
+if not srcpkg_name:
+    print "Can't find source package for '%s'" % pkg.Name
+srcrec = srcrecords.Lookup(srcpkg_name)
+if srcrec:
+    print "Files:"
+    print srcrecords.Files
+    bd = srcrecords.BuildDepends
+    print "build-depends of the package: %s " % bd
+    for b in bd:
+        all_build_depends.add(b[0])
+
+# calculate the build depends for all dependencies
+depends = depcache.GetCandidateVer(base).DependsList
+for dep in depends["Depends"]: # FIXME: do we need to consider PreDepends?
+    pkg = dep[0].TargetPkg
+    srcpkg_name = get_source_pkg(pkg, records, depcache)
+    if not srcpkg_name:
+        print "Can't find source package for '%s'" % pkg.Name
+        continue
+    srcrec = srcrecords.Lookup(srcpkg_name)
+    if srcrec:
+        #print srcrecords.Package
+        #print srcrecords.Binaries
+        bd = srcrecords.BuildDepends
+        #print "%s: %s " % (srcpkg_name, bd)
+        for b in bd:
+            all_build_depends.add(b[0])
+
+
+print "\n".join(all_build_depends)
diff --git a/doc/examples/build-deps.py b/doc/examples/build-deps.py
index 656f1361..5d243943 100755
--- a/doc/examples/build-deps.py
+++ b/doc/examples/build-deps.py
@@ -1,30 +1,12 @@
 #!/usr/bin/python
 # this is a example how to access the build dependencies of a package
 
+import apt
 import apt_pkg
 import sys
 
-
-def get_source_pkg(pkg, records, depcache):
-    """ get the source package name of a given package """
-    version = depcache.GetCandidateVer(pkg)
-    if not version:
-        return None
-    file, index = version.FileList.pop(0)
-    records.Lookup((file, index))
-    if records.SourcePkg != "":
-        srcpkg = records.SourcePkg
-    else:
-        srcpkg = pkg.Name
-    return srcpkg
-
-
 # main
-apt_pkg.init()
-cache = apt_pkg.Cache()
-depcache = apt_pkg.DepCache(cache)
-depcache.Init()
-records = apt_pkg.PackageRecords(cache)
+cache = apt.Cache()
 srcrecords = apt_pkg.SourceRecords()
 
 # base package that we use for build-depends calculation
@@ -39,7 +21,7 @@ except KeyError:
 all_build_depends = set()
 
 # get the build depdends for the package itself
-srcpkg_name = get_source_pkg(base, records, depcache)
+srcpkg_name = base.candidate.source_name
 print "srcpkg_name: %s " % srcpkg_name
 if not srcpkg_name:
     print "Can't find source package for '%s'" % pkg.Name
@@ -53,21 +35,22 @@ if srcrec:
         all_build_depends.add(b[0])
 
 # calculate the build depends for all dependencies
-depends = depcache.GetCandidateVer(base).DependsList
-for dep in depends["Depends"]: # FIXME: do we need to consider PreDepends?
-    pkg = dep[0].TargetPkg
-    srcpkg_name = get_source_pkg(pkg, records, depcache)
-    if not srcpkg_name:
-        print "Can't find source package for '%s'" % pkg.Name
-        continue
-    srcrec = srcrecords.Lookup(srcpkg_name)
-    if srcrec:
-        #print srcrecords.Package
-        #print srcrecords.Binaries
-        bd = srcrecords.BuildDepends
-        #print "%s: %s " % (srcpkg_name, bd)
-        for b in bd:
-            all_build_depends.add(b[0])
+depends = base.candidate.dependencies
+for or_dep in depends:
+    for dep in or_dep.or_dependencies:
+        pkg = cache[dep.name]
+        srcpkg_name = pkg.candidate.source_name
+        if not srcpkg_name:
+            print "Can't find source package for '%s'" % pkg.Name
+            continue
+        srcrec = srcrecords.Lookup(srcpkg_name)
+        if srcrec:
+            #print srcrecords.Package
+            #print srcrecords.Binaries
+            bd = srcrecords.BuildDepends
+            #print "%s: %s " % (srcpkg_name, bd)
+            for b in bd:
+                all_build_depends.add(b[0])
 
 
 print "\n".join(all_build_depends)
diff --git a/doc/source/library/apt_inst.rst b/doc/source/library/apt_inst.rst
index d9403a9e..9e6772f5 100644
--- a/doc/source/library/apt_inst.rst
+++ b/doc/source/library/apt_inst.rst
@@ -134,8 +134,8 @@ Debian Packages
 
     .. attribute:: data
 
-        The :class:`TarFile` object associated with the data.tar.{gz,bz2,lzma}
-        member.
+        The :class:`TarFile` object associated with the
+        data.tar.{gz,bz2,lzma,xz} member.
 
     .. attribute:: debian_binary
 
@@ -307,7 +307,7 @@ function can be replaced.
     Call the function *func* for each member of the tar file *file*.
 
     The parameter *comp* is a string determining the compressor used. Possible
-    options are "lzma", "bzip2" and "gzip". The parameter *file* may be
+    options are "xz", "lzma", "bzip2" and "gzip". The parameter *file* may be
     a :class:`file()` object, a file descriptor, or anything implementing
     a :meth:`fileno` method.
 
diff --git a/doc/source/library/apt_pkg.rst b/doc/source/library/apt_pkg.rst
index ffef9c50..b5ee1a53 100644
--- a/doc/source/library/apt_pkg.rst
+++ b/doc/source/library/apt_pkg.rst
@@ -1904,7 +1904,7 @@ thereof and provides a function :func:`RewriteSection` which takes a
 :class:`TagSection()` object and sorting information and outputs a sorted
 section as a string.
 
-.. class:: TagFile(file)
+.. class:: TagFile(file, bytes: bool = False)
 
     An object which represents a typical debian control file. Can be used for
     Packages, Sources, control, Release, etc. Such an object provides two
@@ -1921,6 +1921,10 @@ section as a string.
     .. versionchanged:: 0.7.100
         Added support for using gzip files, via :class:`gzip.GzipFile` or any
         file containing a compressed gzip stream.
+
+    .. versionadded:: 0.8.5
+
+        Added support for using bytes instead of str in Python 3
         
     .. method:: next()
 
@@ -2392,7 +2396,7 @@ following three functions:
 .. function:: pkgsystem_unlock()
 
     Unlock the global pkgsystem. This reverts the effect of
-    :func:`pkgsystem_unlock`.
+    :func:`pkgsystem_lock`.
 
 
 Other classes
diff --git a/po/am.po b/po/am.po
deleted file mode 100644
index 37ad7aed..00000000
--- a/po/am.po
+++ /dev/null
@@ -1,495 +0,0 @@
-# Amharic 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.
-#
-#, fuzzy
-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: 2006-10-09 15:49+0000\n"
-"Last-Translator: Habte <adbaru@gmail.com>\n"
-"Language-Team: Amharic <am@li.org>\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
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "በየቀኑ"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 6e00b3c9..5e099fdd 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:14+0000\n"
 "Last-Translator: Saleh Odeh <kirk.lock@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,249 +25,329 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "ملاحظات الإصدار"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "تحديثات الإنترنت"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "مدعوم بشكل رسمي"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "حقوق نقل محدودة"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -318,22 +399,22 @@ msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -341,48 +422,48 @@ msgstr ""
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "التّفاصيل"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -391,88 +472,125 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr "الرجاء التأكد من إتصالك بالإنترنت"
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "تعذّر تثبيت '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "سيكون من الضروري إزالة رزم مهمة"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -481,19 +599,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/be.po b/po/be.po
index f950f327..22cfda03 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,385 +3,471 @@
 # This file is distributed under the same license as the update-manager package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
 #
-#, fuzzy
 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: 2006-10-16 04:05+0000\n"
-"Last-Translator: Alexander Nyakhaychyk <nyakhaychyk@gmail.com>\n"
+"POT-Creation-Date: 2012-06-25 14:42+0200\n"
+"PO-Revision-Date: 2012-06-20 18:42+0300\n"
+"Last-Translator: Viktar Siarheichyk <viсs@eq.by>\n"
 "Language-Team: Belarusian <be@li.org>\n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. ChangelogURI
 #: ../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:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD-ROM з Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD-ROM з Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD-ROM з Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 'Maverick Meerkat'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD-ROM з Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Партнёры Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Праграмы, якія Canonical запакаваў для сваіх партнёраў"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Гэтая праграма не ўваходзіць у Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Незалежны"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Пададзены пабочнымі распрацоўнікамі праграмаў"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Праграма, прапанаваная пабочнымі распрацоўнікамі."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD-ROM з Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
+msgstr "Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
+msgstr "CD-ROM з Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
+msgstr "Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
+msgstr "CD-ROM з Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
+msgstr "Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
+msgstr "CD-ROM з Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
+msgstr "Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
+msgstr "CD-ROM з Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
+msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
+msgstr "CD-ROM з Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
+msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
+msgstr "CD-ROM з Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
-msgstr ""
+msgstr "Утрымоўваецца супольнасцю"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
-msgstr ""
+msgstr "Абмежаваная праграма"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "CD-ROM з Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
 msgstr ""
+"Свабодныя праграмы і праграмы з адкрытым кодам, што падтрымваюцца Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
-msgstr ""
+msgstr "Падтрыманыя супольнасцю (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
 msgstr ""
+"Свабодныя праграмы і праграмы з адкрытым кодам, што падтрымваюцца супольнасцю"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
-msgstr ""
+msgstr "Несвабодныя драйверы"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Уласніцкія драйверы прыладаў"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
-msgstr ""
+msgstr "Абмежаваныя праграмы (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
-msgstr ""
+msgstr "Праграмы, абмежаваныя аўтарскім правам ці юрыдычнымі пытаннямі"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
+msgstr "CD-ROM з Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
-msgstr ""
+msgstr "Важныя абнаўленні бяспекі"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
-msgstr ""
+msgstr "Рэкамендаваныя абнаўленні"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
-msgstr ""
+msgstr "Загадзя выдадзеныя абнаўленні"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
-msgstr ""
+msgstr "Абнаўленні, што не падтрымваюцца"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "CD-ROM з Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
+msgstr "Абнаўленні бяспекі Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
-msgstr ""
+msgstr "Абнаўленні Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "CD-ROM з Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
-msgstr ""
+msgstr "Афіцыйна падтрымваюцца"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
+msgstr "Абнаўленні бяспекі Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
-msgstr ""
+msgstr "Абнаўленні Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
-msgstr ""
+msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
-msgstr ""
+msgstr "Падтымваецца супольнасцю (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
-msgstr ""
+msgstr "Несвабодныя (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "CD-ROM з Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
-msgstr ""
+msgstr "Больш не падтрымваюцца афіцыйна"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
-msgstr ""
+msgstr "Абмежаванае аўтарскае права"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
+msgstr "Абнаўленні бяспекі Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
-msgstr ""
+msgstr "Абнаўленні Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 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 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 'Squeeze' "
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 'Lenny' "
 
 #. Description
 #: ../data/templates/Debian.info.in:83
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 'Etch'"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
-msgstr ""
+msgstr "Debian 3.1 'Sarge'"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
-msgstr ""
+msgstr "Прапанаваныя абнаўленні"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
-msgstr ""
+msgstr "Абнаўленні бяспекі"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Цяперашняе стабільнае выданне Debian"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
-msgstr ""
+msgstr "Debian testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
-msgstr ""
+msgstr "Debian 'Sid' (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "Праграмы, сумяшчальныя з DFSG з несвабоднымі залежнымі"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Праграмы, несумяшчальныя з DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, 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
 #. append a list of all used servers
-#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
-msgstr ""
+msgstr "Галоўны сервер"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
-msgstr ""
+msgstr "Іншыя серверы"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, 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
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
+msgstr "Загрузка файла %(current)li of %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
-msgstr "Штодзённа"
+msgstr "Падрабязнасці"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr ""
+msgstr "Пачынаецца..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
-msgstr ""
+msgstr "Скончана"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, 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
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
-msgstr ""
+msgstr "Недасяжны спіс зменаў"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -389,110 +475,164 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"Ліст зменаў пакуль што недасяжны.\n"
+"\n"
+"Глядзіце, калі ласка, http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"пакуль змены не стануць дасяжныя, альбо паспрабуйце пазней."
 
-#: ../apt/package.py:1053
-#, fuzzy
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
-msgstr "Калі ласка, праверце вашае далучэньне да інтэрнэту."
+msgstr ""
+"Не ўдалося атрымаць спіс зменаў. \n"
+"Калі ласка, праверце вашае далучэнне да інтэрнэту."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Спіс файлаў да '%s' не атрымалася прачытаць"
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Спіс файлаў кіравання да '%s' не атрымалася прачытаць"
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Залежнасць, якую не ўдаецца задаволіць: %s\n"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
+msgstr "Канфліктуе з усталяваным пакетам '%s'"
+
+#. 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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
+"Парушае залежнасць %(depname)s (%(deprelation)s %(depversion)s) наяўнага "
+"пакета '%(pkgname)s'"
 
-#: ../apt/debfile.py:319
+#. 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:389
 #, python-format
-msgid "Wrong architecture '%s'"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+"Парушае канфлікт %(targetpkg)s (%(comptype)s %(targetver)s) наяўнага пакета "
+"'%(pkgname)s'"
+
+#: ../apt/debfile.py:399
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
+"the '%(debfile)s' provides it via: '%(provides)s'"
 msgstr ""
+"Парушае наяўны пакет '%(pkgname)s', які канфліктуе з: '%(targetpkg)s'. Але "
+"'%(debfile)s' забяспечваецца праз: '%(provides)s'"
+
+#: ../apt/debfile.py:447
+msgid "No Architecture field in the package"
+msgstr "Гэты пакет не мае поля Architecture"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Памылковая архітэктура '%s'"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Ужо ўсталяваная апошняя версія"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Не атрымалася задаволіць усе залежнасці (зламаны кэш)"
 
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, python-format
 msgid "Cannot install '%s'"
-msgstr "Немагчыма ўсталяваць \"%s\""
+msgstr "Немагчыма ўсталяваць '%s'"
+
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Аўтаматычна распакаваны:\n"
+"\n"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Аўтаматычна ператвораны ў друкаваныя ASCII:\n"
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
+"Усталяваць Build-Dependencies для зыходнага пакета '%s', які збірае %s\n"
 
-#: ../apt/debfile.py:494
-#, fuzzy
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
-msgstr "Трэба было-б выдаліць абавязковы пакет"
+msgstr "Трэба было б выдаліць абавязковы пакет"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Скончана"
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
-msgstr ""
+msgstr "Hit "
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
-msgstr ""
+msgstr "Ign "
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
-msgstr ""
+msgstr "Err "
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr ""
+msgstr "Атрымаць:"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr ""
+msgstr " [Апрацоўваецца]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Змена носьбіта: Калі ласка, устаўце дыск з паметкай\n"
+" '%s'\n"
+"у прыладу '%s' і націсніце 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 ""
+msgstr "Атрымана %sB з %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 ""
+"Калі ласка, падайце імя для гэтага дыска, напрыклад, 'Debian 2.1r1 Disk 1'"
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Калі ласка, устаўце дыск у прыладу і націсніце Enter"
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
-msgstr ""
+msgstr "Будуюцца структуры звестак"
diff --git a/po/bg.po b/po/bg.po
index 0fc3ed71..3bf51e92 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:01+0000\n"
 "Last-Translator: Nikola Kasabov <nikola.kasabov@gmail.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,283 +25,373 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.10 актуализации на сигурността"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 5.10 актуализации"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Поддържани от обществото (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 #, fuzzy
 msgid "Restricted software"
 msgstr "Допринесен софтуер"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Поддържани от обществото (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Поддържани от обществото (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Поддържани от обществото (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Несвободни (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Несвободни (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "_Инсталиране на актуализациите"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "_Инсталиране на актуализациите"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 актуализации"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Състарени версии"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Официално поддържани"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 актуализации"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Състарени версии"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Поддържани от обществото (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Несвободни (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Официално поддържан"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Ограничени авторски права"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 обновления по сигурността"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 обновления"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Състарени версии"
@@ -360,23 +451,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (тестване)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (нестабилен)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-съвместим софтуер с несвободни зависимости"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Софтуер несъвместим с DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -384,50 +475,50 @@ msgstr ""
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Сваляне на файл %li от %li при %s/сек"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Сваляне на файл %li от %li при %s/сек"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Детайли"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 #, fuzzy
 msgid "Starting..."
 msgstr "Настройки"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -436,7 +527,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
@@ -445,81 +536,118 @@ msgstr ""
 "Неуспех при изтегляне на списъка с промени. Моля, проверете Интернет "
 "връзката си."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Не може да се инсталира '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Ще трябва да бъде премахнат важен пакет"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -528,19 +656,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/bn.po b/po/bn.po
index f090b822..6e38909a 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:02+0000\n"
 "Last-Translator: Khandakar Mujahidul Islam <suzan@bengalinux.org>\n"
 "Language-Team: Bengali <bn@li.org>\n"
+"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,277 +25,367 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "উবুন্টু ৫.১০ আপডেট"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 #, fuzzy
 msgid "Restricted software"
 msgstr "ফ্রি নয় (মাল্টিভার্স)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "ফ্রি নয় (মাল্টিভার্স)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "ফ্রি নয় (মাল্টিভার্স)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 #, fuzzy
 msgid "Important security updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "আপডেট ইন্সটল করো (_I)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "আপডেট ইন্সটল করো (_I)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "উবুন্টু ৫.১০ আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "অফিসিয়াল ভাবে সমর্থিত"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "উবুন্টু ৫.১০ আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "ফ্রি নয় (মাল্টিভার্স)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "উবুন্টু ৫.১০ আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
@@ -353,23 +444,23 @@ msgid "Debian testing"
 msgstr "ডেবিয়ান \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "ডেবিয়ান \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -377,49 +468,49 @@ msgstr ""
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "বিস্তারিত"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -428,7 +519,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
@@ -436,81 +527,118 @@ msgid ""
 msgstr ""
 "পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।"
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "'%s' ইন্সটল করা যাচ্ছে না"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "একটি প্রয়োজনীয় প্যকেজ অপসারণ করা হতে পারে"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -519,19 +647,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/br.po b/po/br.po
deleted file mode 100644
index a846d409..00000000
--- a/po/br.po
+++ /dev/null
@@ -1,494 +0,0 @@
-# Breton 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.
-#
-#, fuzzy
-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: 2006-05-19 02:42+0000\n"
-"Last-Translator: Oublieuse <oublieuse@gmail.com>\n"
-"Language-Team: Breton <br@li.org>\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
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/ca.po b/po/ca.po
index ab55c5ee..b7e19a04 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:14+0000\n"
 "Last-Translator: Jordi Irazuzta <irazuzta@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,282 +24,372 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Actualitzacions de seguretat d'Ubuntu 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Actualitzacions de seguretat d'Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Actualitzacions de seguretat d'Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Actualitzacions d'Ubuntu 5.10"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Paquets mantinguts per la comunitat (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 #, fuzzy
 msgid "Restricted software"
 msgstr "Programari de la comunitat"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Paquets mantinguts per la comunitat (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Paquets mantinguts per la comunitat (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Paquets mantinguts per la comunitat (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Paquets sense llicència lliure (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Paquets sense llicència lliure (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 #, fuzzy
 msgid "Important security updates"
 msgstr "Debian Stable Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "_Instal·la les actualitzacions"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "_Instal·la les actualitzacions"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualitzacions de seguretat d'Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualitzacions d'Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Paquets mantinguts oficialment (Main)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualitzacions de seguretat d'Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualitzacions d'Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Paquets mantinguts per la comunitat (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Paquets sense llicència lliure (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Algun programari ja no es mantindrà oficialment"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Paquets amb restriccions per copyright (Restricted)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Actualitzacions de seguretat d'Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualitzacions d'Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
@@ -358,23 +449,23 @@ msgid "Debian testing"
 msgstr "Debian Testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 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 "Programari compatible DFSG amb dependències no lliures"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Programari no compatible DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -382,51 +473,51 @@ msgstr ""
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 #, fuzzy
 msgid "Custom servers"
 msgstr "Servidor més proper"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "S'està descarregant el fitxer %li de %li amb %s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "S'està descarregant el fitxer %li de %li amb %s/s"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Detalls"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 #, fuzzy
 msgid "Starting..."
 msgstr "Paràmetres"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "La llista de canvis encara no està disponible. Proveu-ho després."
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -435,7 +526,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
@@ -444,81 +535,118 @@ msgstr ""
 "S'ha produït un error en descarregar els canvis. Comproveu si teniu connexió "
 "a Internet."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "No s'ha pogut instal·lar '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "S'haurà d'esborrar un paquet essencial"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -527,19 +655,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 0eeec1d6..aeab84fe 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,15 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-18 22:54+0000\n"
 "Last-Translator: Dominik Sauer <Dominik.Sauer@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -25,266 +26,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Bezpečnostní aktualizace Ubuntu 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Cdrom s Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Cdrom s Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Cdrom s Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdrom s Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Bezpečnostní aktualizace Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cdrom s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Bezpečnostní aktualizace Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cdrom s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Udržováno komunitou"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Nesvobodný software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cdrom s Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Svobodný software oficiálně podporovaný společností Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Udržováno komunitou (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Software s otevřeným zdrojovým kódem, který je udržován komunitou"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Nesvobodné ovladače"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Patentované (proprietární) ovladače zařízení"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Software s omezující licencí (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Software omezený ochrannou známkou nebo jinými právními prostředky"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cdrom s Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Důležité bezpečnostní aktualizace"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Doporučené aktualizace"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Navržené aktualizace"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Aktualizace přenesené z vyšších verzí distribuce"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cdrom s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Bezpečnostní aktualizace Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Aktualizace Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Software přenesený z vyšší verze distribuce na Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdrom s Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Oficiálně podporováno"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Bezpečnostní aktualizace Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Aktualizace Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Aplikace přenesené z vyšších verzí distribuce na Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Udržováno komunitou (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Nesvobodný (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Již není oficiálně podporováno"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Omezený copyright"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Bezpečnostní aktualizace Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Aktualizace Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Aplikace přenesené z vyšších verzí distribuce na Ubuntu 4.10"
 
@@ -341,23 +434,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 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 "Software kompatibilní s DFSG, ale závisející na nesvobodných balících"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Software nekompatibilní s DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Server pro zemi \"%s\""
@@ -365,48 +458,48 @@ msgstr "Server pro zemi \"%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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Hlavní server"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Uživatelem vybrané servery"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Stahuji %(current)li. soubor z %(total)li rychlostí %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Stahuji %(current)li. soubor of %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Seznam změn není dostupný."
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -415,7 +508,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -423,81 +516,118 @@ msgstr ""
 "Stažení seznamu změn selhalo. \n"
 "Prosím zkontrolujte své internetové připojení."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Nemohu nainstalovat '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Toto by vedlo k odstranění základního balíku"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -506,19 +636,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/csb.po b/po/csb.po
index c38aafde..270069f8 100644
--- a/po/csb.po
+++ b/po/csb.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-08 04:10+0000\n"
 "Last-Translator: Michôł Òstrowsczi <ostrowski.michal@gmail.com>\n"
 "Language-Team: Kashubian <csb@li.org>\n"
+"Language: csb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,248 +26,328 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "%s aktualizacëji"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -318,22 +399,22 @@ msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Serwera dlô kraju %s"
@@ -341,49 +422,49 @@ msgstr "Serwera dlô kraju %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Przédny serwera"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Jine serwerë"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 #, fuzzy
 msgid "Details"
 msgstr "Codniowò"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -392,86 +473,123 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Nie je mòżno zainstalowac '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr ""
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -480,19 +598,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 8e361052..48e38604 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"
+"POT-Creation-Date: 2012-06-12 10:44+0200\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
@@ -24,266 +26,351 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
 #, fuzzy
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr "Ubuntu 4.10 \"Warty Warthog\""
+#| msgid "Ubuntu 7.04 'Feisty Fawn'"
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 7.04 \"Feisty Fawn\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:158
 #, fuzzy
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
+#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Cd-rom med Ubuntu 7.04 \"Feisty Fawn\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:269
 #, fuzzy
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+#| msgid "Ubuntu 9.10 'Karmic Koala'"
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 9.10 \"Karmic Koala\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Cd-rom med Ubuntu 9.10 \"Karmic Koala\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:395
 #, fuzzy
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
 msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:486
 #, fuzzy
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+#| msgid "Ubuntu 9.10 'Karmic Koala'"
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 9.10 \"Karmic Koala\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:506
 #, fuzzy
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
+#| msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Cd-rom med Ubuntu 9.10 \"Karmic Koala\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
 #, fuzzy
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+#| msgid "Ubuntu 8.04 'Hardy Heron'"
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 8.04 \"Hardy Heron\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:589
 #, fuzzy
+#| msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Cd-rom med Ubuntu 8.04 \"Hardy Heron\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "Ubuntu 9.10 \"Karmic Koala\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:652
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "Cd-rom med Ubuntu 9.10 \"Karmic Koala\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:695
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "Ubuntu 9.04 \"Jaunty Jackalope\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:714
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "Cd-rom med Ubuntu 9.04 \"Jaunty Jackalope\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:757
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "Ubuntu 8.10 \"Intrepid Ibex\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:777
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "Cd-rom med Ubuntu 8.10 \"Intrepid Ibex\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:821
+msgid "Ubuntu 8.04 'Hardy Heron'"
+msgstr "Ubuntu 8.04 \"Hardy Heron\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:841
 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
+#: ../data/templates/Ubuntu.info.in:886
 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
+#: ../data/templates/Ubuntu.info.in:905
 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
+#: ../data/templates/Ubuntu.info.in:950
 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
+#: ../data/templates/Ubuntu.info.in:969
 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
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr "Vedligeholdt af fællesskabet"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Ikke-frit software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cd-rom med Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
-msgstr "Fri software understøttet af Canonical"
+#| msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
+msgstr "Canonical-understøttet software med åben kildekode"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr "Vedligeholdt af fællesskabet (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Fri software vedligeholdt af fællesskabet"
+#| msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
+msgstr "Software med åben kildekode vedligeholdt af fællesskabet"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Proprietære drivere"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Proprietære drivere til enheder"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Ikke-frit software (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Software begrænset af ophavsret eller legale problemer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cd-rom med Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Vigtige sikkerhedsopdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Anbefalede opdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
-msgstr "Foreslåede opdateringer"
+msgstr "Ikke-frigivne opdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
-msgstr "Tilbageporterede opdateringer"
+msgstr "Ikke-understøttede opdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 sikkerhedsopdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 opdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 tilbageporteringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Understøttet officielt"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 sikkerhedsopdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 opdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 tilbageporteringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
-msgstr "Vedligeholdt af fællesskabet (universe)"
+msgstr "Vedligeholdt af fællesskabet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Ikke-frit (multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Ikke længere officielt supporteret"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Begrænset ophavsret"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 sikkerhedsopdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 opdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 tilbageporteringer"
 
@@ -295,25 +382,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,39 +407,36 @@ 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
+#: ../data/templates/Debian.info.in:147
 msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian \"Sid\" (ustabil)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-kompatibel software med ikke-frie afhængigheder"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Ikke-DFSG-kompatibel software"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Server for %s"
@@ -364,48 +444,48 @@ msgstr "Server for %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Hovedserver"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Brugerdefinerede servere"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Henter fil %(current)li af %(total)li med %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Henter fil %(current)li af %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr ""
+msgstr "Starter..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
-msgstr ""
+msgstr "Færdig"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, 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
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Listen med ændringer er ikke tilgængelig"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -413,8 +493,12 @@ 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
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -422,102 +506,146 @@ msgstr ""
 "Fejl ved hentning af ændringslisten.\n"
 "Undersøg venligst din internetforbindelse."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
+#, fuzzy, python-format
+#| msgid "List of files for '%s'could not be read"
+msgid "List of files for '%s' could not be read"
+msgstr "Listen over filer for \"%s\" kunne ikke læses"
+
+#: ../apt/debfile.py:93
+#, fuzzy, python-format
+#| msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
+msgstr "Listen over filer for \"%s\" kunne ikke læses"
+
+#: ../apt/debfile.py:211
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "Dependency is not satisfiable: %s\n"
+msgstr "Afhængighed kan ikke opfyldes; %s\n"
+
+#: ../apt/debfile.py:232
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr "I konflikt med den installerede pakke \"%s\""
 
-#: ../apt/debfile.py:81
+#. 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:373
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#. 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:389
 #, python-format
-msgid "Dependency is not satisfiable: %s\n"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:399
 #, python-format
-msgid "Conflicts with the installed package '%s'"
+msgid ""
+"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
+"the '%(debfile)s' provides it via: '%(provides)s'"
+msgstr ""
+
+#: ../apt/debfile.py:447
+msgid "No Architecture field in the package"
 msgstr ""
 
-#: ../apt/debfile.py:319
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
-msgstr ""
+msgstr "Forkert arkitektur \"%s\""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Der er allerede installeret en senere version"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 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
+#: ../apt/debfile.py:519
+#, python-format
 msgid "Cannot install '%s'"
 msgstr "Kan ikke installere \"%s\""
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, 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
+#: ../apt/debfile.py:700
 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
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Færdig"
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
-msgstr ""
+msgstr "Tjekkede "
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
-msgstr ""
+msgstr "Ign "
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
-msgstr ""
+msgstr "Fejl "
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr ""
+msgstr "Henter:"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr ""
+msgstr " [Arbejder]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%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
+#: ../apt/progress/text.py:223
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
+msgstr "Hentede %sB på %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 ""
+msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'"
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 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
+#: ../apt/cache.py:157
 msgid "Building data structures"
-msgstr ""
+msgstr "Opbygger datastrukturer"
+
+#~ msgid "This is not a valid DEB archive, missing '%s' member"
+#~ msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler \"%s-medlem\""
diff --git a/po/de.po b/po/de.po
index 1a981522..5f3fb0fa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,16 +4,18 @@
 # This file is distributed under the same license as the update-manager package.
 # Initial version by an unknown artist.
 # Frank Arnold <frank@scirocco-5v-turbo.de>, 2005.
+# Holger Wansing <linux@wansing-online.de>, 2012.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: python-apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-31 17:09+0100\n"
-"PO-Revision-Date: 2010-01-31 17:14+0100\n"
-"Last-Translator: Julian Andres Klode <jak@debian.org>\n"
+"POT-Creation-Date: 2012-06-25 14:42+0200\n"
+"PO-Revision-Date: 2012-06-17 20:23+0200\n"
+"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,257 +28,327 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 »Precise Pangolin«"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD-ROM mit Ubuntu 12.04 »Precise Pangolin«"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 »Oneiric Ocelot«"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD-ROM mit Ubuntu 11.10 »Oneiric Ocelot«"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 »Natty Narwhal«"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD-ROM mit Ubuntu 11.04 »Natty Narwhal«"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 »Maverick Meerkat«"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD-ROM mit Ubuntu 10.10 »Maverick Meerkat«"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Canonical-Partner"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Software, die von Canonical für seine Partner paketiert wurde"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Diese Software ist nicht Teil von Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Unabhängig"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Bereitgestellt von Fremd-Software-Entwicklern"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Software, die von Fremd-Software-Entwicklern angeboten wurde"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
 msgid "Ubuntu 10.04 'Lucid Lynx'"
 msgstr "Ubuntu 10.04 »Lucid Lynx«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:589
 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
-msgstr "CD mit Ubuntu 10.04 »Lucid Lynx«"
+msgstr "CD-ROM mit Ubuntu 10.04 »Lucid Lynx«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 9.10 »Karmic Koala«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD-ROM mit Ubuntu 9.10 »Karmic Koala«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 9.04 »Jaunty Jackalope«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD-ROM mit Ubuntu 9.04 »Jaunty Jackalope«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:196
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 8.10 »Intrepid Ibex«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "CD mit Ubuntu 8.10 »Intrepid Ibex«"
+msgstr "CD-ROM mit Ubuntu 8.10 »Intrepid Ibex«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 8.04 »Hardy Heron«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:276
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "CD mit Ubuntu 8.04 »Hardy Heron«"
+msgstr "CD-ROM mit Ubuntu 8.04 »Hardy Heron«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:313
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.10 »Gutsy Gibbon«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:331
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "CD mit Ubuntu 7.10 »Gutsy Gibbon«"
+msgstr "CD-ROM mit Ubuntu 7.10 »Gutsy Gibbon«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04 »Feisty Fawn«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:384
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "CD mit Ubuntu 7.04 »Feisty Fawn«"
+msgstr "CD-ROM mit Ubuntu 7.04 »Feisty Fawn«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 »Edgy Eft«"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:423
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr "Von der Ubuntu-Gemeinde betreut"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:429
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Eingeschränkte Software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:436
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr "CD mit Ubuntu 6.10 »Edgy Eft«"
+msgstr "CD-ROM mit Ubuntu 6.10 »Edgy Eft«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:470
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS »Dapper Drake«"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:473
-msgid "Canonical-supported Open Source software"
-msgstr "Von Canonical unterstütze Open-Source-Software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Von Canonical unterstützte freie und quelloffene Software"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr "Von der Gemeinde betreut (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:476
-msgid "Community-maintained Open Source software"
-msgstr "Von der Ubuntu-Gemeinde betreute Open-Source-Software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Von der Ubuntu-Gemeinde betreute freie und quelloffene Software"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:478
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Proprietäre Treiber"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:479
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Proprietäre Gerätetreiber"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:481
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Eingeschränkte Software (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:482
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Rechtlich eingeschränkte Software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:488
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "CD mit Ubuntu 6.06 LTS »Dapper Drake«"
+msgstr "CD-ROM mit Ubuntu 6.06 LTS »Dapper Drake«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:500
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Wichtige Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:505
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Empfohlene Aktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:510
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr "Vorabveröffentlichte Aktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:515
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
-msgstr "Nicht unterstütze Aktualisierungen"
+msgstr "Nicht unterstützte Aktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:522
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 »Breezy Badger«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:536
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "CD mit Ubuntu 5.10 »Breezy Badger«"
+msgstr "CD-ROM mit Ubuntu 5.10 »Breezy Badger«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:548
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:553
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Aktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:558
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 »Hoary Hedgehog«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:579
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "CD mit Ubuntu 5.04 »Hoary Hedgehog«"
+msgstr "CD-ROM mit Ubuntu 5.04 »Hoary Hedgehog«"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:582 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
 msgstr "Offiziell unterstützt"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:591
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:596
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 Aktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:601
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:607
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 »Warty Warthog«"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:613
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr "Von der Ubuntu-Gemeinde betreut (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:615
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Unfrei (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:621
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD-ROM mit Ubuntu 4.10 »Warty Warthog«"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:624
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Unterstützung ist ausgelaufen"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:626
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Eingeschränktes Copyright"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:633
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:638
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Aktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:643
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Backports"
 
@@ -288,61 +360,66 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Debian.info.in:8
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 »Wheezy«"
+
+#. Description
+#: ../data/templates/Debian.info.in:33
 msgid "Debian 6.0 'Squeeze' "
 msgstr "Debian 6.0 »Squeeze«"
 
 #. Description
-#: ../data/templates/Debian.info.in:33
+#: ../data/templates/Debian.info.in:58
 msgid "Debian 5.0 'Lenny' "
 msgstr "Debian 5.0 »Lenny«"
 
 #. Description
-#: ../data/templates/Debian.info.in:58
+#: ../data/templates/Debian.info.in:83
 msgid "Debian 4.0 'Etch'"
 msgstr "Debian 4.0 »Etch«"
 
 #. Description
-#: ../data/templates/Debian.info.in:83
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
 msgstr "Debian 3.1 »Sarge«"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
 msgstr "Vorgeschlagene Aktualisierungen"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
 msgstr "Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
-msgstr "Aktuelle stabile Freigabe von Debian"
+msgstr "Aktuelle stabile Veröffentlichung von Debian"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
 msgstr "Debian Testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
-msgstr "Debian »Sid« (unstable)"
+msgstr "Debian »Sid« (Unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
 msgstr "Nicht DFSG-kompatible Software"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Server für %s"
@@ -350,48 +427,49 @@ msgstr "Server für %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Haupt-Server"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Benutzerdefinierte Server"
 
-#: ../apt/progress/gtk2.py:259 ../apt/progress/gtk2.py:315
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Datei %(current)li von %(total)li wird mit %(speed)s/s heruntergeladen"
+msgstr ""
+"Datei %(current)li von %(total)li wird mit %(speed)s/s heruntergeladen."
 
-#: ../apt/progress/gtk2.py:265 ../apt/progress/gtk2.py:321
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Datei %(current)li von %(total)li wird heruntergeladen"
+msgstr "Datei %(current)li von %(total)li wird heruntergeladen."
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:341
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Details"
 
-#: ../apt/progress/gtk2.py:429
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr "Starte..."
+msgstr "Starten ..."
 
-#: ../apt/progress/gtk2.py:435
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr "Fertig"
 
-#: ../apt/package.py:333
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr "Ungültiger Unicode-Wert in Beschreibung für '%s' (%s). Bitte melden."
 
-#: ../apt/package.py:989 ../apt/package.py:1095
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Die Liste mit Änderungen ist momentan nicht verfügbar."
 
-#: ../apt/package.py:1099
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -401,10 +479,10 @@ msgid ""
 msgstr ""
 "Die Liste mit Änderungen ist momentan nicht verfügbar.\n"
 "\n"
-"Bitte benutzen Sie http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"Bitte benutzen Sie http://launchpad.net/ubuntu/+source/%s/%s/+changelog,\n"
 "bis die Liste verfügbar ist oder versuchen sie es später erneut."
 
-#: ../apt/package.py:1105
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -412,76 +490,129 @@ msgstr ""
 "Die Liste mit Änderungen konnte nicht heruntergeladen werden. \n"
 "Bitte überprüfen Sie Ihre Internet-Verbindung."
 
-#: ../apt/debfile.py:70
+#: ../apt/debfile.py:82
 #, python-format
 msgid "List of files for '%s' could not be read"
-msgstr "Die Liste der Dateien von ›%s‹ konnte nicht gelesen werden."
+msgstr "Die Liste der Dateien von »%s« konnte nicht gelesen werden."
 
-#: ../apt/debfile.py:138
+#: ../apt/debfile.py:93
+#, python-format
+msgid "List of control files for '%s' could not be read"
+msgstr "Die Liste der Dateien von »%s« konnte nicht gelesen werden."
+
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr "Abhängigkeit nicht erfüllbar: %s\n"
 
-#: ../apt/debfile.py:162
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
-msgstr "Steht in Konflikt zu dem installiertem Paket ›%s‹"
+msgstr "Steht in Konflikt zu dem installierten Paket »%s«"
+
+#. 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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+msgstr ""
+"Beschädigt vorhandenes Paket »%(pkgname)s« wegen Abhängigkeit %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 
-#: ../apt/debfile.py:308
+#. 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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+"Beschädigt vorhandenes Paket »%(pkgname)s« wegen Konflikt: %(targetpkg)s "
+"(%(comptype)s %(targetver)s)"
+
+#: ../apt/debfile.py:399
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
+"the '%(debfile)s' provides it via: '%(provides)s'"
+msgstr ""
+"Beschädigt vorhandenes Paket »%(pkgname)s«, welches in Konflikt steht: "
+"»%(targetpkg)s«. Aber »%(debfile)s« bietet es an über: »%(provides)s«"
+
+#: ../apt/debfile.py:447
+msgid "No Architecture field in the package"
+msgstr "Kein Architecture-Feld in dem Paket"
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
-msgstr "Falsche Architektur ›%s‹"
+msgstr "Falsche Architektur »%s«"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:314
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
-msgstr "Eine spätere Version is bereits installiert."
+msgstr "Eine neuere Version ist bereits installiert."
 
-#: ../apt/debfile.py:334
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr "Es konnten nicht alle Abhängigkeiten erfüllt werden (Cache defekt)"
+msgstr ""
+"Es konnten nicht alle Abhängigkeiten erfüllt werden (Zwischenspeicher "
+"defekt)."
 
-#: ../apt/debfile.py:365
+#: ../apt/debfile.py:519
 #, python-format
 msgid "Cannot install '%s'"
-msgstr "›%s‹ kann nicht installiert werden"
+msgstr "»%s« kann nicht installiert werden."
 
-#: ../apt/debfile.py:473
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Automatisch entpackt:\n"
+"\n"
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Automatisch konvertiert in druckfähiges ASCII:\n"
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
-"Installiere Bau-Abhängigkeiten für das Quellpaket ›%s‹ welches ›%s‹baut\n"
+"Installieren der Bau-Abhängigkeiten für das Quellpaket »%s«, welches »%s« "
+"baut\n"
 
-#: ../apt/debfile.py:483
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr "Ein grundlegendes Paket müsste entfernt werden"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr "%c%s... Fertig"
 
-#: ../apt/progress/text.py:120
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr "OK   "
 
-#: ../apt/progress/text.py:129
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr "Ign  "
 
-#: ../apt/progress/text.py:131
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr "Fehl "
 
-#: ../apt/progress/text.py:142
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr "Hole:"
 
-#: ../apt/progress/text.py:202
+#: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr " [Verarbeite]"
+msgstr " [Verarbeiten]"
 
-#: ../apt/progress/text.py:213
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -490,25 +621,25 @@ msgid ""
 msgstr ""
 "Medienwechsel: Bitte legen Sie das Medium mit dem Namen\n"
 " »%s«\n"
-"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n"
+"in Laufwerk »%s« ein und drücken Sie die Eingabetaste.\n"
 
 #. Trick for getting a translation from apt
-#: ../apt/progress/text.py:222
+#: ../apt/progress/text.py:223
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Es wurden %sB in %s geholt (%sB/s)\n"
 
-#: ../apt/progress/text.py:238
+#: ../apt/progress/text.py:239
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 msgstr ""
 "Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.1r1 "
-"Disk 1«"
+"Disk 1«."
 
-#: ../apt/progress/text.py:254
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
-"Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste"
+"Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste."
 
-#: ../apt/cache.py:127
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr "Datenstrukturen werden aufgebaut"
diff --git a/po/el.po b/po/el.po
index 835417bc..f5599eaf 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,14 +3,16 @@
 # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Kostas Papadimas <pkst@gnome.org>, 2005, 2006.
+# Thomas Vasileiou <thomas-v@wildmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2006-10-16 04:13+0000\n"
-"Last-Translator: Kostas Papadimas <pkst@gmx.net>\n"
+"POT-Creation-Date: 2012-06-25 14:42+0200\n"
+"PO-Revision-Date: 2012-06-13 11:37+0100\n"
+"Last-Translator: Thomas Vasileiou <thomas-v@wildmail.com>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,267 +25,327 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Cdrom με Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 'Oneiric Ocelot''"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Cdrom με το Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Cdrom με το Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Cdrom με το Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Συνεργάτες της Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Πακέτο λογισμικού της Canonical για τους συνεργάτες της "
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Αυτό το λογισμικό δεν αποτελεί μέρος των Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Ανεξάρτητο"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Παρέχεται από τρίτους"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Λογισμικό που προσφέρεται από τρίτους."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Cdrom με Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 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
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'"
+msgstr "Cdrom με το Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:695
 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
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'"
+msgstr "Cdrom με το Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:757
 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
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Cdrom με Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:821
 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
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Cdrom με Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04"
+msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'"
+msgstr "Cdrom με Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04"
+msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'"
+msgstr "Cdrom με Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
-msgstr "Community maintained"
+msgstr "Υποστηριζόμενα από την κοινότητα"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Λογισμικό με περιορισμούς"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cdrom με το Ubuntu 6.10 'Edgy Eft"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 TLS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
-msgid "Canonical-supported Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
 msgstr "Λογισμικό ανοικτού κώδικα υποστηριζόμενο από την Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
-msgstr "Υποστηριζόμενα από την κοινότητα (Universe)"
+msgstr "Υποστηριζόμενα από την κοινότητα (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Community maintained Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Λογισμικό ανοιχτού κώδικα υποστηριζόμενο από την κοινότητα"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Όχι-ελεύθεροι οδηγοί"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Οδηγοί με κλειστό κώδικα για συσκευές"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Όχι-ελεύθερο (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Λογισμικό με περιορισμούς από πνευματικά δικαιώματα και νόμους"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cdrom με Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Σημαντικές ενημερώσεις ασφαλείας"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Συνιστώμενες ενημερώσεις"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr "Προτεινόμενες ενημερώσεις"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
-msgstr "Backported ενημερώσεις"
+msgstr "Μη υποστηριζόμενες ενημερώσεις"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
-msgstr "Αναβαθμίσεις  Ubuntu 5.10"
+msgstr "Αναβαθμίσεις Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Cdrom με Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
-msgstr "Officially supported"
+msgstr "Επίσημα υποστηριζόμενο"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ενημερώσεις Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
-msgstr "Community maintained (Universe)"
+msgstr "Υποστηριζόμενα από την κοινότητα (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Όχι-ελεύθερα (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Δεν υποστηρίζονται πια επίσημα"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Περιορισμένα πνευματικά δικαιώματα"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ενημερώσεις ασφαλείας Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ενημερώσεις Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Backports"
 
@@ -295,68 +357,66 @@ 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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 'Squeeze' "
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 'Lenny' "
 
 #. Description
 #: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 'Etch'"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 'Sarge'"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
 msgstr "Προτεινόμενες ενημερώσεις"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
-msgstr "Σημαντικές ενημερώσεις ασφαλείας"
+msgstr "Ενημερώσεις ασφαλείας"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Τρέχουσα σταθερή έκδοση Debian "
 
 #. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian 'Sid' (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες Εξαρτήσεις"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
 msgstr "Λογισμικό μη συμβατό με DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Εξυπηρετητής για %s"
@@ -364,48 +424,49 @@ 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
 #. append a list of all used servers
-#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Κύριος εξυπηρετητής"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Προσαρμοσμένοι εξυπηρετητές"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Λήψη αρχείου %(current)li από %(total)li με %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Λήψη αρχείου %(current)li από %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr ""
+msgstr "Εκκίνηση..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
-msgstr ""
+msgstr "Ολοκληρώθηκε"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
+"Μη έγκυρος unicode στην περιγραφή για το '%s' (%s). Παρακαλώ αναφέρετέ το."
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
-msgstr "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη."
+msgstr "Η λίστα των αλλαγών δεν είναι διαθέσιμη."
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -413,8 +474,13 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"Η λίστα αλλαγών δεν είναι διαθέσιμη.\n"
+"\n"
+"Παρακαλώ χρησιμοποιήστε το http://launchpad.net/ubuntu/+source/%s/%s/"
+"+changelog\n"
+"έως ότου οι αλλαγές γίνουν διαθέσιμες ή προσπαθήστε αργότερα."
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -422,102 +488,151 @@ msgstr ""
 "Αποτυχία λήψης της λίστας των αλλαγών.\n"
 "Παρακαλώ ελέγξτε τη σύνδεση σας στο διαδίκτυο."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Η λίστα των αρχείων για το '%s' δεν μπόρεσε να διαβαστεί"
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Η λίστα των αρχείων ελέγχου για το '%s' δεν μπόρεσε να διαβαστεί"
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Η εξάρτηση δεν ικανοποιείται: %s\n"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
+msgstr "Συγκρούεται με το εγκατεστημένο πακέτο '%s'"
+
+#. 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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
+"Παραβιάζει υπάρχον πακέτο '%(pkgname)s' εξάρτηση %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 
-#: ../apt/debfile.py:319
+#. 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:389
 #, python-format
-msgid "Wrong architecture '%s'"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+"Παραβιάζει υπάρχον πακέτο '%(pkgname)s' σύγκρουση με : %(targetpkg)s "
+"(%(comptype)s %(targetver)s)"
+
+#: ../apt/debfile.py:399
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
+"the '%(debfile)s' provides it via: '%(provides)s'"
 msgstr ""
+"Παραβιάζει υπάρχον πακέτο '%(pkgname)s' το οποίο συγκρούεται με: "
+"'%(targetpkg)s'. Αλλά το '%(debfile)s', το παρέχει μέσω του: '%(provides)s'"
+
+#: ../apt/debfile.py:447
+msgid "No Architecture field in the package"
+msgstr "Δεν βρέθηκε το πεδίο Αρχιτεκτονική στο πακέτο"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Λάθος αρχιτεκτονική '%s'"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Μια πιο πρόσφατη έκδοση είναι ήδη εγκατεστημένη"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Αποτυχία ικανοποίησης όλων των εξαρτήσεων (σπασμένη cache)"
 
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, python-format
 msgid "Cannot install '%s'"
-msgstr "Αδυναμία εγκατάστασης '%s'"
+msgstr "Αδυναμία εγκατάστασης του '%s'"
+
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Αυτόματη αποσυμπίεση:\n"
+"\n"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Μετατράπηκε αυτόματα σε εκτυπώσιμο ascii:\n"
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
+"Εγκαταστήστε τις Εξαρτήσεις Μεταγλώττισης για το πηγαίο πακέτο  '%s' που "
+"δομεί το %s\n"
 
-#: ../apt/debfile.py:494
-#, fuzzy
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Ολοκληρώθηκε"
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
-msgstr ""
+msgstr "Πιέστε"
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
-msgstr ""
+msgstr "Αγν"
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
-msgstr ""
+msgstr "Λαθ"
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr ""
+msgstr "Φέρε:"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr ""
+msgstr "[Λειτουργεί]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Αλλαγή μέσου: παρακαλώ τοποθετήστε το δίσκο\n"
+" '%s'\n"
+"στον οδηγό '%s' και πατήστε 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 ""
+msgstr "Μεταφέρθηκαν %sB σε %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 ""
+msgstr "Παρακαλώ δώστε ένα όνομα για το Δίσκο, όπως 'Debian 2.1r1 Disk 1'"
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Παρακαλώ τοποθετήστε ένα Δίσκο στον οδηγό και πατήστε enter"
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
-msgstr ""
+msgstr "Κατασκευή δομών δεδομένων"
diff --git a/po/en_AU.po b/po/en_AU.po
index 3c7125e5..c7c3415b 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:01+0000\n"
 "Last-Translator: David Satchell <david@davidsatchell.net>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,266 +25,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD-ROM with Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD-ROM with Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD-ROM with Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD-ROM with Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD-ROM with Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD-ROM with Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Community maintained"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Restricted software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD-ROM with Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Community maintained Open Source software"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Community maintained (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Community maintained Open Source software"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Non-free drivers"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Proprietary drivers for devices"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Restricted software (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "CD-ROM with Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Important security updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Recommended updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Proposed updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Backported updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD-ROM with Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD-ROM with Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Officially supported"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Backports"
 
@@ -340,23 +433,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 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 "DFSG-compatible Software with Non-Free Dependencies"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Non-DFSG-compatible Software"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Server for %s"
@@ -364,48 +457,48 @@ msgstr "Server for %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Main server"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Custom servers"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Downloading file %li of %li with %s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Downloading file %li of %li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Details"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "The list of changes is not available"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -414,7 +507,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
@@ -423,81 +516,118 @@ msgstr ""
 "Failed to download the list of changes. Please check your Internet "
 "connection."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Can't install '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "An essential package would have to be removed"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -506,19 +636,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/en_CA.po b/po/en_CA.po
index 2586ed53..4c63b739 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:06+0000\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,287 +25,377 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 5.04 Updates"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 #, fuzzy
 msgid "Restricted software"
 msgstr "Contributed software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "_Install"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "_Install"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 #, fuzzy
 msgid "Officially supported"
 msgstr "Officially supported"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Officially supported"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.04 Updates"
@@ -362,22 +453,22 @@ msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -385,51 +476,51 @@ msgstr ""
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 #, fuzzy
 msgid "Details"
 msgstr "<b>Details</b>"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 #, fuzzy
 msgid "Starting..."
 msgstr "Settings"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "There is a new release of Ubuntu available!"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -438,7 +529,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
@@ -447,80 +538,117 @@ msgstr ""
 "Failed to download changes. Please check if there is an active internet "
 "connection."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, python-format
 msgid "Cannot install '%s'"
 msgstr ""
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr ""
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -529,19 +657,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
deleted file mode 100644
index aa451a85..00000000
--- a/po/en_GB.po
+++ /dev/null
@@ -1,524 +0,0 @@
-# English (British) translation.
-# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Abigail Brady <morwen@evilmagic.org>, Bastien Nocera <hadess@hadess.net>, 2005.
-#
-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: 2006-10-16 04:14+0000\n"
-"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
-"Language-Team: \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
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-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'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-#, fuzzy
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Ubuntu 4.10 'Warty Warthog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-#, fuzzy
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-#, fuzzy
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-#, fuzzy
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-#, fuzzy
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-#, fuzzy
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-#, fuzzy
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 5.04 Security Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-#, fuzzy
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 5.04 Security Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 6.10 'Edgy Eft'"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
-msgid "Community-maintained"
-msgstr "Community maintained"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr "Restricted software"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
-msgid "Canonical-supported Open Source software"
-msgstr "Canonical supported Open Source software"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
-msgid "Community-maintained (universe)"
-msgstr "Community maintained (universe)"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Community maintained Open Source software"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr "Non-free drivers"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr "Proprietary drivers for devices"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr "Restricted software (Multiverse)"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr "Software restricted by copyright or legal issues"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr "Important security updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr "Recommended updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
-msgid "Pre-released updates"
-msgstr "Proposed updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
-msgid "Unsupported updates"
-msgstr "Backported updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 Security Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 Backports"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr "Officially supported"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 Security Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.04 Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.04 Backports"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 4.10 'Warty Warthog'"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
-msgid "Community-maintained (Universe)"
-msgstr "Community maintained (Universe)"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr "Non-free (Multiverse)"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr "No longer officially supported"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr "Restricted copyright"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 4.10 Security Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 4.10 Updates"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-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 "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\""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian Testing"
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian Testing"
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-#, fuzzy
-msgid "Debian 3.1 'Sarge'"
-msgstr "Debian 3.1 \"Sarge\""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr "Proposed updates"
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
-msgid "Security updates"
-msgstr "Important security updates"
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-#, fuzzy
-msgid "Debian current stable release"
-msgstr "Debian Unstable \"Sid\""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
-msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
-msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr "DFSG-compatible Software with Non-Free Dependencies"
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr "Non-DFSG-compatible Software"
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr "Server for %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
-msgid "Main server"
-msgstr "Main server"
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr "Custom servers"
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Downloading file %(current)li of %(total)li with %(speed)s/s"
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr "Downloading file %(current)li of %(total)li"
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr "Details"
-
-#: ../apt/progress/gtk2.py:367
-#, fuzzy
-msgid "Starting..."
-msgstr "_Settings"
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr "The list of changes is not available"
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
-msgid "Cannot install '%s'"
-msgstr "Can't install '%s'"
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-#, fuzzy
-msgid "An essential package would be removed"
-msgstr "An essential package would have to be removed"
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/eo.po b/po/eo.po
index dcac3593..3eceb847 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -12,17 +12,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-27 15:56+0200\n"
-"PO-Revision-Date: 2011-05-09 16:09+0200\n"
-"Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
+"POT-Creation-Date: 2012-06-25 14:42+0200\n"
+"PO-Revision-Date: 2012-06-11 09:54+0000\n"
+"Last-Translator: Michael Moroni <michael.moroni@mailoo.org>\n"
 "Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-09 14:00+0000\n"
-"X-Generator: Launchpad (build 12981)\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Launchpad-Export-Date: 2012-06-11 09:56+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -31,299 +30,329 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "KD kun Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "KD kun Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "KD kun Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
 msgid "Ubuntu 10.10 'Maverick Meerkat'"
 msgstr "Ubuntu 10.10 'Maverick Meerkat'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:506
 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
 msgstr "KD kun Ubuntu 10.10 'Maverick Meerkat'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:43
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Canonical Partners"
 msgstr "Partneroj de Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:45
+#: ../data/templates/Ubuntu.info.in:520
 msgid "Software packaged by Canonical for their partners"
-msgstr "Programaro pakita de Canonical por iliaj partneroj"
+msgstr "Programaro pakita de Canonical por siaj partneroj"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:46
+#: ../data/templates/Ubuntu.info.in:521
 msgid "This software is not part of Ubuntu."
-msgstr "Tiuj ĉi programoj ne estas parto de Ubuntu."
+msgstr "Ĉi tiu programaro ne estas parto de Ubuntu."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:53
+#: ../data/templates/Ubuntu.info.in:528
 msgid "Independent"
 msgstr "Sendepende"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:55
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Provided by third-party software developers"
-msgstr "Ofertitaj de aliaj programistoj kaj firmaoj"
+msgstr "Ofertitaj de eksteraj programistoj"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:56
+#: ../data/templates/Ubuntu.info.in:531
 msgid "Software offered by third party developers."
-msgstr "Programoj ofertitaj de aliaj programistoj kaj firmaoj"
+msgstr "Programaro ofertita de eksteraj programistoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:94
+#: ../data/templates/Ubuntu.info.in:569
 msgid "Ubuntu 10.04 'Lucid Lynx'"
 msgstr "Ubuntu 10.04 'Lucid Lynx'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:589
 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
 msgstr "KD kun Ubuntu 10.04 'Lucid Lynx'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:155
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:173
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "KD kun Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:216
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:234
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "KD kun Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:277
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "KD kun Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:339
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "KD kun Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:402
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "KD kun Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:465
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:483
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "KD kun Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:525
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
-msgstr "Komunume prizorgata"
+msgstr "Prizorgata de komunumo"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:536
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Limigita programaro"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:543
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "KD kun Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:585
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:588
-msgid "Canonical-supported Open Source software"
-msgstr "Malfermitkoda programaro subtenata de Canonical"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Libera kaj malfermitkoda programaro subtenata de Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:590
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
-msgstr "Komunume prizorgata (universo)"
+msgstr "Prizorgata de komunumo (universo)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:591
-msgid "Community-maintained Open Source software"
-msgstr "Komunume prizorgata malfermitkoda programaro"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Libera kaj malfermitkoda programaro prizorgata de komunumo"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:593
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Neliberaj peliloj"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:594
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Fermitkoda peliloj por aparatoj"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:596
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Limigita programaro (multiverso)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:597
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
-msgstr "Programaro limigita per kopirajto aŭ leĝaj temoj"
+msgstr "Programaro limigita pro kopirajto aŭ leĝaj temoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:603
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "KD kun Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:619
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
-msgstr "Gravaj sekurecaj ĝisdatigoj"
+msgstr "Gravaj ĝisdatigoj pri sekureco"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:624
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Rekomenditaj ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:629
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr "Antaŭ-eldonataj ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:634
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
 msgstr "Nesubtenataj ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:645
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:659
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "KD kun Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:675
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 Sekurecaj ĝisdatigoj"
+msgstr "Sekurecaj ĝisdatigoj de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:680
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 Ĝisdatigoj"
+msgstr "Ĝisdatigoj de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:685
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 Retroportoj"
+msgstr "Retroportoj de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:696
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:710
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "KD kun Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:713 ../data/templates/Debian.info.in:149
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
 msgstr "Oficiale subtenata"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:726
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 Sekurecaj ĝisdatigoj"
+msgstr "Sekurecaj ĝisdatigoj de Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:731
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.04 Ĝisdatigoj"
+msgstr "Ĝisdatigoj de Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:736
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.04 Retroportoj"
+msgstr "Retroportoj de Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:742
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:748
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
-msgstr "Komunume flegata (univreso)"
+msgstr "Prizorgata de komunumo (universo)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:750
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
-msgstr "Mallibere (Multiverse)"
+msgstr "Mallibera (multiverso)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:756
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "KD kun Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:759
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Ne plu oficiale subtenata"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:761
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Limigita kopirajto"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:768
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 4.10 Sekurecaj ĝisdatigoj"
+msgstr "Sekurecaj ĝisdatigoj de Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:773
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 4.10 Ĝisdatigoj"
+msgstr "Ĝisdatigoj de Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:778
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 4.10 Retroportoj"
+msgstr "Retroportoj de Ubuntu 4.10"
 
 #. ChangelogURI
 #: ../data/templates/Debian.info.in.h:4
@@ -333,61 +362,66 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Debian.info.in:8
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debiano 7.0 'Wheezy' "
+
+#. Description
+#: ../data/templates/Debian.info.in:33
 msgid "Debian 6.0 'Squeeze' "
 msgstr "Debiano 6.0 'Squeeze' "
 
 #. Description
-#: ../data/templates/Debian.info.in:33
+#: ../data/templates/Debian.info.in:58
 msgid "Debian 5.0 'Lenny' "
 msgstr "Debiano 5.0 'Lenny' "
 
 #. Description
-#: ../data/templates/Debian.info.in:58
+#: ../data/templates/Debian.info.in:83
 msgid "Debian 4.0 'Etch'"
 msgstr "Debiano 4.0 'Etch'"
 
 #. Description
-#: ../data/templates/Debian.info.in:83
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
 msgstr "Debiano 3.1 'Sarge'"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
 msgstr "Proponitaj ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
 msgstr "Sekurecaj ĝisdatigoj"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
-msgstr "Debiana aktuala stabila eldono"
+msgstr "Aktuala stabila eldono de Debiano"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
-msgstr "Debiana testado"
+msgstr "Testado de Debiano"
 
 #. Description
-#: ../data/templates/Debian.info.in:147
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
-msgstr "Debiano 'Sid' (nestabile)"
+msgstr "Debiano 'Sid' (nestabila)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:151
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-kongrua programaro kun malliberaj dependecoj"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:153
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
-msgstr "Ne-DFSG-kongruaj programaroj"
+msgstr "DFSG-nekongruaj programaroj"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:209 ../aptsources/distro.py:427
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Servilo por %s"
@@ -395,48 +429,48 @@ msgstr "Servilo por %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:227 ../aptsources/distro.py:233
-#: ../aptsources/distro.py:249
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Ĉefa servilo"
 
-#: ../aptsources/distro.py:253
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Propraj serviloj"
 
-#: ../apt/progress/gtk2.py:260 ../apt/progress/gtk2.py:316
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Elŝutante dosieron %(current)li sur %(total)li per %(speed)s/s"
+msgstr "Elŝutanta dosieron %(current)li el %(total)li per %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:266 ../apt/progress/gtk2.py:322
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Elŝutante dosieron %(current)li sur %(total)li"
+msgstr "Elŝutanta dosieron %(current)li el %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:342
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Detaloj"
 
-#: ../apt/progress/gtk2.py:430
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr "Komencante..."
+msgstr "Komencanta..."
 
-#: ../apt/progress/gtk2.py:436
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
-msgstr "Komplete"
+msgstr "Kompleta"
 
-#: ../apt/package.py:358
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr "Nevalida unikodaĵo en priskribo por '%s' (%s). Bonvolu raporti."
+msgstr "Nevalida unikodaĵo en priskribo por '%s' (%s). Bonvole raportu."
 
-#: ../apt/package.py:1065 ../apt/package.py:1171
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
-msgstr "La listo de ŝanĝoj ne haveblas"
+msgstr "La listo de ŝanĝoj ne disponeblas"
 
-#: ../apt/package.py:1177
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -444,91 +478,92 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
-"La listo de ŝanĝoj ankoraŭ ne haveblas.\n"
+"La listo de ŝanĝoj ankoraŭ ne disponeblas.\n"
 "\n"
-"Bonvolu uzi http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"ĝis kiam la ŝanĝoj havebliĝos aŭ poste reklopodi."
+"Bonvole uzu http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"ĝis kiam la ŝanĝoj disponebligos aŭ provu denove poste."
 
-#: ../apt/package.py:1184
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
-"Malsukcesis elŝuti la liston de ŝanĝoj. \n"
-"Bonvolu kontroli vian interretan konekton."
+"Elŝutado de listo de ŝanĝoj fiaskis. \n"
+"Bonvole kontrolu vian interretan konekton."
 
 #: ../apt/debfile.py:82
 #, python-format
 msgid "List of files for '%s' could not be read"
-msgstr "Listo de dosieroj de '%s' ne legeblis"
+msgstr "Listo de dosieroj de '%s' ne legeblas"
+
+#: ../apt/debfile.py:93
+#, python-format
+msgid "List of control files for '%s' could not be read"
+msgstr "Listo de kontroldosieroj por '%s' ne legeblas"
 
-#: ../apt/debfile.py:167
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr "Dependeco ne plenumita: %s\n"
+msgstr "Dependeco ne plenumeblas: %s\n"
 
-#: ../apt/debfile.py:188
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
-msgstr "Konfliktas kun la instalita pakaĵo '%s'"
+msgstr "Ĝi konfliktas kun la instalita pakaĵo '%s'"
 
 #. 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:373
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' dependency %(depname)s "
 "(%(deprelation)s %(depversion)s)"
 msgstr ""
-"Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' dependaĵo %(depname)s "
-"(%(deprelation)s %(depversion)s)"
+"Ĝi malfunkciigas la dependaĵon %(depname)s (%(deprelation)s %(depversion)s) "
+"de la ekzistanta pakaĵo '%(pkgname)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
+#: ../apt/debfile.py:389
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
 "%(targetver)s)"
 msgstr ""
-"Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' konflikto: %(targetpkg)s "
-"(%(comptype)s %(targetver)s)"
+"Ĝi malfunkciigas la konflikton de la ekzistanta pakaĵo '%(pkgname)s': "
+"%(targetpkg)s (%(comptype)s %(targetver)s)"
 
-#: ../apt/debfile.py:353
+#: ../apt/debfile.py:399
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
 "the '%(debfile)s' provides it via: '%(provides)s'"
 msgstr ""
-"Malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' kiu konfliktas kun: "
-"'%(targetpkg)s'. Sed la '%(debfile)s' ofertas ĝin per: '%(provides)s'"
+"Ĝi malfunkciigas la ekzistantan pakaĵon '%(pkgname)s' kiu konfliktas kun "
+"'%(targetpkg)s' sed la '%(debfile)s' ofertas ĝin per '%(provides)s'"
 
-#: ../apt/debfile.py:399
+#: ../apt/debfile.py:447
 msgid "No Architecture field in the package"
-msgstr "Neniu arĥitekturo-kampo en la pakaĵo"
+msgstr "Neniu kampo pri arĥitekturo en la pakaĵo"
 
-#: ../apt/debfile.py:404
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr "Malkorekta arĥitekturo: '%s'"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:411
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr "Pli nova versio estas jam instalita"
 
-#: ../apt/debfile.py:436
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr "Fiaskis plenumi ĉiujn dependecojn (difektita kaŝmemoro)"
+msgstr "Plenumado de ĉiuj dependecoj fiaskis (difektita kaŝmemoro)"
 
-#: ../apt/debfile.py:466
+#: ../apt/debfile.py:519
 #, python-format
 msgid "Cannot install '%s'"
-msgstr "Ne instaleblas '%s'"
-
-#: ../apt/debfile.py:508
-msgid "Python-debian module not available"
-msgstr "Modulo Python-debian ne haveblas"
+msgstr "'%s' ne instaleblas"
 
-#: ../apt/debfile.py:542
+#: ../apt/debfile.py:593
 msgid ""
 "Automatically decompressed:\n"
 "\n"
@@ -536,23 +571,23 @@ msgstr ""
 "Aŭtomate malpakita:\n"
 "\n"
 
-#: ../apt/debfile.py:548
+#: ../apt/debfile.py:599
 msgid "Automatically converted to printable ascii:\n"
-msgstr "Aŭtomate konvertita al presebla 'ascii':\n"
+msgstr "Aŭtomate konvertita al presebla ascii:\n"
 
-#: ../apt/debfile.py:638
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr "Instali kunmet-dependecojn por fontpakaĵo '%s', kiu kunmetas %s\n"
 
-#: ../apt/debfile.py:648
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr "Esenca pakaĵo estus forigita"
 
 #: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr "%c%s... Farite"
+msgstr "%c%s... Farita"
 
 #: ../apt/progress/text.py:122
 msgid "Hit "
@@ -568,11 +603,11 @@ msgstr "Era "
 
 #: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr "Akiri:"
+msgstr "Aki:"
 
 #: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr " [laborante]"
+msgstr " [laboranta]"
 
 #: ../apt/progress/text.py:214
 #, python-format
@@ -581,24 +616,34 @@ msgid ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
-"Ŝanĝo de datenportilo: bonvolu enmeti la diskon nomitan\n"
+"Ŝanĝo de datumportilo: bonvole enmetu la diskon nomatan\n"
 " '%s'\n"
-"en la diskingon '%s' kaj puŝi la enigan klavon\n"
+"en la diskingon '%s' kaj presu la enigan klavon\n"
 
 #. Trick for getting a translation from apt
 #: ../apt/progress/text.py:223
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Prenis %sB en %s (%sB/s)\n"
+msgstr "Prenitaj %sB en %s (%sB/s)\n"
 
 #: ../apt/progress/text.py:239
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr "Bonvolu doni nomon al tiu ĉi disko, ekzemple 'Disko 1 de Debian 2.1r1'"
+msgstr ""
+"Bonvole provizi nomon al ĉi tiu disko, ekzemple 'Disko 1 de Debiano 2.1r1'"
 
 #: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "Bonvolu enmeti diskon en la diskingon kaj puŝi la enigan klavon"
+msgstr "Bonvole enmetu diskon en la diskingon kaj presu la enigan klavon"
 
-#: ../apt/cache.py:149
+#: ../apt/cache.py:157
 msgid "Building data structures"
-msgstr "Konstruado de datenaj strukturoj"
+msgstr "Konstruanta datumstrukturojn"
+
+#~ msgid "Python-debian module not available"
+#~ msgstr "Modulo Python-debian ne haveblas"
+
+#~ msgid "Community-maintained Open Source software"
+#~ msgstr "Komunume prizorgata malfermitkoda programaro"
+
+#~ msgid "Canonical-supported Open Source software"
+#~ msgstr "Malfermitkoda programaro subtenata de Canonical"
diff --git a/po/es.po b/po/es.po
index 1c60e319..2c50a1fe 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:15+0000\n"
 "Last-Translator: Ricardo Pérez López <ricardo@iesdonana.org>\n"
 "Language-Team: Spanish <traductores@gnome.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,266 +27,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 «Hoary Hedgehog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 «Edgy Eft»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Mantenido por la comunidad"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Software restringido"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD-ROM con Ubuntu 6.10 «Edgy Eft»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Software libre soportado por Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Mantenido por la comunidad (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Software libre mantenido por la comunidad"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Controladores no libres"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Controladores privativos para dispositivos"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Software restringido (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Software restringido por copyright o cuestiones legales"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "CD-ROM con Ubuntu 6.06 LTS «Dapper Drake»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Actualizaciones importantes de seguridad"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Actualizaciones recomendadas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Actualizaciones propuestas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Actualizaciones «backport»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualizaciones de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "«Backports» de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Soportado oficialmente"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualizaciones de Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "«Backports» de Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Mantenido por la comunidad (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Software no libre (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Sin más soporte oficial"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Copyright restringido"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Actualizaciones de seguridad"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualizaciones de Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "«Backports» de Ubuntu 4.10"
 
@@ -342,23 +435,23 @@ msgid "Debian testing"
 msgstr "Debian «Etch» (pruebas)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian «Sid» (inestable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Software compatible con la DFSG con dependencias no libres"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Software no compatible con la DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor para %s"
@@ -366,49 +459,49 @@ msgstr "Servidor para %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Servidores personalizados"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Descargando archivo %(current)li de %(total)li a %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Descargando archivo %(current)li de %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Detalles"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 #, fuzzy
 msgid "Starting..."
 msgstr "Preferencias"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "La lista de cambios no se encuentra disponible."
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -417,7 +510,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -425,81 +518,118 @@ msgstr ""
 "Hubo un fallo al descargar la lista de cambios. \n"
 "Por favor, compruebe su conexión a Internet."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "No se ha podido instalar «%s»"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Se ha tenido que desinstalar un paquete esencial"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -508,19 +638,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/et.po b/po/et.po
deleted file mode 100644
index d57a083d..00000000
--- a/po/et.po
+++ /dev/null
@@ -1,496 +0,0 @@
-# Estonian 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.
-#
-#, fuzzy
-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: 2006-10-09 15:49+0000\n"
-"Last-Translator: margus723 <margus723@hot.ee>\n"
-"Language-Team: Estonian <et@li.org>\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
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "Iga päev"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
-msgid "Cannot install '%s'"
-msgstr "Ei saa paigaldada '%s'"
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-#, fuzzy
-msgid "An essential package would be removed"
-msgstr "Hädavajalik pakett tuleks eemaldada"
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/eu.po b/po/eu.po
deleted file mode 100644
index 086cca4b..00000000
--- a/po/eu.po
+++ /dev/null
@@ -1,496 +0,0 @@
-# Basque 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.
-#
-#, fuzzy
-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: 2006-10-09 15:49+0000\n"
-"Last-Translator: Xabi Ezpeleta <xezpeleta@mendikute.com>\n"
-"Language-Team: Basque <eu@li.org>\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
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "Egunero"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
-msgid "Cannot install '%s'"
-msgstr "Ezin da %s instalatu"
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-#, fuzzy
-msgid "An essential package would be removed"
-msgstr "Ezinbesteko pakete bat ezabatu beharko da"
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/fa.po b/po/fa.po
deleted file mode 100644
index 86a3fd9e..00000000
--- a/po/fa.po
+++ /dev/null
@@ -1,495 +0,0 @@
-# Persian 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.
-#
-#, fuzzy
-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: 2006-10-09 15:49+0000\n"
-"Last-Translator: Pedram Ganjeh Hadidi <pedram.ganjeh-hadidi@students.jku."
-"at>\n"
-"Language-Team: Persian <fa@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. ChangelogURI
-#: ../data/templates/Ubuntu.info.in.h:4
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/fi.po b/po/fi.po
index a1f68731..3f018385 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,10 +7,11 @@ 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: 2006-10-23 12:24+0000\n"
+"POT-Creation-Date: 2012-06-25 14:42+0200\n"
+"PO-Revision-Date: 2012-06-11 08:55+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,266 +24,327 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 \"Precise PAngolin\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 \"Precise Pangolin\" -CD-levy"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 \"Oneiric Ocelot\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 \"Oneiric Ocelot\" -CD-levy"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 \"Natty Narwhal\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 \"Natty Narwhal\" -CD-levy"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 \"Maverick Meerkat\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 \"Maverick Meerkat\" -CD-levy"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Canonicalin partnerit"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Canonicalin pakkaamia partnereiden sovelluksia"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Tämä ohjelma ei ole osa Ubuntua."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Riippumaton"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Muiden kehittäjien sovelluksia"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Kolmansien osapuolien tarjoamia sovelluksia."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 \"Lucid Lynx\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 \"Lucid Lynx\" -CD-levy"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 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
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy"
+msgstr "Ubuntu 9.10 \"Karmic Koala\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:695
 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
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy"
+msgstr "Ubuntu 9.04 \"Jaunty Jackalope\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:757
 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
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy"
+msgstr "Ubuntu 8.10 \"Intrepid Ibex\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:821
 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
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy"
+msgstr "Ubuntu 8.04 \"Hardy Heron\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+msgstr "Ubuntu 7.10 \"Gutsy Gibbon\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy"
+msgstr "Ubuntu 7.10 \"Gutsy Gibbon\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+msgstr "Ubuntu 7.04 \"Feisty Fawn\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy"
+msgstr "Ubuntu 7.04 \"Feisty Fawn\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr "Yhteisön ylläpitämät"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Rajoitetut ohjelmistot"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 \"Edgy Eft\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
-msgid "Canonical-supported Open Source software"
-msgstr "Canonicalin tukemat avoimen lähdekoodin ohjelmistot"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Canonicalin tukemat vapaat ja avoimen lähdekoodin ohjelmistot"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr "Yhteisön ylläpitämät (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Yhteisön ylläpitämät avoimen lähdekoodin ohjelmistot"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Yhteisön ylläpitämät vapaat ja avoimen lähdekoodin ohjelmistot"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Ei-vapaat ajurit"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Suljetut laiteajurit"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Käyttörajoitetut ohjelmistot (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Tekijänoikeus- tai lakiasioilla rajoitetut ohjelmistot"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS \"Dapper Drake\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Tärkeät turvallisuuspäivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Suositellut päivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
-msgstr "Ehdotetut päivitykset"
+msgstr "Esijulkaistut päivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
-msgstr "Takaisinsovitetut päivitykset"
+msgstr "Tukemattomat päivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 päivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 takaisinsovitukset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
 msgstr "Virallisesti tuettu"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 päivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 takaisinsovitukset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr "Yhteisön ylläpitämät (universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Ei-vapaat ohjelmistot (multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Ei enää virallisesti tuettu"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Rajoitettu käyttöoikeus"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 turvallisuuspäivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 päivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 takaisinsovitukset"
 
@@ -294,69 +356,67 @@ 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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 \"Wheezy\" "
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 \"Squeeze\" "
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 \"Lenny\" "
 
 #. Description
 #: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 \"Etch\""
+
+#. Description
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
 msgstr "Debian 3.1 \"Sarge\""
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
 msgstr "Ehdotetut päivitykset"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
-msgstr "Tärkeät turvallisuuspäivitykset"
+msgstr "Turvallisuuspäivitykset"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Debian stable (tämänhetkinen vakaa julkaisu)"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
-msgstr "Debian \"Etch\" (testattava)"
+msgstr "Debian testing (testattava)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (epävakaa)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 "DFSG-yhteensopivat ohjelmistot joilla riippuvuuksia epävapaisiin ohjelmiin"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-epäyhteensopivat ohjelmistot"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Palvelin maalle: %s"
@@ -364,49 +424,50 @@ msgstr "Palvelin maalle: %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Pääpalvelin"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Määrittele palvelin"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Noudetaan tiedostoa %(current)li/%(total)li nopeudella %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Noudetaan tiedostoa %(current)li/%(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: ../apt/progress/gtk2.py:367
-#, fuzzy
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr "Asetukset"
+msgstr "Käynnistetään..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
-msgstr ""
+msgstr "Valmis"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
+"\"%s\":n kuvauksessa virheellinen unicode-merkki %s. Ole hyvä ja raportoi "
+"virheestä kehittäjille."
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Muutosluettelo ei ole saatavilla."
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -414,8 +475,12 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"Muutosluettelo ei ole vielä saatavilla.\n"
+"\n"
+"Käytä osoitetta http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"kunnes muutokset tulevat saataville, tai yritä myöhemmin uudelleen."
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -423,102 +488,152 @@ msgstr ""
 "Muutosluettelon nouto epäonnistui. \n"
 "Tarkista Internet-yhteytesi toimivuus."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Kohteen \"%s\" tiedostoluetteloa ei voi lukea"
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Kohteen \"%s\" hallintatiedostoja ei voi lukea"
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Riippuvuus ei täytettävissä: %s\n"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
+msgstr "Ristiriidassa asennetun paketin \"%s\" kanssa"
+
+#. 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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
+"Rikkoo olemassa olevan paketin '%(pkgname)s', riippuvuus %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 
-#: ../apt/debfile.py:319
+#. 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:389
 #, python-format
-msgid "Wrong architecture '%s'"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
 msgstr ""
+"Rikkoo olemassa olevan paketin '%(pkgname)s', ristiriita: %(targetpkg)s "
+"(%(comptype)s %(targetver)s)"
+
+#: ../apt/debfile.py:399
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
+"the '%(debfile)s' provides it via: '%(provides)s'"
+msgstr ""
+"Rikkoo olemassa olevan paketin '%(pkgname)s', joka on ristiriidassa "
+"seuraavien kanssa: '%(targetpkg)s'. Mutta '%(debfile)s' tarjoaa sen "
+"seuraavasti: '%(provides)s'"
+
+#: ../apt/debfile.py:447
+msgid "No Architecture field in the package"
+msgstr "Ei Architecture-kenttää paketissa"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Väärä arkkitehtuuri \"%s\""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Myöhempi versio on jo asennettu"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Kaikkia riippuvuuksia ei voi täyttää (rikkinäinen välimuisti)"
 
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, python-format
 msgid "Cannot install '%s'"
-msgstr "Ei voitu asentaa pakettia \"%s\""
+msgstr "Ei voi asentaa \"%s\""
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Purettu automaattisesti:\n"
+"\n"
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Automaattisesti muunnettu tulostettavaksi asciiksi:\n"
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
+"Asenna käännösriippuvuudet (Build-Dependencies) lähdepaketille \"%s\", josta "
+"%s rakennetaan\n"
 
-#: ../apt/debfile.py:494
-#, fuzzy
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr "Välttämätön paketti jouduttaisiin poistamaan"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... valmis"
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
-msgstr ""
+msgstr "Osuma "
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
-msgstr ""
+msgstr "Ohi "
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
-msgstr ""
+msgstr "Vir "
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr ""
+msgstr "Hae:"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr ""
+msgstr " [Työskennellään]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Tallennusvälineen vaihto: syötä levy \n"
+"\"%s\"\n"
+"asemaan ”%s” ja paina 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 ""
+msgstr "Noudettu %sB in %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 ""
+msgstr "Syötä nimi tälle levylle, esimerkiksi \"Debian 6.0r2 levy 1\""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Syötä levy asemaan ja paina Enter"
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
-msgstr ""
+msgstr "Kasataan tietorakenteita"
diff --git a/po/fr.po b/po/fr.po
index a12828ae..116dff6f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,21 +1,27 @@
 # french translation of python-apt
 # Copyright (C) 2007 Hugues NAULET <hnaulet@gmail.com>
+# Copyright (C) 2005, 2007-2010, 2012 Debian French l10n team <debian-l10n-french@lists.debian.org>
 # This file is distributed under the same license as the python-apt package.
-# Jean Privat <privat@lirmm.fr>, 2005.
-# Vincent Carriere <carriere_vincent@yahoo.fr>, 2005
 #
+# Jean Privat <privat@lirmm.fr>, 2005.
+# Vincent Carriere <carriere_vincent@yahoo.fr>, 2005.
+# Hugues NAULET <hnaulet@gmail.com>, 2007-2009.
+# Bruno Travouillon <debian@travouillon.fr>, 2010.
+# David Prévot <david@tilapin.org>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version:  python-apt 0.7.2\n"
+"Project-Id-Version: python-apt 0.7.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2007-06-25 12:12+0100\n"
-"Last-Translator: Hugues NAULET <hnaulet@gmail.com>\n"
+"POT-Creation-Date: 2012-06-25 14:42+0200\n"
+"PO-Revision-Date: 2012-01-12 18:20-0400\n"
+"Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\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"
+"X-Generator: Lokalize 1.2\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -24,249 +30,329 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 « Precise Pangolin »"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD contenant Ubuntu 12.04 « Precise Pangolin »"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 « Oneiric Ocelot »"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD contenant Ubuntu 11.10 « Oneiric Ocelot »"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 « Natty Narwhal »"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD contenant Ubuntu 11.04 « Natty Narwhal »"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 « Maverick Meerkat »"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD contenant Ubuntu 10.10 « Maverick Meerkat »"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Partenaires de Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Logiciel empaqueté par Canonical pour ses partenaires"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Ce logiciel ne fait pas partie d'Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Indépendant"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Fourni par des développeurs de logiciel tiers"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Logiciel offert par des développeurs de logiciel tiers."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 « Lucid Lynx »"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD contenant Ubuntu 10.04 « Lucid Lynx »"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr "Ubuntu 9.10 « Karmic Koala »"
+msgstr "Ubuntu 9.10 « Karmic Koala »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "CD-ROM contenant Ubuntu 9.10 « Karmic Koala »"
+msgstr "CD contenant Ubuntu 9.10 « Karmic Koala »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Ubuntu 9.04 « Jaunty Jackalope »"
+msgstr "Ubuntu 9.04 « Jaunty Jackalope »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "CD-ROM contenant Ubuntu 9.04 « Jaunty Jackalope »"
+msgstr "CD contenant Ubuntu 9.04 « Jaunty Jackalope »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Ubuntu 8.10 « Intrepid Ibex »"
+msgstr "Ubuntu 8.10 « Intrepid Ibex »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "CD-ROM contenant Ubuntu 8.10 « Intrepid Ibex »"
+msgstr "CD contenant Ubuntu 8.10 « Intrepid Ibex »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr "Ubuntu 8.04 « Hardy Heron »"
+msgstr "Ubuntu 8.04 « Hardy Heron »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "CD-ROM contenant Ubuntu 8.04 « Hardy Heron »"
+msgstr "CD contenant Ubuntu 8.04 « Hardy Heron »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 7.10 « Gutsy Gibbon »"
+msgstr "Ubuntu 7.10 « Gutsy Gibbon »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "CD-ROM contenant Ubuntu 7.10 « Gutsy Gibbon »"
+msgstr "CD contenant Ubuntu 7.10 « Gutsy Gibbon »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 7.04 « Feisty Fawn »"
+msgstr "Ubuntu 7.04 « Feisty Fawn »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "CD-ROM contenant Ubuntu 7.04 « Feisty Fawn »"
+msgstr "CD contenant Ubuntu 7.04 « Feisty Fawn »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 6.10 « Edgy Eft »"
+msgstr "Ubuntu 6.10 « Edgy Eft »"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr "Maintenu par la communauté"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Logiciel non libre"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr "CD-ROM contenant Ubuntu 6.10 « Edgy Eft »"
+msgstr "CD contenant Ubuntu 6.10 « Edgy Eft »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 LTS « Dapper Drake »"
+msgstr "Ubuntu 6.06 LTS « Dapper Drake »"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
 msgstr "Logiciel libre maintenu par Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr "Maintenu par la communauté (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
 msgstr "Logiciel libre maintenu par la communauté"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Pilotes non libres"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Pilotes propriétaires de périphériques"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Logiciel non libre (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Logiciel soumis au droit d'auteur ou à des restrictions légales"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "CD-ROM contenant Ubuntu 6.06 LTS « Dapper Drake »"
+msgstr "CD contenant Ubuntu 6.06 LTS « Dapper Drake »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Mises à jour de sécurité"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Mises à jour recommandées"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr "Mises à jour suggérées"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
 msgstr "Mises à jour non gérées"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 « Breezy Badger »"
+msgstr "Ubuntu 5.10 « Breezy Badger »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "CD-ROM contenant Ubuntu 5.10 « Breezy Badger »"
+msgstr "CD contenant Ubuntu 5.10 « Breezy Badger »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Mises à jour de sécurité pour Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Mises à jour pour Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
-msgstr "« Backports » pour Ubuntu 5.10"
+msgstr "Rétroportages pour Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 « Hoary Hedgehog »"
+msgstr "Ubuntu 5.04 « Hoary Hedgehog »"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "CD-ROM contenant Ubuntu 5.04 « Hoary Hedgehog »"
+msgstr "CD contenant Ubuntu 5.04 « Hoary Hedgehog »"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
-msgstr "Supporté officiellement"
+msgstr "Officiellement pris en charge"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Mises à jour de sécurité pour Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Mises à jour pour Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
-msgstr "« Backports » pour Ubuntu 5.04"
+msgstr "Rétroportages pour Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 4.10 « Warty Warthog »"
+msgstr "Ubuntu 4.10 « Warty Warthog »"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr "Maintenu par la communauté (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Non libre (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr "CD-ROM contenant Ubuntu 4.10 « Warty Warthog »"
+msgstr "CD contenant Ubuntu 4.10 « Warty Warthog »"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
-msgstr "Support officiel terminé"
+msgstr "Suivi officiel terminé"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Copyright restreint"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Mises à jour de sécurité pour Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Mises à jour pour Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
-msgstr "« Backports » pour Ubuntu 4.10"
+msgstr "Rétroportages pour Ubuntu 4.10"
 
 #. ChangelogURI
 #: ../data/templates/Debian.info.in.h:4
@@ -276,63 +362,68 @@ 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 "Debian 6.0 « Squeeze »"
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 « Wheezy »"
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 5.0 « Lenny »"
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 « Squeeze »"
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 4.0 « Etch »"
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 « Lenny »"
 
 #. Description
 #: ../data/templates/Debian.info.in:83
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 « Etch »"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
-msgstr "Debian 3.1 « Sarge »"
+msgstr "Debian 3.1 « Sarge »"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
 msgstr "Mises à jour suggérées"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
 msgstr "Mises à jour de sécurité"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
 msgstr "Debian stable actuelle"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
-msgstr "Debian « Lenny » (testing)"
+msgstr "Debian « Lenny » (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
-msgstr "Debian « Sid » (unstable)"
+msgstr "Debian « Sid » (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
-"Logiciel libre (selon les lignes directrices du projet Debian) dont les "
-"dépendances ne sont pas libres"
+"Logiciel libre (selon les principes du projet Debian) dont les dépendances "
+"ne sont pas libres"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
-msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
+msgstr "Logiciel non libre (selon les principes du projet Debian)"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Serveur pour %s"
@@ -340,49 +431,49 @@ msgstr "Serveur pour %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Serveur principal"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Serveurs personnalisés"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Téléchargement du fichier %(current)li sur %(total)li à %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Téléchargement du fichier %(current)li sur %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Détails"
 
-#: ../apt/progress/gtk2.py:367
-#, fuzzy
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr "Paramètres"
+msgstr "Démarrage…"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
-msgstr ""
+msgstr "Terminé"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
+"Unicode incorrect dans la description de « %s » (%s). Merci de le signaler."
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "La liste des modifications n'est pas disponible"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -390,8 +481,12 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"La liste des modifications n'est pas encore disponible.\n"
+"\n"
+"Veuillez utiliser http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"jusqu'à ce que les changements soient disponibles ou essayer plus tard."
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -399,102 +494,159 @@ msgstr ""
 "Échec lors du téléchargement de la liste des modifications. \n"
 "Veuillez vérifier votre connexion Internet."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "La liste des fichiers pour « %s » ne peut pas être lue"
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "La liste des fichiers de contrôle pour « %s » ne peut pas être lue"
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "La dépendance ne peut être satisfaite : %s\n"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
+msgstr "Conflit avec le paquet installé « %s »"
+
+#. 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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
+"Casse le paquet existant « %(pkgname)s » à cause de sa dépendance "
+"%(depname)s (%(deprelation)s %(depversion)s)"
 
-#: ../apt/debfile.py:319
+#. 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:389
 #, python-format
-msgid "Wrong architecture '%s'"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
 msgstr ""
+"Casse le paquet existant « %(pkgname)s » car en conflit avec %(targetpkg)s "
+"(%(comptype)s %(targetver)s)"
+
+#: ../apt/debfile.py:399
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
+"the '%(debfile)s' provides it via: '%(provides)s'"
+msgstr ""
+"Casse le paquet existant « %(pkgname)s » car en conflit avec %(targetpkg)s. "
+"Mais le « %(debfile)s » le fournit à l'aide de « %(provides)s »"
+
+#: ../apt/debfile.py:447
+msgid "No Architecture field in the package"
+msgstr "Aucun champ Architecture dans ce paquet"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Architecture « %s » incorrecte"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Une version plus récente est déjà installée"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Impossible de résoudre les dépendances, le cache est corrompu."
 
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, python-format
 msgid "Cannot install '%s'"
-msgstr "Impossible d'installer « %s »"
+msgstr "Impossible d'installer « %s »"
+
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Décompression automatique :\n"
+"\n"
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Conversion automatique en ASCII affichable :\n"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
+"Installation des dépendances de construction pour le paquet source « %s » "
+"qui compile %s\n"
 
-#: ../apt/debfile.py:494
-#, fuzzy
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
-msgstr "Un paquet essentiel devrait être enlevé"
+msgstr "Un paquet essentiel devrait être désinstallé"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s… Terminé"
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
-msgstr ""
+msgstr "Att "
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
-msgstr ""
+msgstr "Ign "
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
-msgstr ""
+msgstr "Err "
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr ""
+msgstr "Prendre :"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr ""
+msgstr " [En cours]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Changement de support : veuillez insérer le disque nommé\n"
+" « %s »\n"
+"dans le lecteur « %s » et appuyer sur entrée\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 ""
+msgstr "%s o téléchargés en %s (%s o/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 ""
+"Veuillez fournir le nom de ce disque, par exemple « Debian 2.1r1 disque 1 »"
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Veuillez insérer un disque dans le lecteur et appuyer sur entrée"
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
-msgstr ""
+msgstr "Construction des structures de données"
+
+#~ msgid "Python-debian module not available"
+#~ msgstr "Module Python-debian non disponible"
+
+#~ msgid "This is not a valid DEB archive, missing '%s' member"
+#~ msgstr ""
+#~ "Ce n'est pas une archive « DEB » valide, le membre « %s » est absent"
diff --git a/po/fur.po b/po/fur.po
deleted file mode 100644
index 68966ebb..00000000
--- a/po/fur.po
+++ /dev/null
@@ -1,495 +0,0 @@
-# Friulian 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.
-#
-#, fuzzy
-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: 2006-08-25 05:55+0000\n"
-"Last-Translator: Marco <marcuz@linux.it>\n"
-"Language-Team: Friulian <fur@li.org>\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
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "Ogni dì"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 4a608218..511a2658 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-19 00:43+0000\n"
 "Last-Translator: Felipe Gil Castiñeira <xil@det.uvigo.es>\n"
 "Language-Team: galician\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,266 +27,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Actualizacións de Seguranza para Ubuntu 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Cdrom con Ubuntu 5.10 \"Breezy Badger\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Cdrom con Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Cdrom con Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdrom con Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Actualizacións de Seguranza para Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cdrom con Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Actualizacións de Seguranza para Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cdrom con Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Mantido pola Comunidade"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Aplicacións restrinxidas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cdrom con Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Software de Código Aberto soportado por Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Mantido pola Comunidade (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Software de Código Aberto mantido pola Comunidade"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Controladores non libres"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Controladores propietarios de dispositivos"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Software restrinxido (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Software restrinxido por razóns de copyright ou legais"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cdrom con Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Actualizacións de seguranza importantes"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Actualizacións recomendadas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Actualizacións aconselladas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Actualizacións de backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD con Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cdrom con Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualizacións de seguranza de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualizacións de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Actualizacións de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdrom con Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Soportado oficialmente"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualizacións de Seguranza para Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualizacións para Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Backports para Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Mantido pola comunidade (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Software non libre (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Xa non se mantén oficialmente"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Copyright restrinxido"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Actualizacións de seguranza de Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualizacións de Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Backports para Ubuntu 4.10"
 
@@ -342,23 +435,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (probas)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (inestable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Software compatible coa DFSG con dependencias non libres"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Software non compatible coa DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor desde %s"
@@ -366,48 +459,48 @@ msgstr "Servidor desde %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Servidores personalizados"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "A descargar o ficheiro %(current)li de %(total)li con %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "A descargar o ficheiro %(current)li de %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Detalles"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Non se dispón da lista de cambios"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -416,7 +509,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -424,81 +517,118 @@ msgstr ""
 "Non se puido descargar a lista de cambios.\n"
 "Comprobe a súa conexión á Internet."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Non se puido instalar '%s»"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Tívose que desinstalar un paquete esencial"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -507,19 +637,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/he.po b/po/he.po
index 9df8ed16..4a4126f7 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 08:48+0000\n"
 "Last-Translator: Yaniv Abir <yanivabir@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,268 +28,360 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "עדכוני אבטחה - אובונטו 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "תקליטור אובונטו 5.10 \"Breezy Badger\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "אובונטו 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "אובונטו 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "אובונטו 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "אובונטו 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "תקליטור אובונטו 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "אובונטו 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "אובונטו 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "אובונטו 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "תקליטור אובונטו 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "אובונטו 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "תקליטור אובונטו 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "עדכוני אבטחה - אובונטו 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "תקליטור אובונטו 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "עדכוני אבטחה - אובונטו 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "תקליטור אובונטו 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "אובונטו 6.10 \"Edgy Eft\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "מתוחזק ע\"י הקהילה"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "תוכנה בעלת הגבלות"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "תקליטור אובונטו 6.10 \"Edgy Eft\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "אובונטו 6.06 LTS \"DapperDrake\""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "תוכנות קוד פתוח הנתמכות ע\"י Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "מתוחזק ע\"י הקהילה (Universe("
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "תוכנות קוד פתוח המתוחזקות ע\"י הקהילה"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "דרייברים לא חופשיים"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "דרייברים קניינים להתקנים"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "תוכנה בעלת הגבלות (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "תקליטור אובונטו 6.06 LTS \"Dapper Drake\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "עדכוני אבטחה חשובים"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "עדכונים מומלצים"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "עדכונים מוצעים"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "עדכונים מוצעים"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "אובונטו 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "תקליטור אובונטו 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "עדכוני אבטחה - אובונטו 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "אובונטו 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "תקליטור אובונטו 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "נתמך רשמית"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "עדכוני אבטחה - אובונטו 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "עדכונים - אובונטו 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "אובונטו 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "מתוחזק ע\"י קהילה (Universe("
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "לא-חופשי (Multiverse("
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "אינה נתמכת רשמית יותר"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "זכויות יוצרים מגבילות"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "עדכוני אבטחה - אובונטו 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "עדכונים - אובונטו 5.10"
@@ -347,23 +440,23 @@ msgid "Debian testing"
 msgstr "דביאן בדיקה"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "דביאן לא ארה\"ב (לא יציב)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "השרת ב%s"
@@ -371,50 +464,50 @@ 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
 #. append a list of all used servers
-#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "שרת ראשי"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 #, fuzzy
 msgid "Custom servers"
 msgstr "השרת הקרוב ביותר"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "פרטים"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 #, fuzzy
 msgid "Starting..."
 msgstr "הגדרות"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "רשימת השינויים אינה זמינה"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -423,88 +516,125 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr "נכשל בהורדת רשימת השינויים. אנא בדוק אם החיבור לאינטרנט עובד."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "לא ניתן להתקין את \"%s\""
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "חבילה חיונית תוסר בלית ברירה"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -513,19 +643,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/hi.po b/po/hi.po
deleted file mode 100644
index 24836e22..00000000
--- a/po/hi.po
+++ /dev/null
@@ -1,495 +0,0 @@
-# Hindi 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.
-#
-#, fuzzy
-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: 2006-08-01 15:30+0000\n"
-"Last-Translator: Gaurav Mishra <gauravtechie@gmail.com>\n"
-"Language-Team: Hindi <hi@li.org>\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
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "प्रतिदिन"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 4b268169..24e6526a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,15 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-18 19:37+0000\n"
 "Last-Translator: Ante Karamatić <ivoks@grad.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -25,266 +26,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.04 sigurnosne nadogradnje"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CDROM s Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 'Wart Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Wart Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Wart Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Cdrom sa Ubuntu 5.04 ' Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 'Wart Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 'Wart Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Cdrom sa Ubuntu 5.04 ' Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdrom sa Ubuntu 5.04 ' Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CDROM s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CDROM s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Održavani od strane zajednice"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Neslobodni softver"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CDROM sa Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Službeno podržani Open Source softver"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Održavani od strane zajednice (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Softver održavan od strane zajednice"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Neslobodni pogonski programi"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Neslobodni upogonitelji za uređaje"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Ograničeni softver (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Softver ograničen autorskim pravom ili legalnim pitanjima"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "CDROM s Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Važne sigurnosne nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Preporučene nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Predložene nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Backport nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CDROM s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 osvježenja"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 backporti"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdrom sa Ubuntu 5.04 ' Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Službeno podržani"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 backporti"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Wart Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Održavani od strane zajednice (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Neslobodni (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Više nisu službeno podržani"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Ograničeno autorsko pravo"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 osvježenja"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 backports"
 
@@ -341,23 +434,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (testni)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (nestabilni)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-kompatibilni programi sa neslobodnim ovisnostima"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-nekompatibilni programi"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Poslužitelj za %s"
@@ -365,48 +458,48 @@ msgstr "Poslužitelj za %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Glavni poslužitelj"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Osobni poslužitelji"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Preuzimanje datoteke %(current)li od %(total)li brzinom %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Preuzimam datoteku %(current)li od %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Detalji"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Popis promjena nije dostupan."
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -415,7 +508,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -423,81 +516,118 @@ msgstr ""
 "Preuzimanje popisa promjena nije uspjelo. \n"
 "Molim, provjerite svoju internet vezu."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Ne mogu instalirati '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Bitan paket bi morao biti uklonjen"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -506,19 +636,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index cdfd526f..f775801e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,21 +1,22 @@
 # Hungarian translation of update-manager
 # This file is distributed under the same license as the update-manager package.
-# Copyright (C) 2005, Free Software Foundation, Inc.
-# Gabor Kelemen <kelemeng@gnome.hu>, 2005.
+# Copyright (C) 2005, 2007, Free Software Foundation, Inc.
 #
+# Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2006-10-16 04:03+0000\n"
-"Last-Translator: Gabor Kelemen <kelemengabor@linuxforum.hu>\n"
+"POT-Creation-Date: 2012-06-25 14:42+0200\n"
+"PO-Revision-Date: 2012-06-11 18:21+0000\n"
+"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2012-06-11 18:32+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -24,266 +25,327 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 „Precise Pangolin”"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Az Ubuntu 12.04 „Precise Pangolin”-t tartalmazó CD-ROM"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 „Oneiric Ocelot”"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Az Ubuntu 11.10 „Oneiric Ocelot”-ot tartalmazó CD-ROM"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 „Natty Narwhal”"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Az Ubuntu 11.04 „Natty Narwhal”-t tartalmazó CD-ROM"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 „Maverick Meerkat”"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Az Ubuntu 10.10 „Maverick Meerkat”-ot tartalmazó CD-ROM"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Canonical partnerek"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "A Canonical által partnereinek csomagolt szoftverek"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Ezek a szoftverek nem részei az Ubuntunak."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Független"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Külső szoftverfejlesztők által biztosított"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Külső szoftverfejlesztők által biztosított szoftverek."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 „Lucid Lynx”"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Az Ubuntu 10.04 „Lucid Lynx”-et tartalmazó CD-ROM"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 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
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM"
+msgstr "Az Ubuntu 9.10 „Karmic Koala”-t tartalmazó CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:695
 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
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM"
+msgstr "Az Ubuntu 9.04 „Jaunty Jackalope”-ot tartalmazó CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:757
 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
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM"
+msgstr "Az Ubuntu 8.10 „Intrepid Ibex”-et tartalmazó CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:821
 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
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM"
+msgstr "Az Ubuntu 8.04 „Hardy Heron”-t tartalmazó CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 5.04 biztonsági frissítések"
+msgstr "Ubuntu 7.10 „Gutsy Gibbon”"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM"
+msgstr "Az Ubuntu 7.10 „Gutsy Gibbon”-t tartalmazó CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 5.04 biztonsági frissítések"
+msgstr "Ubuntu 7.04 „Feisty Fawn”"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM"
+msgstr "Az Ubuntu 7.04 „Feisty Fawn”-t tartalmazó CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 6.10 \"Edgy Eft\""
+msgstr "Ubuntu 6.10 „Edgy Eft”"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr "Közösségi karbantartású"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Nem-szabad"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr "Az Ubuntu 6.10 \"Edgy Eft\" CD-ROM"
+msgstr "Az Ubuntu 6.10 „Edgy Eft” CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 LTS \"Dapper Drake\""
+msgstr "Ubuntu 6.06 LTS „Dapper Drake”"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
-msgid "Canonical-supported Open Source software"
-msgstr "A Canonical által támogatott nyílt forrású szoftverek"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "A Canonical által támogatott szabad és nyílt forrású szoftverek"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr "Közösségi karbantartású (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Közösségi karbantartású nyílt forrású szoftverek"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "A közösség által karbantartott szabad és nyílt forrású szoftverek"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Nem-szabad meghajtók"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Szabadalmazott eszközmeghajtók"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Nem-szabad szoftverek (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Szerzői vagy egyéb jogi problémák miatt korlátozott szoftver"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Az Ubuntu 6.06 LTS \"Dapper Drake\"-et tartalmazó CD-ROM"
+msgstr "Az Ubuntu 6.06 LTS „Dapper Drake”-et tartalmazó CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Fontos biztonsági frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Ajánlott frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
-msgstr "Javasolt frissítések"
+msgstr "Előzetesen kiadott frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
-msgstr "Visszaportolt frissítések"
+msgstr "Nem támogatott frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM"
+msgstr "Az Ubuntu 5.10 „Breezy Badger”-t tartalmazó CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 biztonsági frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 visszaportolt csomagok"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Ubuntu 5.04 „Hoary Hedgehog”"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM"
+msgstr "Az Ubuntu 5.04 „Hoary Hedgehog”-ot tartalmazó CD-ROM"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
 msgstr "Hivatalosan támogatott"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 biztonsági frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 visszaportolt csomagok"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Ubuntu 4.10 „Warty Warthog”"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr "Közösségi karbantartású (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Nem-szabad (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM"
+msgstr "Az Ubuntu 4.10 „Warty Warthog”-ot tartalmazó CD-ROM"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Hivatalosan már nem támogatott"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Szerzői jogi korlátozás alatt"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 biztonsági frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 visszaportolt csomagok"
 
@@ -295,68 +357,66 @@ 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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 „Wheezy” "
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 „Squeeze” "
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 „Lenny” "
 
 #. Description
 #: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 „Etch”"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 „Sarge”"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
 msgstr "Javasolt frissítések"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
-msgstr "Fontos biztonsági frissítések"
+msgstr "Biztonsági frissítések"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Jelenlegi stabil Debian kiadás"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
-msgstr "Debian \"Etch\" (tesztelés alatt)"
+msgstr "Debian – tesztelés alatt"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (instabil)"
+msgstr "Debian „Sid” (instabil)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
 msgstr "Nem DFSG-kompatibilis szoftver"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Kiszolgáló a következőhöz: %s"
@@ -364,49 +424,50 @@ msgstr "Kiszolgáló a következőhöz: %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Fő kiszolgáló"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Egyéni kiszolgálók"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 "%(current)li. fájl letöltése, összesen: %(total)li, sebesség: %(speed)s/mp"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "%(current)li. fájl letöltése, összesen: %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "<b>Részletek</b>"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr ""
+msgstr "Indítás…"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
-msgstr ""
+msgstr "Kész"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
+"Érvénytelen unicode karakter a(z) „%s” leírásában (%s). Kérem jelentse."
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "A módosítások listája nem érhető el"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -414,8 +475,12 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"A változtatások listája még nem érhető el.\n"
+"\n"
+"Használja a http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"oldalt, míg nem válik hozzáférhetővé, vagy próbálja meg később."
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -423,102 +488,160 @@ msgstr ""
 "A módosítások listájának letöltése meghiúsult.\n"
 "Ellenőrizze az internetkapcsolatát."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "„%s” fájljainak listája nem olvasható"
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "„%s” vezérlőfájljainak listája nem olvasható"
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "A következő függőség nem elégíthető ki: %s\n"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
+msgstr "Ütközik a következő telepített csomaggal: „%s”"
+
+#. 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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
+"„%(pkgname)s” csomag törik „%(depname)s” függősége által (%(deprelation)s "
+"%(depversion)s)"
 
-#: ../apt/debfile.py:319
+#. 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:389
 #, python-format
-msgid "Wrong architecture '%s'"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+"Megsérti a meglévő „%(pkgname)s” csomag függőségeit; ütközés: %(targetpkg)s "
+"(%(comptype)s %(targetver)s)"
+
+#: ../apt/debfile.py:399
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
+"the '%(debfile)s' provides it via: '%(provides)s'"
 msgstr ""
+"Megsérti a meglévő „%(pkgname)s” csomag függőségeit; ütközés: "
+"„%(targetpkg)s”. Azonban a(z) „%(debfile)s” biztosítja ezen keresztül: "
+"„%(provides)s”"
+
+#: ../apt/debfile.py:447
+msgid "No Architecture field in the package"
+msgstr "A csomagban nincs Architecture mező"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Rossz architektúra: „%s”"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Már telepítve van egy újabb verzió"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Nem elégíthető ki minden függőség (a gyorsítótár sérült)"
 
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, python-format
 msgid "Cannot install '%s'"
-msgstr "'%s' nem telepíthető"
+msgstr "„%s” nem telepíthető"
+
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Automatikusan kibontva:\n"
+"\n"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Automatikusan nyomtatható ascii-vé konvertálva:\n"
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
+"„%s” csomag fordítási függőségeinek telepítése, ami a(z) %s csomagot építi\n"
 
-#: ../apt/debfile.py:494
-#, fuzzy
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
-msgstr "Egy alapvető csomag eltávolításra kerülne"
+msgstr "Egy alapvető csomag törlődne"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Kész"
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
-msgstr ""
+msgstr "Találat "
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
-msgstr ""
+msgstr "Mellőz "
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
-msgstr ""
+msgstr "Hiba "
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr ""
+msgstr "Letöltés:"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr ""
+msgstr " [Folyamatban]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Helyezze be a(z)\n"
+" „%s”\n"
+"címkéjű lemezt a(z) %s meghajtóba, és nyomja meg az Entert\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 ""
+msgstr "%sB letöltve %s alatt (%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 ""
+msgstr "Adja meg a lemez nevét, például „Debian 2.1r1 1. lemez”"
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Helyezzen be egy lemezt a meghajtóba, és nyomja meg az Entert"
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
-msgstr ""
+msgstr "Adatstruktúrák építése"
+
+#~ msgid "Community-maintained Open Source software"
+#~ msgstr "Közösségi karbantartású nyílt forrású szoftverek"
+
+#~ msgid "Canonical-supported Open Source software"
+#~ msgstr "A Canonical által támogatott nyílt forrású szoftverek"
+
+#~ msgid "Python-debian module not available"
+#~ msgstr "A Python-debian modul nem érhető el"
diff --git a/po/id.po b/po/id.po
index d16e283f..8eb83d70 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,20 +1,24 @@
-# Indonesian translation for update-manager
+# Indonesian translation for python-apt
 # 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.
+# This file is distributed under the same license as the python-apt package.
+# Andy Apdhani <imtheface@gmail.com>, 2006.
+# Andika Triwidada <andika@gmail.com>, 2012.
 #
 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 04:03+0000\n"
-"Last-Translator: Andy Apdhani <imtheface@gmail.com>\n"
+"POT-Creation-Date: 2012-06-25 14:42+0200\n"
+"PO-Revision-Date: 2012-06-11 01:59+0700\n"
+"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
+"X-Poedit-Language: Indonesian\n"
+"X-Poedit-Country: INDONESIA\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -23,277 +27,329 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Cdrom dengan Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Cdrom dengan Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Cdrom dengan Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Cdrom dengan Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Partner Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Perangkat lunak yang dipaketkan oleh Canonical bagi partner mereka"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Perangkat lunak ini bukan bagian dari Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Independen"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Disediakan oleh para pengembang perangkat lunak pihak ketiga"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Perangkat lunak ditawarkan oleh para pengembang pihak ketiga."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Cdrom dengan Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr "Ubuntu 6.06 LTS Security Updates"
+msgstr "Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
+msgstr "Cdrom dengan Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Ubuntu 6.06 LTS Security Updates"
+msgstr "Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
+msgstr "Cdrom dengan Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Ubuntu 6.06 LTS Security Updates"
+msgstr "Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
+msgstr "Cdrom dengan Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr "Ubuntu 6.06 LTS Security Updates"
+msgstr "Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
+msgstr "Cdrom dengan Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 6.06 LTS Security Updates"
+msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
+msgstr "Cdrom dengan Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 6.06 LTS Security Updates"
+msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
+msgstr "Cdrom dengan Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
-msgstr "Dikelola oleh komunitas (Universe)"
+msgstr "Dikelola oleh komunitas"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
-msgstr "Tidak-bebas (Multiverse)"
+msgstr "Perangkat lunak terbatas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Cdrom dengan Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 LTS Updates"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
-msgid "Canonical-supported Open Source software"
-msgstr "Dikelola oleh komunitas (Universe)"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Perangkat lunak open-source dan bebas yang didukung oleh Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
-msgstr "Dikelola oleh komunitas (Universe)"
+msgstr "Dikelola oleh komunitas (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Dikelola oleh komunitas (Universe)"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Perangkat lunak open-source dan bebas yang dikelola oleh komunitas"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
-msgstr "Tidak-bebas (Multiverse)"
+msgstr "Driver tidak-bebas"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Driver proprietary bagi perangkat"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
-msgstr "Tidak-bebas (Multiverse)"
+msgstr "Perangkat lunak terbatas (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
-msgstr ""
+msgstr "Perangkat lunak yang terbatas karena masalah hak cipta atau hukum"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
+msgstr "Cdrom dengan Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
-msgstr "Pemutakhiran lewat Internet"
+msgstr "Pemutakhiran keamanan penting"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
-msgstr ""
+msgstr "Pemutakhiran yang disarankan"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
-msgstr "_Instal Update"
+msgstr "Pemutakhira prarilis"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
-msgstr "_Instal Update"
+msgstr "Pemutakhiran yang tak didukung"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Cdrom dengan Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 6.06 LTS Security Updates"
+msgstr "Pemutakhiran Keamanan Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 6.06 LTS Updates"
+msgstr "Pemutakhiran Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 6.06 LTS Backports"
+msgstr "Ubuntu 5.10 Backport"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Cdrom dengan Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
-msgstr "Resmi disokong"
+msgstr "Resmi didukung"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 6.06 LTS Security Updates"
+msgstr "Pemutakhiran Keamanan Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 6.06 LTS Updates"
+msgstr "Pemutakhiran Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 6.06 LTS Backports"
+msgstr "Ubuntu 5.04 Backport"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr "Dikelola oleh komunitas (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Tidak-bebas (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Cdrom dengan Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
-msgstr "Beberapa perangkat lunak tidak lagi resmi disokong"
+msgstr "Tak lagi didukung secara resmi"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
-msgstr "Hak cipta terlarang"
+msgstr "Hak cipta terbatas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 6.06 LTS Security Updates"
+msgstr "Pemutakhiran Keamanan Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 6.06 LTS Updates"
+msgstr "Pemutakhiran Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 6.06 LTS Backports"
+msgstr "Ubuntu 4.10 Backport"
 
 #. ChangelogURI
 #: ../data/templates/Debian.info.in.h:4
@@ -303,121 +359,117 @@ 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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 'Squeeze' "
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 'Lenny' "
 
 #. Description
 #: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 'Etch'"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 'Sarge'"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
-#, fuzzy
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
-msgstr "_Instal Update"
+msgstr "Pemutakhiran yang diusulkan"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
-msgstr "Pemutakhiran lewat Internet"
+msgstr "Pemutakhiran keamanan"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Rilis stabil Debian saat ini"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian 'Sid' (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
-"Perangkat Lunak yang sesuai dengan DFSG tapi tergantung pada Perangkat Lunak "
-"Tidak-Bebas"
+"Perangkat lunak yang kompatibel dengan DFSG tapi tergantung pada Perangkat "
+"Lunak Tidak-Bebas"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
-msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG"
+msgstr "Perangkat Lunak yang tidak kompatibel dengan DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Server untuk %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
-msgstr ""
+msgstr "Server utama"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
-msgstr ""
+msgstr "Server gubahan"
 
-#: ../apt/progress/gtk2.py:259
-#, fuzzy, python-format
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Mengunduh berkas %li dari %li dengan %s/s"
+msgstr "Mengunduh berkas %(current)li dari %(total)li dalam %(speed)s/dt"
 
-#: ../apt/progress/gtk2.py:265
-#, fuzzy, python-format
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Mengunduh berkas %li dari %li dengan %s/s"
+msgstr "Mengunduh berkas %(current)li dari %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Rincian"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr ""
+msgstr "Memulai..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
-msgstr ""
+msgstr "Komplit"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
+msgstr "Unicode tak valid dalam deskripsi bagi '%s' (%s). Mohon laporkan."
 
-#: ../apt/package.py:937 ../apt/package.py:1043
-#, fuzzy
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
-msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti."
+msgstr "Senarai dari perubahan tak tersedia"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -425,112 +477,162 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"Senarai perubahan belum tersedia.\n"
+"\n"
+"Silakan pakai http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"sampai perubahan menjadi tersedia atau coba lagi nanti"
 
-#: ../apt/package.py:1053
-#, fuzzy
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
-"Gagal mengunduh senarai dari perubahan. Silakan periksa koneksi Internet "
-"anda."
+"Gagal mengunduh senarai dari perubahan. \n"
+"Silakan periksa koneksi Internet Anda."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Senarai berkas bagi '%s' tak dapat dibaca"
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Senarai berkas kendali bagi '%s' tak dapat dibaca"
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Kebergantungan tak dapat dipenuhi: %s\n"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
+msgstr "Konflik dengan paket terpasang '%s'"
+
+#. 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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
+"Merusak kebergantungan %(depname)s (%(deprelation)s %(depversion)s) dari "
+"paket '%(pkgname)s' yang telah ada"
 
-#: ../apt/debfile.py:319
+#. 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:389
 #, python-format
-msgid "Wrong architecture '%s'"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+"Merusak paket '%(pkgname)s' yang telah ada, konflik: %(targetpkg)s "
+"(%(comptype)s %(targetver)s)"
+
+#: ../apt/debfile.py:399
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
+"the '%(debfile)s' provides it via: '%(provides)s'"
 msgstr ""
+"Merusak paket '%(pkgname)s' yang telah ada, yang konflik: %(targetpkg)s. "
+"Tapi '%(debfile)s' menyediakannya melalui: '%(provides)s'"
+
+#: ../apt/debfile.py:447
+msgid "No Architecture field in the package"
+msgstr "Tak ada ruas Architecture dalam paket"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Arsitektur '%s' salah"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Versi lebih baru telah terpasang"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Gagal memenuhi semua kebergantungan (singgahan rusak)"
 
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, python-format
 msgid "Cannot install '%s'"
-msgstr "Tidak dapat menginstal '%s'"
+msgstr "Tak bisa memasang '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Membuka kompresi secara otomatis:\n"
+"\n"
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Otomatis dikonversi ke ascii yang dapat dicetak:\n"
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
+msgstr "Memasang Build-Dependencies bagi paket sumber '%s' yang membangun %s\n"
 
-#: ../apt/debfile.py:494
-#, fuzzy
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr "Paket esensial akan dihapus"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Usai"
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
-msgstr ""
+msgstr "Hit "
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
-msgstr ""
+msgstr "Ign "
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
-msgstr ""
+msgstr "Err "
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr ""
+msgstr "Ambil:"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr ""
+msgstr " [Bekerja]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Media berubah: mohon masukkan cakram berlabel\n"
+"'%s'\n"
+"ke drive '%s' dan tekan 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 ""
+msgstr "Diambil %sB dalam %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 ""
+msgstr "Mohon beri nama Cakram ini, seperti misalnya 'Debian 2.1r1 Disk 1'"
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Mohon masukkan Cakram ke dalam drive dan menekan enter"
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
-msgstr ""
+msgstr "Membangun struktur data"
diff --git a/po/it.po b/po/it.po
index 5d1ac5a7..76fce0b8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-22 10:13+0000\n"
 "Last-Translator: Luca Ferretti <elle.uca@libero.it>\n"
 "Language-Team: Italian <it@li.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,266 +26,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.04 - Aggiornamenti di sicurezza"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 «Hoary Hedgehog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 - Aggiornamenti di sicurezza"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 - Aggiornamenti di sicurezza"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 «Edgy Eft»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Mantenuto dalla comunità"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Software con restrizioni"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD-ROM con Ubuntu 6.10 «Edgy Eft»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Software open source supportato da Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Mantenuto dalla comunità (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Software open source mantenuto dalla comunità"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Driver non liberi"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Driver proprietari per i dispositivi"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Software con restrizioni (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Software con restrizioni per copyright o motivi legali"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "CD-ROM con Ubuntu 6.06 LTS «Drapper Drake»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Aggiornamenti di sicurezza importanti"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Aggiornamenti raccomandati"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Aggiornamenti proposti"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Aggiornamenti di backport"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 - Aggiornamenti di sicurezza"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 - Aggiornamenti"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Backport di Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Supportati ufficialmente"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 - Aggiornamenti di sicurezza"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 - Aggiornamenti"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Backport per Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Mantenuti dalla comunità (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Non libero (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Software non più supportato ufficialmente"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Copyright con restrizioni"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 - Aggiornamenti di sicurezza"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Aggiornamenti di Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Backport per Ubuntu 4.10"
 
@@ -342,23 +435,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 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 "Software compatibile con le DFSG con dipendenze non libere"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Software non compatibile con le DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Server in %s"
@@ -366,49 +459,49 @@ msgstr "Server in %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Server principale"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Server personalizzati"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Scaricamento del file %(current)li di %(total)li a %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Scaricamento del file %(current)li di %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Dettagli"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 #, fuzzy
 msgid "Starting..."
 msgstr "Impostazioni"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "L'elenco dei cambiamenti non è disponibile"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -417,7 +510,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -425,81 +518,118 @@ msgstr ""
 "Fallito lo scaricamento dell'elenco dei cambiamenti. \n"
 "Verificare la connessione a Internet."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Impossibile installare \"%s\""
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Un pacchetto essenziale dovrebbe essere rimosso"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -508,19 +638,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 26ec8567..9a9cf53f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: python-apt 0.7.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2007-12-04 22:51+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Ubuntu Japanese Team <ubuntu-ja-users@freeml.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,257 +27,355 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+#| msgid "Ubuntu 7.04 'Feisty Fawn'"
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 7.04 'Feisty Fawn'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 7.04 'Feisty Fawn' のCD-ROM"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog' のCD-ROM"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.10 'Breezy Badger' のCD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog' のCD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.04 'Feisty Fawn' のCD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04 'Feisty Fawn' のCD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr "コミュニティによるメンテナンス"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "制限のあるソフトウェア"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft' のCD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+#, fuzzy
+#| msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Canonical によってサポートされるオープンソースソフトウェア"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr "コミュニティによるメンテナンス (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+#, fuzzy
+#| msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "コミュニティによってメンテナンスされるオープンソースソフトウェア"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "フリーではないドライバ"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "デバイス用のプロプライエタリなドライバ"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "制限されたソフトウェア (Multiuniverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "著作権もしくは法的な問題によって制限されたソフトウェア"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake' の CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "重要なセキュリティアップデート"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "推奨アップデート"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr "プレリリースされたアップデート"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
 msgstr "サポートされていないアップデート"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger' のCD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 セキュリティアップデート"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 アップデート"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 バックポート"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog' のCD-ROM"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "公式なサポート対象"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 セキュリティアップデート"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 アップデート"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 バックポート"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr "コミュニティによるメンテナンス (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "フリーではない (Multiuniverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "もう公式にサポートされません"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "制限された著作権"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 セキュリティアップデート"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 アップデート"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 バックポート"
 
@@ -330,22 +429,22 @@ msgid "Debian testing"
 msgstr "Debian テスト版"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian 'Sid' (不安定版)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "フリーではないものに依存関係のあるDFSG適合ソフトウェア"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSGに適合しないソフトウェア"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "%s のサーバ"
@@ -353,48 +452,48 @@ 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
 #. append a list of all used servers
-#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "メインサーバ"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "カスタムサーバ"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -403,86 +502,123 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, python-format
 msgid "Cannot install '%s'"
 msgstr ""
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr ""
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -491,20 +627,20 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
 
diff --git a/po/ka.po b/po/ka.po
index 49a1729a..5318eccc 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-18 01:28+0000\n"
 "Last-Translator: Malkhaz Barkalaya <malxaz@gmail.com>\n"
 "Language-Team: Georgian <geognome@googlegroups.com>\n"
+"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,266 +27,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.04 უსაფრთხოების განახლება"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.10 'Breezy Badger'-ის ლაზერული დისკი"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 'Warty Warthog'-ის ლაზერული დისკი"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog'-ის ლაზერული დისკი"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog'-ის ლაზერული დისკი"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'-ის ლაზერული დისკი"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 'Warty Warthog'-ის ლაზერული დისკი"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 'Warty Warthog'-ის ლაზერული დისკი"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'-ის ლაზერული დისკი"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'-ის ლაზერული დისკი"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 უსაფრთხოების განახლება"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 'Breezy Badger'-ის ლაზერული დისკი"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 უსაფრთხოების განახლება"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 'Breezy Badger'-ის ლაზერული დისკი"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "universe საზოგადოების მხრდაჭერით"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "არათავისუფალი პროგრამები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'-ს ლაზერული დისკი"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "თავისუფალი პროგრამები (Open Source) Canonical-ის მხარდაჭერით"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "universe საზოგადოების მხრდაჭერით"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "თავისუფალი პროგრამები (Open Source) universe საზოგადოების მხარდაჭერით"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "არათავისუფალი დრაივერები"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "მოწყობილობების საკუთარი დრაივერები"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "არათავისუფალი პროგრამები (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "პატენტებითა და კანონებით შეზღუდული პროგრამები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake'-ის ლაზერული დისკი"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "უსაფრთხოების მნიშვნელოვანი განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "რეკომენდებული განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "შემოთავაზებული განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Backport-განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'-ის ლაზერული დისკი"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 ბექპორტები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'-ის ლაზერული დისკი"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "ოფიციალური მხარდაჭერით"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 უსაფრთხოების განახლება"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 ბექპორტები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "საზოგადოების მხარდაჭერით (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "არათავისუფალი (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'-ის ლაზერული დისკი"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "მოხსნილი აქვს ოფიციალური მხარდაჭერა"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "შეზღუდული საავტორო უფლება"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 უსაფრთხოების განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 ბექპორტები"
 
@@ -342,23 +435,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 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 "არათავისუფალ პროგრამებზე დამოკიდებული DFSG-თავსებადი პროგრამები"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-არათავსებადი პროგრამები"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "%s სერვერი"
@@ -366,48 +459,48 @@ 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
 #. append a list of all used servers
-#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "მთავარი სერვერი"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "საკუთარი სერვერები"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "მე-%(current)li ფაილის ჩამოქაჩვა %(total)li-დან. სიჩქარე - %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "მე-%(current)li ფაილის ჩამოქაჩვა %(total)li-დან"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "ცნობები"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "ცვლილებების სია არ არის ხელმისაწვდომი."
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -416,7 +509,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -424,81 +517,118 @@ msgstr ""
 "ვერ განხორციელდა ცვლილებების სიის ჩამოქაჩვა.\n"
 "შეამოწმეთ ინტერნეტ-კავშირი."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "'%s' ვერ დაყენდა"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "ამით საჭირო პაკეტი წაიშლება"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -507,19 +637,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index dea0a295..d40f53c6 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:04+0000\n"
 "Last-Translator: Eungkyu Song <eungkyu@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,266 +24,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "우분투 5.04 보안 업데이트"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "우분투 5.10 'Breezy Badger' 씨디롬"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "우분투 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "우분투 4.10 'Warty Warthog' 씨디롬"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "우분투 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "우분투 4.10 'Warty Warthog' 씨디롬"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "우분투 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "우분투 4.10 'Warty Warthog' 씨디롬"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "우분투 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "우분투 5.04 'Hoary Hedgehog' 씨디롬"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "우분투 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "우분투 4.10 'Warty Warthog' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "우분투 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "우분투 4.10 'Warty Warthog' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "우분투 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "우분투 5.04 'Hoary Hedgehog' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "우분투 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "우분투 5.04 'Hoary Hedgehog' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "우분투 5.04 보안 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "우분투 5.10 'Breezy Badger' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "우분투 5.04 보안 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "우분투 5.10 'Breezy Badger' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "우분투 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "커뮤니티에서 관리"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "제한된 소프트웨어"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "우분투 6.10 'Edgy Eft' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "우분투 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Canonical이 지원하는 오픈 소스 소프트웨어"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "커뮤니티에서 관리 (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "커뮤니티에서 관리하는 오픈 소스 소프트웨어"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "비자유 드라이버"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "장치의 독점 드라이버"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "제한된 소프트웨어 (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "우분투 6.06 LTS 'Dapper Drake' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "중요한 보안 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "추천하는 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "제안하는 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Backport 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "우분투 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "우분투 5.10 'Breezy Badger' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "우분투 5.10 보안 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "우분투 5.10 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "우분투 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "우분투 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "우분투 5.04 'Hoary Hedgehog' 씨디롬"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "공식적으로 지원함"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "우분투 5.04 보안 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "우분투 5.04 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "우분투 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "우분투 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "커뮤니티에서 관리 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "비자유 (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "우분투 4.10 'Warty Warthog' 씨디롬"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "더 이상 공식적으로 지원하지 않음"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "저작권이 제한됨"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "우분투 4.10 보안 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "우분투 4.10 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "우분투 4.10 Backports"
 
@@ -339,23 +432,23 @@ msgid "Debian testing"
 msgstr "데비안 \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "데비안 \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG 호환이 되지만 비자유 소프트웨어에 의존하는 소프트웨어"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG와 호환이 되지 않는 소프트웨어"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "%s 서버"
@@ -363,49 +456,49 @@ 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
 #. append a list of all used servers
-#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "주 서버"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "사용자 정의 서버"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 "%(total)li개중 %(current)li번째 파일을 %(speed)s/s의 속도로 받고 있습니다"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "%(total)li개중 %(current)li번째 파일을 받고 있습니다"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "자세한 정보"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "변경 사항 목록이 없습니다"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -414,7 +507,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
@@ -422,81 +515,118 @@ msgid ""
 msgstr ""
 "변경 사항 목록을 다운로드하는데 실패했습니다. 인터넷 연결을 확인해 주십시오."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "'%s'을(를) 설치할 수 없습니다"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "필수적인 패키지를 제거해야만 합니다."
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -505,19 +635,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/ku.po b/po/ku.po
index 357e7c42..3b96e13f 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-17 09:50+0000\n"
 "Last-Translator: rizoye-xerzi <rizoxerzi@gmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
+"Language: ku\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,267 +25,359 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Rojanekirinên Ewlekariyên yên Ubuntu 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Cdroma Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Cdroma Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Cdroma Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Cdroma Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Cdroma Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Cdroma Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Cdroma Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Cdroma Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdroma Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Rojanekirinên Ewlekariyên yên Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cdroma Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Rojanekirinên Ewlekariyên yên Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cdroma Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Yên ji aliyê komekê ber çav hatiye derbaskirin"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Nivîsbariya bi sînor"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cdroma Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Çavkaniya xwezayî ya li gorî bingeha nermalavê"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Yên ji aliyê koman lê hatine nihêrtin"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr ""
 "Nivîsbariyên Kodên Çavkaniyên Azad yên ji aliyê koman lê hatine nihêrtin"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Ajokerên ne azad"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Ji bo cîhazan ajokerên ku çavkaniyên wan girtî ne"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Nivîsbariya bi sînor"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Nivîsbariya bi mafên weşan û belavkirinê sînor kirî"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cdroma Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Rojanekirinên ewlekariyê yên girîng"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Rojanekirinên têne pêşniyarkirin"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Rojanekirinên hatine pêşniyarkirin"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Rojanekirinên paş de hatine kişandin"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cdroma Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Rojanekirinên Ewlekariyê yên Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Rojanekirina Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Rojanekirinên Paş de Hatine Kişandin yên Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdroma Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Bi piştgiriya fermî"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Rojanekirinên Ewlekariyên yên Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Rojanekirinên Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Rojanekirinên Paş de Hatine Kişandin yên Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Yên ji aliyê koman ve lê tê nihêrîn (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Ne-azad (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdroma Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Êdi bi awayekî fermî nayê destekkirin"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Mafê kopîkrinê yê sînorkirî"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Rojanekirinên Ubuntu 4.10 yên Ewlekarî"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Rojanekirinên Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 nivîsbariyên bi paş de kişandî (Backports)"
 
@@ -341,23 +434,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 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 "DFSG-nivîsbariya hevgirtî ya ne azad"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "nivîsbariya hevgirtî ya ne li gorî -DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Pêşkêşkera %s"
@@ -365,48 +458,48 @@ msgstr "Pêşkêşkera %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Pêşkêşkera Mak"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Pêşkêşkera taybet"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Pelgeha %(current)li ji %(total)li bi %(speed)s/ç tê daxistin"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Pelgeha %(current)li ji %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Hûragahî"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Lîsteya guherînan ne gihiştbar e"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -415,7 +508,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -423,81 +516,118 @@ msgstr ""
 "Daxistina lîsteya guhertinan biserneket.\n"
 "Ji kerema xwe re girêdana internetê kontrol bike."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Nikarî '%s' saz bike"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Dê pêwiste be ku pakêta bingehîn were jêbirin"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -506,19 +636,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index adc096fa..ee9fe8b0 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:04+0000\n"
 "Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -24,271 +25,363 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.04 saugumo atnaujinimai"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD diskas su Ubuntu 5.10 „Breezy Badger“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 „Warty Warthog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD diskas su Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 „Warty Warthog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD diskas su Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 „Warty Warthog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD diskas su Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 „Hoary Hedgehog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD diskas Ubuntu 5.04 „Hoary Hedgehog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 „Warty Warthog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD diskas su Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 „Warty Warthog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD diskas su Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD diskas Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD diskas Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 saugumo atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD diskas su Ubuntu 5.10 „Breezy Badger“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 saugumo atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD diskas su Ubuntu 5.10 „Breezy Badger“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Prižiūrima bendruomenės"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 #, fuzzy
 msgid "Restricted software"
 msgstr "Ne Laisva (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD diskas su Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 #, fuzzy
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Prižiūrima bendruomenės (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Prižiūrima bendruomenės (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Bendruomenės prižiūrima laisva programinė įranga"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Ne Laisva (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Ne Laisva (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "CD diskas su Ubuntu 6.06 LTS „Dapper Drake“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Svarbūs saugumo atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Rekomenduojami atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Testuojami atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Naujos ir atnaujintos programos"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 „Breezy Badger“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD diskas su Ubuntu 5.10 „Breezy Badger“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 saugumo atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Naujos programos Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD diskas Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Oficialiai palaikoma"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 saugumo atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Naujos programos Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 „Warty Warthog“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Prižiūrima bendruomenės (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Ne Laisva (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD diskas su Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Apribotos autorinės teisės"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 saugumo atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Naujos programos Ubuntu 4.10"
 
@@ -345,23 +438,23 @@ msgid "Debian testing"
 msgstr "Debian „Etch“ (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 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 "Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Su DFSG nesuderinama programinė įranga"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -369,48 +462,48 @@ msgstr ""
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Atsiunčiamas failas %(current)li iš %(total)li, %(speed)s/s greičiu"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Atsiunčiamas failas %(current)li iš %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Detalės"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Pakeitimų sąrašas neprieinamas"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -419,7 +512,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -427,81 +520,118 @@ msgstr ""
 "Nepavyko atsiųsti pakeitimų sąrašo. \n"
 "Patikrinkite Interneto ryšį."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Negalima įdiegti „%s“"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Turėtų būti pašalintas esminis paketas"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -510,19 +640,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/lv.po b/po/lv.po
index 8532bf82..58660cd0 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lp-upd-manager-lv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-09-05 20:00+0000\n"
 "Last-Translator: Raivis Dejus <orvils@gmail.com>\n"
 "Language-Team: Latvian <locale@laka.lv>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,252 +28,333 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Sabiedrības uzturētie (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
+#: ../data/templates/Ubuntu.info.in:1075
+#, fuzzy
+msgid "Canonical-supported free and open-source software"
+msgstr "Sabiedrības uzturētie (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Sabiedrības uzturētie (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Sabiedrības uzturētie (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "%s atjauninājumi"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Oficiāli atbalstītie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Sabiedrības uzturētie (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Maksas (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Saistītie autortiesību"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -324,22 +406,22 @@ msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -347,48 +429,48 @@ msgstr ""
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Galvenais serveris"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Detaļas"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -397,86 +479,123 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Nevar instalēt '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr ""
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -485,19 +604,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/mk.po b/po/mk.po
index ad7e6faf..7be4a45b 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:04+0000\n"
 "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,283 +25,373 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Безбедносни надградби за Убунту 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Безбедносни надградби за Убунту 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Безбедносни надградби за Убунту 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Надградби за Убунту 5.10"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Оддржувано од заедницата (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 #, fuzzy
 msgid "Restricted software"
 msgstr "Додатен софтвер"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Надградби за Убунту 5.04"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Оддржувано од заедницата (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Оддржувано од заедницата (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Оддржувано од заедницата (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Неслободно (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Неслободно (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Надградби за Убунту 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 #, fuzzy
 msgid "Important security updates"
 msgstr "Безбедносни надградби за Debian Stable"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Инсталирам надградби..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Инсталирам надградби..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Безбедносни надградби за Убунту 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Надградби за Убунту 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Надградби за Убунту 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Официјално поддржано"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Безбедносни надградби за Убунту 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Надградби за Убунту 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Надградби за Убунту 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Оддржувано од заедницата (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Неслободно (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Официјално поддржано"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Безбедносни надградби за Убунту 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Надградби за Убунту 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Надградби за Убунту 5.10"
@@ -360,23 +451,23 @@ msgid "Debian testing"
 msgstr "Debian Testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian Non-US (Unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-компатибилен софтвер со неслободни зависности"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Не-DFSG-компатибилен софтвер"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -384,51 +475,51 @@ msgstr ""
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 #, fuzzy
 msgid "Details"
 msgstr "<b>Детали</b>"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 #, fuzzy
 msgid "Starting..."
 msgstr "Поставувања"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Достапна е нова верзија на Убунту!"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -437,7 +528,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
@@ -446,81 +537,118 @@ msgstr ""
 "Не успеав да ги преземам промените. Ве молам проверете дали Вашата интернет "
 "врска е активна."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Не може да се инсталира %s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Важен пакет мора да се отстрани"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -529,19 +657,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
deleted file mode 100644
index a259fddd..00000000
--- a/po/mr.po
+++ /dev/null
@@ -1,494 +0,0 @@
-# Marathi 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.
-#
-#, fuzzy
-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: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Marathi <mr@li.org>\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
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/ms.po b/po/ms.po
deleted file mode 100644
index 4e0d1eed..00000000
--- a/po/ms.po
+++ /dev/null
@@ -1,497 +0,0 @@
-# Malay 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.
-#
-#, fuzzy
-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: 2006-10-16 04:04+0000\n"
-"Last-Translator: azlinux <azlinux@gmail.com>\n"
-"Language-Team: Malay <ms@li.org>\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
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-#, fuzzy
-msgid "No longer officially supported"
-msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi."
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "Harian"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
-msgid "Cannot install '%s'"
-msgstr "Tidak dapat memasang '%s'"
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-#, fuzzy
-msgid "An essential package would be removed"
-msgstr "Satu pakej yang perlu terpaksa dikeluarkan"
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 5cc30e76..c7fc8405 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:04+0000\n"
 "Last-Translator: Hans Petter Birkeland <hanspb@bluezone.no>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,284 +25,374 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 5.10 Oppdateringer"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 #, fuzzy
 msgid "Restricted software"
 msgstr "Bidratt programvare"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 #, fuzzy
 msgid "Recommended updates"
 msgstr "Anbefalte oppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Installerer oppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Installerer oppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Oppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Offisielt støttet"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Oppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Noe programvare er ikke lenger offisielt støttet"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Begrenset opphavsrett"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
@@ -361,23 +452,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 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 "DFSG-kompatiblel programvare med Non-Free avhengigheter"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Ikke-DFSG-kompatibel programvare"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, fuzzy, python-format
 msgid "Server for %s"
 msgstr "Tjener for %s"
@@ -385,52 +476,52 @@ msgstr "Tjener for %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 #, fuzzy
 msgid "Main server"
 msgstr "Hovedtjener"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 #, fuzzy
 msgid "Custom servers"
 msgstr "Egendefinerte tjenere"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Laster ned filen %li av %li med %s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Laster ned filen %li av %li med %s/s"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 #, fuzzy
 msgid "Starting..."
 msgstr "Instillinger"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere."
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -439,7 +530,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
@@ -448,81 +539,118 @@ msgstr ""
 "Kunne ikke laste ned listen med endringer. Vennligst kontrollér "
 "internettilkoblingen."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Kan ikke installere '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "En nødvendig pakke må fjernes"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -531,19 +659,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/ne.po b/po/ne.po
index 30cb6542..c26e0451 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:13+0000\n"
 "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
+"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,287 +26,377 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 #, fuzzy
 msgid "Restricted software"
 msgstr "योगदान गरिएको सफ्टवेयर"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "नन-फ्री (बहुभर्स)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "नन-फ्री (बहुभर्स)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 #, fuzzy
 msgid "Important security updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 #, fuzzy
 msgid "Officially supported"
 msgstr "कार्यालय बाट समर्थित"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "नन-फ्री (बहुभर्स)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "कार्यालय बाट समर्थित"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "निषेधित प्रतिलिपि अधिकार"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "युबन्टु ४.१० सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
@@ -364,23 +455,23 @@ msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -388,51 +479,51 @@ msgstr ""
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 #, fuzzy
 msgid "Details"
 msgstr "<b>विवरणहरु</b>"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 #, fuzzy
 msgid "Starting..."
 msgstr "सेटिंगहरु"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -441,87 +532,124 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस"
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, python-format
 msgid "Cannot install '%s'"
 msgstr ""
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr ""
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -530,19 +658,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index b46d889f..c9995edf 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,20 +1,21 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Ducht translation of python-apt.
+# Copyright (C) 2006-2012 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the python-apt package.
+# Tino Meinen <a.t.meinen@chello.nl>, 2006.
+# Jeroen Schot <schot@a-eskwadraat.nl, 2011, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: update-manager HEAD\n"
+"Project-Id-Version: python-apt 0.8.4+nmu1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2006-10-21 13:15+0000\n"
-"Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
-"Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
+"POT-Creation-Date: 2012-06-25 14:42+0200\n"
+"PO-Revision-Date: 2012-06-13 12:12+0200\n"
+"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"Language: nl\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
@@ -23,267 +24,328 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD met Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD met Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD met Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD met Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Partners van Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Software dis is verpakt door Canonical voor zijn partners"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Deze software is geen onderdeel van Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Onafhankelijk"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Aangeboden door externe ontwikkelaars"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Software die door externe ontwikkelaars wordt aangeboden."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD met Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 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
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’"
+msgstr "CD met Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:695
 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
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’"
+msgstr "CD met Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:757
 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
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Cd-rom met Ubuntu 5.04 ‘Hoary Hedgehog’"
+msgstr "CD met Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:821
 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
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "Cd-rom met Ubuntu 5.04 ‘Hoary Hedgehog’"
+msgstr "CD met Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 5.04 veiligheidsupdates"
+msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’"
+msgstr "CD met Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 5.04 veiligheidsupdates"
+msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’"
+msgstr "CD met Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 6.10 ‘Edgy Eft’"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr "Door de gemeenschap beheerd"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Beperkte software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr "Cd-rom met Ubuntu 6.10 'Edgy Eft'"
+msgstr "CD met Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 LTS ‘Dapper Drake’"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
-msgid "Canonical-supported Open Source software"
-msgstr "Door Canonical beheerde Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Door Canonical ondersteunde vrije en opensourcesoftware"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr "Door de gemeenschap beheerd (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Door de gemeenschap beheerde Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Door de gemeenschap beheerde vrije en opensourcesoftware"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Niet-vrije stuurprogramma's"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Niet-vrije stuurprogramma's voor apparaten"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Beperkte software (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 "Software die door auteursrechten of wettelijke regelingen beperkt wordt."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Cd-rom met Ubuntu 6.06 LTS ‘Dapper Drake’"
+msgstr "CD met Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Belangrijke veiligheidsupdates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Aanbevolen updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr "Voorgestelde updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
-msgstr "Updates die van een nieuwere distributie afkomstig zijn (backports)"
+msgstr "Niet-ondersteunde updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’"
+msgstr "CD met Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 veiligheidsupdates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 ‘Hoary Hedgehog’"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Cd-rom met Ubuntu 5.04 ‘Hoary Hedgehog’"
+msgstr "CD met Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
 msgstr "Officieel ondersteund"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 veiligheidsupdates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 4.10 ‘Warty Warthog’"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr "Door de gemeenschap beheerd (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Niet-vrij (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’"
+msgstr "CD met Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Niet meer officieel ondersteund"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Beperkte auteursrechten"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 veiligheidsupdates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 backports"
 
@@ -295,68 +357,66 @@ 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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 'Squeeze' "
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 'Lenny' "
 
 #. Description
 #: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 'Etch'"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 'Sarge'"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
 msgstr "Voorgestelde updates"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
-msgstr "Belangrijke veiligheidsupdates"
+msgstr "veiligheidsupdates"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Huidige stabiele uitgave van Debian"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian testing (test)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (onstabiel)"
+msgstr "Debian 'Sid' (unstable/onstabiel)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Software compatibel met DFSG, maar met niet-vrije afhankelijkheden"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
 msgstr "Software niet compatibel met DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Server voor %s"
@@ -364,48 +424,49 @@ msgstr "Server voor %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Hoofdserver"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Andere servers"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Downloaden van bestand %(current)li uit %(total)li met %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Downloaden van bestand %(current)li uit %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Details"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr ""
+msgstr "Opstarten..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
-msgstr ""
+msgstr "Voltooid"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
+"Ongeldige unicode in de beschrijving van '%s' (%s). Gelieve dit te melden."
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Een overzicht van de wijzigingen is nog niet beschikbaar."
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -413,8 +474,12 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"De lijst van veranderingen is nog niet beschikbaar\n"
+"\n"
+"Gebruik http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"todat de veranderingen beschikbaar zijn of probeer het later nog eens."
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -422,102 +487,153 @@ msgstr ""
 "Kon de lijst met wijzigingen niet downloaden. \n"
 "Controleer uw internetverbinding."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "De lijst van bestanden voor '%s' kon niet gelezen worden"
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "De lijst van bestanden voor '%s' kon niet gelezen worden"
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Afhankelijkheid is niet vervulbaar: %s\n"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
+msgstr "Conflicteerd met het geinstalleerde pakket '%s'"
+
+#. 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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
+"Maakt het bestaande pakket '%(pkgname)s' stuk door afhankelijkheid "
+"%(depname)s (%(deprelation)s %(depversion)s)"
 
-#: ../apt/debfile.py:319
+#. 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:389
 #, python-format
-msgid "Wrong architecture '%s'"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
 msgstr ""
+"Maakt het bestaande pakket '%(pkgname)s' stuk door conflict: %(targetpkg)s "
+"(%(comptype)s %(targetver)s) "
+
+#: ../apt/debfile.py:399
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
+"the '%(debfile)s' provides it via: '%(provides)s'"
+msgstr ""
+"Maakt het bestaande pakket '%(pkgname)s' stuk die conflicteert: "
+"'%(targetpkg)s'. Maar de '%(debfile)s biedt deze aan via: '%(provides)s'"
+
+#: ../apt/debfile.py:447
+msgid "No Architecture field in the package"
+msgstr "Pakket heeft geen Architecture-veld"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Verkeerde architectuur '%s'"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Er is al een nieuwere versie geïnstalleerd"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Voldoen van alle vereisten is mislukt (defecte cache)"
 
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, python-format
 msgid "Cannot install '%s'"
 msgstr "Kan '%s' niet installeren"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Automatisch uitgepakt:\n"
+"\n"
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Automatisch omgezet naar toonbare ASCII:\n"
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
+"Installeer de bouwevereisten voor het bronpakket '%s' waaruit '%s' wordt "
+"gebouwd\n"
 
-#: ../apt/debfile.py:494
-#, fuzzy
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr "Een essentieel pakket zou verwijderd worden"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Klaar"
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
-msgstr ""
+msgstr "Geraakt "
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
-msgstr ""
+msgstr "Genegeerd "
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
-msgstr ""
+msgstr "Fout "
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr ""
+msgstr "Ophalen:"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr ""
+msgstr " [Bezig]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Medium wisselen: Gelieve de schijf met label\n"
+" '%s'\n"
+"in het station '%s' te plaatsen en op 'enter' te drukken\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 ""
+msgstr "%sB opgehaald in %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 ""
+"Gelieve een naam voor deze schijf op te geven, bijvoorbeeld 'Debian 2.1r1 "
+"schijf 1'"
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Gelieve een schijf in het station te plaatsen en op 'Enter' te drukken"
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
-msgstr ""
+msgstr "Opbouwen van pakketstructuren"
diff --git a/po/nn.po b/po/nn.po
deleted file mode 100644
index 1da62fa0..00000000
--- a/po/nn.po
+++ /dev/null
@@ -1,496 +0,0 @@
-# Norwegian Nynorsk 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.
-#
-#, fuzzy
-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: 2006-10-09 15:50+0000\n"
-"Last-Translator: Willy André Bergstrøm <root@willyandre.net>\n"
-"Language-Team: Norwegian Nynorsk <nn@li.org>\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
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "Kvar dag"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
-msgid "Cannot install '%s'"
-msgstr "Kan ikkje installere '%s'"
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-#, fuzzy
-msgid "An essential package would be removed"
-msgstr "Ein naudsynt pakke vil måtte fjernast"
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/no.po b/po/no.po
index 2a8259e8..b6002293 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2005-06-08 23:10+0200\n"
 "Last-Translator: Terance Edward Sola <terance@lyse.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,286 +25,376 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.10 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 5.10 Updates"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 #, fuzzy
 msgid "Restricted software"
 msgstr "Bidratt programvare"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Updates"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Installerer oppdateringer..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Installerer oppdateringer..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 #, fuzzy
 msgid "Officially supported"
 msgstr "Offisielt støttet"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Offisielt støttet"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Begrenset opphavsrett"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Updates"
@@ -363,23 +454,23 @@ msgid "Debian testing"
 msgstr "Debian Testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian Non-US (Unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -387,51 +478,51 @@ msgstr ""
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 #, fuzzy
 msgid "Details"
 msgstr "<b>Detaljer</b>"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 #, fuzzy
 msgid "Starting..."
 msgstr "Instillinger"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Det er en ny versjon av Ubuntu tilgjengelig!"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -440,87 +531,124 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr "Feil under nedlasting av endringer. Sjekk tilkoblingen til internett."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "_Installer"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr ""
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -529,19 +657,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/oc.po b/po/oc.po
index 7a18ca33..17b6e3d3 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -8,11 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-18 10:01+0000\n"
 "Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannick.marchegay@lokanova."
 "com>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,271 +26,361 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Mesas a jorn de seguretat per Ubuntu 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD-ROM amb Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Mesas a jorn de seguretat per Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD-ROM amb Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Mesas a jorn de seguretat per Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD-ROM amb Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 #, fuzzy
 msgid "Restricted software"
 msgstr "Pas liure (multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD-ROM que conten Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Pilòts pas liures"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Pas liure (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "CD-ROM que conten Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Mesas a jorn de seguretat importantas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Autras mesas a jorn"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Mesas a jorn de seguretat importantas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD-ROM amb Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Mesas a jorn de seguretat per Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "Mesas a jorn per Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Mesas a jorn de seguretat per Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Pas liure (multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -346,23 +437,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (en tèst)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (instable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor per %s"
@@ -370,48 +461,48 @@ msgstr "Servidor per %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Servidors personalizats"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Detalhs"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "La tièra de las modificacioons es pas disponibla"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -420,87 +511,124 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr "Verificatz vòstra connection internet."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Impossible d'installar '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr ""
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -509,19 +637,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
deleted file mode 100644
index fc645ce8..00000000
--- a/po/pa.po
+++ /dev/null
@@ -1,500 +0,0 @@
-# translation of pa.po to Punjabi
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Amanpreet Singh Alam <amanpreetalam@yahoo.com>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: pa\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2006-10-16 04:16+0000\n"
-"Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
-"Language-Team: Punjabi <fedora-transa-pa@redhat.com>\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"
-"X-Generator: KBabel 1.9.1\n"
-
-#. ChangelogURI
-#: ../data/templates/Ubuntu.info.in.h:4
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-#, fuzzy
-msgid "Important security updates"
-msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
-msgid "Pre-released updates"
-msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
-msgid "Unsupported updates"
-msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-#, fuzzy
-msgid "Proposed updates"
-msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
-msgid "Security updates"
-msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "<b>ਵੇਰਵਾ</b>"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/pl.po b/po/pl.po
index d57ebc98..19976714 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager cvs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-21 12:05+0000\n"
 "Last-Translator: Dominik Zablotny <doza@sztorm.net>\n"
 "Language-Team: Polish <translators@gnomepl.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,267 +25,359 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD-ROM z Ubuntu 5.10 \"Breezy Badger\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu·4.10·\"Warty·Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu·4.10·\"Warty·Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu·4.10·\"Warty·Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD-ROM z Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu·4.10·\"Warty·Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu·4.10·\"Warty·Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD-ROM z Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD-ROM z Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD-ROM z Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD-ROM z Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Pod opieką społeczeństwa"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Ograniczone oprogramowanie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD-ROM z Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Oprogramowanie Open Source wspierane przez firmę Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Obsługiwane przez społeczność (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Oprogramowanie Open Source pod opieką społeczeństwa"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Sterowniki nie-wolnodostępne"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Własnościowe sterowniki dla urządzeń"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Oprogramowanie nie-wolnodostępne (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 "Oprogramowanie ograniczone prawami autorskimi lub problemami natury prawnej"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "CD-ROM z Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Ważne aktualizacje bezpieczeństwa"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Aktualizacje polecane"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Aktualizacje proponowane"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Aktualizacje backportowane"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD-ROM z Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Aktualizacje dla Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD-ROM z Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Wspierane oficjalnie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Aktualizacje dla Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Aktualizacje dla Ubuntu 5.04 (backporty)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu·4.10·\"Warty·Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Utrzymywane przez społeczność (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Nie-wolnodostępne (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Już nieobsługiwane"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "O ograniczonych prawach kopiowania"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Aktualizacje dla Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Aktualizacje dla Ubuntu 4.10 (backporty)"
 
@@ -341,23 +434,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (wersja testowa)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (wersja unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Oprogramowanie niekompatybilne z DFSG."
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Serwer dla kraju %s"
@@ -365,49 +458,49 @@ msgstr "Serwer dla kraju %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Serwer główny"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Inne serwery"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Pobieranie pliku %(current)li z %(total)li z prędkością %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Pobieranie pliku %(current)li z %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Szczegóły"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 #, fuzzy
 msgid "Starting..."
 msgstr "Ustawienia"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Lista zmian nie jest dostępna."
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -416,7 +509,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -424,81 +517,118 @@ msgstr ""
 "Nie udało się pobrać listy zmian. \n"
 "Proszę sprawdzić swoje połączenie intenetowe."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Nie można zainstalować \"%s\""
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Niezbędny pakiet musiałby zostać usunięty"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -507,19 +637,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/ps.po b/po/ps.po
deleted file mode 100644
index 711ca4fe..00000000
--- a/po/ps.po
+++ /dev/null
@@ -1,494 +0,0 @@
-# Pushto 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.
-#
-#, fuzzy
-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: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Pushto <ps@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. ChangelogURI
-#: ../data/templates/Ubuntu.info.in.h:4
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/pt.po b/po/pt.po
index a8a52a99..2e2b21f5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 11:04+0000\n"
 "Last-Translator: Tiago Silva <tiagosilva29@gmail.com>\n"
 "Language-Team: Ubuntu Portuguese Team <ubuntu-pt.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,266 +23,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Actualizações de Segurança do Ubuntu 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Cdrom com o Ubuntu 5.10 \"Breezy Badger\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Cdrom com o Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Cdrom com o Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdrom com o Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Actualizações de Segurança do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cdrom com o Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Actualizações de Segurança do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cdrom com o Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Mantido pela comunidade"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Software Restrito"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cdrom com o Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Software de Código Aberto suportado pela Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Mantido pela comunidade (universal)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Software de Código Fonte Aberto mantido pela comunidade"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Controladores não-livres"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Drivers proprietários para dispositivos"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Software não-livre (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Software restringido por copyright ou questões legais"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cdrom com o Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Actualizações de segurança importantes"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Actualizações recomendadas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Actualizações propostas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Actualizações dos repositórios \"backport\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cdrom com o Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Actualizações de Segurança"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Actualizações"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdrom 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:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Suportado Oficialmente"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualizações de Segurança do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualizações do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Backports do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Mantido pela comunidade (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Não-livre (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Sem mais suporte oficial"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Direitos de autor restritos"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Actualizações de Segurança do Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualizações do Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Backports do Ubuntu 4.10"
 
@@ -338,23 +431,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 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 "Software compatível-DFSG 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 "Software compatível-DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor para %s"
@@ -362,48 +455,48 @@ msgstr "Servidor para %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Servidores personalizados"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "A descarregar ficheiro %(current)li de %(total)li a %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "A descarregar ficheiro %(current)li de %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 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:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -412,7 +505,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -420,81 +513,118 @@ msgstr ""
 "Falha ao descarregar a lista de alterações. \n"
 "Por favor verifique a sua ligação à Internet."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Impossível de instalar '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Um pacote essencial teria que ser removido"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -503,19 +633,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7f95b222..a19c5c2c 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 - 2012.
 #
 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: 2012-06-25 14:42+0200\n"
+"PO-Revision-Date: 2012-06-10 15:53-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"
@@ -23,248 +25,327 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD-ROM com o Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD-ROM com o Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD-ROM com o Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD-ROM com o Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Parceiros da Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Aplicativos empacotados pela Canonical para os seus parceiros"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Estes aplicativos não são parte do Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Independentes"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Fornecidos por desenvolvedores de software terceiros"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Aplicativos oferecidos por desenvolvedores terceiros."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD-ROM com o Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 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:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 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:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 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:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 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:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 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:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 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:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr "Mantido pela comunidade"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Aplicativos restritos"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 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:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr "Aplicativo de Código Aberto suportado pela Canonical"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Aplicativos livres de código aberto suportados pela Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr "Mantido pela comunidade (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr "Aplicativo de Código Aberto mantido pela comunidade"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Aplicativos livres de código aberto mantidos pela comunidade"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Drivers não-livres"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Drivers proprietários para dispositivos"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Aplicativos restritos (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 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:1091
 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:1107
 msgid "Important security updates"
 msgstr "Atualizações de segurança importantes"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Atualizações recomendadas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr "Atualizações de pré-lançamento"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
 msgstr "Atualizações não suportadas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 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:1164
 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:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Atualizações do Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Backports do Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 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:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
 msgstr "Suportados oficialmente"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 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:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Atualizações do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Backports do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr "Mantido pela comunidade (universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Não-livres (multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 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:1250
 msgid "No longer officially supported"
 msgstr "Não mais suportado oficialmente"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Copyright restrito"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 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:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Atualizações do Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Backports do Ubuntu 4.10"
 
@@ -276,62 +357,66 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Debian.info.in:8
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
+
+#. Description
+#: ../data/templates/Debian.info.in:33
 msgid "Debian 6.0 'Squeeze' "
 msgstr "Debian 6.0 'Squeeze' "
 
 #. Description
-#: ../data/templates/Debian.info.in:33
+#: ../data/templates/Debian.info.in:58
 msgid "Debian 5.0 'Lenny' "
 msgstr "Debian 5.0 'Lenny' "
 
 #. Description
-#: ../data/templates/Debian.info.in:58
+#: ../data/templates/Debian.info.in:83
 msgid "Debian 4.0 'Etch'"
 msgstr "Debian 4.0 'Etch'"
 
 #. Description
-#: ../data/templates/Debian.info.in:83
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
 msgstr "Debian 3.1 'Sarge'"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
 msgstr "Atualizações sugeridas"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
 msgstr "Atualizações de segurança"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
 msgstr "Atual versão estável do Debian"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
 msgstr "Debian testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian 'Sid' (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
 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:178
 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:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor - %s"
@@ -339,50 +424,48 @@ 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Servidores personalizados"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, 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:264 ../apt/progress/gtk2.py:320
 #, 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:340
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr "Iniciando..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr "Completo"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, 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:1088 ../apt/package.py:1194
 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:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -395,7 +478,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:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -403,80 +486,126 @@ msgstr ""
 "Falha ao baixar a lista de alterações. \n"
 "Por favor verifique sua conexão com a Internet."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, 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"
+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:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
-msgstr "A lista de arquivos de '%s' não pôde ser lida"
+msgid "List of control files for '%s' could not be read"
+msgstr "A lista de arquivos de controle de '%s' não pôde ser lida"
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, 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:232
 #, 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:373
+#, 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:389
+#, 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:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr "Sem campo de arquitetura no pacote"
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr "Arquitetura incorreta '%s'"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr "Uma versão mais atual já está instalada"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 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:519
 #, python-format
 msgid "Cannot install '%s'"
 msgstr "Incapaz de instalar '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Descompactado automaticamente:\n"
+"\n"
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Convertido automaticamente para ascii imprimível:\n"
+
+#: ../apt/debfile.py:689
 #, 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:700
 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 +617,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:157
 msgid "Building data structures"
 msgstr "Construindo estruturas de dados"
 
+#~ msgid "Python-debian module not available"
+#~ msgstr "Módulo python-debian não disponível"
+
+#~ msgid "Failed to fetch %s  %s\n"
+#~ msgstr "Falha ao buscar %s,  %s\n"
+
+#~ 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 682c133a..940cd13a 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-03-21 15:01+0100\n"
+"POT-Creation-Date: 2012-06-25 14:31+0200\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,297 +24,327 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
 msgid "Ubuntu 10.10 'Maverick Meerkat'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:506
 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:43
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Canonical Partners"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:45
+#: ../data/templates/Ubuntu.info.in:520
 msgid "Software packaged by Canonical for their partners"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:46
+#: ../data/templates/Ubuntu.info.in:521
 msgid "This software is not part of Ubuntu."
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:53
+#: ../data/templates/Ubuntu.info.in:528
 msgid "Independent"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:55
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Provided by third-party software developers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:56
+#: ../data/templates/Ubuntu.info.in:531
 msgid "Software offered by third party developers."
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:94
+#: ../data/templates/Ubuntu.info.in:569
 msgid "Ubuntu 10.04 'Lucid Lynx'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:589
 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:155
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:173
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:216
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:234
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:277
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:339
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:402
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:465
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:483
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:525
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:536
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:543
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:585
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:588
-msgid "Canonical-supported Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:590
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:591
-msgid "Community-maintained Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:593
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:594
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:596
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:597
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:603
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:619
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:624
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:629
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:634
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:645
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:659
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:675
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:680
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:685
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:696
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:710
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:713 ../data/templates/Debian.info.in:149
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:726
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:731
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:736
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:742
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:748
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:750
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:756
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:759
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:761
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:768
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:773
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:778
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -326,61 +356,66 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
+msgid "Debian 7.0 'Wheezy' "
 msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
+msgid "Debian 6.0 'Squeeze' "
 msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
+msgid "Debian 5.0 'Lenny' "
 msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:83
+msgid "Debian 4.0 'Etch'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:101
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:121
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:147
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:151
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:153
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:209 ../aptsources/distro.py:424
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -388,48 +423,48 @@ msgstr ""
 #. 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:227 ../aptsources/distro.py:233
-#: ../aptsources/distro.py:249
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:253
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:260 ../apt/progress/gtk2.py:316
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, 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:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:342
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:430
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:436
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:342
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:1012 ../apt/package.py:1117
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../apt/package.py:1123
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -438,29 +473,34 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1130
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:82
 #, python-format
 msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:166
+#: ../apt/debfile.py:93
+#, python-format
+msgid "List of control files for '%s' could not be read"
+msgstr ""
+
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:187
+#: ../apt/debfile.py:232
 #, 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:326
+#: ../apt/debfile.py:373
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' dependency %(depname)s "
@@ -468,63 +508,59 @@ 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:342
+#: ../apt/debfile.py:389
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
 "%(targetver)s)"
 msgstr ""
 
-#: ../apt/debfile.py:352
+#: ../apt/debfile.py:399
 #, 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:398
+#: ../apt/debfile.py:447
 msgid "No Architecture field in the package"
 msgstr ""
 
-#: ../apt/debfile.py:403
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:410
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:435
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:465
+#: ../apt/debfile.py:519
 #, python-format
 msgid "Cannot install '%s'"
 msgstr ""
 
-#: ../apt/debfile.py:507
-msgid "Python-debian module not available"
-msgstr ""
-
-#: ../apt/debfile.py:541
+#: ../apt/debfile.py:593
 msgid ""
 "Automatically decompressed:\n"
 "\n"
 msgstr ""
 
-#: ../apt/debfile.py:547
+#: ../apt/debfile.py:599
 msgid "Automatically converted to printable ascii:\n"
 msgstr ""
 
-#: ../apt/debfile.py:637
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:647
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr ""
 
@@ -549,11 +585,11 @@ msgstr ""
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:204
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:215
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -562,19 +598,19 @@ msgid ""
 msgstr ""
 
 #. Trick for getting a translation from apt
-#: ../apt/progress/text.py:224
+#: ../apt/progress/text.py:223
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
-#: ../apt/progress/text.py:240
+#: ../apt/progress/text.py:239
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 msgstr ""
 
-#: ../apt/progress/text.py:256
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:135
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/qu.po b/po/qu.po
deleted file mode 100644
index 30815be8..00000000
--- a/po/qu.po
+++ /dev/null
@@ -1,494 +0,0 @@
-# Quechua 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.
-#
-#, fuzzy
-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: 2006-10-09 15:50+0000\n"
-"Last-Translator: Rosetta Administrators <rosetta@launchpad.net>\n"
-"Language-Team: Quechua <qu@li.org>\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 % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
-
-#. ChangelogURI
-#: ../data/templates/Ubuntu.info.in.h:4
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 82b3c199..be165f96 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:13+0000\n"
 "Last-Translator: Sami POTIRCA <spotirca@gmail.com>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,268 +26,360 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Actualizări de Securitate Ubuntu 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Cdrom cu Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Cdrom cu Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Cdrom cu Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdrom cu Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Actualizări de Securitate Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cdrom cu Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Actualizări de Securitate Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cdrom cu Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Pachete întreţinute de comunitate (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 #, fuzzy
 msgid "Restricted software"
 msgstr "Software în contribuţie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cdrom cu Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Pachete întreţinute de comunitate (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Pachete întreţinute de comunitate (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Pachete întreţinute de comunitate (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Pachete non-libere"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Software restricţionat (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cdrom cu Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Actualizări importante de securitate"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Actualizări recomandate"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Pachete propuse"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Actualizări portate înapoi"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cdrom cu Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualizări de Securitate Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualizări Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdrom cu Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Pachete suportate oficial"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualizări de Securitate Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualizări Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Pachete întreţinute de comunitate (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Pachete non-libere (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Pachete suportate oficial"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Copyright restrictiv"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Actualizări de securitate Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualizări Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Backports"
 
@@ -343,23 +436,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 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 "Software compatibil DFSG cu dependenţe negratuite"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Software incompatibil DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Server pentru %s"
@@ -367,48 +460,48 @@ msgstr "Server pentru %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Server principal"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Servere preferenţiale"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Detalii"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Lista schimbărilor nu este disponibilă"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -417,7 +510,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
@@ -426,81 +519,118 @@ msgstr ""
 "Nu am putut descărca lista modificărilor. Vă rog să verificaţi dacă aveţi o "
 "conexiune internet activă."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Nu pot instala '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Un pachet esenţial ar trebui şters"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -509,19 +639,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 2b17faa0..aa8be8e4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,15 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-25 14:42+0200\n"
 "PO-Revision-Date: 2006-10-18 09:11+0000\n"
 "Last-Translator: Igor Zubarev <igor4u@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -25,266 +26,356 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Диск с Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Диск с Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Диск с Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Диск с Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Партнеры Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Програмное обеспечение упаковано Canonical для партнеров"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Это програмное обеспечение не является частью Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Независимый"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Предоставлено сторонними разработчиками."
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Програмное обеспечение предлагается  сторонними разработчиками."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Диск с Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, 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
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "CD с Ubuntu 4.10 'Warty Warthog'"
+msgstr "Диск с Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, 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
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "CD с Ubuntu 4.10 'Warty Warthog'"
+msgstr "Диск с Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, 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
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr "Диск с Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, 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
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr "Диск с Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Обновления безопасности Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "CD с Ubuntu 5.10 'Breezy Badger'"
+msgstr "Диск с Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Обновления безопасности Ubuntu 5.04"
+msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "CD с Ubuntu 5.10 'Breezy Badger'"
+msgstr "Диск с Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Поддерживается сообществом"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Несвободное ПО"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CDROM с Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Open Source приложения, поддерживаемые Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Поддерживается сообществом (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Поддерживаемое сообществом свободное ПО"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Несвободные драйвера"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Проприетарные драйвера устройств"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Несвободное обеспечение (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Программы, ограниченные патентами или законами"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "CD с Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Важные обновления безопасности"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Рекомендованые обновления"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
-msgstr "Предлагаемые обновления"
+msgstr "Пред-релизные обновления"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
-msgstr "Обновления в бэкпортах"
+msgstr "Не поддерживаемые обновления"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD с Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Обновления безопасности Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Обновления Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
 msgstr "Официально поддерживается"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Обновления безопасности Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Обновления Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 бэкпорты"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Поддерживается сообществом (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Несвободное (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD с Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Официально больше не поддерживается"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Ограниченные авторские права"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Обновления безопасности Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Обновления Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 бэкпорты"
 
@@ -296,68 +387,73 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Debian.info.in:8
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
+
+#. Description
+#: ../data/templates/Debian.info.in:33
 #, fuzzy
 msgid "Debian 6.0 'Squeeze' "
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 6.0 'Squeeze' "
 
 #. Description
-#: ../data/templates/Debian.info.in:33
+#: ../data/templates/Debian.info.in:58
 #, fuzzy
 msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 5.0 'Lenny' "
 
 #. Description
-#: ../data/templates/Debian.info.in:58
+#: ../data/templates/Debian.info.in:83
 #, fuzzy
 msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 4.0 'Etch'"
 
 #. Description
-#: ../data/templates/Debian.info.in:83
+#: ../data/templates/Debian.info.in:108
 #, fuzzy
 msgid "Debian 3.1 'Sarge'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 'Sarge'"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
 msgstr "Предлагаемые обновления"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
+#: ../data/templates/Debian.info.in:126
 #, fuzzy
 msgid "Security updates"
-msgstr "Важные обновления безопасности"
+msgstr "Обновления безопасности"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Текущий стабильный релиз Debian"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:172
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian 'Sid' (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-совместимое ПО с зависимостями от несвободного ПО"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
 msgstr "Не-DFSG-совместимое ПО"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Сервер %s"
@@ -365,48 +461,48 @@ 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
 #. append a list of all used servers
-#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Основной сервер"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Свои сервера"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Загрузка файла %(current)li из %(total)li со скоростью %(speed)s/с"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Загрузка файла %(current)li из %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Подробности"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr ""
+msgstr "Начинаем..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
-msgstr ""
+msgstr "Завершено"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, 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
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Список изменений недоступен или отсутствует."
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -414,8 +510,12 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"Список изменений еще недоступен.\n"
+"\n"
+"Пожалуйста используйте http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"до тех пор, пока изменения не станут доступны или попробуйте позже."
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -423,81 +523,122 @@ msgstr ""
 "Ошибка при загрузке списка изменений. \n"
 "Пожалуйста, проверьте ваше соединение с Интернет."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Список файлов для '%s' не может быть прочтен"
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Список контролирующих файлов для '%s' не может быть прочтен"
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Неразрешимая зависимость: %s\n"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
+msgstr "Конфликт с установленым пакетом '%s'"
+
+#. 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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
+"Ломает в существующем пакете '%(pkgname)s' зависимость %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 
-#: ../apt/debfile.py:319
+#. 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:389
 #, python-format
-msgid "Wrong architecture '%s'"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+"Ломает существующий пакет '%(pkgname)s' конфликтует с: %(targetpkg)s "
+"(%(comptype)s %(targetver)s)"
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr "Нет указания архитектуры в пакете"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Неправильная архитектура '%s'"
+
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Более поздняя версия уже установлена"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Неудалось определить все зависимости (broken cache)"
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Невозможно установить '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Будет удален необходимый пакет"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -506,19 +647,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/rw.po b/po/rw.po
deleted file mode 100644
index fcc7d589..00000000
--- a/po/rw.po
+++ /dev/null
@@ -1,549 +0,0 @@
-# translation of update-manager to Kinyarwanda.
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the update-manager package.
-# Steve Murphy <murf@e-tools.com>, 2005
-# Steve performed initial rough translation from compendium built from translations provided by the following translators:
-# Philibert Ndandali  <ndandali@yahoo.fr>, 2005.
-# Viateur MUGENZI <muvia1@yahoo.fr>, 2005.
-# Noëlla Mupole <s24211045@tuks.co.za>, 2005.
-# Carole Karema <karemacarole@hotmail.com>, 2005.
-# JEAN BAPTISTE NGENDAHAYO <ngenda_denis@yahoo.co.uk>, 2005.
-# Augustin KIBERWA  <akiberwa@yahoo.co.uk>, 2005.
-# Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005..
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: update-manager HEAD\n"
-"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: Steve Murphy <murf@e-tools.com>\n"
-"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-
-#. ChangelogURI
-#: ../data/templates/Ubuntu.info.in.h:4
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-#, fuzzy
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-#, fuzzy
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-#, fuzzy
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-#, fuzzy
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-#, fuzzy
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-#, fuzzy
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-#, fuzzy
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-#, fuzzy
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-#, fuzzy
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-#, fuzzy
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "5"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-#, fuzzy
-msgid "Restricted software"
-msgstr "Kohereza Nta gukoresha bisesuye"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-#, fuzzy
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "5"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-#, fuzzy
-msgid "Non-free drivers"
-msgstr "Kigenga"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-#, fuzzy
-msgid "Restricted software (Multiverse)"
-msgstr "Kigenga"
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-#, fuzzy
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-#, fuzzy
-msgid "Important security updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
-msgid "Pre-released updates"
-msgstr "Kwinjiza porogaramu"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
-msgid "Unsupported updates"
-msgstr "Kwinjiza porogaramu"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-#, fuzzy
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-#, fuzzy
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-#, fuzzy
-msgid "Ubuntu 5.10 Updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-#, fuzzy
-msgid "Ubuntu 5.10 Backports"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-#, fuzzy
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-#, fuzzy
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "5"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-#, fuzzy
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-#, fuzzy
-msgid "Ubuntu 5.04 Updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-#, fuzzy
-msgid "Ubuntu 5.04 Backports"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-#, fuzzy
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "5"
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-#, fuzzy
-msgid "Non-free (Multiverse)"
-msgstr "Kigenga"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-#, fuzzy
-msgid "Restricted copyright"
-msgstr "Uburenganzira bw'umuhimbyi"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-#, fuzzy
-msgid "Ubuntu 4.10 Security Updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-#, fuzzy
-msgid "Ubuntu 4.10 Updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-#, fuzzy
-msgid "Ubuntu 4.10 Backports"
-msgstr "5"
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-#, fuzzy
-msgid "Debian 6.0 'Squeeze' "
-msgstr "4. 10"
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "4. 10"
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "4. 10"
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-#, fuzzy
-msgid "Debian 3.1 'Sarge'"
-msgstr "4. 10"
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-#, fuzzy
-msgid "Proposed updates"
-msgstr "Kwinjiza porogaramu"
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
-msgid "Security updates"
-msgstr "5"
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "<B B"
-
-#: ../apt/progress/gtk2.py:367
-#, fuzzy
-msgid "Starting..."
-msgstr "Amagenamiterere"
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-#, fuzzy
-msgid "The list of changes is not available"
-msgstr "ni a Gishya Bya Bihari"
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-#, fuzzy
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-"Kuri Gufungura Amahinduka Kugenzura... NIBA ni Gikora Interineti Ukwihuza"
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/sk.po b/po/sk.po
index eeac9dda..d01acebb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,16 +2,17 @@
 # Copyright (C) 2006 Canonical Ltd, and Rosetta Contributors 2006
 # This file is distributed under the same license as the update-manager package.
 # Peter Chabada <sk-i18n_chabada_sk>, 2006.
-#
+# Ivan Masár <helix84@centrum.sk>, 2012.
 #
 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: 2006-10-16 04:17+0000\n"
-"Last-Translator: Peter Chabada <ubuntu@chabada.sk>\n"
-"Language-Team: Slovak <sk-i18n@linux.sk>\n"
+"POT-Creation-Date: 2012-06-25 14:42+0200\n"
+"PO-Revision-Date: 2012-06-10 23:28+0100\n"
+"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
+"Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,286 +25,329 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 „Precise Pangolin“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "CD-ROM s Ubuntu 12.04 „Precise Pangolin“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 „Oneiric Ocelot“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "CD-ROM s Ubuntu 11.10 „Oneiric Ocelot“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 „Natty Narwhal“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "CD-ROM s Ubuntu 11.04 „Natty Narwhal“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 „Maverick Meerkat“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "CD-ROM s Ubuntu 10.10 „Maverick Meerkat“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Partneri Canonicalu"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Balíky softvéru, ktoré pripravil Canonical pre svojich partnerov"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Tento softvér nie je súčasťou Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Nezávislé"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Poskytované vývojármi tretích strán"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Softvér, ktorý ponúkajú vývojári tretích strán."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 „Lucid Lynx“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD-ROM s Ubuntu 10.04 „Lucid Lynx“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Ubuntu 9.10 „Karmic Koala“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
+msgstr "CD-ROM s Ubuntu 9.10 „Karmic Koala“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Ubuntu 9.04 „Jaunty Jackalope“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
+msgstr "CD-ROM s Ubuntu 9.04 „Jaunty Jackalope“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Ubuntu 8.10 „Intrepid Ibex“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Disk s Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Ubuntu 8.04 „Hardy Heron“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "CD-ROM s Ubuntu 8.04 „Hardy Heron“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
+msgstr "Ubuntu 7.10 „Gutsy Gibbon“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD-ROM s Ubuntu 7.10 „Gutsy Gibbon“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
+msgstr "Ubuntu 7.04 „Feisty Fawn“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD-ROM s Ubuntu 7.04 „Feisty Fawn“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 - aktualizácie"
+msgstr "Ubuntu 6.10 „Edgy Eft“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
-msgstr "Udržiavané komunitou (Universe)"
+msgstr "Udržiavané komunitou"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
-msgstr "Softvér závislý na neslobornom softvéri"
+msgstr "Softvér závislý na neslobodnom softvéri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
+msgstr "CD-ROM s Ubuntu 6.10 „Edgy Eft“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Ubuntu 6.06 LTS „Dapper Drake“"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-#, fuzzy
-msgid "Canonical-supported Open Source software"
-msgstr "Udržiavané komunitou (Universe)"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Slobodný a open source softvér, ktorý podporuje Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
-msgstr "Udržiavané komunitou (Universe)"
+msgstr "Udržiavané komunitou (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Udržiavané komunitou (Universe)"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Slobodný a open source softvér udržiavaný komunitou"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
-msgstr "Neslobodné (Multiverse)"
+msgstr "Neslobodné ovládače"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Proprietárne ovládače zariadení"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
-msgstr "Neslobodné (Multiverse)"
+msgstr "Neslobodný softvér (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
-msgstr ""
+msgstr "Softvér obmedzený autorskými právami alebo právnymi otázkami"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "CD-ROM s Ubuntu 6.06 LTS „Dapper Drake“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
+msgstr "Dôležité bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
-msgstr ""
+msgstr "Odporúčané aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
-msgstr "Nainštalovať _aktualizácie"
+msgstr "Aktualizácie pred vydaním"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
-msgstr "Nainštalovať _aktualizácie"
+msgstr "Nepodporované aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD-ROM s Ubuntu 5.10 „Breezy Badger“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 - aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 - backporty"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "CD-ROM s Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
 msgstr "Oficiálne podporované"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
+msgstr "Ubuntu 5.04 - bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 - aktualizácie"
+msgstr "Ubuntu 5.04 - aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 - backporty"
+msgstr "Ubuntu 5.04 - backporty"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Ubuntu 4.10 „Warty Warthog“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr "Udržiavané komunitou (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Neslobodné (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
+msgstr "CD-ROM s Ubuntu 4.10 „Warty Warthog“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
-msgstr "Niektoré programy už nie sú viac oficiálne podporované"
+msgstr "Už nie sú oficiálne podporované"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "S obmedzujúcou licenciou"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 - backporty"
+msgstr "Ubuntu 4.10 - backporty"
 
 #. ChangelogURI
 #: ../data/templates/Debian.info.in.h:4
@@ -313,70 +357,66 @@ 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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 „Wheezy“ "
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 „Squeeze“ "
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 „Lenny“ "
 
 #. Description
 #: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 „Etch“"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 „Sarge“"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
-#, fuzzy
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
-msgstr "Nainštalovať _aktualizácie"
+msgstr "Navrhované aktualizácie"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
-msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
+msgstr "Bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
-#, fuzzy
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
-msgstr "Debian Unstable \"Sid\""
+msgstr "Aktuálne vydanie Debian stable"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian „Sid“ (nestabilné)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Softvér kompatibilný s DFSG bez závislostí na neslobodnom softvére"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
 msgstr "Softvér nekompatibilný s DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Server pre %s"
@@ -384,52 +424,48 @@ msgstr "Server pre %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
-#, fuzzy
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
-msgstr "Najbližší server"
+msgstr "Hlavný server"
 
-#: ../aptsources/distro.py:252
-#, fuzzy
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
-msgstr "Najbližší server"
+msgstr "Vlastné servery"
 
-#: ../apt/progress/gtk2.py:259
-#, fuzzy, python-format
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Sťahovanie súboru %li z %li pri %s/s"
+msgstr "Sťahuje sa súbor %(current)li z %(total)li pri %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
-#, fuzzy, python-format
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Sťahovanie súboru %li z %li pri %s/s"
+msgstr "Sťahuje sa súbor %(current)li z %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: ../apt/progress/gtk2.py:367
-#, fuzzy
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr "Nastavenia"
+msgstr "Spúšťa sa..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
-msgstr ""
+msgstr "Hotovo"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
+msgstr "Neplatný Unicode v pospise „%s“ (%s). Nahláste to, prosím."
 
-#: ../apt/package.py:937 ../apt/package.py:1043
-#, fuzzy
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
-msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr."
+msgstr "Zoznam zmien nie je k dispozícii"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -437,112 +473,166 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"Zoznam zmien zatiaľ nie je dostupný.\n"
+"\n"
+"Prosím, použite http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"pokým zmeny nebudú dostupné alebo to skúste znova neskôr."
 
-#: ../apt/package.py:1053
-#, fuzzy
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
-"Zlyhalo získavanie zoznamu zmien. Skontrolujte si svoje internetové "
-"pripojenie."
+"Nepodarilo sa stiahnuť zoznam zmien. \n"
+"Prosím, skontrolujte si svoje pripojenie k internetu."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Zoznam súborov „%s“ nebolo možné načítať"
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Zoznam riadiacich súborov „%s“ nebolo možné načítať"
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Závislosť nemožno uspokojiť: %s\n"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
+msgstr "Je v konflikte s nainštalovaným balíkom „%s“"
+
+#. 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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
+"Kazí závislosť %(depname)s (%(deprelation)s %(depversion)s) existujúceho "
+"balíka „'%(pkgname)s“"
 
-#: ../apt/debfile.py:319
+#. 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:389
 #, python-format
-msgid "Wrong architecture '%s'"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
 msgstr ""
+"Kazí konflikt %(targetpkg)s (%(comptype)s %(targetver)s) existujúceho balíka "
+"„'%(pkgname)s“"
+
+#: ../apt/debfile.py:399
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
+"the '%(debfile)s' provides it via: '%(provides)s'"
+msgstr ""
+"Kazí existujúci balík „'%(pkgname)s“, ktorý je v konflikte s: "
+"„'%(targetpkg)s“. Ale „'%(debfile)s“ ho poskytuje prostredníctvom "
+"„'%(provides)s“"
+
+#: ../apt/debfile.py:447
+msgid "No Architecture field in the package"
+msgstr "Balíku chýba pole Architecture (architektúra)"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Nesprávna architektúra „%s“"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Novšia verzia už je nainštalovaná"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
+"Nepodarilo sa uspokojiť všetky závislosti (poškodená vyrovnávacia pamäť)"
 
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, python-format
 msgid "Cannot install '%s'"
-msgstr "Nemôžem inštalovať '%s'"
+msgstr "Nie je možné bainštalovať „%s“"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Automaticky rozbalené:\n"
+"\n"
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Automaticky prevedené na tlačiteľné znaky ASCII:\n"
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
+"Nainštalovať závislosti zostavenia zdrojového balíka „%s“, ktorý zostavuje "
+"%s\n"
 
-#: ../apt/debfile.py:494
-#, fuzzy
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
-msgstr "Musel by byť odstránený dôležitý balík"
+msgstr "Bol by odstránený nevyhnutný balík"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Hotovo"
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
-msgstr ""
+msgstr "Stiah "
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
-msgstr ""
+msgstr "Ignor "
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
-msgstr ""
+msgstr "Chyba "
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr ""
+msgstr "Získať:"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr ""
+msgstr " [Pracuje sa]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Výmena média: prosím, vložte disk s označením\n"
+" „%s“\n"
+"do mechaniky „%s“ a stlačte 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 ""
+msgstr "Stiahnutých %sB za %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 ""
+msgstr "Prosím, zadajte názov tohto disku. Napr. „Debian 2.1r1 Disk 1“"
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Prosím, vložte disk do mechaniky a stlačte Enter"
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
-msgstr ""
+msgstr "Zostavujú sa údajové štruktúry"
diff --git a/po/sl.po b/po/sl.po
index 323cf9ac..ce5d7081 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,22 +1,28 @@
 # Slovenian translation for python-apt-rosetta.
 # Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
 # This file is distributed under the same license as the python-apt-rosetta package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+# Matej Urbančič <mateju@svn.gnome.org>, 2006 - 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: python-apt-rosetta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-17 16:13+0100\n"
-"PO-Revision-Date: 2010-09-01 08:08+0200\n"
+"POT-Creation-Date: 2012-06-25 14:42+0200\n"
+"PO-Revision-Date: 2012-06-10 22:24+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-30 17:55+0000\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+"X-Launchpad-Export-Date: 2010-12-03 00:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -25,299 +31,329 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "xUbuntu 7.04 'Feisty Fawn'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Nosilec CD z Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "xUbuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Nosilec CD z Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "xUbuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Nosilec CD z Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
 msgid "Ubuntu 10.10 'Maverick Meerkat'"
 msgstr "Ubuntu 10.10 'Maverick Meerkat'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:506
 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
 msgstr "Nosilec CD z Ubuntu 10.10 'Maverick Meerkat'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:43
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Canonical Partners"
-msgstr ""
+msgstr "Partnerske ustanove Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:45
+#: ../data/templates/Ubuntu.info.in:520
 msgid "Software packaged by Canonical for their partners"
-msgstr ""
+msgstr "Programska oprema Canonical za partnerske ustanove"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:46
+#: ../data/templates/Ubuntu.info.in:521
 msgid "This software is not part of Ubuntu."
-msgstr ""
+msgstr "Programska opreme ni del distribucije Ubuntu."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:53
+#: ../data/templates/Ubuntu.info.in:528
 msgid "Independent"
-msgstr ""
+msgstr "Neodvisno"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:55
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Provided by third-party software developers"
-msgstr ""
+msgstr "Programska oprema, ki jo objavljajo razvijalci skupnosti"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:56
+#: ../data/templates/Ubuntu.info.in:531
 msgid "Software offered by third party developers."
-msgstr ""
+msgstr "Programska oprema tretje roke."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:94
+#: ../data/templates/Ubuntu.info.in:569
 msgid "Ubuntu 10.04 'Lucid Lynx'"
 msgstr "Ubuntu 10.04 'Lucid Lynx'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:589
 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
 msgstr "Nosilec CD z Ubuntu 10.04 'Lucid Lynx'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:155
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:173
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Nosilec CD z Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:216
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:234
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Nosilec CD z Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:277
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Nosilec CD z Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:339
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Nosilec CD z Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:402
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Nosilec CD z Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:465
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:483
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Nosilec CD z Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:525
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr "Paketi skupnosti"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:536
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Avtorsko omejena programska oprema"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:543
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Nosilec CD z Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:585
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:588
-msgid "Canonical-supported Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
 msgstr "Odprtokodna programska oprema podprta s strani Canonical Ltd"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:590
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr "Paketi skupnosti (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:591
-msgid "Community-maintained Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
 msgstr "Programska oprema, ki jo vzdržuje odprtokodna skupnost"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:593
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Neprosti gonilniki"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:594
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Lastniški gonilniki za naprave"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:596
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Avtorsko omejena programska oprema (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:597
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 "Programska oprema, ki je omejena z avtorskimi pravicami ali drugimi pravnimi "
 "vidiki"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:603
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Nosilec CD z Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:619
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Pomembne varnostne posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:624
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Priporočene posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:629
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr "Predhodno izdane posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:634
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
 msgstr "Nepodprte posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:645
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:659
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Nosilec CD z Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:675
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 varnostne posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:680
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:685
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 postarani paketi"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:696
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:710
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Nosilec CD z Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:713 ../data/templates/Debian.info.in:149
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
 msgstr "Uradno podprto"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:726
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 varnostne posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:731
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:736
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 postarani paketi"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:742
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:748
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr "Paketi skupnosti (universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:750
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Ne-prosti paketi (multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:756
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Nosilec CD z Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:759
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Brez uradne podpore"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:761
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Omejeno z avtorskimi pravicami"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:768
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 varnostne posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:773
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 posodobitve"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:778
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 postarani paketi"
 
@@ -329,61 +365,66 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Debian.info.in:8
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
+
+#. Description
+#: ../data/templates/Debian.info.in:33
 msgid "Debian 6.0 'Squeeze' "
 msgstr "Debian 6.0 'Squeeze' "
 
 #. Description
-#: ../data/templates/Debian.info.in:33
+#: ../data/templates/Debian.info.in:58
 msgid "Debian 5.0 'Lenny' "
 msgstr "Debian 5.0 'Lenny' "
 
 #. Description
-#: ../data/templates/Debian.info.in:58
+#: ../data/templates/Debian.info.in:83
 msgid "Debian 4.0 'Etch'"
 msgstr "Debian 4.0 'Etch'"
 
 #. Description
-#: ../data/templates/Debian.info.in:83
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
 msgstr "Debian 3.1 'Sarge'"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
 msgstr "Predlagane posodobitve"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
 msgstr "Varnostne posodobitve"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
 msgstr "Debian trenutna stabilna različica"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
 msgstr "Debian preizkusna različica"
 
 #. Description
-#: ../data/templates/Debian.info.in:147
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (razvojna različica)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:151
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Program je skladen z DFSG-compatible ne prostimi odvisnostmi"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:153
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
 msgstr "Program ni skladen z DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:209 ../aptsources/distro.py:424
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Strežnik za %s"
@@ -391,51 +432,50 @@ msgstr "Strežnik za %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:227 ../aptsources/distro.py:233
-#: ../aptsources/distro.py:249
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Glavni strežnik"
 
-#: ../aptsources/distro.py:253
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Strežniki po meri"
 
-#: ../apt/progress/gtk2.py:260 ../apt/progress/gtk2.py:316
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
-"Prejemanje %(current)li. datoteke od skupno %(total)li s hitrostjo %(speed)s/"
-"s"
+"Prejemanje datoteke %(current)li od skupno %(total)li s hitrostjo %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:266 ../apt/progress/gtk2.py:322
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Prejemanje %(current)li. datoteke od skupno %(total)li."
+msgstr "Prejemanje datoteke %(current)li od skupno %(total)li."
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:342
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: ../apt/progress/gtk2.py:430
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr "Začenjanje ..."
 
-#: ../apt/progress/gtk2.py:436
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr "Končano"
 
-#: ../apt/package.py:342
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
-"Neveljaven unicode znak v opisu za '%s' (%s). Pošljite poročilo o napaki."
+"Neveljaven znak unikod v opisu za '%s' (%s). Pošljite poročilo o napaki."
 
-#: ../apt/package.py:1012 ../apt/package.py:1117
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Seznam sprememb ni na voljo"
 
-#: ../apt/package.py:1123
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -448,31 +488,36 @@ msgstr ""
 "Več podrobnosti je na http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "dokler dnevnik ne bo posodobljen ali pa poskusite kasneje."
 
-#: ../apt/package.py:1130
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
-"Prjemanje seznama sprememb je spodletelo.\n"
+"Prejemanje seznama sprememb je spodletelo.\n"
 "Preverite internetno povezavo."
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:82
 #, python-format
 msgid "List of files for '%s' could not be read"
 msgstr "Seznama datotek za '%s' ni mogoče prebrati"
 
-#: ../apt/debfile.py:166
+#: ../apt/debfile.py:93
+#, python-format
+msgid "List of control files for '%s' could not be read"
+msgstr "Nadzornega seznama datotek za '%s' ni mogoče prebrati"
+
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr "Odvisnost ni razrešena: %s\n"
 
-#: ../apt/debfile.py:187
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr "Spor z nameščenim paketom '%s'"
 
 #. 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:326
+#: ../apt/debfile.py:373
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' dependency %(depname)s "
@@ -482,7 +527,7 @@ msgstr ""
 "(%(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:342
+#: ../apt/debfile.py:389
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
@@ -491,43 +536,39 @@ msgstr ""
 "Pokvari spor obstoječega paketa '%(pkgname)s': %(targetpkg)s (%(comptype)s "
 "%(targetver)s)"
 
-#: ../apt/debfile.py:352
+#: ../apt/debfile.py:399
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
 "the '%(debfile)s' provides it via: '%(provides)s'"
 msgstr ""
-"Pokvari obstoječi paket '%(pkgname)s', ki je v sporu z: '%(targetpkg)s'. "
-"Toda '%(debfile)s' ga zagotavlja preko: '%(provides)s'"
+"Pokvari obstoječi paket '%(pkgname)s', ki je v sporu s paketom: "
+"'%(targetpkg)s'. Paket '%(debfile)s' ga zagotavlja preko: '%(provides)s'"
 
-#: ../apt/debfile.py:398
+#: ../apt/debfile.py:447
 msgid "No Architecture field in the package"
-msgstr "Ni polja določila arhitekture sistema v paketu"
+msgstr "V paketu ni polja določila arhitekture sistema"
 
-#: ../apt/debfile.py:403
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr "Napačna arhitektura '%s'"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:410
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr "Novejša različica je že nameščena."
 
-#: ../apt/debfile.py:435
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr "Ni mogoče razrešiti vseh odvisnosti (napaka v predpomnilniku)"
 
-#: ../apt/debfile.py:465
+#: ../apt/debfile.py:519
 #, python-format
 msgid "Cannot install '%s'"
 msgstr "Ni mogoče namestiti '%s'"
 
-#: ../apt/debfile.py:507
-msgid "Python-debian module not available"
-msgstr "Modul Python-debian ni na voljo"
-
-#: ../apt/debfile.py:539
+#: ../apt/debfile.py:593
 msgid ""
 "Automatically decompressed:\n"
 "\n"
@@ -535,47 +576,47 @@ msgstr ""
 "Samodejno razširjeno:\n"
 "\n"
 
-#: ../apt/debfile.py:545
+#: ../apt/debfile.py:599
 msgid "Automatically converted to printable ascii:\n"
-msgstr "Samodejno pretvorjeno v zapis ascii:\n"
+msgstr "Samodejno pretvorjeno v zapis ASCII:\n"
 
-#: ../apt/debfile.py:635
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 "Namestiti je treba pakete za izgradnjo iz izvorne kode '%s' s katerimi je "
 "mogoče izgraditi %s\n"
 
-#: ../apt/debfile.py:645
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr "Z dejanjem bi bil odstranjen sistemski paket"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr "%c%s... Končano."
+msgstr "%c%s ... Končano."
 
-#: ../apt/progress/text.py:120
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr "Zad "
 
-#: ../apt/progress/text.py:129
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr "Prz "
 
-#: ../apt/progress/text.py:131
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr "Nap "
 
-#: ../apt/progress/text.py:142
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr "Pridobi:"
 
-#: ../apt/progress/text.py:202
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr " [V delovanju]"
 
-#: ../apt/progress/text.py:213
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -587,19 +628,22 @@ msgstr ""
 "v enoto '%s' in pritisnite vnosno tipko\n"
 
 #. Trick for getting a translation from apt
-#: ../apt/progress/text.py:222
+#: ../apt/progress/text.py:223
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Pridobljenih %sB v %s (%sB/s)\n"
 
-#: ../apt/progress/text.py:238
+#: ../apt/progress/text.py:239
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 msgstr "Poimenujte disk, na primer 'Debian 2.1r1 Disk 1'"
 
-#: ../apt/progress/text.py:254
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Vstavite disk v pogon in pritisnite vnosno tipko"
 
-#: ../apt/cache.py:135
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr "Izgradnja podatkovnega drevesa"
+
+#~ msgid "Python-debian module not available"
+#~ msgstr "Modul Python-debian ni na voljo"
diff --git a/po/sq.po b/po/sq.po
index 031f5955..2753a123 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-09 15:50+0000\n"
 "Last-Translator: Alejdin Tirolli <a.tirolli@hotmail.com>\n"
 "Language-Team: Albanian <sq@li.org>\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,248 +25,328 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "%s përmirësimet"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -317,22 +398,22 @@ msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Serveri për %s"
@@ -340,51 +421,51 @@ msgstr "Serveri për %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 #, fuzzy
 msgid "Main server"
 msgstr "Serveri më i afërt"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 #, fuzzy
 msgid "Custom servers"
 msgstr "Serveri më i afërt"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 #, fuzzy
 msgid "Details"
 msgstr "Përditë"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -393,87 +474,124 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "'%s' nuk mund të instalohet"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Një paketë themelore u deshtë të largohej"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -482,19 +600,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 905c0041..0726da4c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,379 +8,479 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-25 14:42+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"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
 #. ChangelogURI
 #: ../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:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Оптички диск са Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Оптички диск са 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Оптички диск са Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 'Maverick Meerkat'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Оптички диск са Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Canonical партнери"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Софтвер упакован од Canonical за њихове партнере"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Овај софтвер није дио Ubuntu"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Независан"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Обезбјеђен од независних програмера софтвера"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Софтвер је понуђен од независних програмера софтвера"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Оптички диск са Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
+msgstr "Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
+msgstr "Ubuntu 9.04 'Jaunty Jackalope"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 9.04 'Jaunty Jackalope"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
+msgstr "Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
+msgstr "Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
+msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
+msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
-msgstr ""
+msgstr "Одржаван од стране заједнице"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
-msgstr ""
+msgstr "Ограничени софтвер"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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 ""
+#: ../data/templates/Ubuntu.info.in:1075
+#, fuzzy
+msgid "Canonical-supported free and open-source software"
+msgstr "Canonical-подржава слободан софтвер и софтвер отвореног кода"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
-msgstr ""
+msgstr "Одржаван од стране заједнице"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
+#: ../data/templates/Ubuntu.info.in:1078
+#, fuzzy
+msgid "Community-maintained free and open-source software"
+msgstr "Заједница одржава слободан софтвер и софтвер отвореног кода"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
-msgstr ""
+msgstr "Комерцијални драјвери"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Власнички драјвери за уређаје"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
-msgstr ""
+msgstr "Ограничени софтвер"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
-msgstr ""
+msgstr "Софтвер ограничен ауторским правом или правним регулативама"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
-msgstr ""
+msgstr "Важне сигурносне исправке"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
-msgstr ""
+msgstr "Препоручено ажурирање"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
-msgstr ""
+msgstr "Унапријед објављене исправке"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
-msgstr ""
+msgstr "Некомпитабилна ажурирања"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 сигурносне исправке"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 исправке"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 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
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
-msgstr ""
+msgstr "Званично подржани"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
+msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
-msgstr ""
+msgstr "Ubuntu 5.04 Исправке"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
-msgstr ""
+msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Ubuntu 4.10 'Warty Warthog"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
-msgstr ""
+msgstr "Одржаван од стране заједнице"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
-msgstr ""
+msgstr "Не слободн драјвери"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Оптички диск са Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
-msgstr ""
+msgstr "Званично није више подржано"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
-msgstr ""
+msgstr "Ограничена права"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
+msgstr "Ubuntu 4.10 сигурносне исправке"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
-msgstr ""
+msgstr "Ubuntu 4.10 Исправке"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 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 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
+#, fuzzy
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 'Squeeze'"
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 'Lenny'"
 
 #. Description
 #: ../data/templates/Debian.info.in:83
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 'Etch'"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
-msgstr ""
+msgstr "Debian 3.1 'Sarge'"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
-msgstr ""
+msgstr "Предложене исправке (ажурирања)"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
-msgstr ""
+msgstr "Сигурносне исправке"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Дебиан-тренутно стабилно издање"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
-msgstr ""
+msgstr "Дебиан-тестирање"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
-msgstr ""
+msgstr "Debian 'Sid' (нестабилно)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "DFSG-компитабилан са не слободним софтвером"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Непостоји-DFSG компитабилног софтвера"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, 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
 #. append a list of all used servers
-#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
-msgstr ""
+msgstr "Главни сервер"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
-msgstr ""
+msgstr "Прилагођени сервер"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, 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
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, 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
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Детаљи"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr ""
+msgstr "Покретање..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
-msgstr ""
+msgstr "Завршено"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, 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
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
-msgstr ""
+msgstr "Листа промјена није доступна"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -388,108 +488,161 @@ 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
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr ""
+"Преузиманје листе промјена неуспјешно. \n"
+"Молимо провјерите своју конекцију са интернетом."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Листа фајлова за '%s' не може да се прочита"
 
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+#: ../apt/debfile.py:93
+#, fuzzy, python-format
+msgid "List of control files for '%s' could not be read"
+msgstr "Листа фајлова за '%s' не може да се прочита"
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Зависнот није задовољена: %s\n"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
+msgstr "Сукоби међу инсталираним пакетима '%s'"
+
+#. 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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
+"Прекид постојања пакета '%(pkgname)s' зависи од %(depname)s (%(deprelation)s "
+"%(depversion)s)"
 
-#: ../apt/debfile.py:319
+#. 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:389
 #, python-format
-msgid "Wrong architecture '%s'"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+"Прекид постојања пакета '%(pkgname)s' конфликт: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+
+#: ../apt/debfile.py:399
+#, fuzzy, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
+"the '%(debfile)s' provides it via: '%(provides)s'"
 msgstr ""
+"Прекид посојања пакета '%(pkgname)s' који је иѕаѕвао конфликт: "
+"'%(targetpkg)s'. Али '%(targetpkg)s' га даје преко: '%(provides)s'"
+
+#: ../apt/debfile.py:447
+msgid "No Architecture field in the package"
+msgstr "Нема поља архитектуре у пакету"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Погрешна архитектура '%s'"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Новија верзија је већ инсталирана"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Није успео да задовољи све зависности (грешка у кешу)"
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
-msgstr "Инсталирај %s"
+msgstr "Не могу да се инсталирају %s"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr "Аутомацка декомпресија:\n"
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Аутомацко пребацивање за штампање ascii:\n"
+
+#: ../apt/debfile.py:689
 #, 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
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
-msgstr ""
+msgstr "Битан пакет би био уклоњен"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Крај"
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
-msgstr ""
+msgstr "Погодак"
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
-msgstr ""
+msgstr "Игнорисано"
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
-msgstr ""
+msgstr "Грешка"
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr ""
+msgstr "Узимам:"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr ""
+msgstr "[Радим]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%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
+#: ../apt/progress/text.py:223
 #, python-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
+msgstr "Преузето %sB in %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 ""
+msgstr "Молимо обезбједите име за диск, као нпр. 'Debian 2.1r1 Disk 1'"
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Молимо Вас да убаците диск у оптички уређај и притиснете enter"
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
-msgstr ""
+msgstr "Изградња структуре података"
+
+#~ msgid "This is not a valid DEB archive, missing '%s' member"
+#~ msgstr "Ово није валидна DEB архива, недостаје '% с' члан"
diff --git a/po/sv.po b/po/sv.po
index 5926f2b4..fcfcbc56 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 05:06+0000\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,266 +26,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Säkerhetsuppdateringar för Ubuntu 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Säkerhetsuppdateringar för Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Säkerhetsuppdateringar för Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Gemenskapsunderhållen"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Inskränkt programvara"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cd-rom med Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Öppen källkodsprogramvara som stöds av Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Gemenskapsunderhållen (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Öppen källkodsprogramvara underhållen av gemenskapen"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Ickefria drivrutiner"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Properitära drivrutiner för enheter"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Inskränkt programvara (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Programvara begränsad av upphovsrätt eller juridiska avtal"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cd-rom med Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Viktiga säkerhetsuppdateringar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Rekommenderade uppdateringar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Föreslagna uppdateringar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Bakåtporterade uppdateringar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Uppdateringar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Bakåtportar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Stöds officiellt"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Säkerhetsuppdateringar för Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Uppdateringar för Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Bakåtporteringar för Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Gemenskapsunderhållen (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Ickefri (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Stöds inte längre officiellt"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Begränsad upphovsrätt"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Säkerhetsuppdateringar för Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Uppdateringar för Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Bakåtporteringar för Ubuntu 4.10"
 
@@ -341,23 +434,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 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 "DFSG-kompatibel programvara med icke-fria beroenden"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "Icke-DFSG-kompatibel programvara"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "Server för %s"
@@ -365,50 +458,50 @@ msgstr "Server för %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Huvudserver"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Anpassade servrar"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Hämtar fil %(current)li av %(total)li med %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Hämtar fil %(current)li av %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 #, fuzzy
 msgid "Starting..."
 msgstr "Söker..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 #, fuzzy
 msgid "Complete"
 msgstr "Komponenter"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Listan över ändringar finns inte tillgänglig"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -417,7 +510,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -425,81 +518,118 @@ msgstr ""
 "Misslyckades med att hämta listan över ändringar. \n"
 "Kontrollera din Internetanslutning."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, fuzzy, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr "Beroendeupplösning misslyckades"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Kan inte installera \"%s\""
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Ett grundläggande paket skulle behöva tas bort"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -508,19 +638,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/ta.po b/po/ta.po
deleted file mode 100644
index 2189ffdc..00000000
--- a/po/ta.po
+++ /dev/null
@@ -1,495 +0,0 @@
-# Tamil 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.
-#
-#, fuzzy
-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: 2006-10-16 04:06+0000\n"
-"Last-Translator: Raghavan <vijay.raghavan08@gmail.com>\n"
-"Language-Team: Tamil <ta@li.org>\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
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "தினமும்"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
-msgid "Cannot install '%s'"
-msgstr "'%s' நிறுவமுடியவில்லை"
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/th.po b/po/th.po
index 8070774e..90f509d2 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:17+0000\n"
 "Last-Translator: Roys Hengwatanakul <roysheng@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,266 +24,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "อูบันตู 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "อูบันตู 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "อูบันตู 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "อูบันตู 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "อูบันตู 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "อูบันตู 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "อูบันตู 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "อูบันตู 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "อูบันตู 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "ชุมชนดูแล"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "ซอฟต์แวร์จำกัดการใช้งาน"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "ซีดีรอมที่มีอูบันตู 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "อูบันตู 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "ซอฟต์แบบเปิดเผยสนับสนุนโดย Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "ชุมชนดูแล (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "ชุมชนดูแล ซอฟต์แวร์แบบเปิดเผย"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "ไดรเวอร์ที่ไม่ฟรี"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "ไดรเวอร์ที่มีกรรมสิทธิ์สำหรับอุปกรณ์"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "ซอฟต์แวร์จำกัดการใช้งาน(Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "ซอฟต์แวร์นี้มีลิขสิทธ์หรือข้อกฏหมายจำกัดอยู่"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "ซีดีรอมที่มีอูบันตู 6.06 LST 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "ปรับปรุงด้านความปลอดภัยที่สำคัญ"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "การปรับปรุงที่แนะนำให้ทำ"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "การปรับปรุงที่เสนอให้ทำ"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "การปรับปรุงแบบย้อนหลัง"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "อูบันตู 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "อูบันตู 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "อูบันตู 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "อูบันตู 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "สนับสนุนอย่างเป็นทางการ"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "อูบันตู 5.04 ปรับปรุง"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "อูบันตู 5.04 พอร์ตย้อนหลัง"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "อูบันตู 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "ชุมชนดูแล (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "ไม่ฟรี(ลิขสิทธิ์)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "ไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "จำกัดลิขสิทธิ์"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "อูบันตู 4.10 ปรับปรุงด้านความปลอดภัย"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "อูบันตู 4.10 ปรับปรุง"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "อูบันตู 4.10 พอร์ตย้อนหลัง"
 
@@ -339,23 +432,23 @@ msgid "Debian testing"
 msgstr "เดเบียน \"Etch\" (กำลังทดสอบ)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "เดเบียน  \"Sid\" (ผันผวน)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "เข้ากับ DFSG ซอฟแวร์แต่ขึ้นอยู่กับไม่ฟรี"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "ไม่เข้ากับ DFSG ซอฟแวร์"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "เซิร์ฟเวอร์สำหรับประเทศ %s"
@@ -363,49 +456,49 @@ 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
 #. append a list of all used servers
-#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "เซิร์ฟเวอร์หลัก"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "เซิร์ฟเวอร์ที่กำหนดเอาเอง"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 "กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li ด้วยความเร็ว %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "รายละเอียด"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -414,7 +507,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -422,81 +515,118 @@ msgstr ""
 "ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง \n"
 "กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ"
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "ไม่สามารถติดตั้ง  '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "แพจเกจที่สำคัญจะถูกลบออก"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -505,19 +635,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/tl.po b/po/tl.po
index 7ba4939b..24260ca9 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the update-manager package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
 #
-#, fuzzy
 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: 2006-09-16 15:44+0000\n"
+"POT-Creation-Date: 2012-06-25 14:42+0200\n"
+"PO-Revision-Date: 2012-06-11 11:13+0800\n"
 "Last-Translator: Ariel S. Betan <ariel.betan@up.edu.ph>\n"
 "Language-Team: Tagalog <tl@li.org>\n"
+"Language: tl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,255 +24,330 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Cdrom na may Ubuntu 12.04 'Precise Pangolin'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Cdrom na may Ubuntu 11.10 'Oneiric Ocelot'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Cdrom na may Ubuntu 11.04 'Natty Narwhal'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Cdrom na may Ubuntu 10.10 'Maverick Meerkat'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr "Mga Kasama ng Canonical"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr "Software na pinakete ng Canonical para sa kanilang mga kasama"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr "Ang software na ito ay hindi bahagi ng Ubuntu."
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr "Malaya"
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr "Ipinamahagi ng mga third-party software developers"
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr "Software na ibinigay mga third party developers "
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Cdrom na may Ubuntu 10.04 'Lucid Lynx'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
+msgstr "Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
+msgstr "Cdrom na may Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
+msgstr "Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
+msgstr "Cdrom na may Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
+msgstr "Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
+msgstr "Cdrom na may Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
+msgstr "Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
+msgstr "Cdrom na may Ubuntu 8.04 'Hardy Heron'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
+msgstr "Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
+msgstr "Cdrom na may Ubuntu 7.10 'Gutsy Gibbon'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
+msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
+msgstr "Cdrom na may Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
-msgstr "Inaalagaan ng kumunidad (Universe)"
+msgstr "Inaalagaan ng kumunidad"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
-msgstr ""
+msgstr "Software na may mahigpit na gamit"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Cdrom na may Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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 ""
+#: ../data/templates/Ubuntu.info.in:1075
+msgid "Canonical-supported free and open-source software"
+msgstr "Malaya at bukas na software suportado ng Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
-msgstr "Inaalagaan ng kumunidad (Universe)"
+msgstr "Inaalagaan ng kumunidad (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-#, fuzzy
-msgid "Community-maintained Open Source software"
-msgstr "Inaalagaan ng kumunidad (Universe)"
+#: ../data/templates/Ubuntu.info.in:1078
+msgid "Community-maintained free and open-source software"
+msgstr "Malaya at bukas na software suportado ng Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
-msgstr ""
+msgstr "Hindi malayang drivers"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Proprietary drivers para sa mga devices"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
-msgstr ""
+msgstr "Software na may mahigpit na gamit (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
+"Software na may mahigpit na gamit dahil sa copyright o mga legal issues"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
+msgstr "Cdrom na may Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
-msgstr ""
+msgstr "Mga mahalagang updates pang-seguridad"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
-msgstr ""
+msgstr "Mga mungkahing updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
-msgstr "Release Notes"
+msgstr "Mga updates bago ma-released"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
-msgstr "Mga updates mula sa Internet"
+msgstr "Mga hindi suportadong updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Cdrom na may Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
-msgstr ""
+msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Cdrom na may Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174
 msgid "Officially supported"
 msgstr "Opisyal na sinusuportahan"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
+msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
-msgstr ""
+msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
-msgstr ""
+msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-#, fuzzy
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr "Inaalagaan ng kumunidad (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Di-malaya (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Cdrom na may Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
-msgstr ""
+msgstr "Hindi na opisyal na sinusuportahan"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Mahigpit na copyright"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
+msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
-msgstr ""
+msgstr "Ubuntu 4.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
-msgstr ""
+msgstr "Ubuntu 4.10 Backports"
 
 #. ChangelogURI
 #: ../data/templates/Debian.info.in.h:4
@@ -282,117 +357,116 @@ 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\""
+msgid "Debian 7.0 'Wheezy' "
+msgstr "Debian 7.0 'Wheezy' "
 
 #. Description
 #: ../data/templates/Debian.info.in:33
-#, fuzzy
-msgid "Debian 5.0 'Lenny' "
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 6.0 'Squeeze' "
 
 #. Description
 #: ../data/templates/Debian.info.in:58
-#, fuzzy
-msgid "Debian 4.0 'Etch'"
-msgstr "Debian 3.1 \"Sarge\""
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 5.0 'Lenny' "
 
 #. Description
 #: ../data/templates/Debian.info.in:83
-#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 4.0 'Etch'"
+
+#. Description
+#: ../data/templates/Debian.info.in:108
 msgid "Debian 3.1 'Sarge'"
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 'Sarge'"
 
 #. Description
-#: ../data/templates/Debian.info.in:94
+#: ../data/templates/Debian.info.in:119
 msgid "Proposed updates"
-msgstr ""
+msgstr "Mga mungkahing updates"
 
 #. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
+#: ../data/templates/Debian.info.in:126
 msgid "Security updates"
-msgstr "Mga updates mula sa Internet"
+msgstr "Mga updates pang-seguridad"
 
 #. Description
-#: ../data/templates/Debian.info.in:108
+#: ../data/templates/Debian.info.in:133
 msgid "Debian current stable release"
-msgstr ""
+msgstr "Kasalukuyang stable release ng Debian"
 
 #. Description
-#: ../data/templates/Debian.info.in:121
-#, fuzzy
+#: ../data/templates/Debian.info.in:146
 msgid "Debian testing"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
-#, fuzzy
+#: ../data/templates/Debian.info.in:172
 msgid "Debian 'Sid' (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian 'Sid' (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:176
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Software na DFSG-compatible na may Di-Malayang mga Dependensiya"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:178
 msgid "Non-DFSG-compatible Software"
 msgstr "Software na Di-DFSG-compatible"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Server para sa %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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
-msgstr ""
+msgstr "Pangunahing server"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
-msgstr ""
+msgstr "Pasadyang mga servers"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
+msgstr "Downloading file %(current)li of %(total)li with %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
+msgstr "Downloading file %(current)li of %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Mga Detalye"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
-msgstr ""
+msgstr "Nagsisimula..."
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
-msgstr ""
+msgstr "Kumpleto"
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
+"Invalidong unicode sa deskripsyon para '%s' (%s). Mangyaring ipagbigay alam."
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
-msgstr ""
+msgstr "Ang talaan ng mga pagbabago ay wala"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -400,110 +474,166 @@ msgid ""
 "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "until the changes become available or try again later."
 msgstr ""
+"Ang talaan ng mga pagbabago ay wala pa.\n"
+"\n"
+"Mangyaring gamitin http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"hanggang mayroon ng mga pagbabago o subukang muli mamaya."
 
-#: ../apt/package.py:1053
-#, fuzzy
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
-msgstr "Mangyaring suriin ang inyong internet connection"
+msgstr ""
+"Bigo sa pag-download ng talaan ng mga pagbabago. \n"
+"Mangyaring suriin ang inyong koneksyon sa internet."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgid "List of files for '%s' could not be read"
+msgstr "Ang talaan ng mga files para sa '%s' ay hindi mabasa"
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
+msgid "List of control files for '%s' could not be read"
+msgstr "Ang talaan ng mga files na pang-kontrol para sa '%s' ay hindi mabasa"
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
+msgstr "Ang Dependensiya ay hindi sapat: %s\n"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
+msgstr "Mga mga conflicts sa na-install na paketeng '%s'"
+
+#. 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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 msgstr ""
+"Binabasag ang umiiral na paketeng '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
 
-#: ../apt/debfile.py:319
+#. 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:389
 #, python-format
-msgid "Wrong architecture '%s'"
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
 msgstr ""
+"Binabasag ang umiiral na paketeng '%(pkgname)s' conflict: %(targetpkg)s "
+"(%(comptype)s %(targetver)s)"
+
+#: ../apt/debfile.py:399
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
+"the '%(debfile)s' provides it via: '%(provides)s'"
+msgstr ""
+"Binabasag ang umiiral na paketeng '%(pkgname)s' na may conflict sa: "
+"'%(targetpkg)s'. Ngunit ang '%(debfile)s' ay nagbibigay nito sa pamamagitan "
+"ng: '%(provides)s'"
+
+#: ../apt/debfile.py:447
+msgid "No Architecture field in the package"
+msgstr "Walang Architecture field sa loob ng pakete"
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr "Maling architecture '%s'"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
-msgstr ""
+msgstr "Mas naunang bersiyon ang kasalukuyang naka-install"
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
+msgstr "Bigo na maging sapat ang lahat ng dependensiya (broken cache)"
 
-#: ../apt/debfile.py:376
-#, fuzzy, python-format
+#: ../apt/debfile.py:519
+#, python-format
 msgid "Cannot install '%s'"
 msgstr "Hindi ma-install '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+"Automatikong na decompressed:\n"
+"\n"
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr "Automatikong na-convert sa printable ascii:\n"
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
+"Install Build-Dependencies para sa pinagmulang pakete '%s' na nag-build ng "
+"%s\n"
 
-#: ../apt/debfile.py:494
-#, fuzzy
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
-msgstr "Isang esensiyal na pakete ang kailangang tanggalin"
+msgstr "Isang kinakailangang pakete ang kailangang tanggalin"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Tapos na"
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
-msgstr ""
+msgstr "Hit "
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
-msgstr ""
+msgstr "Ign "
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
-msgstr ""
+msgstr "Err "
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
-msgstr ""
+msgstr "Kunin:"
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
-msgstr ""
+msgstr " [Nagtatrabaho]"
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
+"Bagong media: magyaring ipasok ang disc na may label na\n"
+" '%s'\n"
+"sa drive '%s' at pindutin ang 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 ""
+msgstr "Kinuha %sB sa %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 ""
+"Mangyaring magbigay ng pangalan para sa Disc, tulad ng 'Debian 2.1r1 Disk 1'"
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Mangyaring magpasok ng Disc sa drive at pindutin ang enter"
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
-msgstr ""
+msgstr "Nagbubuo ng data structures"
diff --git a/po/tr.po b/po/tr.po
index d3abf69a..b82b8b67 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-21 20:58+0000\n"
 "Last-Translator: Atilla Karaman <atillakaraman@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,266 +25,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.04 Güvenlik Güncelleştirmeleri"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.10 'Breezy Badger' Cdrom'u"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog' Cdrom'u"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 'Breezy Badger' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 'Breezy Badger' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Topluluk tarafından bakılan"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "Kısıtlı yazılımlar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 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:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Canonical Açık Kaynak yazılımı destekledi"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Topluluk tarafından bakılan (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Topluluk tarafından bakılan Açık Kaynak Kodlu yazılımlar"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "Özgür olmayan sürücüler"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "Aygıtlar için kapalı kaynak sürücüler"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "Kısıtlı yazılımlar (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "Yazılım telif haklarıyla veya yasal sorunlar sebebiyle kısıtlanmıştır"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "Önemli güvenlik güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "Önerilen güncellemeler"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Teklif edilmiş güncellemeler"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Geritaşınmış (backported) güncellemeler"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Geritaşınmış Yazılımlar (Backports)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog' Cdrom'u"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Resmi olarak desteklenenler"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Geritaşınmış Yazılımlar (Backports)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Topluluk tarafından bakılan (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Özgür olmayan (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "Artık resmi olarak desteklenmiyor"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Sınırlı telif hakkı"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Geritaşınmış Yazılımlar (Backports)"
 
@@ -340,23 +433,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (test)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (kararsız)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Özgür Olmayan Bağımlılığı Bulunan DFSG Uyumlu Yazılım"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG Uyumlu Olmayan Yazılım"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "%s sunucusu"
@@ -364,48 +457,48 @@ msgstr "%s sunucusu"
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Ana sunucu"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Özel sunucular"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Ayrıntılar"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr "Değişiklikler listesi erişilebilir değil"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -414,7 +507,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -422,81 +515,118 @@ msgstr ""
 "Değişiklik listesini indirme başarısız oldu. \n"
 "Lütfen İnternet bağlantınızı kontrol edin."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "'%s' yüklenemiyor"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Gerekli bir paketin kaldırılması gerekmekte"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -505,19 +635,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index aebb5d88..7abe872f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uk(5)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:15+0000\n"
 "Last-Translator: Vadim Abramchuck <abram@email.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.2\n"
 
 #. ChangelogURI
@@ -25,252 +26,333 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Підтримується спільнотою (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
+#: ../data/templates/Ubuntu.info.in:1075
+#, fuzzy
+msgid "Canonical-supported free and open-source software"
+msgstr "Підтримується спільнотою (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Підтримується спільнотою (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Підтримується спільнотою (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "<b>Оновлення через Інтернет</b>"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "Офіційно підтримуються"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Підтримується спільнотою (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Не-вільний (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Обмежені авторські права"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -327,23 +409,23 @@ msgid "Debian testing"
 msgstr "Debian \"Etch\" (тестовий)"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (нестабільний)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -351,48 +433,48 @@ msgstr ""
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Завантажується файл %li of %li at %s/s"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Завантажується файл %li of %li at %s/s"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Деталі"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -401,7 +483,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
@@ -409,81 +491,118 @@ msgid ""
 msgstr ""
 "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Не можливо встановити '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Це призведе до видалення !essential! пакунку системи"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -492,19 +611,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/ur.po b/po/ur.po
deleted file mode 100644
index 5dc339e8..00000000
--- a/po/ur.po
+++ /dev/null
@@ -1,495 +0,0 @@
-# Urdu 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.
-#
-#, fuzzy
-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: 2006-05-19 02:46+0000\n"
-"Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n"
-"Language-Team: Urdu <urd@li.org>\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
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-msgid "Pre-released updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-msgid "Unsupported updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-msgid "Security updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-#, fuzzy
-msgid "Details"
-msgstr "روز"
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-msgid "The list of changes is not available"
-msgstr ""
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/vi.po b/po/vi.po
index ed7892cd..eb7e19ce 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager Gnome HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:17+0000\n"
 "Last-Translator: Tran The Trung <tttrung@hotmail.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,286 +24,376 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Do cộng đồng bảo quản (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 #, fuzzy
 msgid "Restricted software"
 msgstr "Phần mềm đã đóng góp"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Bản cập nhật Ubuntu 5.04"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
+#: ../data/templates/Ubuntu.info.in:1075
 #, fuzzy
-msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Do cộng đồng bảo quản (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Do cộng đồng bảo quản (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "Do cộng đồng bảo quản (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Không tự do (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Không tự do (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Bản cập nhật Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 #, fuzzy
 msgid "Important security updates"
 msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Đang cài đặt bản cập nhật..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Đang cài đặt bản cập nhật..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 #, fuzzy
 msgid "Officially supported"
 msgstr "Được hỗ trợ một cách chính thức"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Do cộng đồng bảo quản (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "Không tự do (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Được hỗ trợ một cách chính thức"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "Bản quyền bị giới hạn"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Bản cập nhật bảo mặt Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Bản cập nhật Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Bản cập nhật Ubuntu 5.10"
@@ -362,23 +453,23 @@ msgid "Debian testing"
 msgstr "Thử ra Debian"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Không Mỹ Debian (Bất định)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -386,51 +477,51 @@ msgstr ""
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 #, fuzzy
 msgid "Details"
 msgstr "<b>Chi tiết</b>"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 #, fuzzy
 msgid "Starting..."
 msgstr "Thiết lập"
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Có một bản phát hành Ubuntu mới công bố."
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -439,7 +530,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
@@ -448,81 +539,118 @@ msgstr ""
 "Không tải thay đổi về được. Bạn hãy kiểm tra có kết nối đến Mạng hoạt động "
 "chưa."
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "Không thể cài đặt '%s'"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Một gói quan trọng cần phải bị gỡ bỏ"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -531,19 +659,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/xh.po b/po/xh.po
deleted file mode 100644
index bdf2a903..00000000
--- a/po/xh.po
+++ /dev/null
@@ -1,500 +0,0 @@
-# Xhosa translation of update-notifier
-# Copyright (C) 2005 Canonical Ltd.
-# This file is distributed under the same license as the update-notifier package.
-# Translation by Canonical Ltd <translations@canonical.com> with thanks to
-# Translation World CC in South Africa, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: update-notifier\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
-"PO-Revision-Date: 2006-10-05 20:45+0000\n"
-"Last-Translator: Canonical Ltd <translations@canonical.com>\n"
-"Language-Team: Xhosa <xh-translate@ubuntu.com>\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
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:13
-msgid "Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:31
-msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:74
-msgid "Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:92
-msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:135
-msgid "Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:153
-msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:197
-msgid "Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:215
-msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:252
-msgid "Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:270
-msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:305
-msgid "Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:323
-msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:357
-msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
-msgid "Community-maintained"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
-msgid "Restricted software"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:375
-msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:409
-msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
-msgid "Community-maintained (universe)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
-msgid "Community-maintained Open Source software"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
-msgid "Non-free drivers"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
-msgid "Proprietary drivers for devices"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
-msgid "Restricted software (Multiverse)"
-msgstr ""
-
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
-msgid "Software restricted by copyright or legal issues"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:427
-msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:439
-#, fuzzy
-msgid "Important security updates"
-msgstr "Bonisa izihlaziyo"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:444
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:449
-#, fuzzy
-msgid "Pre-released updates"
-msgstr "Bonisa izihlaziyo"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:454
-#, fuzzy
-msgid "Unsupported updates"
-msgstr "Bonisa izihlaziyo"
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:461
-msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:475
-msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:487
-msgid "Ubuntu 5.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:492
-msgid "Ubuntu 5.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:497
-msgid "Ubuntu 5.10 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:504
-msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:518
-msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
-msgid "Officially supported"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:530
-msgid "Ubuntu 5.04 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:535
-msgid "Ubuntu 5.04 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:540
-msgid "Ubuntu 5.04 Backports"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:546
-msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
-msgid "Community-maintained (Universe)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
-msgid "Non-free (Multiverse)"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:560
-msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
-msgid "No longer officially supported"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
-msgid "Restricted copyright"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:572
-msgid "Ubuntu 4.10 Security Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:577
-msgid "Ubuntu 4.10 Updates"
-msgstr ""
-
-#. Description
-#: ../data/templates/Ubuntu.info.in:582
-msgid "Ubuntu 4.10 Backports"
-msgstr ""
-
-#. 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 ""
-
-#. Description
-#: ../data/templates/Debian.info.in:8
-msgid "Debian 6.0 'Squeeze' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:33
-msgid "Debian 5.0 'Lenny' "
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:58
-msgid "Debian 4.0 'Etch'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:83
-msgid "Debian 3.1 'Sarge'"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:94
-#, fuzzy
-msgid "Proposed updates"
-msgstr "Bonisa izihlaziyo"
-
-#. Description
-#: ../data/templates/Debian.info.in:101
-#, fuzzy
-msgid "Security updates"
-msgstr "Bonisa izihlaziyo"
-
-#. Description
-#: ../data/templates/Debian.info.in:108
-msgid "Debian current stable release"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:121
-msgid "Debian testing"
-msgstr ""
-
-#. Description
-#: ../data/templates/Debian.info.in:146
-msgid "Debian 'Sid' (unstable)"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:150
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
-
-#. CompDescription
-#: ../data/templates/Debian.info.in:152
-msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
-#, python-format
-msgid "Server for %s"
-msgstr ""
-
-#. 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
-msgid "Main server"
-msgstr ""
-
-#: ../aptsources/distro.py:252
-msgid "Custom servers"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:259
-#, python-format
-msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:265
-#, python-format
-msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
-
-#. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
-msgid "Details"
-msgstr ""
-
-#: ../apt/progress/gtk2.py:367
-msgid "Starting..."
-msgstr ""
-
-#: ../apt/progress/gtk2.py:373
-msgid "Complete"
-msgstr ""
-
-#: ../apt/package.py:301
-#, python-format
-msgid "Invalid unicode in description for '%s' (%s). Please report."
-msgstr ""
-
-#: ../apt/package.py:937 ../apt/package.py:1043
-#, fuzzy
-msgid "The list of changes is not available"
-msgstr "Kukho i-%i yohlaziyo ekhoyo"
-
-#: ../apt/package.py:1047
-#, python-format
-msgid ""
-"The list of changes is not available yet.\n"
-"\n"
-"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
-"until the changes become available or try again later."
-msgstr ""
-
-#: ../apt/package.py:1053
-msgid ""
-"Failed to download the list of changes. \n"
-"Please check your Internet connection."
-msgstr ""
-
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: ../apt/debfile.py:81
-#, python-format
-msgid "List of files for '%s'could not be read"
-msgstr ""
-
-#: ../apt/debfile.py:149
-#, python-format
-msgid "Dependency is not satisfiable: %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:173
-#, python-format
-msgid "Conflicts with the installed package '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:319
-#, python-format
-msgid "Wrong architecture '%s'"
-msgstr ""
-
-#. the deb is older than the installed
-#: ../apt/debfile.py:325
-msgid "A later version is already installed"
-msgstr ""
-
-#: ../apt/debfile.py:345
-msgid "Failed to satisfy all dependencies (broken cache)"
-msgstr ""
-
-#: ../apt/debfile.py:376
-#, python-format
-msgid "Cannot install '%s'"
-msgstr ""
-
-#: ../apt/debfile.py:484
-#, python-format
-msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
-msgstr ""
-
-#: ../apt/debfile.py:494
-msgid "An essential package would be removed"
-msgstr ""
-
-#: ../apt/progress/text.py:81
-#, python-format
-msgid "%c%s... Done"
-msgstr ""
-
-#: ../apt/progress/text.py:118
-msgid "Hit "
-msgstr ""
-
-#: ../apt/progress/text.py:126
-msgid "Ign "
-msgstr ""
-
-#: ../apt/progress/text.py:128
-msgid "Err "
-msgstr ""
-
-#: ../apt/progress/text.py:138
-msgid "Get:"
-msgstr ""
-
-#: ../apt/progress/text.py:198
-msgid " [Working]"
-msgstr ""
-
-#: ../apt/progress/text.py:208
-#, python-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-
-#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:216
-#, python-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
-
-#: ../apt/progress/text.py:229
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-
-#: ../apt/progress/text.py:241
-msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-
-#: ../apt/cache.py:96
-msgid "Building data structures"
-msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f7bb9fec..ae4d0132 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-04 09:06+0000\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2009-09-06 03:14+0000\n"
 "Last-Translator: Feng Chao <rainofchaos@gmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,217 +24,361 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+#| msgid "Ubuntu 7.04 'Feisty Fawn'"
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 7.04‘(Feisty Fawn)’"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "已插入 Ubuntu 7.04 'Feisty Fawn' 光盘的光驱"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 6.10 'Edgy Eft' 光盘"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog'光盘"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog'光盘"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+#| msgid "Ubuntu 8.04 'Hardy Heron'"
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 8.04‘Hardy Heron’"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "已插入 Ubuntu 8.04 'Hardy Heron' 光盘的光驱"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:652
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "Ubuntu 4.10 'Warty Warthog'光盘"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:695
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:714
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "Ubuntu 4.10 'Warty Warthog'光盘"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:757
+#, fuzzy
+#| msgid "Ubuntu 8.04 'Hardy Heron'"
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "Ubuntu 8.04‘Hardy Heron’"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:777
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "已插入 Ubuntu 8.04 'Hardy Heron' 光盘的光驱"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 8.04‘Hardy Heron’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "已插入 Ubuntu 8.04 'Hardy Heron' 光盘的光驱"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.10‘Gutsy Gibbon’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.10‘Gutsy Gibbon’光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04‘(Feisty Fawn)’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "已插入 Ubuntu 7.04 'Feisty Fawn' 光盘的光驱"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:1016
 msgid "Community-maintained"
 msgstr "社区维护"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr "受限软件"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
-msgid "Canonical-supported Open Source software"
+#: ../data/templates/Ubuntu.info.in:1075
+#, fuzzy
+#| msgid "Canonical-supported Open Source software"
+msgid "Canonical-supported free and open-source software"
 msgstr "Canonical 支持的开源软件"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Community-maintained (universe)"
 msgstr "社区维护 (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
-msgid "Community-maintained Open Source software"
+#: ../data/templates/Ubuntu.info.in:1078
+#, fuzzy
+#| msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "社区维护的开源软件"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr "非开源或私有驱动"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr "设备的专有驱动"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr "受限软件(Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr "有版权和合法性问题的的软件"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "重要安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "推荐更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:1117
 msgid "Pre-released updates"
 msgstr "提前释放出的更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:1122
 msgid "Unsupported updates"
 msgstr "不支持的更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 移植"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'光盘"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "官方支持"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:1238
 msgid "Community-maintained (Universe)"
 msgstr "社区维护 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "非自由"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'光盘"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr "官方不再支持"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "版权受限"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Backports"
 
@@ -245,53 +390,66 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
-msgstr ""
+#, fuzzy
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian 3.1 \"Sarge\""
+
+#. Description
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 3.1 \"Sarge\""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../data/templates/Debian.info.in:58
+#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 3.1 \"Sarge\""
+
+#. Description
+#: ../data/templates/Debian.info.in:83
 #, fuzzy
 msgid "Debian 3.1 'Sarge'"
 msgstr "Debian 3.1 \"Sarge\""
 
 #. Description
-#: ../data/templates/Debian.info.in:42
+#: ../data/templates/Debian.info.in:94
 msgid "Proposed updates"
 msgstr "建议更新"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 msgid "Security updates"
 msgstr "安全更新"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr "当前稳定的 Debian 发布"
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr "Debian testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (非稳定)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "带有非自由依赖关系的DFSG兼容软件"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "非DFSG兼容软件"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "%s 的服务器"
@@ -299,12 +457,194 @@ 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
 #. append a list of all used servers
-#: ../aptsources/distro.py:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "主服务器"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "自定义服务器"
 
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
+
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:340
+msgid "Details"
+msgstr ""
+
+#: ../apt/progress/gtk2.py:428
+msgid "Starting..."
+msgstr ""
+
+#: ../apt/progress/gtk2.py:434
+msgid "Complete"
+msgstr ""
+
+#: ../apt/package.py:359
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
+
+#: ../apt/package.py:1088 ../apt/package.py:1194
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../apt/package.py:1200
+#, python-format
+msgid ""
+"The list of changes is not available yet.\n"
+"\n"
+"Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
+"until the changes become available or try again later."
+msgstr ""
+
+#: ../apt/package.py:1207
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#: ../apt/debfile.py:82
+#, python-format
+msgid "List of files for '%s' could not be read"
+msgstr ""
+
+#: ../apt/debfile.py:93
+#, python-format
+msgid "List of control files for '%s' could not be read"
+msgstr ""
+
+#: ../apt/debfile.py:211
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
+
+#: ../apt/debfile.py:232
+#, 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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
+
+#. the deb is older than the installed
+#: ../apt/debfile.py:464
+msgid "A later version is already installed"
+msgstr ""
+
+#: ../apt/debfile.py:489
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
+
+#: ../apt/debfile.py:519
+#, python-format
+msgid "Cannot install '%s'"
+msgstr ""
+
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
+
+#: ../apt/debfile.py:700
+msgid "An essential package would be removed"
+msgstr ""
+
+#: ../apt/progress/text.py:82
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
+
+#: ../apt/progress/text.py:122
+msgid "Hit "
+msgstr ""
+
+#: ../apt/progress/text.py:131
+msgid "Ign "
+msgstr ""
+
+#: ../apt/progress/text.py:133
+msgid "Err "
+msgstr ""
+
+#: ../apt/progress/text.py:144
+msgid "Get:"
+msgstr ""
+
+#: ../apt/progress/text.py:203
+msgid " [Working]"
+msgstr ""
+
+#: ../apt/progress/text.py:214
+#, python-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:223
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
+
+#: ../apt/progress/text.py:239
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: ../apt/progress/text.py:255
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+
+#: ../apt/cache.py:157
+msgid "Building data structures"
+msgstr ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 1b5891ec..ed9cad2b 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.42.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:15+0000\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,253 +23,334 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "協力維護軟件 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
+#: ../data/templates/Ubuntu.info.in:1075
+#, fuzzy
+msgid "Canonical-supported free and open-source software"
+msgstr "協力維護軟件 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "協力維護軟件 (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "協力維護軟件 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "發行通告"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "網絡更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "正式支援"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "協力維護軟件 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "非自由軟件 (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "版權受限"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -325,23 +407,23 @@ msgid "Debian testing"
 msgstr "Debian 「Etch」（測試版）"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian 「Sid」（不穩定版）"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "符合 DFSG 的軟件，但依賴於非自由軟件"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "和 DFSG 不相容的軟件"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -349,49 +431,49 @@ msgstr ""
 #. 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:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "正在下載檔案 %li/%li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "詳細資料"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "修改紀錄不存在，請稍後再試。"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -400,88 +482,125 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。"
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "無法安裝「%s」"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "準備移除 %s 個套件。"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -490,19 +609,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b71f291b..c937de60 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.41.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 15:59+0200\n"
+"POT-Creation-Date: 2012-06-12 10:44+0200\n"
 "PO-Revision-Date: 2006-10-16 04:15+0000\n"
 "Last-Translator: SOC Ho <soc.scho@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@linux.org.tw>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,265 +19,358 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:13
+#: ../data/templates/Ubuntu.info.in:151
+#, fuzzy
+msgid "Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.04安全性更新"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:158
+#, fuzzy
+msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
+msgstr "Ubuntu 5.10 'Breezy Badger'的光碟"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:269
+#, fuzzy
+msgid "Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:276
+#, fuzzy
+msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
+msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:388
+#, fuzzy
+#| msgid "Ubuntu 4.10 'Warty Warthog'"
+msgid "Ubuntu 11.04 'Natty Narwhal'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:395
+#, fuzzy
+#| msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
+msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:486
+#, fuzzy
+msgid "Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:506
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
+msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:518
+msgid "Canonical Partners"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:520
+msgid "Software packaged by Canonical for their partners"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:521
+msgid "This software is not part of Ubuntu."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:528
+msgid "Independent"
+msgstr ""
+
+#. CompDescription
+#: ../data/templates/Ubuntu.info.in:530
+msgid "Provided by third-party software developers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/templates/Ubuntu.info.in:531
+msgid "Software offered by third party developers."
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:569
+#, fuzzy
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:589
+#, fuzzy
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'的光碟"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:632
 #, fuzzy
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:652
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:695
 #, fuzzy
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:714
 #, fuzzy
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:757
 #, fuzzy
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:777
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'的光碟"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:821
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:841
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'的光碟"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:886
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04安全性更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:905
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 'Breezy Badger'的光碟"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:950
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04安全性更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:969
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 'Breezy Badger'的光碟"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:1011
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:1016
 #, fuzzy
 msgid "Community-maintained"
 msgstr "協力維護軟體 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:1022
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:1030
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'的光碟"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:1072
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:412
-msgid "Canonical-supported Open Source software"
-msgstr ""
+#: ../data/templates/Ubuntu.info.in:1075
+#, fuzzy
+msgid "Canonical-supported free and open-source software"
+msgstr "協力維護軟體 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:1077
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "協力維護軟體 (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:1078
 #, fuzzy
-msgid "Community-maintained Open Source software"
+msgid "Community-maintained free and open-source software"
 msgstr "協力維護軟體 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:1080
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:1081
 msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:1083
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:1084
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:1091
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "含Ubuntu 6.06 LTS 'Dapper Drake'之光碟"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:1107
 msgid "Important security updates"
 msgstr "重要的安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:1112
 msgid "Recommended updates"
 msgstr "建議的安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:1117
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "建議的安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:1122
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "重要的安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:1133
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:1148
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'的光碟"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:1164
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10安全性更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:1169
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:1174
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:1185
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:1200
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'的光碟"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149
 msgid "Officially supported"
 msgstr "官方支援"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:1216
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04安全性更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:1221
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:1226
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:1232
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:1238
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "協力維護軟體 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:1240
 msgid "Non-free (Multiverse)"
 msgstr "非自由軟體 (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:1247
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:1250
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:1252
 msgid "Restricted copyright"
 msgstr "版權受限制"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:1259
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10安全性更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:1264
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:1269
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -333,23 +427,23 @@ msgid "Debian testing"
 msgstr "Debian “Etch”（測試版）"
 
 #. Description
-#: ../data/templates/Debian.info.in:146
+#: ../data/templates/Debian.info.in:147
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian “Sid”（不穩定版）"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:150
+#: ../data/templates/Debian.info.in:151
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "符合 DFSG 的軟體，但有依賴於非自由軟體"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:152
+#: ../data/templates/Debian.info.in:153
 msgid "Non-DFSG-compatible Software"
 msgstr "不符合 DFSG 的軟體"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:436
 #, python-format
 msgid "Server for %s"
 msgstr "位於%s的伺服器"
@@ -357,49 +451,49 @@ 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
 #. append a list of all used servers
-#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
-#: ../aptsources/distro.py:248
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "主要伺服器"
 
-#: ../aptsources/distro.py:252
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "個人伺服器"
 
-#: ../apt/progress/gtk2.py:259
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒"
 
-#: ../apt/progress/gtk2.py:265
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, fuzzy, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "正在下載檔案 %li/%li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:285
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "詳細資料"
 
-#: ../apt/progress/gtk2.py:367
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:373
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:301
+#: ../apt/package.py:359
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:937 ../apt/package.py:1043
+#: ../apt/package.py:1088 ../apt/package.py:1194
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "修改紀錄不存在，請稍後再試。"
 
-#: ../apt/package.py:1047
+#: ../apt/package.py:1200
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -408,88 +502,125 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:1053
+#: ../apt/package.py:1207
 #, fuzzy
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
 msgstr "無法下載更動列表。請檢查網路連線是否正常。"
 
-#: ../apt/debfile.py:56
+#: ../apt/debfile.py:82
 #, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
+msgid "List of files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:93
 #, python-format
-msgid "List of files for '%s'could not be read"
+msgid "List of control files for '%s' could not be read"
 msgstr ""
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr ""
 
-#: ../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:373
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' dependency %(depname)s "
+"(%(deprelation)s %(depversion)s)"
+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:389
+#, python-format
+msgid ""
+"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
+"%(targetver)s)"
+msgstr ""
+
+#: ../apt/debfile.py:399
+#, 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:447
+msgid "No Architecture field in the package"
+msgstr ""
+
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr ""
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr ""
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:519
 #, fuzzy, python-format
 msgid "Cannot install '%s'"
 msgstr "無法安裝‘%s’"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:593
+msgid ""
+"Automatically decompressed:\n"
+"\n"
+msgstr ""
+
+#: ../apt/debfile.py:599
+msgid "Automatically converted to printable ascii:\n"
+msgstr ""
+
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:700
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "將會移除的核心套件"
 
-#: ../apt/progress/text.py:81
+#: ../apt/progress/text.py:82
 #, python-format
 msgid "%c%s... Done"
 msgstr ""
 
-#: ../apt/progress/text.py:118
+#: ../apt/progress/text.py:122
 msgid "Hit "
 msgstr ""
 
-#: ../apt/progress/text.py:126
+#: ../apt/progress/text.py:131
 msgid "Ign "
 msgstr ""
 
-#: ../apt/progress/text.py:128
+#: ../apt/progress/text.py:133
 msgid "Err "
 msgstr ""
 
-#: ../apt/progress/text.py:138
+#: ../apt/progress/text.py:144
 msgid "Get:"
 msgstr ""
 
-#: ../apt/progress/text.py:198
+#: ../apt/progress/text.py:203
 msgid " [Working]"
 msgstr ""
 
-#: ../apt/progress/text.py:208
+#: ../apt/progress/text.py:214
 #, python-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -498,19 +629,19 @@ msgid ""
 msgstr ""
 
 #. 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 ""
 
-#: ../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 ""
 
-#: ../apt/progress/text.py:241
+#: ../apt/progress/text.py:255
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: ../apt/cache.py:96
+#: ../apt/cache.py:157
 msgid "Building data structures"
 msgstr ""
diff --git a/pre-build.sh b/pre-build.sh
index 026a491e..1c5a9183 100755
--- a/pre-build.sh
+++ b/pre-build.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+set -e
+
+dpkg-checkbuilddeps -d 'python-debian, python-feedparser'
 
 echo "updating Ubuntu mirror list from launchpad"
 if [ -n "$https_proxy" ]; then
diff --git a/python/acquire.cc b/python/acquire.cc
index 6169ff40..45b4493c 100644
--- a/python/acquire.cc
+++ b/python/acquire.cc
@@ -328,18 +328,17 @@ static PyObject *PkgAcquireNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
         // FIXME: memleak?
         progress = new PyFetchProgress();
         progress->setCallbackInst(pyFetchProgressInst);
-        fetcher = new pkgAcquire(progress);
-    }
-    else {
-        fetcher = new pkgAcquire();
     }
 
+    fetcher = new pkgAcquire();
+    fetcher->Setup(progress);
+
     PyObject *FetcherObj = CppPyObject_NEW<pkgAcquire*>(NULL, type, fetcher);
 
     if (progress != 0)
         progress->setPyAcquire(FetcherObj);
     // prepare our map of items.
-    return FetcherObj;
+    return HandleErrors(FetcherObj);
 }
 
 /**
diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index e8490b4e..7704aa01 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"
@@ -891,7 +920,7 @@ extern "C" void initapt_pkg()
    PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_SUGGESTS",
                         MkPyNumber(pkgCache::Dep::Suggests));
    PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_RECOMMENDS",
-                        MkPyNumber(pkgCache::Dep::Suggests));
+                        MkPyNumber(pkgCache::Dep::Recommends));
    PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_CONFLICTS",
                         MkPyNumber(pkgCache::Dep::Conflicts));
    PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_REPLACES",
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 c3aa74d1..44cd3c82 100644
--- a/python/arfile.cc
+++ b/python/arfile.cc
@@ -25,6 +25,8 @@
 #include <apt-pkg/arfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sptr.h>
+#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/configuration.h>
 #include <utime.h>
 
 #include <unistd.h>
@@ -202,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
@@ -477,8 +479,8 @@ PyTypeObject PyArArchive_Type = {
  * Representation of a Debian package.
  *
  * This does not resemble debDebFile in apt-inst, but instead is a subclass
- * of ArFile which adds properties for the control.tar.{xz,lzma,bz2,gz} and
- * data.tar.{xz,lzma,bz2,gz} members which return TarFile objects. It also adds
+ * of ArFile which adds properties for the control.tar.$compression and
+ * data.tar.$compression members which return TarFile objects. It also adds
  * a descriptor 'version' which returns the content of 'debian-binary'.
  *
  * We are using it this way as it seems more natural to represent this special
@@ -532,21 +534,28 @@ static PyObject *debfile_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         return PyErr_Format(PyExc_SystemError, "No debian archive, missing %s",
                             "control.tar.gz");
 
-    self->data = _gettar(self, self->Object->FindMember("data.tar.gz"),
-                         "gzip");
-    if (!self->data)
-        self->data = _gettar(self, self->Object->FindMember("data.tar.bz2"),
-                             "bzip2");
-    if (!self->data)
-        self->data = _gettar(self, self->Object->FindMember("data.tar.lzma"),
-                             "lzma");
-    if (!self->data)
-        self->data = _gettar(self, self->Object->FindMember("data.tar.xz"),
-                             "xz");
-    if (!self->data)
-        return PyErr_Format(PyExc_SystemError, "No debian archive, missing %s",
-                            "data.tar.gz or data.tar.bz2 or data.tar.lzma "
-			    "or data.tar.xz");
+    // try all compression types
+    std::vector<std::string> types = APT::Configuration::getCompressionTypes();
+    for (std::vector<std::string>::const_iterator t = types.begin(); 
+         t != types.end(); ++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)
+          break;
+    }
+    // no data found, we need to 
+    if (!self->data) {
+       std::string error;
+       for (std::vector<std::string>::const_iterator t = types.begin(); 
+            t != types.end(); ++t) 
+          error.append(*t + ",");
+        return PyErr_Format(PyExc_SystemError, 
+                            "No debian archive, missing data.tar.{%s}", 
+                            error.c_str());
+    }
 
 
     const ARArchive::Member *member = self->Object->FindMember("debian-binary");
@@ -590,7 +599,9 @@ static PyGetSetDef debfile_getset[] = {
     {"control",(getter)debfile_get_control,0,
      "The TarFile object associated with the control.tar.gz member."},
     {"data",(getter)debfile_get_data,0,
-     "The TarFile object associated with the data.tar.{gz,bz2,lzma,xz}) member."},
+     "The TarFile object associated with the data.tar.$compression member. "
+     "All apt compression methods are supported. "
+    },
     {"debian_binary",(getter)debfile_get_debian_binary,0,
      "The package version, as contained in debian-binary."},
     {NULL}
@@ -604,8 +615,9 @@ static const char *debfile_doc =
     "specifying a file descriptor (returned by e.g. os.open()).\n"
     "The recommended way of using it is to pass in the path to the file.\n\n"
     "It differs from ArArchive by providing the members 'control', 'data'\n"
-    "and 'version' for accessing the control.tar.gz, data.tar.{gz,bz2,lzma,xz},\n"
-    "and debian-binary members in the archive.";
+    "and 'version' for accessing the control.tar.gz, data.tar.$compression \n"
+    "(all apt compression methods are supported), and debian-binary members \n"
+    "in the archive.";
 
 PyTypeObject PyDebFile_Type = {
     PyVarObject_HEAD_INIT(&PyType_Type, 0)
diff --git a/python/cache.cc b/python/cache.cc
index b263d320..c51bd4af 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -198,11 +198,13 @@ static PyObject *PkgCacheOpen(PyObject *Self,PyObject *Args)
    }
 
    //std::cout << "new cache is " << (pkgCache*)(*Cache) << std::endl;
+   
+   // ensure that the states are correct (LP: #659438)
+   pkgApplyStatus(*Cache);
 
    // update the cache pointer after the cache was rebuild
    ((CppPyObject<pkgCache*> *)Self)->Object = (pkgCache*)(*Cache);
 
-
    Py_INCREF(Py_None);
    return HandleErrors(Py_None);
 }
@@ -229,6 +231,12 @@ static PyObject *PkgCacheGetGroups(PyObject *Self, void*) {
    return CppPyObject_NEW<GrpListStruct>(Self,&PyGroupList_Type,Cache->GrpBegin());
 }
 
+static PyObject *PkgCacheGetPolicy(PyObject *Self, void*) {
+   pkgCacheFile *CacheFile = GetCpp<pkgCacheFile *>(Self);
+   std::cerr << "policy: " << CacheFile->Policy << std::endl;
+   return CppPyObject_NEW<pkgPolicy*>(Self,&PyPolicy_Type,CacheFile->Policy);
+}
+
 static PyObject *PkgCacheGetPackages(PyObject *Self, void*) {
    pkgCache *Cache = GetCpp<pkgCache *>(Self);
    return CppPyObject_NEW<PkgListStruct>(Self,&PyPackageList_Type,Cache->PkgBegin());
@@ -289,6 +297,7 @@ static PyGetSetDef PkgCacheGetSet[] = {
    {"group_count",PkgCacheGetGroupCount,0,
     "The number of apt_pkg.Group objects stored in the cache."},
    {"groups",  PkgCacheGetGroups, 0, "A list of Group objects in the cache"},
+   {"policy",  PkgCacheGetPolicy, 0, "The PkgPolicy for the cache"},
    {"is_multi_arch", PkgCacheGetIsMultiArch, 0,
     "Whether the cache supports multi-arch."},
    {"package_count",PkgCacheGetPackageCount,0,
@@ -394,6 +403,9 @@ static PyObject *PkgCacheNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 	     return HandleErrors();
    }
 
+   // ensure that the states are correct (LP: #659438)
+   pkgApplyStatus(*Cache);
+
    CppPyObject<pkgCacheFile*> *CacheFileObj =
 	   CppPyObject_NEW<pkgCacheFile*>(0,&PyCacheFile_Type, Cache);
 
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..37374625 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());
 }
@@ -331,13 +331,16 @@ static PyObject *CnfMap(PyObject *Self,PyObject *Arg)
 // Assignment with operator []
 static int CnfMapSet(PyObject *Self,PyObject *Arg,PyObject *Val)
 {
-   if (PyString_Check(Arg) == 0 || PyString_Check(Val) == 0)
+   if (PyString_Check(Arg) == 0 || (Val != NULL && PyString_Check(Val) == 0))
    {
       PyErr_SetNone(PyExc_TypeError);
       return -1;
    }
 
-   GetSelf(Self).Set(PyString_AsString(Arg),PyString_AsString(Val));
+   if (Val == NULL)
+      GetSelf(Self).Clear(PyString_AsString(Arg));
+   else
+      GetSelf(Self).Set(PyString_AsString(Arg),PyString_AsString(Val));
    return 0;
 }
 									/*}}}*/
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/policy.cc b/python/policy.cc
index b11e4dde..96b83abd 100644
--- a/python/policy.cc
+++ b/python/policy.cc
@@ -46,8 +46,11 @@ PyObject *policy_get_priority(PyObject *self, PyObject *arg) {
     if (PyObject_TypeCheck(arg, &PyPackage_Type)) {
         pkgCache::PkgIterator pkg = GetCpp<pkgCache::PkgIterator>(arg);
         return MkPyNumber(policy->GetPriority(pkg));
+    } else if (PyObject_TypeCheck(arg, &PyPackageFile_Type)) {
+        pkgCache::PkgFileIterator pkgfile = GetCpp<pkgCache::PkgFileIterator>(arg);
+        return MkPyNumber(policy->GetPriority(pkgfile));
     } else {
-        PyErr_SetString(PyExc_TypeError,"Argument must be of Package().");
+        PyErr_SetString(PyExc_TypeError,"Argument must be of Package() or PackageFile().");
         return 0;
     }
 }
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..248d818d 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>
@@ -37,6 +38,10 @@ using namespace std;
 struct TagSecData : public CppPyObject<pkgTagSection>
 {
    char *Data;
+   bool Bytes;
+#if PY_MAJOR_VERSION >= 3
+   PyObject *Encoding;
+#endif
 };
 
 // The owner of the TagFile is a Python file object.
@@ -44,6 +49,10 @@ struct TagFileData : public CppPyObject<pkgTagFile>
 {
    TagSecData *Section;
    FileFd Fd;
+   bool Bytes;
+#if PY_MAJOR_VERSION >= 3
+   PyObject *Encoding;
+#endif
 };
 
 // Traversal and Clean for owned objects
@@ -59,6 +68,35 @@ int TagFileClear(PyObject *self) {
     return 0;
 }
 
+// Helpers to return Unicode or bytes as appropriate.
+#if PY_MAJOR_VERSION < 3
+#define TagSecString_FromStringAndSize(self, v, len) \
+    PyString_FromStringAndSize((v), (len))
+#define TagSecString_FromString(self, v) PyString_FromString(v)
+#else
+PyObject *TagSecString_FromStringAndSize(PyObject *self, const char *v,
+	 				 Py_ssize_t len) {
+   TagSecData *Self = (TagSecData *)self;
+   if (Self->Bytes)
+      return PyBytes_FromStringAndSize(v, len);
+   else if (Self->Encoding)
+      return PyUnicode_Decode(v, len, PyUnicode_AsString(Self->Encoding), 0);
+   else
+      return PyUnicode_FromStringAndSize(v, len);
+}
+
+PyObject *TagSecString_FromString(PyObject *self, const char *v) {
+   TagSecData *Self = (TagSecData *)self;
+   if (Self->Bytes)
+      return PyBytes_FromString(v);
+   else if (Self->Encoding)
+      return PyUnicode_Decode(v, strlen(v),
+			      PyUnicode_AsString(Self->Encoding), 0);
+   else
+      return PyUnicode_FromString(v);
+}
+#endif
+
 
 									/*}}}*/
 // TagSecFree - Free a Tag Section					/*{{{*/
@@ -106,9 +144,9 @@ static PyObject *TagSecFind(PyObject *Self,PyObject *Args)
    {
       if (Default == 0)
 	 Py_RETURN_NONE;
-      return PyString_FromString(Default);
+      return TagSecString_FromString(Self,Default);
    }
-   return PyString_FromStringAndSize(Start,Stop-Start);
+   return TagSecString_FromStringAndSize(Self,Start,Stop-Start);
 }
 
 static char *doc_FindRaw =
@@ -127,14 +165,14 @@ static PyObject *TagSecFindRaw(PyObject *Self,PyObject *Args)
    {
       if (Default == 0)
 	 Py_RETURN_NONE;
-      return PyString_FromString(Default);
+      return TagSecString_FromString(Self,Default);
    }
 
    const char *Start;
    const char *Stop;
    GetCpp<pkgTagSection>(Self).Get(Start,Stop,Pos);
 
-   return PyString_FromStringAndSize(Start,Stop-Start);
+   return TagSecString_FromStringAndSize(Self,Start,Stop-Start);
 }
 
 static char *doc_FindFlag =
@@ -160,21 +198,18 @@ static PyObject *TagSecFindFlag(PyObject *Self,PyObject *Args)
 // Map access, operator []
 static PyObject *TagSecMap(PyObject *Self,PyObject *Arg)
 {
-   if (PyString_Check(Arg) == 0)
-   {
-      PyErr_SetNone(PyExc_TypeError);
+   const char *Name = PyObject_AsString(Arg);
+   if (Name == 0)
       return 0;
-   }
-
    const char *Start;
    const char *Stop;
-   if (GetCpp<pkgTagSection>(Self).Find(PyString_AsString(Arg),Start,Stop) == false)
+   if (GetCpp<pkgTagSection>(Self).Find(Name,Start,Stop) == false)
    {
-      PyErr_SetString(PyExc_KeyError,PyString_AsString(Arg));
+      PyErr_SetString(PyExc_KeyError,Name);
       return 0;
    }
 
-   return PyString_FromStringAndSize(Start,Stop-Start);
+   return TagSecString_FromStringAndSize(Self,Start,Stop-Start);
 }
 
 // len() operation
@@ -229,9 +264,9 @@ static PyObject *TagSecExists(PyObject *Self,PyObject *Args)
 
 static int TagSecContains(PyObject *Self,PyObject *Arg)
 {
-   if (PyString_Check(Arg) == 0)
-       return 0;
-   const char *Name = PyString_AsString(Arg);
+   const char *Name = PyObject_AsString(Arg);
+   if (Name == 0)
+      return 0;
    const char *Start;
    const char *Stop;
    if (GetCpp<pkgTagSection>(Self).Find(Name,Start,Stop) == false)
@@ -255,7 +290,7 @@ static PyObject *TagSecStr(PyObject *Self)
    const char *Start;
    const char *Stop;
    GetCpp<pkgTagSection>(Self).GetSection(Start,Stop);
-   return PyString_FromStringAndSize(Start,Stop-Start);
+   return TagSecString_FromStringAndSize(Self,Start,Stop-Start);
 }
 									/*}}}*/
 // TagFile Wrappers							/*{{{*/
@@ -285,6 +320,12 @@ static PyObject *TagFileNext(PyObject *Self)
    Obj.Section->Owner = Self;
    Py_INCREF(Obj.Section->Owner);
    Obj.Section->Data = 0;
+   Obj.Section->Bytes = Obj.Bytes;
+#if PY_MAJOR_VERSION >= 3
+   // We don't need to incref Encoding as the previous Section object already
+   // held a reference to it.
+   Obj.Section->Encoding = Obj.Encoding;
+#endif
    if (Obj.Object.Step(Obj.Section->Object) == false)
       return HandleErrors(NULL);
 
@@ -346,11 +387,12 @@ static PyObject *TagFileJump(PyObject *Self,PyObject *Args)
 static PyObject *TagSecNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) {
    char *Data;
    int Len;
-   char *kwlist[] = {"text", 0};
+   char Bytes = 0;
+   char *kwlist[] = {"text", "bytes", 0};
 
    // this allows reading "byte" types from python3 - but we don't
    // make (much) use of it yet
-   if (PyArg_ParseTupleAndKeywords(Args,kwds,"s#",kwlist,&Data,&Len) == 0)
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"s#|b",kwlist,&Data,&Len,&Bytes) == 0)
       return 0;
 
    // Create the object..
@@ -358,6 +400,10 @@ static PyObject *TagSecNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) {
    new (&New->Object) pkgTagSection();
    New->Data = new char[strlen(Data)+2];
    snprintf(New->Data,strlen(Data)+2,"%s\n",Data);
+   New->Bytes = Bytes;
+#if PY_MAJOR_VERSION >= 3
+   New->Encoding = 0;
+#endif
 
    if (New->Object.Scan(New->Data,strlen(New->Data)) == false)
    {
@@ -389,23 +435,62 @@ PyObject *ParseSection(PyObject *self,PyObject *Args)
 
 static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 {
-   PyObject *File;
-   char *kwlist[] = {"file", 0};
-   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O",kwlist,&File) == 0)
+   TagFileData *New;
+   PyObject *File = 0;
+   char Bytes = 0;
+
+   char *kwlist[] = {"file", "bytes", 0};
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O|b",kwlist,&File,&Bytes) == 0)
       return 0;
-   int fileno = PyObject_AsFileDescriptor(File);
-   if (fileno == -1)
+
+   // check if we got a filename or a file object
+   int fileno = -1;
+   const char *filename = NULL;
+   filename = PyObject_AsString(File);
+   if (filename == NULL) {
+      PyErr_Clear();
+      fileno = PyObject_AsFileDescriptor(File);
+   }
+
+   // handle invalid arguments
+   if (fileno == -1 && filename == NULL)
+   {
+      PyErr_SetString(PyExc_TypeError, 
+                      "Argument must be string, fd or have a fileno() method");
       return 0;
+   }
 
-   TagFileData *New = (TagFileData*)type->tp_alloc(type, 0);
+   New = (TagFileData*)type->tp_alloc(type, 0);
+   if (fileno != -1)
+   {
 #ifdef APT_HAS_GZIP
-   new (&New->Fd) FileFd();
-   New->Fd.OpenDescriptor(fileno, FileFd::ReadOnlyGzip, false);
+      new (&New->Fd) FileFd();
+      New->Fd.OpenDescriptor(fileno, FileFd::ReadOnlyGzip, false);
 #else
-   new (&New->Fd) FileFd(fileno,false);
+      new (&New->Fd) FileFd(fileno,false);
 #endif
+   }
+   else 
+   {
+      // FileFd::Extension got added in this revision
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 12)
+      new (&New->Fd) FileFd(filename, FileFd::ReadOnly, FileFd::Extension, false);
+#else
+      new (&New->Fd) FileFd(filename, FileFd::ReadOnly, false);
+#endif
+   } 
+   New->Bytes = Bytes;
    New->Owner = File;
    Py_INCREF(New->Owner);
+#if PY_MAJOR_VERSION >= 3
+   if (fileno != -1) {
+      New->Encoding = PyObject_GetAttr(File, PyUnicode_FromString("encoding"));
+      if (New->Encoding && !PyUnicode_Check(New->Encoding))
+         New->Encoding = 0;
+   } else
+      New->Encoding = 0;
+   Py_XINCREF(New->Encoding);
+#endif
    new (&New->Object) pkgTagFile(&New->Fd);
 
    // Create the section
@@ -414,6 +499,11 @@ static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
    New->Section->Owner = New;
    Py_INCREF(New->Section->Owner);
    New->Section->Data = 0;
+   New->Section->Bytes = Bytes;
+#if PY_MAJOR_VERSION >= 3
+   New->Section->Encoding = New->Encoding;
+   Py_XINCREF(New->Section->Encoding);
+#endif
 
    return HandleErrors(New);
 }
@@ -491,7 +581,7 @@ PyObject *RewriteSection(PyObject *self,PyObject *Args)
    }
 
    // Return the string
-   PyObject *ResObj = PyString_FromStringAndSize(bp,size);
+   PyObject *ResObj = TagSecString_FromStringAndSize(Section,bp,size);
    free(bp);
    return HandleErrors(ResObj);
 }
@@ -520,11 +610,15 @@ PySequenceMethods TagSecSeqMeth = {0,0,0,0,0,0,0,TagSecContains,0,0};
 PyMappingMethods TagSecMapMeth = {TagSecLength,TagSecMap,0};
 
 
-static char *doc_TagSec = "TagSection(text: str)\n\n"
+static char *doc_TagSec = "TagSection(text: str, [bytes: bool = False])\n\n"
    "Provide methods to access RFC822-style header sections, like those\n"
    "found in debian/control or Packages files.\n\n"
    "TagSection() behave like read-only dictionaries and also provide access\n"
-   "to the functions provided by the C++ class (e.g. find)";
+   "to the functions provided by the C++ class (e.g. find).\n\n"
+   "By default, text read from files is treated as strings (binary data in\n"
+   "Python 2, Unicode strings in Python 3). Use bytes=True to cause all\n"
+   "header values read from this TagSection to be bytes even in Python 3.\n"
+   "Header names are always treated as Unicode.";
 PyTypeObject PyTagSection_Type =
 {
    PyVarObject_HEAD_INIT(&PyType_Type, 0)
@@ -595,7 +689,7 @@ static PyGetSetDef TagFileGetSet[] = {
 };
 
 
-static char *doc_TagFile = "TagFile(file)\n\n"
+static char *doc_TagFile = "TagFile(file, [bytes: bool = False])\n\n"
    "TagFile() objects provide access to debian control files, which consist\n"
    "of multiple RFC822-style sections.\n\n"
    "To provide access to those sections, TagFile objects provide an iterator\n"
@@ -607,7 +701,11 @@ static char *doc_TagFile = "TagFile(file)\n\n"
    "It is important to not mix the use of both APIs, because this can have\n"
    "unwanted effects.\n\n"
    "The parameter 'file' refers to an object providing a fileno() method or\n"
-   "a file descriptor (an integer)";
+   "a file descriptor (an integer).\n\n"
+   "By default, text read from files is treated as strings (binary data in\n"
+   "Python 2, Unicode strings in Python 3). Use bytes=True to cause all\n"
+   "header values read from this TagFile to be bytes even in Python 3.\n"
+   "Header names are always treated as Unicode.";
 
 // Type for a Tag File
 PyTypeObject PyTagFile_Type =
diff --git a/python/tar.cc b/python/tar.cc
index b994d4e7..e42a9c50 100644
--- a/python/tar.cc
+++ b/python/tar.cc
@@ -182,6 +182,8 @@ PyObject *debExtract(PyObject *Self,PyObject *Args)
 	      Comp = "bzip2";
       else if(strcmp(".lzma", &Chunk[strlen(Chunk)-5]) == 0)
 	      Comp = "lzma";
+      else if(strcmp(".xz", &Chunk[strlen(Chunk)-3]) == 0)
+	      Comp = "xz";
       ExtractTar Tar(Deb.GetFile(),Member->Size,Comp);
       ProcessTar Proc(Function);
       if (Tar.Go(Proc) == false)
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/setup.py b/setup.py
index eff78379..8af5c2a6 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,11 @@ except ImportError:
 
 if sys.version_info[0] == 3:
     from distutils.command.build_py import build_py_2to3
+    from lib2to3.refactor import get_fixers_from_package
     cmdclass['build_py'] = build_py_2to3
+    cmdclass['build_py'].fixer_names = sorted(
+        set(get_fixers_from_package("lib2to3.fixes")) -
+        set(["lib2to3.fixes.fix_future"]))
 
 # The apt_pkg module.
 files = ['apt_pkgmodule.cc', 'acquire.cc', 'cache.cc', 'cdrom.cc',
diff --git a/tests/data/misc/foo_Release b/tests/data/misc/foo_Release
new file mode 100644
index 00000000..0f42220c
--- /dev/null
+++ b/tests/data/misc/foo_Release
@@ -0,0 +1,492 @@
+Origin: Ubuntu
+Label: Ubuntu
+Suite: precise
+Version: 12.04
+Codename: precise
+Date: Wed, 25 Apr 2012 22:49:23 UTC
+Architectures: amd64 armel armhf i386 powerpc
+Components: main restricted universe multiverse
+Description: Ubuntu Precise 12.04
+MD5Sum:
+ 6a815674c5b3178152d449a9396cb2e5          1640344 main/binary-amd64/Packages.gz
+ 98140fa3444c9e945f6944acbb9ddcff          7818931 main/binary-amd64/Packages
+ 846e0e856bcbf9b64d9119c8727cda8c               97 main/binary-amd64/Release
+ cfd5f57de107941bbe661ffada4dce88          1272844 main/binary-amd64/Packages.bz2
+ 5b220aea8056a900c8eaf28e79cdd64a               97 main/binary-armel/Release
+ 92e3160bbb664f8b5d7d4f2d161dd81c          1619078 main/binary-armel/Packages.gz
+ 28fbf69ee965639c92c8a54256cd6ba1          1257389 main/binary-armel/Packages.bz2
+ 4e3ba67129f73f8afe28186b31eb3112          7743353 main/binary-armel/Packages
+ 81cfd32bf54d2b007542e14e09953bae               97 main/binary-armhf/Release
+ ed404b1123d1497cb09aceae8850fc06          7620333 main/binary-armhf/Packages
+ 64156d29df19fdaa36fa4eafd4c17dc1          1257653 main/binary-armhf/Packages.bz2
+ 3d3238bd89cb1e8e23a1a4a5bf574739          1617483 main/binary-armhf/Packages.gz
+ dc2fe62f05e29f36ffe4e58499796ae6          1273857 main/binary-i386/Packages.bz2
+ 7c678c50ce682e9f5cc5ba8f8eb2d6ad          1641082 main/binary-i386/Packages.gz
+ b6aa9a96c765bbd4202dae7dbaf18cc2               96 main/binary-i386/Release
+ eb3b4870b877863fecf1d3307c3beb54          7816415 main/binary-i386/Packages
+ 54658d89b612a38592431fe6b8a780a1          1627734 main/binary-powerpc/Packages.gz
+ 4185aca6984f00fd65aa0c0de12367d4               99 main/binary-powerpc/Release
+ fc9bf1959082733fc42c682285bf46e7          1263942 main/binary-powerpc/Packages.bz2
+ c32afd79c9163cffe013f98669deb727          7661552 main/binary-powerpc/Packages
+ ff5434612595a569236f7ba4990a3b63            62166 main/debian-installer/binary-amd64/Packages.gz
+ 7dd470290bacbacc7bec24830100aade           234592 main/debian-installer/binary-amd64/Packages
+ 013d9839e9c8f8c102daf6eb77841bf7            48784 main/debian-installer/binary-amd64/Packages.bz2
+ 08608ef832f2410970d07fdd802fc4e4            47964 main/debian-installer/binary-armel/Packages.bz2
+ 0a0a559023aac4096a38e2fb51870ddf           230310 main/debian-installer/binary-armel/Packages
+ f79f29b841a05b971ac318a9e0a396e0            61118 main/debian-installer/binary-armel/Packages.gz
+ 20a72276b6607fa58f52fcc5b7742ff4            62777 main/debian-installer/binary-armhf/Packages.gz
+ 8da4a15400cec4b06e2aa1bba6cfc2c3            49051 main/debian-installer/binary-armhf/Packages.bz2
+ 49f9f82a7c7e9e13c399d15df43148f1           238862 main/debian-installer/binary-armhf/Packages
+ 3dd181be504206f7abb41039dc508ed9            52279 main/debian-installer/binary-i386/Packages.bz2
+ 5c2c6ca586bb6ffb2de414e2cd063c70           259996 main/debian-installer/binary-i386/Packages
+ ca1b7db323ebef593617ef0a7c833dfb            67180 main/debian-installer/binary-i386/Packages.gz
+ 876f115ee26518319458fc26ec785485           246636 main/debian-installer/binary-powerpc/Packages
+ 49402b5b12b10804abfae14629d23f1c            50309 main/debian-installer/binary-powerpc/Packages.bz2
+ 29010a7ba3ac1e60a0efaef04f6f2e42            64468 main/debian-installer/binary-powerpc/Packages.gz
+ adf74189a01512a8f68d4bfc411dc692             3706 main/i18n/Index
+ 2f2ddab9be4ecc2c9e190bb639304943          4356187 main/source/Sources
+ 5c2893c352ebbf3ee380ebdab6b5e487           933770 main/source/Sources.bz2
+ 323e5ca1ba86c7a503c4c7b0772749b1          1174967 main/source/Sources.gz
+ 3c3104465b2c7e54f4b8f566ac825339               98 main/source/Release
+ f75f8a98e9e952194046da388a11c42a           119109 multiverse/binary-amd64/Packages.bz2
+ c2df9a9ff319486e3d6f46d9c35a8530           151924 multiverse/binary-amd64/Packages.gz
+ ece719c6a770134150f158cdb65ca6fc           581550 multiverse/binary-amd64/Packages
+ d3f34ec2fc86c95e4d3bc4606d751c66              103 multiverse/binary-amd64/Release
+ f296954282382f88b12dd8c64d813f5c           136295 multiverse/binary-armel/Packages.gz
+ d0da88f8a408fba12d44d5b6e107cfc0           519605 multiverse/binary-armel/Packages
+ 6d0c32b1cae4bdcfd6f18fd2d6fbf31f              103 multiverse/binary-armel/Release
+ 6744aaa8a3457d139348ea18379781ce           106873 multiverse/binary-armel/Packages.bz2
+ 1cc2613becf46fd578aa6d52ab12db94           104529 multiverse/binary-armhf/Packages.bz2
+ b0f8df0c9d700a1f7d295be4d4c03788           505901 multiverse/binary-armhf/Packages
+ 73cb5bc3d0c5021e5a4a413a73bcefce              103 multiverse/binary-armhf/Release
+ 00c07f1601226b8387fe4c9afaf2b044           133117 multiverse/binary-armhf/Packages.gz
+ bf0237c8c5d06a6df172db28710b8a36           121196 multiverse/binary-i386/Packages.bz2
+ cf110f58668bf5731e593ed78af54c27           591662 multiverse/binary-i386/Packages
+ 8a915986a504c0f3eb95b61ae909c9a4              102 multiverse/binary-i386/Release
+ c6d89a2752d1154a219c295e6d70b697           154762 multiverse/binary-i386/Packages.gz
+ ae93681c6b316c95207091b3c91042a7              105 multiverse/binary-powerpc/Release
+ ec463c2070c515de099f8baa3a4b5993           107209 multiverse/binary-powerpc/Packages.bz2
+ 675204a2b4aabeb9e99e406070b2af9b           520882 multiverse/binary-powerpc/Packages
+ c806ea7584c782d57363df12ddb28839           136930 multiverse/binary-powerpc/Packages.gz
+ d41d8cd98f00b204e9800998ecf8427e                0 multiverse/debian-installer/binary-amd64/Packages
+ 4a4dd3598707603b3f76a2378a4504aa               20 multiverse/debian-installer/binary-amd64/Packages.gz
+ 4059d198768f9f8dc9372dc1c54bc3c3               14 multiverse/debian-installer/binary-amd64/Packages.bz2
+ 4059d198768f9f8dc9372dc1c54bc3c3               14 multiverse/debian-installer/binary-armel/Packages.bz2
+ d41d8cd98f00b204e9800998ecf8427e                0 multiverse/debian-installer/binary-armel/Packages
+ 4a4dd3598707603b3f76a2378a4504aa               20 multiverse/debian-installer/binary-armel/Packages.gz
+ 4a4dd3598707603b3f76a2378a4504aa               20 multiverse/debian-installer/binary-armhf/Packages.gz
+ d41d8cd98f00b204e9800998ecf8427e                0 multiverse/debian-installer/binary-armhf/Packages
+ 4059d198768f9f8dc9372dc1c54bc3c3               14 multiverse/debian-installer/binary-armhf/Packages.bz2
+ 4059d198768f9f8dc9372dc1c54bc3c3               14 multiverse/debian-installer/binary-i386/Packages.bz2
+ 4a4dd3598707603b3f76a2378a4504aa               20 multiverse/debian-installer/binary-i386/Packages.gz
+ d41d8cd98f00b204e9800998ecf8427e                0 multiverse/debian-installer/binary-i386/Packages
+ 4a4dd3598707603b3f76a2378a4504aa               20 multiverse/debian-installer/binary-powerpc/Packages.gz
+ d41d8cd98f00b204e9800998ecf8427e                0 multiverse/debian-installer/binary-powerpc/Packages
+ 4059d198768f9f8dc9372dc1c54bc3c3               14 multiverse/debian-installer/binary-powerpc/Packages.bz2
+ a2bcfa86da39328db94629011506a877             2676 multiverse/i18n/Index
+ c2ffda2a848000b71573dbc3dc7d4402           154990 multiverse/source/Sources.bz2
+ f1d64bb88933686a71108de73b1f2262           628753 multiverse/source/Sources
+ 3d35747578528fa13640b98184120e51           188325 multiverse/source/Sources.gz
+ c9828946b46ac900fec682369c52bfa7              104 multiverse/source/Release
+ 5644835af0d1ed82cc7c14e34c2a543f             9098 restricted/binary-amd64/Packages.gz
+ d3058923c862e74c2c08b9a4ad7ec51e           134705 restricted/binary-amd64/Packages
+ 97ecff09a695f1460177843ff5d2b3e6              103 restricted/binary-amd64/Release
+ f8ed966e5400930411a32a7183357810             8452 restricted/binary-amd64/Packages.bz2
+ 60e74c701a6e40b7f869dd83b335ec5c              103 restricted/binary-armel/Release
+ 4a4dd3598707603b3f76a2378a4504aa               20 restricted/binary-armel/Packages.gz
+ 4059d198768f9f8dc9372dc1c54bc3c3               14 restricted/binary-armel/Packages.bz2
+ d41d8cd98f00b204e9800998ecf8427e                0 restricted/binary-armel/Packages
+ 55c08a48fc4b3370acc95a391bde1189              103 restricted/binary-armhf/Release
+ ce2da4621bbbaf55d858ae4243e17715             1103 restricted/binary-armhf/Packages.bz2
+ b26814493282faf0c5b269c44b799653             2477 restricted/binary-armhf/Packages
+ 784050b4fd16ea71e10cf130e47132d9              941 restricted/binary-armhf/Packages.gz
+ c4280a67444afbb8e2564d6f2249d397             9108 restricted/binary-i386/Packages.gz
+ 6dfd90555b37a912f82894b4ec3b63a0             8431 restricted/binary-i386/Packages.bz2
+ 48d3e36bf54be9b3fc7576cfcd0aac79           134582 restricted/binary-i386/Packages
+ e49b38cbf4dc409e8c25f6ab4b32fbe4              102 restricted/binary-i386/Release
+ 4a4dd3598707603b3f76a2378a4504aa               20 restricted/binary-powerpc/Packages.gz
+ 4059d198768f9f8dc9372dc1c54bc3c3               14 restricted/binary-powerpc/Packages.bz2
+ d41d8cd98f00b204e9800998ecf8427e                0 restricted/binary-powerpc/Packages
+ edb68a453747a9faa9e98389787fb79d              105 restricted/binary-powerpc/Release
+ d41d8cd98f00b204e9800998ecf8427e                0 restricted/debian-installer/binary-amd64/Packages
+ 4059d198768f9f8dc9372dc1c54bc3c3               14 restricted/debian-installer/binary-amd64/Packages.bz2
+ 4a4dd3598707603b3f76a2378a4504aa               20 restricted/debian-installer/binary-amd64/Packages.gz
+ 4a4dd3598707603b3f76a2378a4504aa               20 restricted/debian-installer/binary-armel/Packages.gz
+ 4059d198768f9f8dc9372dc1c54bc3c3               14 restricted/debian-installer/binary-armel/Packages.bz2
+ d41d8cd98f00b204e9800998ecf8427e                0 restricted/debian-installer/binary-armel/Packages
+ 4059d198768f9f8dc9372dc1c54bc3c3               14 restricted/debian-installer/binary-armhf/Packages.bz2
+ 4a4dd3598707603b3f76a2378a4504aa               20 restricted/debian-installer/binary-armhf/Packages.gz
+ d41d8cd98f00b204e9800998ecf8427e                0 restricted/debian-installer/binary-armhf/Packages
+ 4a4dd3598707603b3f76a2378a4504aa               20 restricted/debian-installer/binary-i386/Packages.gz
+ 4059d198768f9f8dc9372dc1c54bc3c3               14 restricted/debian-installer/binary-i386/Packages.bz2
+ d41d8cd98f00b204e9800998ecf8427e                0 restricted/debian-installer/binary-i386/Packages
+ 4a4dd3598707603b3f76a2378a4504aa               20 restricted/debian-installer/binary-powerpc/Packages.gz
+ 4059d198768f9f8dc9372dc1c54bc3c3               14 restricted/debian-installer/binary-powerpc/Packages.bz2
+ d41d8cd98f00b204e9800998ecf8427e                0 restricted/debian-installer/binary-powerpc/Packages
+ 39ef6c1d54f83252b07406f9cc3e9204             2596 restricted/i18n/Index
+ a76089a7a653d4f2196c38093058d1aa            19001 restricted/source/Sources
+ 3990b36e6ef2846251b58a58cde3768d             5470 restricted/source/Sources.bz2
+ f0a32107aaf12daf3e64b4dc3ee11321             5306 restricted/source/Sources.gz
+ 7871a3f6f83e033ab93c06bf886e305d              104 restricted/source/Release
+ 3464b1b15950e714151f8bb43982951e         25546870 universe/binary-amd64/Packages
+ 9340d5c4051da92820bb5bd5ba05f7a7          4785960 universe/binary-amd64/Packages.bz2
+ 1f6974aea9904921afdb4d1c5d0e8578          6166988 universe/binary-amd64/Packages.gz
+ 75ea366982b4862a41d9640687778dd2              101 universe/binary-amd64/Release
+ 5492f7f7183461d52f8d58871026c3e8              101 universe/binary-armel/Release
+ 420abe7ca02b5cb2abcd1b273efcfea9          4667308 universe/binary-armel/Packages.bz2
+ 4da3448f54e710222b26646b0bee14e8          6009219 universe/binary-armel/Packages.gz
+ e99405db74ba425a3f898fdda0a42113         24901082 universe/binary-armel/Packages
+ d0545845bbcff572a5c852b80582b269          5948128 universe/binary-armhf/Packages.gz
+ 8f0d262f1eb03fc3523cd80b3112a7e0              101 universe/binary-armhf/Release
+ a10169d0cc23f526bcee5769d27778b0          4618508 universe/binary-armhf/Packages.bz2
+ 952259d2cdb2c85df177702ac92075a0         24642528 universe/binary-armhf/Packages
+ df43c3b4ec37e79a00023475a09e2bfa          6179579 universe/binary-i386/Packages.gz
+ cc44a3e2ad759febb38ef2bec15ab29e         25568759 universe/binary-i386/Packages
+ 826b1d8609f0944a6d2ae95617e4d05a              100 universe/binary-i386/Release
+ 50690005918dd03ad9b71ffffa678d6f          4795820 universe/binary-i386/Packages.bz2
+ 8a1f21204f4178574251a2238c00f317         25188905 universe/binary-powerpc/Packages
+ 7409876b9e1238d5a147720b41233a26          6080488 universe/binary-powerpc/Packages.gz
+ 9bcc15c59aa3fbbd15f0d187fe90b353          4716652 universe/binary-powerpc/Packages.bz2
+ c3bdb05d2be1efa2dca9d2bac4e85b13              103 universe/binary-powerpc/Release
+ f8259410f0e1ad66324dbce895fdde2d            15255 universe/debian-installer/binary-amd64/Packages.bz2
+ ce60affbf23a069735c29951bfb0b818            17243 universe/debian-installer/binary-amd64/Packages.gz
+ 13ce59ecd4540ddef3670dbbed73cdbc            61801 universe/debian-installer/binary-amd64/Packages
+ 988da583db40ce21d400926641fe6ed8           113584 universe/debian-installer/binary-armel/Packages
+ 75381e3ed15a3a2fa1480fdea72cfd24            23193 universe/debian-installer/binary-armel/Packages.bz2
+ 4a8e6a98277f254660e8690fd050b232            27397 universe/debian-installer/binary-armel/Packages.gz
+ 02e7128ef42cd61e66c768520961fb11            20065 universe/debian-installer/binary-armhf/Packages.gz
+ 851afb686177a6819b291a714fa15813            17619 universe/debian-installer/binary-armhf/Packages.bz2
+ ce3b6645e37226c4047546a40675ecdd            76034 universe/debian-installer/binary-armhf/Packages
+ 229235ad9979a343e3bea9aedb5af8da            17260 universe/debian-installer/binary-i386/Packages.gz
+ 8065c9994844e578af00ef8794709b18            15272 universe/debian-installer/binary-i386/Packages.bz2
+ f28d6328611ab1e382fb0d0e798aca97            61718 universe/debian-installer/binary-i386/Packages
+ 60f54adbd38213dbbfe5d638f98a17e9            61121 universe/debian-installer/binary-powerpc/Packages
+ 1d48a07b3f4214200ff3eb1c5894e4a1            15024 universe/debian-installer/binary-powerpc/Packages.bz2
+ 51eb13c4b9baf089e4e8b0e85556b90e            16860 universe/debian-installer/binary-powerpc/Packages.gz
+ 155e0b646671f37a7fe235c4579e59f2             2922 universe/i18n/Index
+ 2ef7ccbe106edb394dc69d8511775122         21256524 universe/source/Sources
+ e52b7cb491cc6a950cd11fa6263d7330          5019105 universe/source/Sources.bz2
+ c722166709cfe9c398643b9c1a443610              102 universe/source/Release
+ 5ddd8bd0dda063b203d1a1da150983a0          6238766 universe/source/Sources.gz
+SHA1:
+ 0b326daa3b2ac8748ca10942aaec15ebdcc78b36          1640344 main/binary-amd64/Packages.gz
+ 8a6068a75feb86e12b088dad2478600f6670f2d7          7818931 main/binary-amd64/Packages
+ 19655f20d48d9819ad95f2c9ecc59e5b1d94c3d0               97 main/binary-amd64/Release
+ f9761ecf8536859ef38b670a7f17d83febec4a37          1272844 main/binary-amd64/Packages.bz2
+ a3a5faadbdf0a49d1587f07181b9eca870cb24ce               97 main/binary-armel/Release
+ 3c5d8f3a401427110adfd7f7d65513bfa47b933a          1619078 main/binary-armel/Packages.gz
+ 4d54e387978fdf829b4ff7336ed4d02e61c54d6a          1257389 main/binary-armel/Packages.bz2
+ 969dfd243cc3f514eea9914de571db28621cd9bd          7743353 main/binary-armel/Packages
+ f8f33265eab2ff9fd8a6353e014e36a9d318a54d               97 main/binary-armhf/Release
+ 1d210f8ad3547b771bc8c8d2a9eb5ee99d437d81          7620333 main/binary-armhf/Packages
+ 5057a8b2d11d2325bb2546ad6613517b208fff18          1257653 main/binary-armhf/Packages.bz2
+ 25fc010c2789028727308fbf6132a8da387423b8          1617483 main/binary-armhf/Packages.gz
+ 79369a31bc481f7f9f71f666906c3bdb356c44d8          1273857 main/binary-i386/Packages.bz2
+ aaadaa6eaf0b7e73b0d371cdebae573f28833a43          1641082 main/binary-i386/Packages.gz
+ 6f8e5e9dd04a2379a7c6d8dc23b4ff8df5584741               96 main/binary-i386/Release
+ 8509eead0c5e9410e23d4226ee5d190220db1275          7816415 main/binary-i386/Packages
+ 7da3fd8ad7102912a4cc9882c66fbb1b65edd4c0          1627734 main/binary-powerpc/Packages.gz
+ 8a0c3b7757b738a89644e8c5a3b9afed806d2f83               99 main/binary-powerpc/Release
+ 4063338a28f6504f7bc2f9c00fc34ac26fc5a1fa          1263942 main/binary-powerpc/Packages.bz2
+ 81844e44aaf0ed255ca200e7316bc9279ef238b6          7661552 main/binary-powerpc/Packages
+ d17439034551742aaa4762b4c174c1d72881f49f            62166 main/debian-installer/binary-amd64/Packages.gz
+ 05e024776b06a40253b9e252caad6dc4a13a90b9           234592 main/debian-installer/binary-amd64/Packages
+ fa692a307ecab69c106a5253107f980527cf58a9            48784 main/debian-installer/binary-amd64/Packages.bz2
+ fb8be98ef08265d2f101cf265b9bf37654d750ac            47964 main/debian-installer/binary-armel/Packages.bz2
+ 8953964fd2b54539e8276237cd5e4e2d4f9dc2ab           230310 main/debian-installer/binary-armel/Packages
+ cfdde60bbcbfb25c66fa474d28217e03a4c06789            61118 main/debian-installer/binary-armel/Packages.gz
+ 468306dc06acc828c50196427ba324c8ce225c79            62777 main/debian-installer/binary-armhf/Packages.gz
+ 17e7331a837675de31c365529ea9454cc48baf98            49051 main/debian-installer/binary-armhf/Packages.bz2
+ 3404140163a5acece9a054912abf72d11a5591d0           238862 main/debian-installer/binary-armhf/Packages
+ 2bb7e052999eadc333a9f6481bdc20acb238d4c1            52279 main/debian-installer/binary-i386/Packages.bz2
+ b2ad69cd6759724461c3566d91c1c5ec209eba07           259996 main/debian-installer/binary-i386/Packages
+ ebd0ab3923b3df4eca53eb863773bf0a9a4c3a67            67180 main/debian-installer/binary-i386/Packages.gz
+ eff551b62b72a1c0b183d4903a1452f2be08f3da           246636 main/debian-installer/binary-powerpc/Packages
+ 5c8aa09d48d7a792d555e7b16f4c89733e8441af            50309 main/debian-installer/binary-powerpc/Packages.bz2
+ 582a86208e89e77a7f284e10a50b9cceaf4358ee            64468 main/debian-installer/binary-powerpc/Packages.gz
+ f426621b1015147e766dc003d1d2f140dc9c062d             3706 main/i18n/Index
+ b22a946cdae39d29535a63b020c0f2ad74c3c992          4356187 main/source/Sources
+ 711225fd252e77d85c7bb992aeb5aa5e45414ae1           933770 main/source/Sources.bz2
+ a8807bf20dbaceb9d408f959840951131fd7d9f9          1174967 main/source/Sources.gz
+ cc2d2f6ce53597666df1a5ab216a08f08995f43f               98 main/source/Release
+ 06b070fc1ae771806c65e791742832320cc588e7           119109 multiverse/binary-amd64/Packages.bz2
+ ae591617f4b6f988d6534270d4c32e3f0876166b           151924 multiverse/binary-amd64/Packages.gz
+ a28786a87a6136fb74a005c480c78a152123b9c0           581550 multiverse/binary-amd64/Packages
+ 3860a3ce6d87bb8a43803a1048cc96d4de3ae8a7              103 multiverse/binary-amd64/Release
+ 4bae80c3f5270e45f825141bcadb94d7dd82cd0e           136295 multiverse/binary-armel/Packages.gz
+ 9534dfc2e4a40386f48eff79062ee1742212b7d3           519605 multiverse/binary-armel/Packages
+ 92d1536ae99c958afd74299ffe30bdc6800cd8d0              103 multiverse/binary-armel/Release
+ 8e3ec557dc8f750e82e8ed5cbb0c509182feba79           106873 multiverse/binary-armel/Packages.bz2
+ 009531e7cfb08701883a9e7a5f50235325e109cd           104529 multiverse/binary-armhf/Packages.bz2
+ 596a666233560852574d9bca0109f4933a12c949           505901 multiverse/binary-armhf/Packages
+ eca4ab620c41d76c00a9615d8530db5a9c918fe8              103 multiverse/binary-armhf/Release
+ 53916a24cff0523e218bfee2c5464866d2099042           133117 multiverse/binary-armhf/Packages.gz
+ a7518b6b3e693d840a49b125020785d2049e75b9           121196 multiverse/binary-i386/Packages.bz2
+ 84069f1643bd0092f4ec1b24eb921310532d72b2           591662 multiverse/binary-i386/Packages
+ 1d42b054d297b33cf69af011fa91f601c6b1a1b9              102 multiverse/binary-i386/Release
+ 8eae892b29234e9aac4c58a7098b097fe5ebde16           154762 multiverse/binary-i386/Packages.gz
+ 873bc8f864de428a4a47a3afaf53bc3a3a6e81c0              105 multiverse/binary-powerpc/Release
+ 665942774934afa56721d082a398735a067afe91           107209 multiverse/binary-powerpc/Packages.bz2
+ c965416be0f7bf88c78394becf4a72aee342b829           520882 multiverse/binary-powerpc/Packages
+ e304951d28df0b75065fd3ef8166c65415a3cad2           136930 multiverse/binary-powerpc/Packages.gz
+ da39a3ee5e6b4b0d3255bfef95601890afd80709                0 multiverse/debian-installer/binary-amd64/Packages
+ a0fddd5458378c1bf3c10dd2f5c060d1347741ed               20 multiverse/debian-installer/binary-amd64/Packages.gz
+ 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2               14 multiverse/debian-installer/binary-amd64/Packages.bz2
+ 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2               14 multiverse/debian-installer/binary-armel/Packages.bz2
+ da39a3ee5e6b4b0d3255bfef95601890afd80709                0 multiverse/debian-installer/binary-armel/Packages
+ a0fddd5458378c1bf3c10dd2f5c060d1347741ed               20 multiverse/debian-installer/binary-armel/Packages.gz
+ a0fddd5458378c1bf3c10dd2f5c060d1347741ed               20 multiverse/debian-installer/binary-armhf/Packages.gz
+ da39a3ee5e6b4b0d3255bfef95601890afd80709                0 multiverse/debian-installer/binary-armhf/Packages
+ 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2               14 multiverse/debian-installer/binary-armhf/Packages.bz2
+ 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2               14 multiverse/debian-installer/binary-i386/Packages.bz2
+ a0fddd5458378c1bf3c10dd2f5c060d1347741ed               20 multiverse/debian-installer/binary-i386/Packages.gz
+ da39a3ee5e6b4b0d3255bfef95601890afd80709                0 multiverse/debian-installer/binary-i386/Packages
+ a0fddd5458378c1bf3c10dd2f5c060d1347741ed               20 multiverse/debian-installer/binary-powerpc/Packages.gz
+ da39a3ee5e6b4b0d3255bfef95601890afd80709                0 multiverse/debian-installer/binary-powerpc/Packages
+ 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2               14 multiverse/debian-installer/binary-powerpc/Packages.bz2
+ 09a8aff01c419e0eae19749acf3b223e1f95eccc             2676 multiverse/i18n/Index
+ a088c61bca210afebf4c53904049e2a969d8ece3           154990 multiverse/source/Sources.bz2
+ df4078a91645024ce93b1ee363003c83ffa2aa84           628753 multiverse/source/Sources
+ e6ec0430d594fa7fa2c98cb9a5fa8ac7ed0d506d           188325 multiverse/source/Sources.gz
+ 0750588f28b1c2cf6a005501c7d027cfa663cce1              104 multiverse/source/Release
+ 200fdeee1984ac78b6fdabfad34d2b485512ca2d             9098 restricted/binary-amd64/Packages.gz
+ 0e7ebd3d2690c7f89d19f8b337cf292cac913c18           134705 restricted/binary-amd64/Packages
+ c968d68baa554ffc7009688ee7d0d3e70663243c              103 restricted/binary-amd64/Release
+ 4185a5b6c2e702ea4754437ebfef23d828ec67a0             8452 restricted/binary-amd64/Packages.bz2
+ 27886dcc6c7d08369cc65d4c35f26b806f57be56              103 restricted/binary-armel/Release
+ a0fddd5458378c1bf3c10dd2f5c060d1347741ed               20 restricted/binary-armel/Packages.gz
+ 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2               14 restricted/binary-armel/Packages.bz2
+ da39a3ee5e6b4b0d3255bfef95601890afd80709                0 restricted/binary-armel/Packages
+ d83803a5f6c2f5c7321d68d126733b6015c8e2a9              103 restricted/binary-armhf/Release
+ 6607111b78dcd3de05cb88692c1e2142abf9a4c1             1103 restricted/binary-armhf/Packages.bz2
+ b9f55d161632f89b5125a638ca6ad4fe5e9d11fe             2477 restricted/binary-armhf/Packages
+ d0c0a616aeac580d13256693cfbd507ae7c9b280              941 restricted/binary-armhf/Packages.gz
+ f3e483bbe77cbf0f64accbd0291df19b4e4d694b             9108 restricted/binary-i386/Packages.gz
+ 48d76b03a19e4d66d6f7a20339dab91acebaba99             8431 restricted/binary-i386/Packages.bz2
+ 3ca46ea8f32b7cbc49ce76dd1c1ab91589900fd7           134582 restricted/binary-i386/Packages
+ 2aad61f5084ecdd64ff520520d77e980e8b21f81              102 restricted/binary-i386/Release
+ a0fddd5458378c1bf3c10dd2f5c060d1347741ed               20 restricted/binary-powerpc/Packages.gz
+ 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2               14 restricted/binary-powerpc/Packages.bz2
+ da39a3ee5e6b4b0d3255bfef95601890afd80709                0 restricted/binary-powerpc/Packages
+ 6b0a230bbf47463e3d7e88f535e210aaa96a1251              105 restricted/binary-powerpc/Release
+ da39a3ee5e6b4b0d3255bfef95601890afd80709                0 restricted/debian-installer/binary-amd64/Packages
+ 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2               14 restricted/debian-installer/binary-amd64/Packages.bz2
+ a0fddd5458378c1bf3c10dd2f5c060d1347741ed               20 restricted/debian-installer/binary-amd64/Packages.gz
+ a0fddd5458378c1bf3c10dd2f5c060d1347741ed               20 restricted/debian-installer/binary-armel/Packages.gz
+ 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2               14 restricted/debian-installer/binary-armel/Packages.bz2
+ da39a3ee5e6b4b0d3255bfef95601890afd80709                0 restricted/debian-installer/binary-armel/Packages
+ 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2               14 restricted/debian-installer/binary-armhf/Packages.bz2
+ a0fddd5458378c1bf3c10dd2f5c060d1347741ed               20 restricted/debian-installer/binary-armhf/Packages.gz
+ da39a3ee5e6b4b0d3255bfef95601890afd80709                0 restricted/debian-installer/binary-armhf/Packages
+ a0fddd5458378c1bf3c10dd2f5c060d1347741ed               20 restricted/debian-installer/binary-i386/Packages.gz
+ 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2               14 restricted/debian-installer/binary-i386/Packages.bz2
+ da39a3ee5e6b4b0d3255bfef95601890afd80709                0 restricted/debian-installer/binary-i386/Packages
+ a0fddd5458378c1bf3c10dd2f5c060d1347741ed               20 restricted/debian-installer/binary-powerpc/Packages.gz
+ 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2               14 restricted/debian-installer/binary-powerpc/Packages.bz2
+ da39a3ee5e6b4b0d3255bfef95601890afd80709                0 restricted/debian-installer/binary-powerpc/Packages
+ d59f5ac2532dcc7cb2f1e5b788c700bf8ab13b66             2596 restricted/i18n/Index
+ 8a80cdcf50cdcabcf4f47c772d7b252587cc9dc1            19001 restricted/source/Sources
+ ff7d82cf1d965953c745d224a1d4adc67b586528             5470 restricted/source/Sources.bz2
+ f64da9da2038712c5d73ce3337e91d92ee39cd30             5306 restricted/source/Sources.gz
+ 5c963f5f4d4720afa5fbb914375d0033bcd50078              104 restricted/source/Release
+ 10c6989f4a241aabe00146905e776391fc4d9ac0         25546870 universe/binary-amd64/Packages
+ f6900616102430e0eafa8ac89795efff7edc0710          4785960 universe/binary-amd64/Packages.bz2
+ 4f938bde9dff32a49bccd917613666017185882d          6166988 universe/binary-amd64/Packages.gz
+ 9d6cba1ed46b5eee1f6c065934e5f4854b3efee5              101 universe/binary-amd64/Release
+ 3573e863c714c0a083f9c962ea9136916f796e92              101 universe/binary-armel/Release
+ bb8f53ead3723737c13950e5343327884f737da9          4667308 universe/binary-armel/Packages.bz2
+ 43d9a98706b6e50c21092ce35313b5b034f30d01          6009219 universe/binary-armel/Packages.gz
+ 7f97dcbe710882d281efcfd2f8d70ca7d4e47265         24901082 universe/binary-armel/Packages
+ 8f6d42d7f8178a51a7065d7bf3234eecbca12810          5948128 universe/binary-armhf/Packages.gz
+ ea648f433d0edd47de820582fa6a1cd89ef66681              101 universe/binary-armhf/Release
+ e6ad9bdb18ce9e09e262b9e6f85b0b307a3456f1          4618508 universe/binary-armhf/Packages.bz2
+ ba55530da6c3a9604977ea4a37b4b4d8943ff994         24642528 universe/binary-armhf/Packages
+ 05de59263866a33c104787943347164e7b124aba          6179579 universe/binary-i386/Packages.gz
+ 286a3dd2fda0d98d2ff14eafee0bba5c912d6df2         25568759 universe/binary-i386/Packages
+ 839529b6f6e2a64465e4a825fa5ad46a36f1c73d              100 universe/binary-i386/Release
+ 70c27be4d8bc87dc26bbe6f21fbb7328dc1c4d01          4795820 universe/binary-i386/Packages.bz2
+ 06af7fdef1a54920a7667728a7b810553d00a9c8         25188905 universe/binary-powerpc/Packages
+ 4df1b07075b25ccae6e60d26d5a5761444ece689          6080488 universe/binary-powerpc/Packages.gz
+ 15d041ad1284527b07f75218cf6eb32322092f84          4716652 universe/binary-powerpc/Packages.bz2
+ 42d6a46ed2e525b219f8f6dc076dadbd06fc7f1b              103 universe/binary-powerpc/Release
+ 92c3bef6ad40051021a4e9dadb16e5edc7410b57            15255 universe/debian-installer/binary-amd64/Packages.bz2
+ 31d8725b0d238c282d9b572bb56b7e45c0ff53f8            17243 universe/debian-installer/binary-amd64/Packages.gz
+ e334a7c80e14dae3055950d9e45213db65d4087b            61801 universe/debian-installer/binary-amd64/Packages
+ 1fd1ae2b87eb85525b173ea982d15f3c98e6e33d           113584 universe/debian-installer/binary-armel/Packages
+ c56579feb77b5aac2d261abbbb6c89a1458ca4d9            23193 universe/debian-installer/binary-armel/Packages.bz2
+ e4b08e57397f3ab0599e0bf6a2fbcba3aed438b5            27397 universe/debian-installer/binary-armel/Packages.gz
+ 5a9608213061eab983392258288e8aec36d006f0            20065 universe/debian-installer/binary-armhf/Packages.gz
+ dc558d56aef72991a3188909a14f752aabdee325            17619 universe/debian-installer/binary-armhf/Packages.bz2
+ c6afa0e14c706aceea60aad033b6a067320fc165            76034 universe/debian-installer/binary-armhf/Packages
+ f359cf916a19055133546a7b7f3e35c7c260488e            17260 universe/debian-installer/binary-i386/Packages.gz
+ 23920ee4974d88ba824b0e884f8df6e2711a20db            15272 universe/debian-installer/binary-i386/Packages.bz2
+ 21cfd020eefc848307fac14b8f0efe0d6cd9c6ea            61718 universe/debian-installer/binary-i386/Packages
+ f2ff72c8f1fe4ce40ccf44f8ccd6623cedf4e6f0            61121 universe/debian-installer/binary-powerpc/Packages
+ bd9c731941b261b22c022d97ca139bfeb1ad70ba            15024 universe/debian-installer/binary-powerpc/Packages.bz2
+ e173071bda799068783c9192bff6536db9790a27            16860 universe/debian-installer/binary-powerpc/Packages.gz
+ 59a86abaed7cab292600b6766b18752b7e7c3d49             2922 universe/i18n/Index
+ 4b0ed5f327b0fa9b3f9d9410933a3d2afe467a7e         21256524 universe/source/Sources
+ d0525203f9ad5ec9183996e6765d0ef9a024691f          5019105 universe/source/Sources.bz2
+ 00847d46051ba44d436000b0394b218503de125b              102 universe/source/Release
+ d9706a8ab2ffeadb51b50d042712536a95dc4343          6238766 universe/source/Sources.gz
+SHA256:
+ 0d61aacd269015c0abfe01fe7f90a4f534c368e9c513f7e90d3111af82656b3d          1640344 main/binary-amd64/Packages.gz
+ a1bc8d839ca9966a0b924e4a4c60f1c23b4d431deb81e1bc529edf95f30fc29d          7818931 main/binary-amd64/Packages
+ a55d3b2e6e2a175529d73e6ca92989018cf57745e705f7ff675b05f80e5141f7               97 main/binary-amd64/Release
+ cc0d3a19c51188b4b4acb80e3013264462c6e0f60759bfd46206c60681bd4ba9          1272844 main/binary-amd64/Packages.bz2
+ a841750f49bd11f99b9dae6941d2fa6ec1fd87906139d0ceeacf0d4df57a87cf               97 main/binary-armel/Release
+ e80eaf12c1aa520b353de8ad97e79364779e82ef011cb93db372edc900eb7be9          1619078 main/binary-armel/Packages.gz
+ 0ab0929c3c44837886e532f8ec4bee77f3664bdcc2cc3192a02b991c52b156ce          1257389 main/binary-armel/Packages.bz2
+ ea400cf67f84c12265e4bf419de442a38880fab37d76999985972fc6df3e13b3          7743353 main/binary-armel/Packages
+ f3c40f057bb085f28ef2ed950f62366483d2a418571435c355dc27c0912dccff               97 main/binary-armhf/Release
+ cde037224f43e4619213c5195f2ea5c2f91d078f449579652dbd4128793d5062          7620333 main/binary-armhf/Packages
+ 7c6ea67e609b96dec6f2185df4cd81160e37ba467f9132a9bfb101da3f9a0468          1257653 main/binary-armhf/Packages.bz2
+ 2b83bf5501ecae3347e5c96658edae7d48eef42108b4786471a3de241e75e7d3          1617483 main/binary-armhf/Packages.gz
+ 4d74c53917b84d37cb3277e2b755672a8733e2cfaf949f6e644e6e88094cdaa2          1273857 main/binary-i386/Packages.bz2
+ 07f33bddfefdb4a0c44ddee59fd3eca497df2ad0456e0eeade136e4f0302ee3c          1641082 main/binary-i386/Packages.gz
+ 5182e22f799fe66c8db6dfb073fb040e9e583d88bb9d4d77e058b2afb87e9479               96 main/binary-i386/Release
+ 4cecfc8c0d2113d51b03afa8fdcdcc963d9ad74474696472ec1cdbdb38b856e2          7816415 main/binary-i386/Packages
+ 2795904625f466b4a2fb96d41c00b000ab7f2bdc7f288b0c9ef1283d7e110f87          1627734 main/binary-powerpc/Packages.gz
+ a9247e6d8b0c5977bc1e72be09b1f42a83b5f5a6a70b17f4fef35a0657e3c206               99 main/binary-powerpc/Release
+ 6e745b7edcd67755fa09f54cc3afdd0ffbd0475302a74293472e97e46ba75ddc          1263942 main/binary-powerpc/Packages.bz2
+ 8b953dbae4a14e7ab47151044a47c7b0f0e1dd2a6480170b8172e00d9dad7a2a          7661552 main/binary-powerpc/Packages
+ a5bdf4116ecfeda052d5b3751138c6153e814ac58b2f551503f3ed90e6c3510c            62166 main/debian-installer/binary-amd64/Packages.gz
+ 6a9a4837a4a7df3e7e0566b354b7f1dd2dcf46254335ae3d06a72538f85e410a           234592 main/debian-installer/binary-amd64/Packages
+ 0da4f8190eebfef22103f1f6f7051adbe9489d454ab7224f09d05646407881e8            48784 main/debian-installer/binary-amd64/Packages.bz2
+ ea01244357deb22c2a4bd7eaa34a1635c0915b89ce174f312c0e0a4b081eaf30            47964 main/debian-installer/binary-armel/Packages.bz2
+ 4177b0519c75f7f950e5a0f0d72d40cc0c4ccf29ebe89fbb9bc1f11a80874526           230310 main/debian-installer/binary-armel/Packages
+ 2b6f81ef9fa687bfb2eb56bb3e90faef0c012351d096b141caa710fd50846043            61118 main/debian-installer/binary-armel/Packages.gz
+ 52c834247ff3a5475466e647802f6eff393f85589e5da5fd3e5b497669b8b49c            62777 main/debian-installer/binary-armhf/Packages.gz
+ 7090f1ad1307a012fbfff883885f16099ed66ebffdeece356f837e632b177a4f            49051 main/debian-installer/binary-armhf/Packages.bz2
+ 4bae13f507993e977c279937406fc03e37fede7805a92508f6d3cba76f1aaf95           238862 main/debian-installer/binary-armhf/Packages
+ d1d23926ff15cfaa6160c5fd0327d181721093fbd2f2e8125be5559a991a81a8            52279 main/debian-installer/binary-i386/Packages.bz2
+ 30e0ec7a2c3d47d5501de8414b436482ff523e9c4983b536b2c9911a30618b98           259996 main/debian-installer/binary-i386/Packages
+ 7a4dcb001ed4bb5fa2458af901de312e11a745bc86a0f877e47567d0f911bc0d            67180 main/debian-installer/binary-i386/Packages.gz
+ 30c2f590c2dedc9f78dfc7f0026b51bc9baa712ac8c9310404d9d6577af77d90           246636 main/debian-installer/binary-powerpc/Packages
+ 6c53fab780cf774c5cabb1788eea1e3446c528cde4352d106907f4ec22449370            50309 main/debian-installer/binary-powerpc/Packages.bz2
+ b003f3fbf2fa6dbf7d47cf3fbd029ecd86b316ec497a9ac4eea3614cf4ec76af            64468 main/debian-installer/binary-powerpc/Packages.gz
+ fefed230e286d832ab6eb0fb7b72442165b50df23a68402ae6e9d265a31920a2             3706 main/i18n/Index
+ bb618cebb361a2a7148be0bad9af012c8d9de23dbc32d6d9ba035fa6ee0078ab          4356187 main/source/Sources
+ 0aeef2c2258136f9f774c36a158cf759389acf6a35a3153a03d3fa41d4f346d5           933770 main/source/Sources.bz2
+ 4a058ba65244e8eaf17d159b72edebe4e621d54c274a82d4a973b358b4af9a28          1174967 main/source/Sources.gz
+ 864ba9a26e348c6297c08c047d8c228e5ed031ec3d46ef7aad93c3fa550395a8               98 main/source/Release
+ 85477d2b2e7ea2f46b6a059f7526cf52d75fea1a5120aa3b256c576e904d40ff           119109 multiverse/binary-amd64/Packages.bz2
+ 2967ae6c1cc065bec03225d808b4511b138cc13b8de801a0562fec6e30710f36           151924 multiverse/binary-amd64/Packages.gz
+ 18fcf61bb74ef2a01c3d4a8d4646a75836f43244168b43d6ae202f368167b224           581550 multiverse/binary-amd64/Packages
+ fbc4931ef84d50a39da65d110f787aee274df8819a758a3c0aa1ff13f0ba6ee0              103 multiverse/binary-amd64/Release
+ 49f48a34696d08a13a0fdc19a0f6896af2cb477e72860a8880954926c7d45e60           136295 multiverse/binary-armel/Packages.gz
+ f20d7f0bc32b5b2fbcb442f7c128aaad7e18aece3781d53f560932bb191d6830           519605 multiverse/binary-armel/Packages
+ f7ea72b2c07af81f2e342414025dce7a658a6a9915c4d8adc13b992cb3b9fd2f              103 multiverse/binary-armel/Release
+ dd3d4e8a6ec9055d5b553af49822de74648f071ceb0fd314d6cd1aaf7ad6882b           106873 multiverse/binary-armel/Packages.bz2
+ 567c1f9d30a4d6650552d66c5fb43d2d8910d3fed69793daed622d2c699f4bc8           104529 multiverse/binary-armhf/Packages.bz2
+ a47ef2c0a68adeb70a0bc6b22c94b08402396ff6f5c77664e06c2fb7ee0e7ab0           505901 multiverse/binary-armhf/Packages
+ 6b95e8edaa2bb799f6e15a4a6aaf223da0faea670cd03340395bdcea90205afc              103 multiverse/binary-armhf/Release
+ 14721b333f19a6344addb185f161d1cd14e04ac284c8fa9d726064ec228269a8           133117 multiverse/binary-armhf/Packages.gz
+ 454436f374186007075445c1f206ba5c926f30609baa732c495f1ba456d71e59           121196 multiverse/binary-i386/Packages.bz2
+ 9fabd7bfdbfd216968f7a17265e5609cdd72f1ea7c8f50941e294694e76b180d           591662 multiverse/binary-i386/Packages
+ 7141881b898ac6a78f1ca6f3e81481ee6657f6762fa22768816ab39f6b17e695              102 multiverse/binary-i386/Release
+ 3f4cae31df741f55d523ecea758d05a7e012a205bb03974ee20eb09e3f4fa63b           154762 multiverse/binary-i386/Packages.gz
+ 332dde644a8467496eb5f45ffd2d735ca61ea781da21cd205b3267cd83fa0563              105 multiverse/binary-powerpc/Release
+ 99ef0a611aa32ffa4f16a006d641fbd8dd9e3e73bde3c93b831cd6583746e64b           107209 multiverse/binary-powerpc/Packages.bz2
+ 60f2431dab7bd02fe2c2428bf400c3535be49641cc9d5645a8f1b4fd44f5086f           520882 multiverse/binary-powerpc/Packages
+ cacfd10b40992a617ce32c479f9505531c8cc57e4cf964687d663a5f41f8dcbd           136930 multiverse/binary-powerpc/Packages.gz
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 multiverse/debian-installer/binary-amd64/Packages
+ f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec               20 multiverse/debian-installer/binary-amd64/Packages.gz
+ d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058               14 multiverse/debian-installer/binary-amd64/Packages.bz2
+ d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058               14 multiverse/debian-installer/binary-armel/Packages.bz2
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 multiverse/debian-installer/binary-armel/Packages
+ f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec               20 multiverse/debian-installer/binary-armel/Packages.gz
+ f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec               20 multiverse/debian-installer/binary-armhf/Packages.gz
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 multiverse/debian-installer/binary-armhf/Packages
+ d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058               14 multiverse/debian-installer/binary-armhf/Packages.bz2
+ d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058               14 multiverse/debian-installer/binary-i386/Packages.bz2
+ f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec               20 multiverse/debian-installer/binary-i386/Packages.gz
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 multiverse/debian-installer/binary-i386/Packages
+ f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec               20 multiverse/debian-installer/binary-powerpc/Packages.gz
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 multiverse/debian-installer/binary-powerpc/Packages
+ d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058               14 multiverse/debian-installer/binary-powerpc/Packages.bz2
+ f0b16a5cfd2d633c9ddecfadfa6742544b18c23ed30023286e2b20ef29f33c73             2676 multiverse/i18n/Index
+ faa0360612fc00453dfdd55b6a1bb20e4f876e041ad6fca410d5da65608ab31e           154990 multiverse/source/Sources.bz2
+ 2f0deae62e2cf7e5257bbd858cb0bf2a94122c4eb82be13e13768d0b9ce84c9e           628753 multiverse/source/Sources
+ 28f6d95fcba03e442cf24dc547653d5ec60177a29d7cfea771efcc5501077747           188325 multiverse/source/Sources.gz
+ f35f721bf16691842cc916c3563fab535f6bb83329f40c33ac02f4ba637707d3              104 multiverse/source/Release
+ 3e872fa356cbce4dfd75a88caa4fc6b47616e1fc7d224f4fc2123650fd7f4be3             9098 restricted/binary-amd64/Packages.gz
+ 459a26c3ef3cb5db8c8355ea6abfa8cfe0a7a266a197929d86d37686daf8a337           134705 restricted/binary-amd64/Packages
+ ea47572182da041b46543e471cb7a6fcc4e001fbe19a27740085ebf5d77252a9              103 restricted/binary-amd64/Release
+ adb08d7f0fa444f2869e8d932db7adb1515839f11af6032284cf1e20060e2dd6             8452 restricted/binary-amd64/Packages.bz2
+ 65a5ac0820d61383f7dcf33699aa029b5965b7906bc8341f94f8f7f354cdcd83              103 restricted/binary-armel/Release
+ f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec               20 restricted/binary-armel/Packages.gz
+ d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058               14 restricted/binary-armel/Packages.bz2
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 restricted/binary-armel/Packages
+ ee447ce81793bd3bc8c127d4e065c6ec24e5901573dffb7cc5abedfbcb86592c              103 restricted/binary-armhf/Release
+ d88ed7df97cd60cdce35c3ca81de66e2bedf0f22e67ec8922dbd5eca545b5e50             1103 restricted/binary-armhf/Packages.bz2
+ 9ade66f4a49598fb371705a79244e5f3abb74c04467f9f9954641ae5acec6766             2477 restricted/binary-armhf/Packages
+ 03d8b64c445f327ce9e369bca815652844bd6aafb344d0287fb4e71f321d0414              941 restricted/binary-armhf/Packages.gz
+ 07e344ed07234876c3fddd9aa763e04bfc2e013fc18428738be71abfb9e1ca77             9108 restricted/binary-i386/Packages.gz
+ 8061335b923c49e72a2b60b437d5bbad1b98a45ac178a68fd8359cec9fad27ec             8431 restricted/binary-i386/Packages.bz2
+ 122336146860047af3d5817dbc423f01d57a90cbf41db1ee0ad9235c0559a43e           134582 restricted/binary-i386/Packages
+ 58634ed42b6fadb280d48f419b960e28151320a62b4486e520ca327719db554a              102 restricted/binary-i386/Release
+ f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec               20 restricted/binary-powerpc/Packages.gz
+ d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058               14 restricted/binary-powerpc/Packages.bz2
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 restricted/binary-powerpc/Packages
+ d9bce398e46f0eac57d1d33fd8a6caa0bd7ab6334508c0640956cb7adbe1eba1              105 restricted/binary-powerpc/Release
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 restricted/debian-installer/binary-amd64/Packages
+ d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058               14 restricted/debian-installer/binary-amd64/Packages.bz2
+ f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec               20 restricted/debian-installer/binary-amd64/Packages.gz
+ f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec               20 restricted/debian-installer/binary-armel/Packages.gz
+ d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058               14 restricted/debian-installer/binary-armel/Packages.bz2
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 restricted/debian-installer/binary-armel/Packages
+ d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058               14 restricted/debian-installer/binary-armhf/Packages.bz2
+ f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec               20 restricted/debian-installer/binary-armhf/Packages.gz
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 restricted/debian-installer/binary-armhf/Packages
+ f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec               20 restricted/debian-installer/binary-i386/Packages.gz
+ d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058               14 restricted/debian-installer/binary-i386/Packages.bz2
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 restricted/debian-installer/binary-i386/Packages
+ f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec               20 restricted/debian-installer/binary-powerpc/Packages.gz
+ d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058               14 restricted/debian-installer/binary-powerpc/Packages.bz2
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855                0 restricted/debian-installer/binary-powerpc/Packages
+ 17dde58abfdb4dfdad9c8a82db09c9dbc3d8a7cd84b51dd9167579d6899e9ff5             2596 restricted/i18n/Index
+ ee3655459e45778fdfa06fb649565e66b25d2dd0870c75890005fb3597bb71d7            19001 restricted/source/Sources
+ cff18d2ad74ead8712f1b77a23b32e84e54269b03ba2a409ae4227860d1181f5             5470 restricted/source/Sources.bz2
+ cf085bdcb323dd2c2a599ddb7a9b3ae7bd37121f42024d68b367a4f735df900f             5306 restricted/source/Sources.gz
+ 9137393fc24cf64808d55ca7665bc5a7bd46b48918e6720a95ba239a8fab092e              104 restricted/source/Release
+ 901469729d2354891be94c192dabd8c1d0bc31e1497ea8360b70d2e847c1f3c1         25546870 universe/binary-amd64/Packages
+ 799347395d4e011a215aa5ce0c9006449d8af884795ffbce7a35767a55f99074          4785960 universe/binary-amd64/Packages.bz2
+ 68b08847604c4efe7d6f56ba79f923ce0ab82127dfcc6e8cffaf12af25d7adba          6166988 universe/binary-amd64/Packages.gz
+ 52ffdd1777a886edc5e1e1ef430b03a72937920f9722fd453ee8243cb0aac860              101 universe/binary-amd64/Release
+ a78a1304e105b2fe4c950c77c1794f715c1256d14d8541cca8f5cd13db48119e              101 universe/binary-armel/Release
+ d6d4bfa5d0891086f5a4f2aabfaecd7a1e0c0d8b46aef33b3470e349e7a9210e          4667308 universe/binary-armel/Packages.bz2
+ 374d50d0335c655da46f9cd54cd00d9a20058d2fe7c56989aa121b49883cfb88          6009219 universe/binary-armel/Packages.gz
+ ab5073e90417b729d1fe3b68052e6a8e66e48986c35470944f6a58676e967450         24901082 universe/binary-armel/Packages
+ af74034d1a3e1f90745dc48b996a98c471d997b12a1d810eb8754088540591d7          5948128 universe/binary-armhf/Packages.gz
+ 6697d196b35850817476e884fdc013d9670b4bac73310c54a4d62cd810f02c70              101 universe/binary-armhf/Release
+ 1ca17d3aecec2325cba53e1c299aeb6a1fed01d7acbc40163595de9e651abdeb          4618508 universe/binary-armhf/Packages.bz2
+ 2b422ffa77d4374650d4cc543c5a1123b2535effb2c8cdaf25fd77d1dde632c4         24642528 universe/binary-armhf/Packages
+ cd6b5cb8165553482abee1bf85e5cd3288abadccb6acf34239ec45f79a090784          6179579 universe/binary-i386/Packages.gz
+ 8ef7db20ba08cf1b4d98a618189c615c69865f4da025ac654e3e6b8a4382a3ae         25568759 universe/binary-i386/Packages
+ 06af492500145bd64762d885417d167269db6ea03022c6968f1a5d0515ac55dd              100 universe/binary-i386/Release
+ 530a2efb8051a63ed17431ae0c7243df79ecb418acf1dadc2487cd6fd79fb420          4795820 universe/binary-i386/Packages.bz2
+ 1e8fa52a64292d2c73cee0645d0eed5583ea7cc1138af4744838c6833716d638         25188905 universe/binary-powerpc/Packages
+ 5d2b8e23e0a16f13e25595b63807fb64afd9074aadf7a37b8e238b2011e894b8          6080488 universe/binary-powerpc/Packages.gz
+ eb482b008c8c882b349230abaa812ed6e545a2ef9132bb0d3d3bffa74da0c6c7          4716652 universe/binary-powerpc/Packages.bz2
+ 98d44cc7544f79c18b8e8ea697d476e9b85d91088385b643c82d4064b21f4657              103 universe/binary-powerpc/Release
+ 3da2d1e57aaca628148e2688a951cbb784a9a54b7f6b1f84d530add1b66fcceb            15255 universe/debian-installer/binary-amd64/Packages.bz2
+ 43f891ac590f44fde5854de9ba15222c088b70562f5dc4ff26064909e60cf62e            17243 universe/debian-installer/binary-amd64/Packages.gz
+ 3084a8a441e961eeb3865ff411557166ec105be86a55df268cdb6725f49e1f67            61801 universe/debian-installer/binary-amd64/Packages
+ a1ff01f18766744f36d0774a68d8a89355246c585c4b28ee18e5e139fafae530           113584 universe/debian-installer/binary-armel/Packages
+ e0713f86f5f5121deb60ce61d774951468625184a7ae9576f81d70202ef585b7            23193 universe/debian-installer/binary-armel/Packages.bz2
+ 5a8411e2b0648e553fa25ac82ea83fb17dd2d2a77bd10cec14cab12f5582d4c4            27397 universe/debian-installer/binary-armel/Packages.gz
+ b79c86d926c3129f5c27e50185157a78d85abde8ada90a9910338e660c4318be            20065 universe/debian-installer/binary-armhf/Packages.gz
+ b2113b25380423be8f6202a4860479e44a00072e46fa035f0da2f3a5a280de20            17619 universe/debian-installer/binary-armhf/Packages.bz2
+ 3f023d2cc55d6ebab883f6f2d7305a4e3564f918f63ca4f745d6fd1318e67ab7            76034 universe/debian-installer/binary-armhf/Packages
+ 5ea61a62a3e8fc755c22e23c9d87b20924707c0986a490458472a3d7e9cbe117            17260 universe/debian-installer/binary-i386/Packages.gz
+ 7a90b014c655311e92de1ea4cf24e100665c564a2ed699df63d17c82ad9e1349            15272 universe/debian-installer/binary-i386/Packages.bz2
+ 7e39417ce073e3a35d048847a29a0414af69c4e923c018dc22438319c79adea5            61718 universe/debian-installer/binary-i386/Packages
+ cdf17a791544d0c522fa853a23b317deffa76ac643e88bec0b84b0aa5afe957b            61121 universe/debian-installer/binary-powerpc/Packages
+ b470146da791dc4f4593d2bb00ea4e305d6f55f346a5f3ac6755d890a3318080            15024 universe/debian-installer/binary-powerpc/Packages.bz2
+ 810d1590d1cd7298e1fd5465f85ba49b6ae79780b42d8e8b68aebb42283785ea            16860 universe/debian-installer/binary-powerpc/Packages.gz
+ 563a55a892e1ec8bf565e3294c033b4e8dbbbe4651e73733eac7338db77282f7             2922 universe/i18n/Index
+ 7bc01d4f10bbcf882ce6931aa9371b2de6b35277efc2ae52e233280dcd12a18d         21256524 universe/source/Sources
+ 95135631873f4dce05ba657478475033d02462bbb8f7263832585d1decb5c9b8          5019105 universe/source/Sources.bz2
+ 0fd2ae580be352cb8ab4bb87e5504b78f78bcb7249b644719b3c2db3b5d3ca8c              102 universe/source/Release
+ d1dd96015e24dd369ea22413a2b876686a60c5d9d91958a5df3745a66289910f          6238766 universe/source/Sources.gz
diff --git a/tests/data/tagfile/history.1.log.gz b/tests/data/tagfile/history.1.log.gz
new file mode 100644
index 00000000..4174e02b
--- /dev/null
+++ b/tests/data/tagfile/history.1.log.gz
diff --git a/tests/data/tagfile/history.log b/tests/data/tagfile/history.log
new file mode 100644
index 00000000..f1d72665
--- /dev/null
+++ b/tests/data/tagfile/history.log
@@ -0,0 +1,15 @@
+
+Start-Date: 2012-02-01  13:54:52
+Commandline: apt-get install chromium-browser
+Install: chromium-browser:amd64 (16.0.912.77~r118311-0ubuntu1), chromium-browser-l10n:amd64 (16.0.912.77~r118311-0ubuntu1, automatic), chromium-codecs-ffmpeg:amd64 (16.0.912.77~r118311-0ubuntu1, automatic)
+End-Date: 2012-02-01  13:55:01
+
+Start-Date: 2012-02-02  10:39:04
+Commandline: apt-get install python-geoclue
+Install: python-geoclue:amd64 (0.1.0-4build1)
+End-Date: 2012-02-02  10:39:08
+
+Start-Date: 2012-02-03  10:20:50
+Commandline: apt-get install python-qt4
+Install: python-qt4:amd64 (4.9-3ubuntu1)
+End-Date: 2012-02-03  10:20:55
diff --git a/tests/data/test-provides/etc/apt/sources.list b/tests/data/test-provides/etc/apt/sources.list
new file mode 100644
index 00000000..2955b5c3
--- /dev/null
+++ b/tests/data/test-provides/etc/apt/sources.list
@@ -0,0 +1 @@
+deb http://archive.ubuntu.com/ubuntu oneiric main
diff --git a/tests/data/test-provides/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_oneiric_main_binary-i386_Packages b/tests/data/test-provides/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_oneiric_main_binary-i386_Packages
new file mode 100644
index 00000000..f991cb96
--- /dev/null
+++ b/tests/data/test-provides/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_oneiric_main_binary-i386_Packages
@@ -0,0 +1,75 @@
+Package: exim4-daemon-light
+Priority: extra
+Section: mail
+Installed-Size: 1092
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: Exim4 Maintainers <pkg-exim4-maintainers@lists.alioth.debian.org>
+Architecture: all
+Source: exim4
+Version: 4.76-2ubuntu1
+Replaces:  mail-transport-agent
+Provides:  mail-transport-agent
+Conflicts: mail-transport-agent
+Filename: pool/main/e/exim4/exim4-daemon-light_4.76-2ubuntu1_i386.deb
+Size: 451088
+MD5sum: 81795887e233ecfb3471e8a3da4c4b8b
+SHA1: da0202f7da88b9e9c5ee326a24c3fdd640543a5d
+SHA256: 5ffa03674b5198d1c0e9e0d9e3442cdd7fbe13226c7df91aa53def1f8b6c0d86
+Description: lightweight Exim MTA (v4) daemon
+ Exim (v4) is a mail transport agent. This package contains the exim4
+ daemon with only basic features enabled. It works well with the
+ standard setups that are provided by Debian and includes support for
+ TLS encryption and the dlopen patch to allow dynamic loading of a
+ local_scan function.
+ .
+ The Debian exim4 packages have their own web page,
+ http://pkg-exim4.alioth.debian.org/. There is also a Debian-specific
+ FAQ list. Information about the way the Debian packages are
+ configured can be found in
+ /usr/share/doc/exim4-base/README.Debian.gz, which additionally contains
+ information about the way the Debian binary packages are built. The
+ very extensive upstream documentation is shipped in
+ /usr/share/doc/exim4-base/spec.txt.gz. To repeat the debconf-driven
+ configuration process in a standard setup, invoke dpkg-reconfigure
+ exim4-config. There is a Debian-centered mailing list,
+ pkg-exim4-users@lists.alioth.debian.org. Please ask Debian-specific
+ questions there, and only write to the upstream exim-users mailing
+ list if you are sure that your question is not Debian-specific. You
+ can find the subscription web page on
+ http://lists.alioth.debian.org/mailman/listinfo/pkg-exim4-users
+Homepage: http://www.exim.org/
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 18m
+
+Package: postfix
+Priority: optional
+Section: mail
+Installed-Size: 3472
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: LaMont Jones <lamont@debian.org>
+Architecture: all
+Version: 2.8.3-1ubuntu1
+Replaces: mail-transport-agent
+Provides: default-mta, mail-transport-agent
+Recommends: python
+Suggests: procmail, postfix-mysql, postfix-pgsql, postfix-ldap, postfix-pcre, sasl2-bin, libsasl2-modules, dovecot-common, resolvconf, postfix-cdb, mail-reader, ufw
+Conflicts: libnss-db (<< 2.2-3), mail-transport-agent, smail
+Filename: pool/main/p/postfix/postfix_2.8.3-1ubuntu1_i386.deb
+Size: 1221834
+MD5sum: c4575f03ef0711cc744d394ae36f4a8c
+SHA1: f0f636c942981782cf23cee3d8a95aee188081b9
+SHA256: 13a4bfaf10c8addfc7dce01c0ea65bfbd6a759c4a2aaaafbae5855d099925fe0
+Description: High-performance mail transport agent
+ Postfix is Wietse Venema's mail transport agent that started life as an
+ alternative to the widely-used Sendmail program.  Postfix attempts to
+ be fast, easy to administer, and secure, while at the same time being
+ sendmail compatible enough to not upset existing users. Thus, the outside
+ has a sendmail-ish flavor, but the inside is completely different.
+Homepage: http://www.postfix.org
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Origin: Ubuntu
+Supported: 18m
+Task: mail-server
+
+
diff --git a/tests/data/test-provides/var/lib/dpkg/status b/tests/data/test-provides/var/lib/dpkg/status
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/data/test-provides/var/lib/dpkg/status
diff --git a/tests/data/test_debs/data-tar-broken.deb b/tests/data/test_debs/data-tar-broken.deb
new file mode 100644
index 00000000..4fd42e0f
--- /dev/null
+++ b/tests/data/test_debs/data-tar-broken.deb
diff --git a/tests/data/test_debs/multiarch-test1_i386.deb b/tests/data/test_debs/multiarch-test1_i386.deb
new file mode 100644
index 00000000..439a9f46
--- /dev/null
+++ b/tests/data/test_debs/multiarch-test1_i386.deb
diff --git a/tests/fakeroot-apt-key b/tests/fakeroot-apt-key
new file mode 100755
index 00000000..997161a1
--- /dev/null
+++ b/tests/fakeroot-apt-key
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec fakeroot /usr/bin/apt-key $*
diff --git a/tests/test_all.py b/tests/test_all.py
index 091581f8..0f548781 100644
--- a/tests/test_all.py
+++ b/tests/test_all.py
@@ -34,11 +34,16 @@ def get_library_dir():
     return os.path.abspath(library_dir)
 
 if __name__ == '__main__':
+    if not os.access("/etc/apt/sources.list", os.R_OK):
+        sys.stderr.write("[tests] Skipping because sources.list is not readable\n")
+        sys.exit(0)
+
     sys.stderr.write("[tests] Running on %s\n" % sys.version.replace("\n", ""))
     dirname = os.path.dirname(__file__)
     if dirname:
         os.chdir(dirname)
     library_dir = get_library_dir()
+    sys.stderr.write("Using library_dir: '%s'" % library_dir)
     if library_dir:
         sys.path.insert(0, os.path.abspath(library_dir))
 
diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py
index aaa9f601..448aed75 100644
--- a/tests/test_apt_cache.py
+++ b/tests/test_apt_cache.py
@@ -19,6 +19,15 @@ import apt
 import apt_pkg
 import shutil
 import glob
+import logging
+
+def if_sources_list_is_readable(f):
+    def wrapper(*args, **kwargs):
+        if os.access("/etc/apt/sources.list", os.R_OK):
+            f(*args, **kwargs)
+        else:
+            logging.warn("skipping '%s' because sources.list is not readable" % f)
+    return wrapper
 
 class TestAptCache(unittest.TestCase):
     """ test the apt cache """
@@ -26,8 +35,17 @@ class TestAptCache(unittest.TestCase):
     def setUp(self):
         # reset any config manipulations done in the individual tests
         apt_pkg.init_config()
+        # save/restore the apt config
+        self._cnf = {}
+        for item in apt_pkg.config.keys():
+            self._cnf[item] = apt_pkg.config.find(item)
 
-    def testAptCache(self):
+    def tearDown(self):
+        for item in self._cnf:
+            apt_pkg.config.set(item, self._cnf[item])
+
+    @if_sources_list_is_readable
+    def test_apt_cache(self):
         """cache: iterate all packages and all dependencies """
         cache = apt.Cache()
         # number is not meaningful and just need to be "big enough",
@@ -37,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))
@@ -53,27 +71,30 @@ class TestAptCache(unittest.TestCase):
                 self.assertTrue(str(r).startswith('Package: %s\n' % pkg.shortname))
 
     def test_get_provided_packages(self):
-        cache = apt.Cache()
+        apt.apt_pkg.config.set("Apt::architecture", "i386")
+        cache = apt.Cache(rootdir="./data/test-provides/")
+        cache.open()
+        if len(cache) == 0:
+            logging.warn("skipping test_get_provided_packages, cache empty?!?")
+            return
         # a true virtual pkg
         l = cache.get_providing_packages("mail-transport-agent")
         self.assertTrue(len(l) > 0)
         self.assertTrue("postfix" in [p.name for p in l])
-        # this is a not virtual (transitional) package provided by another 
-        l = cache.get_providing_packages("git-core")
-        self.assertEqual(l, [])
-        # now inlcude nonvirtual packages in the search (rarian-compat
-        # provides scrollkeeper)
-        l = cache.get_providing_packages("git-core",
-                                         include_nonvirtual=True)
-        self.assertEqual([p.name for p in l], ["git"])
         self.assertTrue("mail-transport-agent" in cache["postfix"].candidate.provides)
 
     def test_low_level_pkg_provides(self):
+        apt.apt_pkg.config.set("Apt::architecture", "i386")
+        # create highlevel cache and get the lowlevel one from it
+        highlevel_cache = apt.Cache(rootdir="./data/test-provides")
+        if len(highlevel_cache) == 0:
+            logging.warn("skipping test_log_level_pkg_provides, cache empty?!?")
+            return
         # low level cache provides list of the pkg
-        cache = apt_pkg.Cache(progress=None)
+        cache = highlevel_cache._cache
         l = cache["mail-transport-agent"].provides_list
         # arbitrary number, just needs to be higher enough
-        self.assertTrue(len(l), 5)
+        self.assertEqual(len(l), 2)
         for (providesname, providesver, version) in l:
             self.assertEqual(providesname, "mail-transport-agent")
             if version.parent_pkg.name == "postfix":
@@ -81,10 +102,8 @@ class TestAptCache(unittest.TestCase):
         else:
             self.assertNotReached()
    
-
+    @if_sources_list_is_readable
     def test_dpkg_journal_dirty(self):
-        # backup old value
-        old_status = apt_pkg.config.find_file("Dir::State::status")
         # create tmp env
         tmpdir = tempfile.mkdtemp()
         dpkg_dir = os.path.join(tmpdir,"var","lib","dpkg")
@@ -101,9 +120,8 @@ class TestAptCache(unittest.TestCase):
         # that is a dirty journal
         open(os.path.join(dpkg_dir,"updates","000"), "w").close()
         self.assertTrue(cache.dpkg_journal_dirty)
-        # reset config value
-        apt_pkg.config.set("Dir::State::status", old_status)
 
+    @if_sources_list_is_readable
     def test_apt_update(self):
         rootdir = "./data/tmp"
         if os.path.exists(rootdir):
@@ -114,11 +132,14 @@ class TestAptCache(unittest.TestCase):
             pass
         state_dir = os.path.join(rootdir, "var/lib/apt")
         lists_dir = os.path.join(rootdir, "var/lib/apt/lists")
+        old_state = apt_pkg.config.find("dir::state")
         apt_pkg.config.set("dir::state", state_dir)
         # set a local sources.list that does not need the network
         base_sources = os.path.abspath(os.path.join(rootdir, "sources.list"))
+        old_source_list = apt_pkg.config.find("dir::etc::sourcelist")
+        old_source_parts = apt_pkg.config.find("dir::etc::sourceparts")
         apt_pkg.config.set("dir::etc::sourcelist", base_sources)
-        apt_pkg.config.set("dir::etc::sourceparts", "xxx")
+        apt_pkg.config.set("dir::etc::sourceparts", "/tmp")
         # main sources.list
         sources_list = base_sources
         with open(sources_list, "w") as f:
@@ -162,6 +183,25 @@ class TestAptCache(unittest.TestCase):
         cache.update(sources_list=sources_list)
         all_packages = glob.glob(lists_dir+"/*_Packages*")
         self.assertEqual(len(all_packages), 2)
+        apt_pkg.config.set("dir::state", old_state)
+        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["intltool"])
+        l.append(cache["python3"])
+        l.append(cache["apt"])
+        l.sort()
+        self.assertEqual([p.name for p in l],
+                         ["apt", "intltool", "python3"])
+
+    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_aptsources.py b/tests/test_aptsources.py
index 1597674e..dcfb0682 100644
--- a/tests/test_aptsources.py
+++ b/tests/test_aptsources.py
@@ -3,6 +3,7 @@
 import unittest
 import os
 import copy
+import tempfile
 
 import apt_pkg
 import aptsources.sourceslist
@@ -17,7 +18,7 @@ class TestAptSources(unittest.TestCase):
         if apt_pkg.config["APT::Architecture"] not in ('i386', 'amd64'):
             apt_pkg.config.set("APT::Architecture", "i386")
         apt_pkg.config.set("Dir::Etc", os.getcwd())
-        apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx")
+        apt_pkg.config.set("Dir::Etc::sourceparts", tempfile.mkdtemp())
         if os.path.exists("./build/data/templates"):
             self.templates = os.path.abspath("./build/data/templates")
         elif os.path.exists("../build/data/templates"):
@@ -159,6 +160,29 @@ class TestAptSources(unittest.TestCase):
         assert sources.list[8].comps == ["main"]
         assert sources.list[8].line.strip() == str(sources.list[8])
 
+    def test_enable_component(self):
+        from subprocess import Popen, PIPE
+        target = "./data/aptsources/sources.list.enable_comps"
+        line = "deb http://archive.ubuntu.com/ubuntu lucid main\n"
+        open(target, "w").write(line)
+        apt_pkg.config.set("Dir::Etc::sourcelist", target)
+        sources = aptsources.sourceslist.SourcesList(True, self.templates)
+        distro = aptsources.distro.get_distro(id="Ubuntu")
+        # make sure we are using the right distro
+        distro.codename = "lucid"
+        distro.id = "Ubuntu"
+        distro.release = "10.04"
+        # and get the sources
+        distro.get_sources(sources)
+        # test enable_component
+        comp = "multiverse"
+        distro.enable_component(comp)
+        comps = set()
+        for entry in sources:
+            comps = comps.union(set(entry.comps))
+        self.assertTrue("multiverse" in comps)
+        self.assertTrue("universe" in comps)
+        
     def testDistribution(self):
         """aptsources: Test distribution detection."""
         apt_pkg.config.set("Dir::Etc::sourcelist", "data/aptsources/"
diff --git a/tests/test_aptsources_ports.py b/tests/test_aptsources_ports.py
index 991b532a..67c21b9c 100644
--- a/tests/test_aptsources_ports.py
+++ b/tests/test_aptsources_ports.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import os
 import unittest
-
+import tempfile
 
 import apt_pkg
 import aptsources.sourceslist
@@ -17,7 +17,7 @@ class TestAptSourcesPorts(unittest.TestCase):
         apt_pkg.config.set("APT::Architecture", "powerpc")
         apt_pkg.config.set("Dir::Etc",
                            os.path.abspath("data/aptsources_ports"))
-        apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx")
+        apt_pkg.config.set("Dir::Etc::sourceparts", tempfile.mkdtemp())
         if os.path.exists("../build/data/templates"):
             self.templates = os.path.abspath("../build/data/templates")
         else:
diff --git a/tests/test_auth.py b/tests/test_auth.py
new file mode 100644
index 00000000..99c40db5
--- /dev/null
+++ b/tests/test_auth.py
@@ -0,0 +1,235 @@
+#!/usr/bin/env python
+
+import os
+import shutil
+import sys
+import tempfile
+import time
+import unittest
+
+if sys.version_info[0] > 2:
+    from http.server import HTTPServer
+    from http.server import SimpleHTTPRequestHandler as HTTPRequestHandler
+else:
+    from BaseHTTPServer import HTTPServer
+    from SimpleHTTPServer import SimpleHTTPRequestHandler as HTTPRequestHandler
+
+import apt_pkg
+import apt.auth
+
+WHEEZY_KEY = """-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+mQINBE+a7rUBEADQiEKtLOgqiq8YY/p7IFODMqGPR+o1vtXaksie8iTOh3Vxab38
+cA3kK1iB5XYElbZ5b/x3vWiufHK2semOpn5MG2GRJUwmKxZbt3HLZiHtAadkby2l
+rnMxeIzfxcTxloxsQ02TMRalq89Xvy6P7lgedcW5ujcMR6JbE6uL1c/jNlkIPNuN
+9paZsNJWXnZ03R+NrAJLjOPUZKZRPYgIwEci2sVNA/autsJL+HuW6X8PfldvMe5h
+SdWelOoXMsZMX04JP8Efq8a09yIgKBfuXjoHJbtK0rTr9tjFKt/VM6MejLdJf4Dl
+r6Zhx2ygmjcvj+FlWFoxDlPHdqfZ6mGsKR4eWDRu3bZtalDNvhZKvecwf0KaAWVU
+M+GxkR+Ol3TsQ0tLbjbwZhWMioipR8Lsp6kZ1tLUjM0aOR3Mw/csyFJYKFiCo3GR
+QSGY0++cDrfhQRwOJ9s2eeGGS1/I95vJZA5zZnx1ksnO0W2fHVBavICR821EBAEZ
+slLzr+IOrbB16YE/aN2iA9nTcQVk69XeEh5gaeiCZ7JhA2nkAg8a/H1r4BVBC/cL
+egzhUvP90kk94MmL1D2gY6UlyK4yTnHgVfjsQw6u2sPDlramyXBZehnKabIndM1P
+368IbW8GTNo0gNwg/oC/vENwYnAuX+S96/O/1XfQoBNr+epTVdS4VQHICQARAQAB
+tEhEZWJpYW4gQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDcuMC93aGVl
+enkpIDxmdHBtYXN0ZXJAZGViaWFuLm9yZz6JAj4EEwEIACgFAk+a7rUCGwMFCQ8J
+nAAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEItIrWJGklVTdQEQAMLCmMQr
+7SxFULYgprbr5eO6uAs/8nkIBhJBzUnenOUnwsOR3Io9/sHc8Cq/xv1DTsY5G5Qj
+ojywslbeF44TxBZ0j3UwPU437bfNs7yTRkgPVhHK/rZ9ApbnZdCmud+BUkDOChLV
+8fzCZ17Pa5eMr5E4WI0bLM5AA3vVFLBgHFqJUgE7mSn95vA1S881/xOQ4lT1WHfa
+O9K96X6ekn2zpPu/G8aq+oDyVGfo1AKQCPBJ3OCX0WB3GNWbcCb850gy9vtKlWDu
+yAh1a9Cl5OPHlYqz8q+Hqj4ZeRgJiDgCgm8YAlKEooEG/vJzswaY+C3nz6uNfBeq
+60QhPfgaO8qGlriChGAFqzD68ZQ53NApJw/OuwV2p5CgnkyGAVGZ1WuYcXz/wHyU
+awnXq3Bf69RJssbab6SqptJyYuiY8T/2vWRgQxej18KAZ0v1Vr/MC1azp6TWgfSl
+s2fvGvPf9vEbKyBR3YFa5msRKGpRauv4wWmcLfZ+jMLbSAWBfILPK+fGLtRGz4AX
+hRht9rX7c4neQvlBNDDgR3tuaE3s0B1B6gTcvq7EhuuP4pAzkBLhpuzolvw+ZFOV
+5mElfScYi8QbQgT9t2XjUDU1oz1ewviNhynpsxh51t5qxP5ETDGKvEx7RMv4S08p
+5VGG4Y+kjcsQWfAdVAGuLqWOI0sGzUzKYZppiEYEExECAAYFAk+a8vAACgkQcV7W
+oH57isk7FACcCIOIMr39LUSv16Ec9V102uheqlsAnRqdAADYF7iJIrfqyb72s/54
+3JFaiQJGBBMBCAAwBQJPmvMiBxpzdHJpbmchGmh0dHA6Ly9ncGcuZ2FubmVmZi5k
+ZS9wb2xpY3kudHh0AAoJENsWz1uxJSXEhEYP/in+rib86H2vPG+ALZ35o4eh1+9P
+KLtUwgHB3Wr/rmPuPY5uB02H/p3PxgJHXUXUPAleN6uajZvReO1wWLTYspPAK8ZF
+6p52vuyHgOZl+VmGkLgYKOG/cckqQqTTaHwQj0O8pllJjOJYVdt5iWAHkf1N1UAA
+nXC2GdxV+ZVGvZjjCDL8WFWCfoY4HznslcEHQKxg7vzZvVMTjY6L+8NmWkVoD4JL
+kYtQOrId1wWYInJiQRtilyn7n9mJ+rTBSETB9Evs3x+zmNa3ntY1/U8XINgxVA5U
+GYyUfUug2DjZ90LfXyZUOXVLE5yM1x7oOpyg/1mMtl5xkmuqJHOTeVEjQBYfMRHi
+sS4ainR5AoD1Z5KV4S0opt198LDMXGLNjUdJEG24QEK5tfgTFRgFRJYiufxDelI3
+Aq5uGVRrBJygjwaQiJLUVlMqBGHJi++zeWr767pHVWB1XqdmPRvvOqH2v/ez4bSW
+zIkUDTr947qmjyAqNNmCv/jgV5viqbj5LNslBkFg8OS+6O7na2gU5ldXfBoC0nso
+3pdsCuOYUIrHyP/GjT1gvG0m+jZ/15bvoWvUv4Buh+3gYVyLwrgbq7UISRfwQEah
+yzIrO5MvgS0MTIlOgO7Lxog2XMEkQ1ZCbLu5Rvm/8LC0UlSxW9aOIKBSC3hi7U8E
+BuA24Mv5Iz7QvO+giQEcBBABAgAGBQJPmwDBAAoJEF7K+wCjrkSkkq8H/3M/M+Xb
+vI0cY3MOkFMtyG7xmxPcny1/arnQDvjvpv1BhRBnVTstMxHWzAFQf3M8KttARWo4
+C6U5Cbc0Jx6avqXZwop91a8tQORErC9Kcrr27FJfNAOP5AVzXAofpZyXvouFYBig
+ikHdRJlFrn9rydvK9Z5vg63ZzsRB7hTtHi/j1o7d0IpVmR2iTnbWGiUxpnRdLhEF
+AnUU+TDFVg6EoJ6aeKsLa43UPHizq12WZPd72cJNSLMk/u+UZvg4sa7pOrkJNYN1
+jL7BSphwKCuA8vBc2lLO14uYDO8LHjd4opatMWCEEvnJQS98JytIkYcwJhJ/IgCz
+tqAUo44SUcOodNGJAhwEEAECAAYFAk+bA/IACgkQvDciUsoc+WRWgA/9FYi1aqas
+fJyRV4pfe90KhJ4uOO17ivnjULIDU4QFSdJpkCPznxadlDeyRbX/FhVu3RMzldIu
+ZVly+VPqWwubudj9SVnqJxGkua2kEz8u3X96zif+nSB4wQuWLi4GOG9AYTnuNnZI
+hO4RctYpEi9duBsPeewNi2zjUe8akhJacMhJflbW/XGsRf4goeL3WrB+k5DiDphm
+nw2dge96uhZhM+Ih4hSoD9d+YLZbTqXX4L93jELE72UF4qnrZjYJtx8TSto9W2bj
+sGFmpUB41viFtdnABLv5MhMsvlM37w8HTbKzzCYImgzBJNZ8Wr+VAeeQ/uB+izVv
+Ls6aVKcwH2r8D+MMvh5d160lAJSUDXvZ0kdzawtBMzaNOIEYuQqoQxQGXvSAMRDV
+2xFEn/XRT4iRl1stLvX86SMpLksbBfxZnrV9Q+OfTpar5O21sb1dpkgfWoF6W0kc
+rjuAAsI3EbMuX3eK8r5SjWCLfIaU9ton+CdeJjJipEsEox7Rlq075t+6S4LL4wqq
+dJPX4Rcuwx4LPXi9NKZAuQHisp1nuVV4luXttMdYfFq5QtokhjUaedAOORDy4gsC
+mAMyLWgU/2r0grK7+AVLfn1p9wFb9FoBGFILcjVMAiY3OE5tNVPay9wGoD6n/h0O
+cteh2rBrB7kEpXjRqasNfRl8vvlz7nWhTIKJAhwEEAEIAAYFAk+bAq8ACgkQEbTl
+/xWw/YKuew/9Fub3t/nejgJ5KkjhfFppQQkE1yg2VJP3cbnrrhrAYZX6E6jN7dAI
+MlpKqm4YR6FFe5bkra61TeXd2CI5E/MDdW4Q+AD66tA0xKRm5RzVuPvWoR9vyCx/
+fPlRuVZptwczeV5bKTFyflICV3Z/R5llq2aT6M+MZdBL4AHs5yuspkYa5f8EESi6
+pTJW0sXacjRSZyznQOZ2fMKn0LZnefSWjWoAB252hS27WW9kwpniJhUOzrrLuAWF
+wnv6jfahNH14BCbNB7Q0DhcCeYnFocRv/NH8oipTrwfJ+IIMDDOcJvCbgv23w9DJ
+Ynv2BaaJrbk04jux71vhaZUC0xTkE/b+rNZGnPaFnjqWBGN3s+RVZ0SHMQUzdl73
+dH3lL98mULzmf1uD7fPIrF/EYrSvFcsV7mnpFmHOd3ApY6QugmakQOLVaIpi18N4
+hJoEPBwSQ91eriieobRhjGs7LRnfmvkuQIlsQx82eycd1IV6Gp2cqzAb1qPzcaYh
+TskU93Mj9OwmlqETB9FH7w7OvumQUjhHQCASeCGDeFJacZkwohWcxWkB0DUPWGgh
+jnsiInTBzE/+nFsUthVlkh0Bki0BLy3gOUAgldvq3apw73OCsxjd2ORdGpFvvU2v
+Xzogb+aanfTVniIfYDaJ3KHq+rF5WiVogJrK3TxsyuTAh3jFjEKNjVqJAhwEEAEI
+AAYFAk+bo7wACgkQwktlomcsixJuOg/+PZqllY05fJhC5F8UzGpHDIsrokHNAc4L
+xMgcudYoMwsK3NDxfXdKhfBgQqAsToSNpSYE4eNFcUF8yetdJbgoCWJOBIP1LCiy
+dKXpH5mKy1PCQ+2FBb1mtKiGl1nIu1hgOx29R2ATGGSpGwbgm1Q8+cpM/nRVv7Hl
+5e6uPZWkAu0MBUL9RbVSMQRpK6DUCKhLX4Loc3OS4rNjQkGnWyPtqlmU4bmRZ3R2
+INaONb4tnLkjdBhAqhgaMneEGt07nI2GBaVhdTKoI2/aDBADhuSkHomD/euiDLAF
+/gqvG6ir6akBaKiaZlDyFSAdI62gQ4DZqZF0ddGcyUfyWCgAIWxBLf6RX7yDsu5L
+uCT7ppkogHYpxjGdRlUhu9tBukZNqN1BEDbywUu2oHus+XjCr+AKThY2eglRTiVw
+SUo6KX8xBmRoo1W32pk5t9I8uMWMVc3cVh4QhqlKmcjtTJkRIVCNCXZl5JN2Uw8q
+uP6thFNCsJx6g8UwaHRXJZNKyANfe8CFGuNO0/9i8sMP/lRxmhxb5+CgZQKmCBjq
+eL/TOavRJVXbilVsU4j9OFlqx9ptGHfPlfjnIq2Bf9VWJQyS6E64ecqaqc+yqaVf
+hd0FMz9hq067VITuG50JeVnmSJK/EVjSgMvxWlSNinMgUjNetrkQTO9OQ0caAGFq
+DHcut3Yey8o=
+=id4q
+-----END PGP PUBLIC KEY BLOCK-----"""
+
+
+class TestAuthKeys(unittest.TestCase):
+
+    """Test handling of keys for signed repositories."""
+
+    if sys.version_info[0] == 2 and sys.version_info[1] < 7:
+        def addCleanup(self, function, *args, **kwds):
+            try:
+                self.cleanup.append(lambda: function(*args, **kwds))
+            except AttributeError:
+                self.cleanup = [lambda: function(*args, **kwds)]
+
+        def tearDown(self):
+            for f in self.cleanup:
+                f()
+            self.cleanup = []
+
+    def setUp(self):
+        # reset any config manipulations done in the individual tests
+        apt_pkg.init_config()
+        # save the apt config to restore later
+        cnf = {}
+        for item in apt_pkg.config.keys():
+            cnf[item] = apt_pkg.config.find(item)
+        self.addCleanup(self._restore_apt_config, cnf)
+
+        self.tmpdir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.tmpdir)
+        apt_pkg.config.set("Dir", self.tmpdir)
+        apt_pkg.config.set("Dir::Bin::Apt-key", "fakeroot-apt-key")
+        apt_pkg.config.set("Dir::Etc", "etc/apt/")
+        trustedparts_dir = apt_pkg.config.find_dir("Dir::Etc::Trustedparts")
+        confparts_dir = apt_pkg.config.find_dir("Dir::Etc::parts")
+        self.assertTrue(trustedparts_dir.startswith(self.tmpdir))
+        os.makedirs(trustedparts_dir)
+        os.makedirs(confparts_dir)
+        shutil.copy("fakeroot-apt-key", self.tmpdir)
+
+    def _restore_apt_config(self, cnf):
+        """Restore previous apt configuration."""
+        for item in cnf:
+            apt_pkg.config.set(item, cnf[item])
+
+    def testAddAndExportKey(self):
+        """Add an example key."""
+        apt.auth.add_key(WHEEZY_KEY)
+        # Strip the headers from the keys to avoid test errors because
+        # the exported key used a differenct GnuPG version than the
+        # original example key
+        self.assertEqual(apt.auth.export_key("46925553").split("\n")[2:],
+                         WHEEZY_KEY.split("\n")[2:])
+
+    def testAddAndListKey(self):
+        """Add an example key and test if it is correctly returned by
+        list_keys()
+        """
+        apt.auth.add_key(WHEEZY_KEY)
+        ret = apt.auth.list_keys()
+        self.assertEqual(len(ret), 1)
+        key = ret[0]
+        self.assertEqual(key.name,
+                         "Debian Archive Automatic Signing Key (7.0/wheezy) "
+                         "<ftpmaster@debian.org>")
+        self.assertEqual(key.keyid, "46925553")
+        self.assertEqual(key.date, "2012-04-27")
+
+    def testAddKeyFromFile(self):
+        """Test adding a key from file."""
+        keyfd, keyname = tempfile.mkstemp()
+        self.addCleanup(os.close, keyfd)
+        os.write(keyfd, WHEEZY_KEY.encode("UTF-8"))
+
+        apt.auth.add_key_from_file(keyname)
+
+        ret = apt.auth.list_keys()
+        self.assertEqual(len(ret), 1)
+        key = ret[0]
+        self.assertEqual(key.name,
+                         "Debian Archive Automatic Signing Key (7.0/wheezy) "
+                         "<ftpmaster@debian.org>")
+        self.assertEqual(key.keyid, "46925553")
+        self.assertEqual(key.date, "2012-04-27")
+
+    def testAddKeyFromServer(self):
+        """Install a GnuPG key from a remote server."""
+        self._start_keyserver()
+        self.addCleanup(self._stop_keyserver)
+
+        apt.auth.add_key_from_keyserver("46925553", "hkp://localhost:19191")
+
+        ret = apt.auth.list_keys()
+        self.assertEqual(len(ret), 1)
+        key = ret[0]
+        self.assertEqual(key.name,
+                         "Debian Archive Automatic Signing Key (7.0/wheezy) "
+                         "<ftpmaster@debian.org>")
+        self.assertEqual(key.keyid, "46925553")
+        self.assertEqual(key.date, "2012-04-27")
+
+    def _start_keyserver(self):
+        """Start a fake keyserver on http://localhost:19191
+        Thanks pitti.
+        """
+        dir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, dir)
+        os.mkdir(os.path.join(dir, "pks"))
+        with open(os.path.join(dir, "pks", "lookup"), "w") as key_file:
+            key_file.write(WHEEZY_KEY)
+
+        self.keyserver_pid = os.fork()
+        if self.keyserver_pid == 0:
+            # quiesce server log
+            os.dup2(os.open('/dev/null', os.O_WRONLY), sys.stderr.fileno())
+            os.chdir(dir)
+            httpd = HTTPServer(('localhost', 19191), HTTPRequestHandler)
+            httpd.serve_forever()
+            os._exit(0)
+
+        # wait a bit until server is ready
+        time.sleep(0.5)
+
+    def _stop_keyserver(self):
+        '''Stop fake keyserver'''
+        assert self.keyserver_pid
+
+        os.kill(self.keyserver_pid, 15)
+        os.wait()
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/test_debfile.py b/tests/test_debfile.py
index 5f6d1aa2..04a6b65a 100644
--- a/tests/test_debfile.py
+++ b/tests/test_debfile.py
@@ -17,8 +17,8 @@ sys.path.insert(0, get_library_dir())
 import apt_pkg
 import apt.debfile
 
-class TestDebfilee(unittest.TestCase):
-    """ test the apt cache """
+class TestDebfile(unittest.TestCase):
+    """ test the debfile """
 
     TEST_DEBS = [
         # conflicts with apt
@@ -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,23 @@ 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
+        try:
+            deb = apt.debfile.DebPackage("./data/test_debs/data-tar-broken.deb")
+        except SystemError:
+            raised = True
+	# with self.assertRaises(SystemError): is more elegant above, but
+	# we need to support python2.6
+        self.assertTrue(raised)
+
 
 if __name__ == "__main__":
     #logging.basicConfig(level=logging.DEBUG)
diff --git a/tests/test_debfile_multiarch.py b/tests/test_debfile_multiarch.py
new file mode 100644
index 00000000..7c02a32a
--- /dev/null
+++ b/tests/test_debfile_multiarch.py
@@ -0,0 +1,55 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2010 Michael Vogt <mvo@ubuntu.com>
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+"""Unit tests for verifying the correctness of DebPackage in apt.debfile."""
+import os
+import logging
+import unittest
+
+from test_all import get_library_dir
+import sys
+sys.path.insert(0, get_library_dir())
+import apt
+import apt_pkg
+import apt.debfile
+
+class TestDebfileMultiarch(unittest.TestCase):
+    """ test the multiarch debfile """
+
+    def test_multiarch_deb_check(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")
+        missing = deb.missing_deps
+        #print missing
+        self.assertFalse("dpkg:i386" in missing)
+
+    def test_multiarch_conflicts(self):
+        cache = apt.Cache()
+        # WARNING: this assumes that lib3ds-1-3 is a non-multiarch lib
+        # use "lib3ds-1-3" as a test to see if non-multiach lib conflicts work
+        canary = "lib3ds-1-3"
+        if not canary in cache:
+            logging.warn("skipping test because %s is missing" % canary)
+            return
+        cache[canary].mark_install()
+        deb = apt.debfile.DebPackage(
+            "./data/test_debs/multiarch-test1_i386.deb", cache=cache)
+        # this deb should now not be installable
+        installable = deb.check()
+        #print deb._failure_string
+        self.assertFalse(installable)
+        self.assertEqual(deb._failure_string, 
+                         "Conflicts with the installed package 'lib3ds-1-3'")
+
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/test_lp659438.py b/tests/test_lp659438.py
new file mode 100644
index 00000000..4564f0f6
--- /dev/null
+++ b/tests/test_lp659438.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""Regression test for LP: #981896, LP: #659438"""
+# Copyright (C) 2012 Sebastian Heinlein <devel@glatzor.de>
+#
+# Licensed under the GNU General Public License Version 2
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Licensed under the GNU General Public License Version 2
+
+__author__  = "Sebastian Heinlein <devel@glatzor.de>"
+
+import os
+import shutil
+import tempfile
+import unittest
+
+import apt_pkg
+import apt
+
+
+class RegressionTestCase(unittest.TestCase):
+
+    """Test suite for LP: #981896, LP: #659438
+    'Cannot locate a file for package X'
+    """
+
+    def setUp(self):
+        apt_pkg.init_config()
+        self.chroot_path = chroot_path = tempfile.mkdtemp()
+        # Create a damaged status file
+        self.cache = apt.cache.Cache(rootdir=chroot_path)
+        with open(apt_pkg.config.find_file("Dir::State::status"),
+                  "a") as status:
+            status.write("""Package: abrowser
+Status: install reinstreq half-installed
+Priority: optional
+Section: admin
+Version: 3.6.9+build1+nobinonly-0ubuntu1""")
+        sources_list_path = apt_pkg.config.find_file("Dir::Etc::sourcelist")
+        repo_path = os.path.abspath("./data/test-repo")
+        with open(sources_list_path, "w") as sources_list:
+            sources_list.write("deb copy:%s /\n" % repo_path)
+        # os.makedirs(os.path.join(chroot_path, "etc/apt/sources.list.d/"))
+        self.cache.update(sources_list=sources_list_path)
+        self.cache.open()
+
+    def tearDown(self):
+        # this resets the rootdir apt_pkg.config to ensure it does not
+        # "pollute" the later tests
+        cache = apt.cache.Cache(rootdir="/")
+        shutil.rmtree(self.chroot_path)
+
+    def test_survive_reqreinst(self):
+        """Test that we survive a package in require reinstallation state"""
+        # this should be 82324L but python3.2 gets unhappy about the "L"
+        self.assertEqual(self.cache.required_download, 82324)
+
+if __name__ == "__main__":
+    unittest.main()
+
+# vim: ts=4 et sts=4
diff --git a/tests/test_policy.py b/tests/test_policy.py
new file mode 100644
index 00000000..f7d41152
--- /dev/null
+++ b/tests/test_policy.py
@@ -0,0 +1,39 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2012 Michael Vogt <mvo@ubuntu.com>
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+
+import apt
+import unittest
+
+class TestAptPolicy(unittest.TestCase):
+
+    def test_apt_policy_lowlevel(self):
+        # get a policy
+        cache = apt.Cache()
+        policy = cache._depcache.policy
+        self.assertNotEqual(policy, None)
+        # basic tests
+        pkg = cache["apt"]
+        self.assertEqual(policy.get_priority(pkg._pkg), 0)
+        # get priority for all pkgfiles
+        for ver in pkg.versions:
+            lowlevel_ver = ver._cand
+            for pkgfile, i in lowlevel_ver.file_list:
+                #print pkgfile, i, policy.get_priority(pkgfile)
+                self.assertTrue(policy.get_priority(pkgfile) >= 1)
+                self.assertTrue(policy.get_priority(pkgfile) < 1001)
+
+    def test_apt_policy_highlevel(self):
+        cache = apt.Cache()
+        pkg = cache["apt"]
+        self.assertTrue(pkg.candidate.policy_priority > 1 and
+                        pkg.candidate.policy_priority < 1001)
+
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/test_progress.py b/tests/test_progress.py
index 73853dfa..3b6285d6 100644
--- a/tests/test_progress.py
+++ b/tests/test_progress.py
@@ -27,7 +27,7 @@ class TestProgress(unittest.TestCase):
         apt_pkg.init()
         apt_pkg.config.set("APT::Architecture", "amd64")
         apt_pkg.config.set("Dir::Etc", basedir)
-        apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx")
+        apt_pkg.config.set("Dir::Etc::sourceparts", "/tmp")
         # setup lists dir
         if not os.path.exists("./tmp/partial"):
             os.makedirs("./tmp/partial")
diff --git a/tests/test_tagfile.py b/tests/test_tagfile.py
new file mode 100644
index 00000000..33197e6a
--- /dev/null
+++ b/tests/test_tagfile.py
@@ -0,0 +1,133 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2010 Michael Vogt <mvo@ubuntu.com>
+# Copyright (C) 2012 Canonical Ltd.
+# Author: Colin Watson <cjwatson@ubuntu.com>
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+"""Unit tests for verifying the correctness of apt_pkg.TagFile"""
+
+from __future__ import print_function, unicode_literals
+
+import io
+import glob
+import os
+import shutil
+import sys
+import tempfile
+import unittest
+
+from test_all import get_library_dir
+sys.path.insert(0, get_library_dir())
+
+import apt_pkg
+
+class TestTagFile(unittest.TestCase):
+    """ test the apt_pkg.TagFile """
+
+    def setUp(self):
+        apt_pkg.init()
+        self.temp_dir = tempfile.mkdtemp()
+
+    def tearDown(self):
+        shutil.rmtree(self.temp_dir)
+
+    def test_tag_file(self):
+        basepath = os.path.dirname(__file__)
+        tagfilepath = os.path.join(basepath, "./data/tagfile/*")
+        # test once for compressed and uncompressed
+        for testfile in glob.glob(tagfilepath):
+            # test once using the open() method and once using the path
+            for f in [testfile, open(testfile)]:
+                tagfile = apt_pkg.TagFile(f)
+                for i, stanza in enumerate(tagfile):
+                    pass
+                self.assertEqual(i, 2)
+
+    def test_errors(self):
+        # Raises SystemError via lbiapt
+        self.assertRaises(SystemError, apt_pkg.TagFile, "not-there-no-no")
+        # Raises Type error
+        self.assertRaises(TypeError, apt_pkg.TagFile, object())
+
+    def test_utf8(self):
+        value = "Tést Persön <test@example.org>"
+        packages = os.path.join(self.temp_dir, "Packages")
+        with io.open(packages, "w", encoding="UTF-8") as packages_file:
+            print("Maintainer: %s" % value, file=packages_file)
+            print("", file=packages_file)
+        if sys.version < '3':
+            # In Python 2, test the traditional file interface.
+            with open(packages) as packages_file:
+                tagfile = apt_pkg.TagFile(packages_file)
+                tagfile.step()
+                self.assertEqual(
+                    value.encode("UTF-8"), tagfile.section["Maintainer"])
+        with io.open(packages, encoding="UTF-8") as packages_file:
+            tagfile = apt_pkg.TagFile(packages_file)
+            tagfile.step()
+            if sys.version < '3':
+                self.assertEqual(
+                    value.encode("UTF-8"), tagfile.section["Maintainer"])
+            else:
+                self.assertEqual(value, tagfile.section["Maintainer"])
+
+    def test_latin1(self):
+        value = "Tést Persön <test@example.org>"
+        packages = os.path.join(self.temp_dir, "Packages")
+        with io.open(packages, "w", encoding="ISO-8859-1") as packages_file:
+            print("Maintainer: %s" % value, file=packages_file)
+            print("", file=packages_file)
+        if sys.version < '3':
+            # In Python 2, test the traditional file interface.
+            with open(packages) as packages_file:
+                tagfile = apt_pkg.TagFile(packages_file)
+                tagfile.step()
+                self.assertEqual(
+                    value.encode("ISO-8859-1"), tagfile.section["Maintainer"])
+        with io.open(packages) as packages_file:
+            tagfile = apt_pkg.TagFile(packages_file, bytes=True)
+            tagfile.step()
+            self.assertEqual(
+                value.encode("ISO-8859-1"), tagfile.section["Maintainer"])
+        if sys.version >= '3':
+            # In Python 3, TagFile can pick up the encoding of the file
+            # object.
+            with io.open(packages, encoding="ISO-8859-1") as packages_file:
+                tagfile = apt_pkg.TagFile(packages_file)
+                tagfile.step()
+                self.assertEqual(value, tagfile.section["Maintainer"])
+
+    def test_mixed(self):
+        value = "Tést Persön <test@example.org>"
+        packages = os.path.join(self.temp_dir, "Packages")
+        with io.open(packages, "w", encoding="UTF-8") as packages_file:
+            print("Maintainer: %s" % value, file=packages_file)
+            print("", file=packages_file)
+        with io.open(packages, "a", encoding="ISO-8859-1") as packages_file:
+            print("Maintainer: %s" % value, file=packages_file)
+            print("", file=packages_file)
+        if sys.version < '3':
+            # In Python 2, test the traditional file interface.
+            with open(packages) as packages_file:
+                tagfile = apt_pkg.TagFile(packages_file)
+                tagfile.step()
+                self.assertEqual(
+                    value.encode("UTF-8"), tagfile.section["Maintainer"])
+                tagfile.step()
+                self.assertEqual(
+                    value.encode("ISO-8859-1"), tagfile.section["Maintainer"])
+        with io.open(packages) as packages_file:
+            tagfile = apt_pkg.TagFile(packages_file, bytes=True)
+            tagfile.step()
+            self.assertEqual(
+                value.encode("UTF-8"), tagfile.section["Maintainer"])
+            tagfile.step()
+            self.assertEqual(
+                value.encode("ISO-8859-1"), tagfile.section["Maintainer"])
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/test_utils.py b/tests/test_utils.py
new file mode 100644
index 00000000..2676bb98
--- /dev/null
+++ b/tests/test_utils.py
@@ -0,0 +1,67 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2010 Michael Vogt <michael.vogt@ubuntu.com>
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+
+import datetime
+import os
+import sys
+import unittest
+
+import apt_pkg
+import apt.utils
+
+from apt.utils import (
+    get_maintenance_end_date,
+    get_release_date_from_release_file,
+    )
+
+class TestUtils(unittest.TestCase):
+
+    def test_get_release_date_from_release_file(self):
+        path = os.path.join(os.path.dirname(__file__), 
+                            "data", "misc", "foo_Release")
+        t = get_release_date_from_release_file(path)
+        self.assertEqual(str(datetime.datetime.utcfromtimestamp(t)),
+                         "2012-04-25 22:49:23")
+
+    def test_maintenance_time(self):
+        months_of_support = 18
+        # test historic releases, jaunty
+        release_date = datetime.datetime(2009, 4, 23)
+        (end_year, end_month) = get_maintenance_end_date(release_date, months_of_support)
+        self.assertEqual(end_year, 2010)
+        self.assertEqual(end_month, 10)
+        # test historic releases, karmic
+        release_date = datetime.datetime(2009, 10, 29)
+        (end_year, end_month) = get_maintenance_end_date(release_date, months_of_support)
+        self.assertEqual(end_year, 2011)
+        self.assertEqual(end_month, 4)
+        # test maverick
+        release_date = datetime.datetime(2010, 10, 10)
+        (end_year, end_month) = get_maintenance_end_date(release_date, months_of_support)
+        self.assertEqual(end_year, 2012)
+        self.assertEqual(end_month, 4)
+
+        # test with modulo zero
+        release_date = datetime.datetime(2010, 6, 10)
+        (end_year, end_month) = get_maintenance_end_date(release_date, months_of_support)
+        self.assertEqual(end_year, 2011)
+        self.assertEqual(end_month, 12)
+
+        # test dapper
+        months_of_support = 60
+        release_date = datetime.datetime(2008, 4, 24)
+        (end_year, end_month) = get_maintenance_end_date(release_date, months_of_support)
+        self.assertEqual(end_year, 2013)
+        self.assertEqual(end_month, 4)
+        
+        # what datetime says
+        #d = datetime.timedelta(18*30)
+        #print "end date: ", release_date + d
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/utils/get_ubuntu_mirrors_from_lp.py b/utils/get_ubuntu_mirrors_from_lp.py
index 341dba8a..ef049f78 100755
--- a/utils/get_ubuntu_mirrors_from_lp.py
+++ b/utils/get_ubuntu_mirrors_from_lp.py
@@ -40,8 +40,8 @@ for entry in d.entries:
         countries[countrycode].add(link.href)
 
 
-keys = countries.keys()
-keys.sort()
+keys = sorted(countries)
+print("mirror://mirrors.ubuntu.com/mirrors.txt")
 for country in keys:
-    print "#LOC:%s" % country
-    print "\n".join(sorted(countries[country]))
+    print("#LOC:%s" % country)
+    print("\n".join(sorted(countries[country])))