merged from lp:~mvo/python-apt/mvo

233 files changed, 30492 insertions, 61055 deletions

diff --git a/AUTHORS b/AUTHORS
index dc247ef8..1ed949c1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,3 +4,4 @@ mvo Michael Vogt <mvo@debian.org>
 Michiel Sikkes <michiel@eyesopened.nl>
 Sebastian Heinlein <glatzor@ubuntu.com>
 Sean Wheller   <sean@inwords.co.za>
+Julian Andres Klode <jak@debian.org>
diff --git a/apt/__init__.py b/apt/__init__.py
index 4b3e6bf2..677a625b 100644
--- a/apt/__init__.py
+++ b/apt/__init__.py
@@ -17,22 +17,21 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 # import the core of apt_pkg
+"""High-Level Interface for working with apt."""
 import apt_pkg
-import sys
-import os
 
 # import some fancy classes
 from apt.package import Package
 from apt.cache import Cache, ProblemResolver
-from apt.progress import (
-    OpProgress, FetchProgress, InstallProgress, CdromProgress)
 from apt.cdrom import Cdrom
-from apt_pkg import SizeToStr, TimeToStr, VersionCompare
+
+if apt_pkg._COMPAT_0_7:
+    from apt.progress.old import (OpProgress, FetchProgress, InstallProgress,
+                                  CdromProgress)
+    from apt_pkg import (size_to_str as SizeToStr, time_to_str as TimeToStr,
+                         version_compare as VersionCompare)
 
 # init the package system
 apt_pkg.init()
 
-
-#import warnings
-#warnings.warn("apt API not stable yet", FutureWarning)
-#del warnings
+__all__ = ['Cache', 'Cdrom', 'Package']
diff --git a/apt/cache.py b/apt/cache.py
index ae6f2fcc..cfe6bedc 100644
--- a/apt/cache.py
+++ b/apt/cache.py
@@ -24,7 +24,10 @@ import weakref
 
 import apt_pkg
 from apt import Package
-import apt.progress
+from apt_pkg import gettext as _
+from apt.deprecation import (AttributeDeprecatedBy, function_deprecated_by,
+                             deprecated_args)
+import apt.progress.text
 
 
 class FetchCancelledException(IOError):
@@ -43,39 +46,43 @@ class Cache(object):
     """Dictionary-like package cache.
 
     This class has all the packages that are available in it's
-    dictionary. 
+    dictionary.
 
     Keyword arguments:
     progress -- a OpProgress object
-    rootdir -- a alternative root directory. if that is given 
-               the system sources.list and system lists/ files are 
+    rootdir -- a alternative root directory. if that is given
+               the system sources.list and system lists/ files are
                not read, only files relative to the given rootdir
     memonly -- build the cache in memory only
     """
 
     def __init__(self, progress=None, rootdir=None, memonly=False):
+        self._cache = None
+        self._depcache = None
+        self._records = None
+        self._list = None
         self._callbacks = {}
         self._weakref = weakref.WeakValueDictionary()
         self._set = set()
         if memonly:
             # force apt to build its caches in memory
-            apt_pkg.Config.Set("Dir::Cache::pkgcache", "")
+            apt_pkg.config.set("Dir::Cache::pkgcache", "")
         if rootdir:
             if os.path.exists(rootdir+"/etc/apt/apt.conf"):
-                apt_pkg.ReadConfigFile(apt_pkg.Config,
+                apt_pkg.read_config_file(apt_pkg.config,
                                        rootdir + "/etc/apt/apt.conf")
             if os.path.isdir(rootdir+"/etc/apt/apt.conf.d"):
-                apt_pkg.ReadConfigDir(apt_pkg.Config,
+                apt_pkg.read_config_dir(apt_pkg.config,
                                       rootdir + "/etc/apt/apt.conf.d")
-            apt_pkg.Config.Set("Dir", rootdir)
-            apt_pkg.Config.Set("Dir::State::status",
+            apt_pkg.config.set("Dir", rootdir)
+            apt_pkg.config.set("Dir::State::status",
                                rootdir + "/var/lib/dpkg/status")
             # create required dirs/files when run with special rootdir
             # automatically
             self._check_and_create_required_dirs(rootdir)
             # Call InitSystem so the change to Dir::State::Status is actually
             # recognized (LP: #320665)
-            apt_pkg.InitSystem()
+            apt_pkg.init_system()
         self.open(progress)
 
     def _check_and_create_required_dirs(self, rootdir):
@@ -92,14 +99,14 @@ class Cache(object):
                 "/var/lib/apt/lists/partial",
                ]
         for d in dirs:
-            if not os.path.exists(rootdir+d):
-                print "creating: ",rootdir+d
-                os.makedirs(rootdir+d)
+            if not os.path.exists(rootdir + d):
+                print "creating: ", rootdir + d
+                os.makedirs(rootdir + d)
         for f in files:
-            if not os.path.exists(rootdir+f):
-                open(rootdir+f,"w")
+            if not os.path.exists(rootdir + f):
+                open(rootdir + f, "w")
 
-    def _runCallbacks(self, name):
+    def _run_callbacks(self, name):
         """ internal helper to run a callback """
         if name in self._callbacks:
             for callback in self._callbacks[name]:
@@ -110,31 +117,32 @@ class Cache(object):
             a dictionary
         """
         if progress is None:
-            progress = apt.progress.OpProgress()
-        self._runCallbacks("cache_pre_open")
-        self._cache = apt_pkg.GetCache(progress)
-        self._depcache = apt_pkg.GetDepCache(self._cache)
-        self._records = apt_pkg.GetPkgRecords(self._cache)
-        self._list = apt_pkg.GetPkgSourceList()
-        self._list.ReadMainList()
+            progress = apt.progress.base.OpProgress()
+        self._run_callbacks("cache_pre_open")
+
+        self._cache = apt_pkg.Cache(progress)
+        self._depcache = apt_pkg.DepCache(self._cache)
+        self._records = apt_pkg.PackageRecords(self._cache)
+        self._list = apt_pkg.SourceList()
+        self._list.read_main_list()
         self._set.clear()
         self._weakref.clear()
 
-        progress.Op = "Building data structures"
-        i=last=0
-        size=len(self._cache.Packages)
-        for pkg in self._cache.Packages:
+        progress.op = _("Building data structures")
+        i = last = 0
+        size = len(self._cache.packages)
+        for pkg in self._cache.packages:
             if progress is not None and last+100 < i:
                 progress.update(i/float(size)*100)
-                last=i
+                last = i
             # drop stuff with no versions (cruft)
-            if len(pkg.VersionList) > 0:
-                self._set.add(pkg.Name)
+            if len(pkg.version_list) > 0:
+                self._set.add(pkg.name)
 
             i += 1
 
         progress.done()
-        self._runCallbacks("cache_post_open")
+        self._run_callbacks("cache_post_open")
 
     def __getitem__(self, key):
         """ look like a dictionary (get key) """
@@ -165,97 +173,105 @@ class Cache(object):
     def keys(self):
         return list(self._set)
 
-    def getChanges(self):
+    def get_changes(self):
         """ Get the marked changes """
         changes = []
-        for p in self:
-            if p.markedUpgrade or p.markedInstall or p.markedDelete or \
-               p.markedDowngrade or p.markedReinstall:
-                changes.append(p)
+        for pkg in self:
+            if (pkg.marked_upgrade or pkg.marked_install or pkg.marked_delete
+                or pkg.marked_downgrade or pkg.marked_reinstall):
+                changes.append(pkg)
         return changes
 
-    def upgrade(self, distUpgrade=False):
-        """ Upgrade the all package, DistUpgrade will also install
-            new dependencies
+    @deprecated_args
+    def upgrade(self, dist_upgrade=False):
+        """Upgrade all packages.
+
+        If the parameter *dist_upgrade* is True, new dependencies will be
+        installed as well (and conflicting packages may be removed). The
+        default value is False.
         """
-        self.cachePreChange()
-        self._depcache.Upgrade(distUpgrade)
-        self.cachePostChange()
+        self.cache_pre_change()
+        self._depcache.upgrade(dist_upgrade)
+        self.cache_post_change()
 
     @property
-    def requiredDownload(self):
+    def required_download(self):
         """Get the size of the packages that are required to download."""
-        pm = apt_pkg.GetPackageManager(self._depcache)
-        fetcher = apt_pkg.GetAcquire()
-        pm.GetArchives(fetcher, self._list, self._records)
-        return fetcher.FetchNeeded
+        pm = apt_pkg.PackageManager(self._depcache)
+        fetcher = apt_pkg.Acquire()
+        pm.get_archives(fetcher, self._list, self._records)
+        return fetcher.fetch_needed
 
     @property
-    def additionalRequiredSpace(self):
+    def required_space(self):
         """Get the size of the additional required space on the fs."""
-        return self._depcache.UsrSize
+        return self._depcache.usr_size
 
     @property
-    def reqReinstallPkgs(self):
+    def req_reinstall_pkgs(self):
         """Return the packages not downloadable packages in reqreinst state."""
         reqreinst = set()
         for pkg in self:
             if (not pkg.candidate.downloadable and
-                (pkg._pkg.InstState == apt_pkg.InstStateReInstReq or
-                 pkg._pkg.InstState == apt_pkg.InstStateHoldReInstReq)):
+                (pkg._pkg.inst_state == apt_pkg.INSTSTATE_REINSTREQ or
+                 pkg._pkg.inst_state == apt_pkg.INSTSTATE_HOLD_REINSTREQ)):
                 reqreinst.add(pkg.name)
         return reqreinst
 
-    def _runFetcher(self, fetcher):
+    def _run_fetcher(self, fetcher):
         # do the actual fetching
-        res = fetcher.Run()
+        res = fetcher.run()
 
         # now check the result (this is the code from apt-get.cc)
         failed = False
         transient = False
-        errMsg = ""
-        for item in fetcher.Items:
-            if item.Status == item.StatDone:
+        err_msg = ""
+        for item in fetcher.items:
+            if item.status == item.STAT_DONE:
                 continue
-            if item.StatIdle:
+            if item.STAT_IDLE:
                 transient = True
                 continue
-            errMsg += "Failed to fetch %s %s\n" % (item.DescURI,
-                                                   item.ErrorText)
+            err_msg += "Failed to fetch %s %s\n" % (item.desc_uri,
+                                                   item.error_text)
             failed = True
 
         # we raise a exception if the download failed or it was cancelt
-        if res == fetcher.ResultCancelled:
-            raise FetchCancelledException(errMsg)
+        if res == fetcher.RESULT_CANCELLED:
+            raise FetchCancelledException(err_msg)
         elif failed:
-            raise FetchFailedException(errMsg)
+            raise FetchFailedException(err_msg)
         return res
 
-    def _fetchArchives(self, fetcher, pm):
+    def _fetch_archives(self, fetcher, pm):
         """ fetch the needed archives """
 
         # get lock
-        lockfile = apt_pkg.Config.FindDir("Dir::Cache::Archives") + "lock"
-        lock = apt_pkg.GetLock(lockfile)
+        lockfile = apt_pkg.config.find_dir("Dir::Cache::Archives") + "lock"
+        lock = apt_pkg.get_lock(lockfile)
         if lock < 0:
             raise LockFailedException("Failed to lock %s" % lockfile)
 
         try:
             # this may as well throw a SystemError exception
-            if not pm.GetArchives(fetcher, self._list, self._records):
+            if not pm.get_archives(fetcher, self._list, self._records):
                 return False
             # now run the fetcher, throw exception if something fails to be
             # fetched
-            return self._runFetcher(fetcher)
+            return self._run_fetcher(fetcher)
         finally:
             os.close(lock)
 
-    def isVirtualPackage(self, pkgname):
+    def is_virtual_package(self, pkgname):
         """Return whether the package is a virtual package."""
-        pkg = self._cache[pkgname]
-        return bool(pkg.ProvidesList and not pkg.VersionList)
+        try:
+            pkg = self._cache[pkgname]
+        except KeyError:
+            return False
+        else:
+            return bool(pkg.provides_list and not pkg.version_list)
 
-    def getProvidingPackages(self, virtual):
+    def get_providing_packages(self, virtual):
         """
         Return a list of packages which provide the virtual package of the
         specified name
@@ -263,49 +279,82 @@ class Cache(object):
         providers = []
         try:
             vp = self._cache[virtual]
-            if len(vp.VersionList) != 0:
+            if len(vp.version_list) != 0:
                 return providers
         except KeyError:
             return providers
         for pkg in self:
-            v = self._depcache.GetCandidateVer(pkg._pkg)
+            v = self._depcache.get_candidate_ver(pkg._pkg)
             if v is None:
                 continue
-            for p in v.ProvidesList:
+            for p in v.provides_list:
                 if virtual == p[0]:
                     # we found a pkg that provides this virtual pkg
                     providers.append(pkg)
         return providers
 
-    def update(self, fetchProgress=None, pulseInterval=0, raiseOnError=False):
-        " run the equivalent of apt-get update "
-        lockfile = apt_pkg.Config.FindDir("Dir::State::Lists") + "lock"
-        lock = apt_pkg.GetLock(lockfile)
+    @deprecated_args
+    def update(self, fetch_progress=None, pulse_interval=0,
+               raise_on_error=True):
+        """Run the equivalent of apt-get update.
+
+        The first parameter *fetch_progress* may be set to an instance of
+        apt.progress.FetchProgress, the default is apt.progress.FetchProgress()
+        .
+        """
+        lockfile = apt_pkg.config.find_dir("Dir::State::Lists") + "lock"
+        lock = apt_pkg.get_lock(lockfile)
+
         if lock < 0:
             raise LockFailedException("Failed to lock %s" % lockfile)
 
         try:
-            if fetchProgress is None:
-                fetchProgress = apt.progress.FetchProgress()
-            res = self._cache.Update(fetchProgress, self._list, pulseInterval)
-
-            if res == 2 and raiseOnError:
-                raise FetchCancelledException()
-            elif res == 1 and raiseOnError:
+            if fetch_progress is None:
+                fetch_progress = apt.progress.base.AcquireProgress()
+            try:
+                res = self._cache.update(fetch_progress, self._list,
+                                         pulse_interval)
+            except SystemError, e:
+                raise FetchFailedException(e)
+            if not res and raise_on_error:
                 raise FetchFailedException()
             else:
                 return res
         finally:
             os.close(lock)
 
-    def installArchives(self, pm, installProgress):
-        installProgress.startUpdate()
-        res = installProgress.run(pm)
-        installProgress.finishUpdate()
+    @deprecated_args
+    def install_archives(self, pm, install_progress):
+        """
+        The first parameter *pm* refers to an object returned by
+        apt_pkg.PackageManager().
+
+        The second parameter *install_progress* refers to an InstallProgress()
+        object of the module apt.progress.
+        """
+        # compat with older API
+        try:
+            install_progress.startUpdate()
+        except AttributeError:
+            install_progress.start_update()
+        res = install_progress.run(pm)
+        try:
+            install_progress.finishUpdate()
+        except AttributeError:
+            install_progress.finish_update()
         return res
 
-    def commit(self, fetchProgress=None, installProgress=None):
-        """ Apply the marked changes to the cache """
+    @deprecated_args
+    def commit(self, fetch_progress=None, install_progress=None):
+        """Apply the marked changes to the cache.
+
+        The first parameter, *fetch_progress*, refers to a FetchProgress()
+        object as found in apt.progress, the default being
+        apt.progress.FetchProgress().
+
+        The second parameter, *install_progress*, is a
+        apt.progress.InstallProgress() object.
+        """
         # FIXME:
         # use the new acquire/pkgmanager interface here,
         # raise exceptions when a download or install fails
@@ -313,45 +362,53 @@ class Cache(object):
         # Current a failed download will just display "error"
         # which is less than optimal!
 
-        if fetchProgress is None:
-            fetchProgress = apt.progress.FetchProgress()
-        if installProgress is None:
-            installProgress = apt.progress.InstallProgress()
+        if fetch_progress is None:
+            fetch_progress = apt.progress.base.AcquireProgress()
+        if install_progress is None:
+            install_progress = apt.progress.base.InstallProgress()
 
-        pm = apt_pkg.GetPackageManager(self._depcache)
-        fetcher = apt_pkg.GetAcquire(fetchProgress)
+        pm = apt_pkg.PackageManager(self._depcache)
+        fetcher = apt_pkg.Acquire(fetch_progress)
         while True:
             # fetch archives first
-            res = self._fetchArchives(fetcher, pm)
+            res = self._fetch_archives(fetcher, pm)
 
             # then install
-            res = self.installArchives(pm, installProgress)
-            if res == pm.ResultCompleted:
+            res = self.install_archives(pm, install_progress)
+            if res == pm.RESULT_COMPLETED:
                 break
-            elif res == pm.ResultFailed:
+            elif res == pm.RESULT_FAILED:
                 raise SystemError("installArchives() failed")
-            elif res == pm.ResultIncomplete:
-                 pass
+            elif res == pm.RESULT_INCOMPLETE:
+                pass
             else:
-                 raise SystemError("internal-error: unknown result code from InstallArchives: %s" % res)
+                raise SystemError("internal-error: unknown result code "
+                                  "from InstallArchives: %s" % res)
             # reload the fetcher for media swaping
-            fetcher.Shutdown()
-        return (res == pm.ResultCompleted)
+            fetcher.shutdown()
+        return (res == pm.RESULT_COMPLETED)
 
     def clear(self):
         """ Unmark all changes """
-        self._depcache.Init()
+        self._depcache.init()
 
     # cache changes
 
-    def cachePostChange(self):
+    def cache_post_change(self):
         " called internally if the cache has changed, emit a signal then "
-        self._runCallbacks("cache_post_change")
+        self._run_callbacks("cache_post_change")
 
-    def cachePreChange(self):
+    def cache_pre_change(self):
         """ called internally if the cache is about to change, emit
             a signal then """
-        self._runCallbacks("cache_pre_change")
+        self._run_callbacks("cache_pre_change")
+
+    def connect(self, name, callback):
+        """ connect to a signal, currently only used for
+            cache_{post,pre}_{changed,open} """
+        if not name in self._callbacks:
+            self._callbacks[name] = []
+        self._callbacks[name].append(callback)
 
     def actiongroup(self):
         """Return an ActionGroup() object for the current cache.
@@ -359,35 +416,54 @@ class Cache(object):
         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
         deleted or when release() is called.
-        """
-        return apt_pkg.GetPkgActionGroup(self._depcache)
 
-    def connect(self, name, callback):
-        """ connect to a signal, currently only used for
-            cache_{post,pre}_{changed,open} """
-        if not name in self._callbacks:
-            self._callbacks[name] = []
-        self._callbacks[name].append(callback)
+        You can use the action group as a context manager, this is the
+        recommended way::
+
+            with cache.actiongroup():
+                for package in my_selected_packages:
+                    package.mark_install()
+
+        This way, the ActionGroup 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.
+        """
+        return apt_pkg.ActionGroup(self._depcache)
 
     @property
     def broken_count(self):
         """Return the number of packages with broken dependencies."""
-        return self._depcache.BrokenCount
+        return self._depcache.broken_count
 
     @property
     def delete_count(self):
         """Return the number of packages marked for deletion."""
-        return self._depcache.DelCount
+        return self._depcache.del_count
 
     @property
     def install_count(self):
         """Return the number of packages marked for installation."""
-        return self._depcache.InstCount
+        return self._depcache.inst_count
 
     @property
     def keep_count(self):
         """Return the number of packages marked as keep."""
-        return self._depcache.KeepCount
+        return self._depcache.keep_count
+
+    if apt_pkg._COMPAT_0_7:
+        _runCallbacks = function_deprecated_by(_run_callbacks)
+        getChanges = function_deprecated_by(get_changes)
+        requiredDownload = AttributeDeprecatedBy('required_download')
+        additionalRequiredSpace = AttributeDeprecatedBy('required_space')
+        reqReinstallPkgs = AttributeDeprecatedBy('req_reinstall_pkgs')
+        _runFetcher = function_deprecated_by(_run_fetcher)
+        _fetchArchives = function_deprecated_by(_fetch_archives)
+        isVirtualPackage = function_deprecated_by(is_virtual_package)
+        getProvidingPackages = function_deprecated_by(get_providing_packages)
+        installArchives = function_deprecated_by(install_archives)
+        cachePostChange = function_deprecated_by(cache_post_change)
+        cachePreChange = function_deprecated_by(cache_pre_change)
 
 
 class ProblemResolver(object):
@@ -397,31 +473,31 @@ class ProblemResolver(object):
     """
 
     def __init__(self, cache):
-        self._resolver = apt_pkg.GetPkgProblemResolver(cache._depcache)
+        self._resolver = apt_pkg.ProblemResolver(cache._depcache)
 
     def clear(self, package):
         """Reset the package to the default state."""
-        self._resolver.Clear(package._pkg)
+        self._resolver.clear(package._pkg)
 
     def install_protect(self):
         """mark protected packages for install or removal."""
-        self._resolver.InstallProtect()
+        self._resolver.install_protect()
 
     def protect(self, package):
         """Protect a package so it won't be removed."""
-        self._resolver.Protect(package._pkg)
+        self._resolver.protect(package._pkg)
 
     def remove(self, package):
         """Mark a package for removal."""
-        self._resolver.Remove(package._pkg)
+        self._resolver.remove(package._pkg)
 
     def resolve(self):
         """Resolve dependencies, try to remove packages where needed."""
-        self._resolver.Resolve()
+        self._resolver.resolve()
 
     def resolve_by_keep(self):
         """Resolve dependencies, do not try to remove packages."""
-        self._resolver.ResolveByKeep()
+        self._resolver.resolve_by_keep()
 
 
 # ----------------------------- experimental interface
@@ -441,7 +517,7 @@ class MarkedChangesFilter(Filter):
     """ Filter that returns all marked changes """
 
     def apply(self, pkg):
-        if pkg.markedInstall or pkg.markedDelete or pkg.markedUpgrade:
+        if pkg.marked_install or pkg.marked_delete or pkg.marked_upgrade:
             return True
         else:
             return False
@@ -458,8 +534,8 @@ class FilteredCache(object):
             self.cache = Cache(progress)
         else:
             self.cache = cache
-        self.cache.connect("cache_post_change", self.filterCachePostChange)
-        self.cache.connect("cache_post_open", self.filterCachePostChange)
+        self.cache.connect("cache_post_change", self.filter_cache_post_change)
+        self.cache.connect("cache_post_open", self.filter_cache_post_change)
         self._filtered = {}
         self._filters = []
 
@@ -482,7 +558,7 @@ class FilteredCache(object):
     def __contains__(self, key):
         return (key in self._filtered)
 
-    def _reapplyFilter(self):
+    def _reapply_filter(self):
         " internal helper to refilter "
         self._filtered = {}
         for pkg in self.cache:
@@ -491,18 +567,19 @@ class FilteredCache(object):
                     self._filtered[pkg.name] = 1
                     break
 
-    def setFilter(self, filter):
+    def set_filter(self, filter):
         """Set the current active filter."""
         self._filters = []
         self._filters.append(filter)
         #self._reapplyFilter()
         # force a cache-change event that will result in a refiltering
-        self.cache.cachePostChange()
+        self.cache.cache_post_change()
 
-    def filterCachePostChange(self):
+    def filter_cache_post_change(self):
         """Called internally if the cache changes, emit a signal then."""
         #print "filterCachePostChange()"
-        self._reapplyFilter()
+        self._reapply_filter()
+
 
 #    def connect(self, name, callback):
 #        self.cache.connect(name, callback)
@@ -512,6 +589,12 @@ class FilteredCache(object):
         #print "getattr: %s " % key
         return getattr(self.cache, key)
 
+    if apt_pkg._COMPAT_0_7:
+        _reapplyFilter = function_deprecated_by(_reapply_filter)
+        setFilter = function_deprecated_by(set_filter)
+        filterCachePostChange = function_deprecated_by(\
+                                                    filter_cache_post_change)
+
 
 def cache_pre_changed():
     print "cache pre changed"
@@ -521,61 +604,61 @@ def cache_post_changed():
     print "cache post changed"
 
 
-# internal test code
-if __name__ == "__main__":
+def _test():
+    """Internal test code."""
     print "Cache self test"
     apt_pkg.init()
-    c = Cache(apt.progress.OpTextProgress())
-    c.connect("cache_pre_change", cache_pre_changed)
-    c.connect("cache_post_change", cache_post_changed)
-    print ("aptitude" in c)
-    p = c["aptitude"]
-    print p.name
-    print len(c)
-
-    for pkg in c.keys():
-        x= c[pkg].name
-
-    c.upgrade()
-    changes = c.getChanges()
+    cache = Cache(apt.progress.text.OpProgress())
+    cache.connect("cache_pre_change", cache_pre_changed)
+    cache.connect("cache_post_change", cache_post_changed)
+    print ("aptitude" in cache)
+    pkg = cache["aptitude"]
+    print pkg.name
+    print len(cache)
+
+    for pkgname in cache.keys():
+        assert cache[pkgname].name == pkgname
+
+    cache.upgrade()
+    changes = cache.get_changes()
     print len(changes)
-    for p in changes:
-        #print p.name
-        x = p.name
+    for pkg in changes:
+        assert pkg.name
+
 
 
     # see if fetching works
-    for d in ["/tmp/pytest", "/tmp/pytest/partial"]:
-        if not os.path.exists(d):
-            os.mkdir(d)
-    apt_pkg.Config.Set("Dir::Cache::Archives", "/tmp/pytest")
-    pm = apt_pkg.GetPackageManager(c._depcache)
-    fetcher = apt_pkg.GetAcquire(apt.progress.TextFetchProgress())
-    c._fetchArchives(fetcher, pm)
+    for dirname in ["/tmp/pytest", "/tmp/pytest/partial"]:
+        if not os.path.exists(dirname):
+            os.mkdir(dirname)
+    apt_pkg.config.set("Dir::Cache::Archives", "/tmp/pytest")
+    pm = apt_pkg.PackageManager(cache._depcache)
+    fetcher = apt_pkg.Acquire(apt.progress.text.AcquireProgress())
+    cache._fetch_archives(fetcher, pm)
     #sys.exit(1)
 
     print "Testing filtered cache (argument is old cache)"
-    f = FilteredCache(c)
-    f.cache.connect("cache_pre_change", cache_pre_changed)
-    f.cache.connect("cache_post_change", cache_post_changed)
-    f.cache.upgrade()
-    f.setFilter(MarkedChangesFilter())
-    print len(f)
-    for pkg in f.keys():
-        #print c[pkg].name
-        x = f[pkg].name
-
-    print len(f)
+    filtered = FilteredCache(cache)
+    filtered.cache.connect("cache_pre_change", cache_pre_changed)
+    filtered.cache.connect("cache_post_change", cache_post_changed)
+    filtered.cache.upgrade()
+    filtered.set_filter(MarkedChangesFilter())
+    print len(filtered)
+    for pkgname in filtered.keys():
+        assert pkgname == filtered[pkg].name
+
+    print len(filtered)
 
     print "Testing filtered cache (no argument)"
-    f = FilteredCache(progress=apt.progress.OpTextProgress())
-    f.cache.connect("cache_pre_change", cache_pre_changed)
-    f.cache.connect("cache_post_change", cache_post_changed)
-    f.cache.upgrade()
-    f.setFilter(MarkedChangesFilter())
-    print len(f)
-    for pkg in f.keys():
-        #print c[pkg].name
-        x = f[pkg].name
-
-    print len(f)
+    filtered = FilteredCache(progress=apt.progress.base.OpProgress())
+    filtered.cache.connect("cache_pre_change", cache_pre_changed)
+    filtered.cache.connect("cache_post_change", cache_post_changed)
+    filtered.cache.upgrade()
+    filtered.set_filter(MarkedChangesFilter())
+    print len(filtered)
+    for pkgname in filtered.keys():
+        assert pkgname == filtered[pkgname].name
+
+    print len(filtered)
+if __name__ == '__main__':
+    _test()
diff --git a/apt/cdrom.py b/apt/cdrom.py
index b52762ad..01caa12f 100644
--- a/apt/cdrom.py
+++ b/apt/cdrom.py
@@ -23,10 +23,11 @@
 import glob
 
 import apt_pkg
-from apt.progress import CdromProgress
+from apt.deprecation import AttributeDeprecatedBy
+from apt.progress.base import CdromProgress
 
 
-class Cdrom(object):
+class Cdrom(apt_pkg.Cdrom):
     """Support for apt-cdrom like features.
 
     This class has several optional parameters for initialisation, which may
@@ -44,43 +45,44 @@ class Cdrom(object):
     """
 
     def __init__(self, progress=None, mountpoint=None, nomount=True):
-        self._cdrom = apt_pkg.GetCdrom()
+        apt_pkg.Cdrom.__init__(self)
         if progress is None:
             self._progress = CdromProgress()
         else:
             self._progress = progress
         # see if we have a alternative mountpoint
         if mountpoint is not None:
-            apt_pkg.Config.Set("Acquire::cdrom::mount", mountpoint)
+            apt_pkg.config.set("Acquire::cdrom::mount", mountpoint)
         # do not mess with mount points by default
         if nomount:
-            apt_pkg.Config.Set("APT::CDROM::NoMount", "true")
+            apt_pkg.config.set("APT::CDROM::NoMount", "true")
         else:
-            apt_pkg.Config.Set("APT::CDROM::NoMount", "false")
+            apt_pkg.config.set("APT::CDROM::NoMount", "false")
 
-    def add(self):
+    def add(self, progress=None):
         """Add cdrom to the sources.list."""
-        return self._cdrom.Add(self._progress)
+        return apt_pkg.Cdrom.add(self, progress or self._progress)
 
-    def ident(self):
+    def ident(self, progress=None):
         """Identify the cdrom."""
-        (res, ident) = self._cdrom.Ident(self._progress)
-        if res:
-            return ident
+        return apt_pkg.Cdrom.ident(self, progress or self._progress)
 
     @property
-    def inSourcesList(self):
+    def in_sources_list(self):
         """Check if the cdrom is already in the current sources.list."""
         cd_id = self.ident()
         if cd_id is None:
             # FIXME: throw exception instead
             return False
         # Get a list of files
-        src = glob.glob(apt_pkg.Config.FindDir("Dir::Etc::sourceparts") + '*')
-        src.append(apt_pkg.Config.FindFile("Dir::Etc::sourcelist"))
+        src = glob.glob(apt_pkg.config.find_dir("Dir::Etc::sourceparts") + '*')
+        src.append(apt_pkg.config.find_file("Dir::Etc::sourcelist"))
         # Check each file
         for fname in src:
             for line in open(fname):
                 if not line.lstrip().startswith("#") and cd_id in line:
                     return True
         return False
+
+    if apt_pkg._COMPAT_0_7:
+        inSourcesList = AttributeDeprecatedBy('in_sources_list')
diff --git a/apt/debfile.py b/apt/debfile.py
index 0e455508..ccaa25e4 100644
--- a/apt/debfile.py
+++ b/apt/debfile.py
@@ -17,12 +17,12 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 """Classes for working with locally available Debian packages."""
-from gettext import gettext as _
 import os
 import sys
 
 import apt_inst
 import apt_pkg
+from apt_pkg import gettext as _
 
 
 # Constants for comparing the local package file with the version in the cache
@@ -43,6 +43,9 @@ class DebPackage(object):
     def __init__(self, filename=None, cache=None):
         self._cache = cache
         self._need_pkgs = []
+        self._debfile = None
+        self.pkgname = ""
+        self.filename = filename
         self._sections = {}
         self._installed_conflicts = set()
         self._failure_string = ""
@@ -52,12 +55,9 @@ class DebPackage(object):
     def open(self, filename):
         " open given debfile "
         self.filename = filename
-        if not apt_inst.arCheckMember(open(self.filename), "debian-binary"):
-            raise NoDebArchiveException(_("This is not a valid DEB archive, "
-                                          "missing '%s' member" %
-                                          "debian-binary"))
-        control = apt_inst.debExtractControl(open(self.filename))
-        self._sections = apt_pkg.ParseSection(control)
+        self._debfile = apt_inst.DebFile(self.filename)
+        control = self._debfile.control.extractdata("control")
+        self._sections = apt_pkg.TagSection(control)
         self.pkgname = self._sections["Package"]
 
     def __getitem__(self, key):
@@ -67,19 +67,11 @@ class DebPackage(object):
     def filelist(self):
         """return the list of files in the deb."""
         files = []
-
-        def extract_cb(what, name, *_):
-            files.append(name)
-
-        for member in self._supported_data_members:
-            if apt_inst.arCheckMember(open(self.filename), member):
-                try:
-                    apt_inst.debExtract(open(self.filename), extract_cb,
-                                        member)
-                    break
-                except SystemError:
-                    return [_("List of files for '%s' could not be read" %
-                              self.filename)]
+        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 files
 
     def _is_or_group_satisfied(self, or_group):
@@ -97,16 +89,16 @@ class DebPackage(object):
 
             # check for virtual pkgs
             if not depname in self._cache:
-                if self._cache.isVirtualPackage(depname):
+                if self._cache.is_virtual_package(depname):
                     self._dbg(3, "_isOrGroupSatisfied(): %s is virtual dep" %
                                  depname)
-                    for pkg in self._cache.getProvidingPackages(depname):
-                        if pkg.isInstalled:
+                    for pkg in self._cache.get_providing_packages(depname):
+                        if pkg.is_installed:
                             return True
                 continue
 
             inst = self._cache[depname].installed
-            if inst is not None and apt_pkg.CheckDep(inst.version, oper, ver):
+            if inst is not None and apt_pkg.check_dep(inst.version, oper, ver):
                 return True
         return False
 
@@ -117,9 +109,9 @@ class DebPackage(object):
 
             # if we don't have it in the cache, it may be virtual
             if not depname in self._cache:
-                if not self._cache.isVirtualPackage(depname):
+                if not self._cache.is_virtual_package(depname):
                     continue
-                providers = self._cache.getProvidingPackages(depname)
+                providers = self._cache.get_providing_packages(depname)
                 # if a package just has a single virtual provider, we
                 # just pick that (just like apt)
                 if len(providers) != 1:
@@ -129,10 +121,10 @@ class DebPackage(object):
             # now check if we can satisfy the deps with the candidate(s)
             # in the cache
             pkg = self._cache[depname]
-            cand = self._cache._depcache.GetCandidateVer(pkg._pkg)
+            cand = self._cache._depcache.get_candidate_ver(pkg._pkg)
             if not cand:
                 continue
-            if not apt_pkg.CheckDep(cand.VerStr, oper, ver):
+            if not apt_pkg.check_dep(cand.ver_str, oper, ver):
                 continue
 
             # check if we need to install it
@@ -158,9 +150,9 @@ class DebPackage(object):
                      (pkgname, ver, oper))
 
         pkg = self._cache[pkgname]
-        if pkg.isInstalled:
+        if pkg.is_installed:
             pkgver = pkg.installed.version
-        elif pkg.markedInstall:
+        elif pkg.marked_install:
             pkgver = pkg.candidate.version
         else:
             return False
@@ -168,7 +160,7 @@ class DebPackage(object):
         #print "ver: %s" % ver
         #print "pkgver: %s " % pkgver
         #print "oper: %s " % oper
-        if (apt_pkg.CheckDep(pkgver, oper, ver) and not
+        if (apt_pkg.check_dep(pkgver, oper, ver) and not
             self.replaces_real_pkg(pkgname, oper, ver)):
             self._failure_string += _("Conflicts with the installed package "
                                      "'%s'" % pkg.name)
@@ -179,9 +171,6 @@ class DebPackage(object):
         """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]
@@ -191,8 +180,8 @@ class DebPackage(object):
             if not depname in self._cache:
                 # FIXME: we have to check for virtual replaces here as
                 #        well (to pass tests/gdebi-test8.deb)
-                if self._cache.isVirtualPackage(depname):
-                    for pkg in self._cache.getProvidingPackages(depname):
+                if self._cache.is_virtual_package(depname):
+                    for pkg in self._cache.get_providing_packages(depname):
                         self._dbg(3, "conflicts virtual check: %s" % pkg.name)
                         # P/C/R on virtal pkg, e.g. ftpd
                         if self.pkgname == pkg.name:
@@ -211,7 +200,7 @@ class DebPackage(object):
         """List of package names conflicting with this package."""
         key = "Conflicts"
         try:
-            return apt_pkg.ParseDepends(self._sections[key])
+            return apt_pkg.parse_depends(self._sections[key])
         except KeyError:
             return []
 
@@ -222,7 +211,7 @@ class DebPackage(object):
         # find depends
         for key in "Depends", "PreDepends":
             try:
-                depends.extend(apt_pkg.ParseDepends(self._sections[key]))
+                depends.extend(apt_pkg.parse_depends(self._sections[key]))
             except KeyError:
                 pass
         return depends
@@ -232,7 +221,7 @@ class DebPackage(object):
         """List of virtual packages which are provided by this package."""
         key = "Provides"
         try:
-            return apt_pkg.ParseDepends(self._sections[key])
+            return apt_pkg.parse_depends(self._sections[key])
         except KeyError:
             return []
 
@@ -241,7 +230,7 @@ class DebPackage(object):
         """List of packages which are replaced by this package."""
         key = "Replaces"
         try:
-            return apt_pkg.ParseDepends(self._sections[key])
+            return apt_pkg.parse_depends(self._sections[key])
         except KeyError:
             return []
 
@@ -253,15 +242,15 @@ class DebPackage(object):
         """
         self._dbg(3, "replacesPkg() %s %s %s" % (pkgname, oper, ver))
         pkg = self._cache[pkgname]
-        if pkg.isInstalled:
+        if pkg.is_installed:
             pkgver = pkg.installed.version
-        elif pkg.markedInstall:
+        elif pkg.marked_install:
             pkgver = pkg.candidate.version
         else:
             pkgver = None
         for or_group in self.replaces:
             for (name, ver, oper) in or_group:
-                if (name == pkgname and apt_pkg.CheckDep(pkgver, oper, ver)):
+                if (name == pkgname and apt_pkg.check_dep(pkgver, oper, ver)):
                     self._dbg(3, "we have a replaces in our package for the "
                                  "conflict against '%s'" % (pkgname))
                     return True
@@ -298,23 +287,23 @@ class DebPackage(object):
             else:
                 cachever = self._cache[pkgname].candidate.version
             if cachever is not None:
-                cmp = apt_pkg.VersionCompare(cachever, debver)
-                self._dbg(1, "CompareVersion(debver,instver): %s" % cmp)
-                if cmp == 0:
+                cmpres = apt_pkg.version_compare(cachever, debver)
+                self._dbg(1, "CompareVersion(debver,instver): %s" % cmpres)
+                if cmpres == 0:
                     return VERSION_SAME
-                elif cmp < 0:
+                elif cmpres < 0:
                     return VERSION_NEWER
-                elif cmp > 0:
+                elif cmpres > 0:
                     return VERSION_OUTDATED
         return VERSION_NONE
 
     def check(self):
         """Check if the package is installable."""
-        self._dbg(3, "checkDepends")
+        self._dbg(3, "check_depends")
 
         # check arch
         arch = self._sections["Architecture"]
-        if  arch != "all" and arch != apt_pkg.Config.Find("APT::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
@@ -341,7 +330,7 @@ class DebPackage(object):
         if not self.check_conflicts():
             return False
 
-        if self._cache._depcache.BrokenCount > 0:
+        if self._cache._depcache.broken_count > 0:
             self._failure_string = _("Failed to satisfy all dependencies "
                                     "(broken cache)")
             # clean the cache again
@@ -351,13 +340,13 @@ class DebPackage(object):
 
     def satisfy_depends_str(self, dependsstr):
         """Satisfy the dependencies in the given string."""
-        return self._satisfy_depends(apt_pkg.ParseDepends(dependsstr))
+        return self._satisfy_depends(apt_pkg.parse_depends(dependsstr))
 
     def _satisfy_depends(self, depends):
         """Satisfy the dependencies."""
         # turn off MarkAndSweep via a action group (if available)
         try:
-            _actiongroup = apt_pkg.GetPkgActionGroup(self._cache._depcache)
+            _actiongroup = apt_pkg.ActionGroup(self._cache._depcache)
         except AttributeError:
             pass
         # check depends
@@ -371,8 +360,8 @@ class DebPackage(object):
         # now try it out in the cache
         for pkg in self._need_pkgs:
             try:
-                self._cache[pkg].markInstall(fromUser=False)
-            except SystemError, e:
+                self._cache[pkg].mark_install(fromUser=False)
+            except SystemError:
                 self._failure_string = _("Cannot install '%s'" % pkg)
                 self._cache.clear()
                 return False
@@ -396,7 +385,7 @@ class DebPackage(object):
         remove = []
         unauthenticated = []
         for pkg in self._cache:
-            if pkg.markedInstall or pkg.markedUpgrade:
+            if pkg.marked_install or pkg.marked_upgrade:
                 install.append(pkg.name)
                 # check authentication, one authenticated origin is enough
                 # libapt will skip non-authenticated origins then
@@ -405,7 +394,7 @@ class DebPackage(object):
                     authenticated |= origin.trusted
                 if not authenticated:
                     unauthenticated.append(pkg.name)
-            if pkg.markedDelete:
+            if pkg.marked_delete:
                 remove.append(pkg.name)
         return (install, remove, unauthenticated)
 
@@ -417,7 +406,7 @@ class DebPackage(object):
     def install(self, install_progress=None):
         """Install the package."""
         if install_progress is None:
-            return os.system("dpkg -i %s" % self.filename)
+            return os.spawnlp(os.P_WAIT, "dpkg", "dpkg", "-i", self.filename)
         else:
             try:
                 install_progress.start_update()
@@ -438,7 +427,8 @@ class DscSrcPackage(DebPackage):
         DebPackage.__init__(self, None, cache)
         self._depends = []
         self._conflicts = []
-        self._binaries = []
+        self.pkgname = ""
+        self.binaries = []
         if filename is not None:
             self.open(filename)
 
@@ -458,26 +448,24 @@ class DscSrcPackage(DebPackage):
         conflicts_tags = ["Build-Conflicts", "Build-Conflicts-Indep"]
 
         fobj = open(file)
-        tagfile = apt_pkg.ParseTagFile(fobj)
-        sec = tagfile.Section
+        tagfile = apt_pkg.TagFile(fobj)
         try:
-            while tagfile.Step() == 1:
+            for sec in tagfile:
                 for tag in depends_tags:
-                    if not sec.has_key(tag):
+                    if not tag in sec:
                         continue
-                    self._depends.extend(apt_pkg.ParseSrcDepends(sec[tag]))
+                    self._depends.extend(apt_pkg.parse_src_depends(sec[tag]))
                 for tag in conflicts_tags:
-                    if not sec.has_key(tag):
+                    if not tag in sec:
                         continue
-                    self._conflicts.extend(apt_pkg.ParseSrcDepends(sec[tag]))
-                if sec.has_key('Source'):
+                    self._conflicts.extend(apt_pkg.parse_src_depends(sec[tag]))
+                if 'Source' in sec:
                     self.pkgname = sec['Source']
-                if sec.has_key('Binary'):
+                if 'Binary' in sec:
                     self.binaries = sec['Binary'].split(', ')
-                if sec.has_key('Version'):
+                if 'Version' in sec:
                     self._sections['Version'] = sec['Version']
         finally:
-            del sec
             del tagfile
             fobj.close()
 
@@ -490,9 +478,9 @@ class DscSrcPackage(DebPackage):
         """Check if the package is installable.."""
         if not self.check_conflicts():
             for pkgname in self._installed_conflicts:
-                if self._cache[pkgname]._pkg.Essential:
+                if self._cache[pkgname]._pkg.essential:
                     raise Exception(_("An essential package would be removed"))
-                self._cache[pkgname].markDelete()
+                self._cache[pkgname].mark_delete()
         # FIXME: a additional run of the checkConflicts()
         #        after _satisfyDepends() should probably be done
         return self._satisfy_depends(self.depends)
@@ -507,7 +495,7 @@ def _test():
 
     vp = "www-browser"
     #print "%s virtual: %s" % (vp, cache.isVirtualPackage(vp))
-    providers = cache.getProvidingPackages(vp)
+    providers = cache.get_providing_packages(vp)
     print "Providers for %s :" % vp
     for pkg in providers:
         print " %s" % pkg.name
@@ -525,13 +513,13 @@ def _test():
     print ret
 
     #s = DscSrcPackage(cache, "../tests/3ddesktop_0.2.9-6.dsc")
-    #s.checkDep()
+    #s.check_dep()
     #print "Missing deps: ",s.missingDeps
     #print "Print required changes: ", s.requiredChanges
 
     s = DscSrcPackage(cache=cache)
     d = "libc6 (>= 2.3.2), libaio (>= 0.3.96) | libaio1 (>= 0.3.96)"
-    print s._satisfy_depends(apt_pkg.ParseDepends(d))
+    print s._satisfy_depends(apt_pkg.parse_depends(d))
 
 if __name__ == "__main__":
     _test()
diff --git a/apt/deprecation.py b/apt/deprecation.py
new file mode 100644
index 00000000..0f39ad63
--- /dev/null
+++ b/apt/deprecation.py
@@ -0,0 +1,106 @@
+# deprecation.py - Module providing classes and functions for deprecation.
+#
+#  Copyright (c) 2009 Julian Andres Klode <jak@debian.org>
+#  Copyright (c) 2009 Ben Finney <ben+debian@benfinney.id.au>
+#
+#  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
+"""Classes and functions for deprecating features.
+
+This is used for internal purposes only and not part of the official API. Do
+not use it for anything outside the apt package.
+"""
+import re
+import operator
+import warnings
+
+import apt_pkg
+
+__all__ = []
+
+
+class AttributeDeprecatedBy(object):
+    """Property acting as a proxy for a new attribute.
+
+    When accessed, the property issues a DeprecationWarning and (on get) calls
+    attrgetter() for the attribute 'attribute' on the current object or (on
+    set) uses setattr to set the value of the wrapped attribute.
+    """
+
+    def __init__(self, attribute):
+        """Initialize the property."""
+        self.attribute = attribute
+        self.__doc__ = 'Deprecated, please use \'%s\' instead' % attribute
+        self.getter = operator.attrgetter(attribute)
+
+    def __get__(self, obj, type_=None):
+        """Issue a  DeprecationWarning and return the requested value."""
+        if obj is None:
+            return getattr(type_, self.attribute, self)
+        warnings.warn(self.__doc__, DeprecationWarning, stacklevel=2)
+        return self.getter(obj or type_)
+
+    def __set__(self, obj, value):
+        """Issue a  DeprecationWarning and set the requested value."""
+        warnings.warn(self.__doc__, DeprecationWarning, stacklevel=2)
+        setattr(obj, self.attribute, value)
+
+
+def function_deprecated_by(func, convert_names=True):
+    """Return a function that warns it is deprecated by another function.
+
+    Returns a new function that warns it is deprecated by function 'func',
+    then acts as a pass-through wrapper for 'func'.
+
+    This function also converts all keyword argument names from mixedCase to
+    lowercase_with_underscores, but only if 'convert_names' is True (default).
+    """
+    warning = 'Deprecated, please use \'%s()\' instead' % func.__name__
+
+    def deprecated_function(*args, **kwds):
+        """Wrapper around a deprecated function."""
+        warnings.warn(warning, DeprecationWarning, stacklevel=2)
+        if convert_names:
+            for key in kwds.keys():
+                kwds[re.sub('([A-Z])', '_\\1', key).lower()] = kwds.pop(key)
+        return func(*args, **kwds)
+    return deprecated_function
+
+
+def deprecated_args(func):
+    """A function with deprecated arguments.
+
+    Similar to function_deprecated_by() but warns on every deprecated argument
+    instead of function calls.
+    """
+    if not apt_pkg._COMPAT_0_7:
+        return func
+
+    def deprecated_function(*args, **kwds):
+        """Wrapper around a function with deprecated arguments."""
+        for key in kwds.keys():
+            new_key = re.sub('([A-Z])', '_\\1', key).lower()
+            if new_key != key:
+                warnings.warn("Deprecated parameter %r" % key)
+                kwds[new_key] = kwds.pop(key)
+        return func(*args, **kwds)
+
+    # Wrap the function completely (same as functools.wraps)
+    # pylint: disable-msg=W0622
+    deprecated_function.__name__ = func.__name__
+    deprecated_function.__doc__ = func.__doc__
+    deprecated_function.__module__ = func.__module__
+    deprecated_function.__dict__.update(func.__dict__)
+    return deprecated_function
diff --git a/apt/package.py b/apt/package.py
index f33871c6..0c026504 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -19,7 +19,6 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 """Functionality related to packages."""
-import gettext
 import httplib
 import os
 import sys
@@ -28,6 +27,11 @@ import socket
 import subprocess
 import urllib2
 import warnings
+try:
+    from collections import Mapping, Sequence
+except ImportError:
+    # (for Python < 2.6) pylint: disable-msg=C0103
+    Sequence = Mapping = object
 
 try:
     from collections import Sequence
@@ -35,19 +39,17 @@ except ImportError:
     Sequence = object
 
 import apt_pkg
-import apt.progress
+import apt.progress.text
+from apt_pkg import gettext as _
+from apt.deprecation import (function_deprecated_by, AttributeDeprecatedBy,
+                             deprecated_args)
 
 __all__ = ('BaseDependency', 'Dependency', 'Origin', 'Package', 'Record',
            'Version', 'VersionList')
 
 
-def _(string):
-    """Return the translation of the string."""
-    return gettext.dgettext("python-apt", string)
-
-
 def _file_is_same(path, size, md5):
-    """Return True if the file is the same."""
+    """Return ``True`` if the file is the same."""
     if (os.path.exists(path) and os.path.getsize(path) == size and
         apt_pkg.md5sum(open(path)) == md5):
         return True
@@ -61,23 +63,35 @@ class BaseDependency(object):
     """A single dependency.
 
     Attributes defined here:
-        name      - The name of the dependency
-        relation  - The relation (>>,>=,==,<<,<=,)
-        version   - The version depended on
+        name       - The name of the dependency
+        relation   - The relation (>,>=,==,<,<=,)
+        version    - The version depended on
         rawtype   - The type of the dependendy (e.g. 'Recommends')
-        preDepend - Boolean value whether this is a pre-dependency.
+        pre_depend - Boolean value whether this is a pre-dependency.
     """
 
+    class __dstr(str):
+        """Helper to make > match >> and < match <<"""
+
+        def __eq__(self, other):
+            return str.__eq__(self, other) or str.__eq__(2 * self, other)
+
+        def __ne__(self, other):
+            return str.__eq__(self, other) and str.__ne__(2 * self, other)
+
     def __init__(self, name, rel, ver, pre, rawtype=None):
         self.name = name
-        self.relation = rel
+        self.relation = len(rel) == 1 and self.__dstr(rel) or rel
         self.version = ver
-        self.preDepend = pre
+        self.pre_depend = pre
         self.rawtype = rawtype
 
     def __repr__(self):
         return ('<BaseDependency: name:%r relation:%r version:%r preDepend:%r>'
-                % (self.name, self.relation, self.version, self.preDepend))
+                % (self.name, self.relation, self.version, self.pre_depend))
+
+    if apt_pkg._COMPAT_0_7:
+        preDepend = AttributeDeprecatedBy('pre_depend')
 
 
 class Dependency(object):
@@ -103,15 +117,15 @@ class DeprecatedProperty(property):
 
     def __init__(self, fget=None, fset=None, fdel=None, doc=None):
         property.__init__(self, fget, fset, fdel, doc)
-        self.__doc__ = ':Deprecated: ' + (doc or fget.__doc__ or '')
+        self.__doc__ = (doc or fget.__doc__ or '')
 
-    def __get__(self, obj, type=None):
+    def __get__(self, obj, type_=None):
         if obj is not None:
             warnings.warn("Accessed deprecated property %s.%s, please see the "
                           "Version class for alternatives." %
-                           ((obj.__class__.__name__ or type.__name__),
-                           self.fget.func_name), DeprecationWarning, 2)
-        return property.__get__(self, obj, type)
+                           ((obj.__class__.__name__ or type_.__name__),
+                           self.fget.__name__), DeprecationWarning, 2)
+        return property.__get__(self, obj, type_)
 
 
 class Origin(object):
@@ -126,16 +140,16 @@ class Origin(object):
         trusted   - Boolean value whether this is trustworthy.
     """
 
-    def __init__(self, pkg, VerFileIter):
-        self.archive = VerFileIter.Archive
-        self.component = VerFileIter.Component
-        self.label = VerFileIter.Label
-        self.origin = VerFileIter.Origin
-        self.site = VerFileIter.Site
-        self.not_automatic = VerFileIter.NotAutomatic
+    def __init__(self, pkg, packagefile):
+        self.archive = packagefile.archive
+        self.component = packagefile.component
+        self.label = packagefile.label
+        self.origin = packagefile.origin
+        self.site = packagefile.site
+        self.not_automatic = packagefile.not_automatic
         # check the trust
-        indexfile = pkg._pcache._list.FindIndex(VerFileIter)
-        if indexfile and indexfile.IsTrusted:
+        indexfile = pkg._pcache._list.find_index(packagefile)
+        if indexfile and indexfile.is_trusted:
             self.trusted = True
         else:
             self.trusted = False
@@ -147,7 +161,7 @@ class Origin(object):
                                             self.site, self.trusted)
 
 
-class Record(object):
+class Record(Mapping):
     """Represent a pkgRecord.
 
     It can be accessed like a dictionary and can also give the original package
@@ -155,7 +169,10 @@ class Record(object):
     """
 
     def __init__(self, record_str):
-        self._rec = apt_pkg.ParseSection(record_str)
+        self._rec = apt_pkg.TagSection(record_str)
+
+    def __hash__(self):
+        return hash(self._rec)
 
     def __str__(self):
         return str(self._rec)
@@ -164,7 +181,7 @@ class Record(object):
         return self._rec[key]
 
     def __contains__(self, key):
-        return self._rec.has_key(key)
+        return key in self._rec
 
     def __iter__(self):
         return iter(self._rec.keys())
@@ -175,21 +192,24 @@ class Record(object):
             yield key, self._rec[key]
 
     def get(self, key, default=None):
-        """Return record[key] if key in record, else `default`.
+        """Return record[key] if key in record, else *default*.
 
-        The parameter `default` must be either a string or None.
+        The parameter *default* must be either a string or None.
         """
         return self._rec.get(key, default)
 
     def has_key(self, key):
-        """deprecated form of 'key in x'."""
-        return self._rec.has_key(key)
+        """deprecated form of ``key in x``."""
+        return key in self._rec
+
+    def __len__(self):
+        return len(self._rec)
 
 
 class Version(object):
     """Representation of a package version.
 
-    :since: 0.7.9
+    .. versionadded:: 0.7.9
     """
 
     def __init__(self, package, cand):
@@ -198,9 +218,9 @@ class Version(object):
 
     def _cmp(self, other):
         try:
-            return apt_pkg.VersionCompare(self._cand.VerStr, other.version)
+            return apt_pkg.version_compare(self._cand.ver_str, other.version)
         except AttributeError:
-            return apt_pkg.VersionCompare(self._cand.VerStr, other)
+            return apt_pkg.version_compare(self._cand.ver_str, other)
 
     def __eq__(self, other):
         try:
@@ -239,7 +259,7 @@ class Version(object):
             return NotImplemented
 
     def __hash__(self):
-        return self._cand.Hash
+        return self._cand.hash
 
     def __repr__(self):
         return '<Version: package:%r version:%r>' % (self.package.name,
@@ -248,58 +268,63 @@ class Version(object):
     @property
     def _records(self):
         """Internal helper that moves the Records to the right position."""
-        if self.package._pcache._records.Lookup(self._cand.FileList[0]):
+        if self.package._pcache._records.lookup(self._cand.file_list[0]):
             return self.package._pcache._records
 
     @property
+    def _translated_records(self):
+        """Internal helper to get the translated description."""
+        desc_iter = self._cand.translated_description
+        self.package._pcache._records.lookup(desc_iter.file_list.pop(0))
+        return self.package._pcache._records
+
+    @property
     def installed_size(self):
         """Return the size of the package when installed."""
-        return self._cand.InstalledSize
+        return self._cand.installed_size
 
     @property
     def homepage(self):
         """Return the homepage for the package."""
-        return self._records.Homepage
+        return self._records.homepage
 
     @property
     def size(self):
         """Return the size of the package."""
-        return self._cand.Size
+        return self._cand.size
 
     @property
     def architecture(self):
         """Return the architecture of the package version."""
-        return self._cand.Arch
+        return self._cand.arch
 
     @property
     def downloadable(self):
         """Return whether the version of the package is downloadable."""
-        return bool(self._cand.Downloadable)
+        return bool(self._cand.downloadable)
 
     @property
     def version(self):
         """Return the version as a string."""
-        return self._cand.VerStr
+        return self._cand.ver_str
 
     @property
     def summary(self):
         """Return the short description (one line summary)."""
-        desc_iter = self._cand.TranslatedDescription
-        self.package._pcache._records.Lookup(desc_iter.FileList.pop(0))
-        return self.package._pcache._records.ShortDesc
+        return self._translated_records.short_desc
 
     @property
     def raw_description(self):
         """return the long description (raw)."""
-        return self._records.LongDesc
+        return self._records.long_desc
 
     @property
     def section(self):
         """Return the section of the package."""
-        return self._cand.Section
+        return self._cand.section
 
     @property
-    def description(self, format=True, useDots=False):
+    def description(self):
         """Return the formatted long description.
 
         Return the formated long description according to the Debian policy
@@ -307,10 +332,12 @@ class Version(object):
         See http://www.debian.org/doc/debian-policy/ch-controlfields.html
         for more information.
         """
-        self.summary # This does the lookup for us.
         desc = ''
+        dsc = self._translated_records.long_desc
         try:
-            dsc = unicode(self.package._pcache._records.LongDesc, "utf-8")
+            if not isinstance(dsc, unicode):
+                # Only convert where needed (i.e. Python 2.X)
+                dsc = unicode(dsc, "utf-8")
         except UnicodeDecodeError, err:
             return _("Invalid unicode in description for '%s' (%s). "
                   "Please report.") % (self.package.name, err)
@@ -347,32 +374,33 @@ class Version(object):
     def source_name(self):
         """Return the name of the source package."""
         try:
-            return self._records.SourcePkg or self.package.name
+            return self._records.source_pkg or self.package.name
         except IndexError:
             return self.package.name
 
     @property
     def priority(self):
         """Return the priority of the package, as string."""
-        return self._cand.PriorityStr
+        return self._cand.priority_str
 
     @property
     def record(self):
         """Return a Record() object for this version."""
-        return Record(self._records.Record)
+        return Record(self._records.record)
 
     def get_dependencies(self, *types):
         """Return a list of Dependency objects for the given types."""
         depends_list = []
-        depends = self._cand.DependsList
-        for t in types:
+        depends = self._cand.depends_list
+        for type_ in types:
             try:
-                for depVerList in depends[t]:
+                for dep_ver_list in depends[type_]:
                     base_deps = []
-                    for depOr in depVerList:
-                        base_deps.append(BaseDependency(depOr.TargetPkg.Name,
-                                        depOr.CompType, depOr.TargetVer,
-                                        (t == "PreDepends"), rawtype=t))
+                    for dep_or in dep_ver_list:
+                        base_deps.append(BaseDependency(dep_or.target_pkg.name,
+                                        dep_or.comp_type, dep_or.target_ver,
+                                        (type_ == "PreDepends"),
+                                         rawtype=type_))
                     depends_list.append(Dependency(base_deps))
             except KeyError:
                 pass
@@ -397,123 +425,145 @@ class Version(object):
     def origins(self):
         """Return a list of origins for the package version."""
         origins = []
-        for (verFileIter, index) in self._cand.FileList:
-            origins.append(Origin(self.package, verFileIter))
+        for (packagefile, _) in self._cand.file_list:
+            origins.append(Origin(self.package, packagefile))
         return origins
 
     @property
     def filename(self):
-        """Return the path to the file inside the archive."""
-        return self._records.FileName
+        """Return the path to the file inside the archive.
+
+        .. versionadded:: 0.7.10
+        """
+        return self._records.filename
 
     @property
     def md5(self):
-        """Return the md5sum of the binary."""
-        return self._records.MD5Hash
+        """Return the md5sum of the binary.
+
+        .. versionadded:: 0.7.10
+        """
+        return self._records.md5_hash
 
     @property
     def sha1(self):
-        """Return the sha1sum of the binary."""
-        return self._records.SHA1Hash
+        """Return the sha1sum of the binary.
+
+        .. versionadded:: 0.7.10
+        """
+        return self._records.sha1_hash
 
     @property
     def sha256(self):
-        """Return the sha1sum of the binary."""
-        return self._records.SHA256Hash
+        """Return the sha256sum of the binary.
+
+        .. versionadded:: 0.7.10
+        """
+        return self._records.sha256_hash
 
     def _uris(self):
-        """Return an iterator over all available urls."""
-        for (packagefile, index) in self._cand.FileList:
-            indexfile = self.package._pcache._list.FindIndex(packagefile)
+        """Return an iterator over all available urls.
+
+        .. versionadded:: 0.7.10
+        """
+        for (packagefile, _) in self._cand.file_list:
+            indexfile = self.package._pcache._list.find_index(packagefile)
             if indexfile:
-                yield indexfile.ArchiveURI(self._records.FileName)
+                yield indexfile.archive_uri(self._records.filename)
 
     @property
     def uris(self):
-        """Return a list of all available uris for the binary."""
+        """Return a list of all available uris for the binary.
+
+        .. versionadded:: 0.7.10
+        """
         return list(self._uris())
 
     @property
     def uri(self):
-        """Return a single URI for the binary."""
-        return self._uris().next()
+        """Return a single URI for the binary.
+
+        .. versionadded:: 0.7.10
+        """
+        return iter(self._uris()).next()
 
     def fetch_binary(self, destdir='', progress=None):
         """Fetch the binary version of the package.
 
-        The parameter 'destdir' specifies the directory where the package will
+        The parameter *destdir* specifies the directory where the package will
         be fetched to.
 
-        The parameter 'progress' may refer to an apt.progress.FetchProgress()
-        object. If not specified or None, apt.progress.TextFetchProgress() is
-        used.
+        The parameter *progress* may refer to an apt_pkg.AcquireProgress()
+        object. If not specified or None, apt.progress.text.AcquireProgress()
+        is used.
+
+        .. versionadded:: 0.7.10
         """
-        base = os.path.basename(self._records.FileName)
+        base = os.path.basename(self._records.filename)
         destfile = os.path.join(destdir, base)
-        if _file_is_same(destfile, self.size, self._records.MD5Hash):
+        if _file_is_same(destfile, self.size, self._records.md5_hash):
             print 'Ignoring already existing file:', destfile
             return
-        acq = apt_pkg.GetAcquire(progress or apt.progress.TextFetchProgress())
-        apt_pkg.GetPkgAcqFile(acq, self.uri, self._records.MD5Hash, self.size,
-                              base, destFile=destfile)
-        acq.Run()
-        for item in acq.Items:
-            if item.Status != item.StatDone:
-                raise FetchError("The item %r could not be fetched: %s" %
-                                    (item.DestFile, item.ErrorText))
+        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)
+        acq.run()
+
+        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):
         """Get the source code of a package.
 
-        The parameter 'destdir' specifies the directory where the source will
+        The parameter *destdir* specifies the directory where the source will
         be fetched to.
 
-        The parameter 'progress' may refer to an apt.progress.FetchProgress()
-        object. If not specified or None, apt.progress.TextFetchProgress() is
-        used.
+        The parameter *progress* may refer to an apt_pkg.AcquireProgress()
+        object. If not specified or None, apt.progress.text.AcquireProgress()
+        is used.
 
-        The parameter 'unpack' describes whether the source should be unpacked
-        (True) or not (False). By default, it is unpacked.
+        The parameter *unpack* describes whether the source should be unpacked
+        (``True``) or not (``False``). By default, it is unpacked.
 
-        If 'unpack' is True, the path to the extracted directory is returned.
-        Otherwise, the path to the .dsc file is returned.
+        If *unpack* is ``True``, the path to the extracted directory is
+        returned. Otherwise, the path to the .dsc file is returned.
         """
-        src = apt_pkg.GetPkgSrcRecords()
-        acq = apt_pkg.GetAcquire(progress or apt.progress.TextFetchProgress())
+        src = apt_pkg.SourceRecords()
+        acq = apt_pkg.Acquire(progress or apt.progress.text.AcquireProgress())
 
         dsc = None
         record = self._records
-        src.Lookup(record.SourcePkg)
+        src.lookup(record.source_pkg)
+        source_version = record.source_ver or self._cand.ver_str
+
         try:
-            while record.SourceVer != src.Version:
-                src.Lookup(record.SourcePkg)
+            while source_version != src.version:
+                src.lookup(record.source_pkg)
         except AttributeError:
             raise ValueError("No source for %r" % self)
-        for md5, size, path, type in src.Files:
+        files = list()
+        for md5, size, path, type_ in src.files:
             base = os.path.basename(path)
             destfile = os.path.join(destdir, base)
-            if type == 'dsc':
+            if type_ == 'dsc':
                 dsc = destfile
-            if os.path.exists(base) and os.path.getsize(base) == size:
-                fobj = open(base)
-                try:
-                    if apt_pkg.md5sum(fobj) == md5:
-                        print 'Ignoring already existing file:', destfile
-                        continue
-                finally:
-                    fobj.close()
-            apt_pkg.GetPkgAcqFile(acq, src.Index.ArchiveURI(path), md5, size,
-                                  base, destFile=destfile)
-        acq.Run()
-
-        for item in acq.Items:
-            if item.Status != item.StatDone:
+            if _file_is_same(destfile, size, md5):
+                print 'Ignoring already existing file:', destfile
+                continue
+            files.append(apt_pkg.AcquireFile(acq, src.index.archive_uri(path),
+                         md5, size, base, destfile=destfile))
+        acq.run()
+
+        for item in acq.items:
+            if item.status != item.STAT_DONE:
                 raise FetchError("The item %r could not be fetched: %s" %
-                                    (item.DestFile, item.ErrorText))
+                                    (item.destfile, item.error_text))
 
         if unpack:
-            outdir = src.Package + '-' + apt_pkg.UpstreamVersion(src.Version)
+            outdir = src.package + '-' + apt_pkg.upstream_version(src.version)
             outdir = os.path.join(destdir, outdir)
             subprocess.check_call(["dpkg-source", "-x", dsc, outdir])
             return os.path.abspath(outdir)
@@ -541,11 +591,11 @@ class VersionList(Sequence):
         max(package.versions)
     """
 
-    def __init__(self, package, slice=None):
+    def __init__(self, package, slice_=None):
         self._package = package # apt.package.Package()
-        self._versions = package._pkg.VersionList # [apt_pkg.Version(), ...]
-        if slice:
-            self._versions = self._versions[slice]
+        self._versions = package._pkg.version_list # [apt_pkg.Version(), ...]
+        if slice_:
+            self._versions = self._versions[slice_]
 
     def __getitem__(self, item):
         if isinstance(item, slice):
@@ -556,7 +606,7 @@ class VersionList(Sequence):
         except TypeError:
             # Dictionary interface item is a string.
             for ver in self._versions:
-                if ver.VerStr == item:
+                if ver.ver_str == item:
                     return Version(self._package, ver)
         raise KeyError("Version: %r not found." % (item))
 
@@ -572,7 +622,7 @@ class VersionList(Sequence):
             item = item.version
         # Dictionary interface.
         for ver in self._versions:
-            if ver.VerStr == item:
+            if ver.ver_str == item:
                 return True
         return False
 
@@ -586,7 +636,7 @@ class VersionList(Sequence):
 
     def keys(self):
         """Return a list of all versions, as strings."""
-        return [ver.VerStr for ver in self._versions]
+        return [ver.ver_str for ver in self._versions]
 
     def get(self, key, default=None):
         """Return the key or the default."""
@@ -611,7 +661,7 @@ class Package(object):
         self._changelog = ""            # Cached changelog
 
     def __repr__(self):
-        return '<Package: name:%r id:%r>' % (self._pkg.Name, self._pkg.ID)
+        return '<Package: name:%r id:%r>' % (self._pkg.name, self._pkg.id)
 
     def candidate(self):
         """Return the candidate version of the package.
@@ -620,15 +670,15 @@ class Package(object):
         of the package. Just assign a Version() object, and it will be set as
         the candidate version.
         """
-        cand = self._pcache._depcache.GetCandidateVer(self._pkg)
+        cand = self._pcache._depcache.get_candidate_ver(self._pkg)
         if cand is not None:
             return Version(self, cand)
 
     def __set_candidate(self, version):
         """Set the candidate version of the package."""
-        self._pcache.cachePreChange()
-        self._pcache._depcache.SetCandidateVer(self._pkg, version._cand)
-        self._pcache.cachePostChange()
+        self._pcache.cache_pre_change()
+        self._pcache._depcache.set_candidate_ver(self._pkg, version._cand)
+        self._pcache.cache_post_change()
 
     candidate = property(candidate, __set_candidate)
 
@@ -636,104 +686,137 @@ class Package(object):
     def installed(self):
         """Return the currently installed version of the package.
 
-        :since: 0.7.9"""
-        if self._pkg.CurrentVer is not None:
-            return Version(self, self._pkg.CurrentVer)
+        .. versionadded:: 0.7.9
+        """
+        if self._pkg.current_ver is not None:
+            return Version(self, self._pkg.current_ver)
 
     @property
     def name(self):
         """Return the name of the package."""
-        return self._pkg.Name
+        return self._pkg.name
 
     @property
     def id(self):
         """Return a uniq ID for the package.
 
         This can be used eg. to store additional information about the pkg."""
-        return self._pkg.ID
+        return self._pkg.id
 
     def __hash__(self):
         """Return the hash of the object.
 
         This returns the same value as ID, which is unique."""
-        return self._pkg.ID
+        return self._pkg.id
 
     @property
     def essential(self):
         """Return True if the package is an essential part of the system."""
-        return self._pkg.Essential
+        return self._pkg.essential
 
     @DeprecatedProperty
-    def installedVersion(self):
+    def installedVersion(self): #pylint: disable-msg=C0103
         """Return the installed version as string.
 
-        Deprecated, please use installed.version instead."""
+        .. deprecated:: 0.7.9"""
         return getattr(self.installed, 'version', None)
 
     @DeprecatedProperty
-    def candidateVersion(self):
-        """Return the candidate version as string."""
+    def candidateVersion(self): #pylint: disable-msg=C0103
+        """Return the candidate version as string.
+
+        .. deprecated:: 0.7.9"""
         return getattr(self.candidate, "version", None)
 
     @DeprecatedProperty
-    def candidateDependencies(self):
-        """Return a list of candidate dependencies."""
+    def candidateDependencies(self): #pylint: disable-msg=C0103
+        """Return a list of candidate dependencies.
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.candidate, "dependencies", None)
 
     @DeprecatedProperty
-    def installedDependencies(self):
-        """Return a list of installed dependencies."""
+    def installedDependencies(self):  #pylint: disable-msg=C0103
+        """Return a list of installed dependencies.
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.installed, 'dependencies', [])
 
     @DeprecatedProperty
     def architecture(self):
-        """Return the Architecture of the package"""
+        """Return the Architecture of the package.
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.candidate, "architecture", None)
 
     @DeprecatedProperty
-    def candidateDownloadable(self):
-        """Return True if the candidate is downloadable."""
+    def candidateDownloadable(self):  #pylint: disable-msg=C0103
+        """Return ``True`` if the candidate is downloadable.
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.candidate, "downloadable", None)
 
     @DeprecatedProperty
-    def installedDownloadable(self):
-        """Return True if the installed version is downloadable."""
+    def installedDownloadable(self):  #pylint: disable-msg=C0103
+        """Return ``True`` if the installed version is downloadable.
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.installed, 'downloadable', False)
 
     @DeprecatedProperty
-    def sourcePackageName(self):
-        """Return the source package name as string."""
+    def sourcePackageName(self):  #pylint: disable-msg=C0103
+        """Return the source package name as string.
+
+        .. deprecated:: 0.7.9
+        """
         try:
-            return self.candidate._records.SourcePkg or self._pkg.Name
+            return self.candidate._records.source_pkg or self._pkg.name
         except AttributeError:
             try:
-                return self.installed._records.SourcePkg or self._pkg.Name
+                return self.installed._records.source_pkg or self._pkg.name
             except AttributeError:
-                return self._pkg.Name
+                return self._pkg.name
 
     @DeprecatedProperty
     def homepage(self):
-        """Return the homepage field as string."""
+        """Return the homepage field as string.
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.candidate, "homepage", None)
 
     @property
     def section(self):
         """Return the section of the package."""
-        return self._pkg.Section
+        return self._pkg.section
 
     @DeprecatedProperty
     def priority(self):
-        """Return the priority (of the candidate version)."""
+        """Return the priority (of the candidate version).
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.candidate, "priority", None)
 
     @DeprecatedProperty
-    def installedPriority(self):
-        """Return the priority (of the installed version)."""
+    def installedPriority(self):  #pylint: disable-msg=C0103
+        """Return the priority (of the installed version).
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.installed, 'priority', None)
 
     @DeprecatedProperty
     def summary(self):
-        """Return the short description (one line summary)."""
+        """Return the short description (one line summary).
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.candidate, "summary", None)
 
     @DeprecatedProperty
@@ -744,101 +827,127 @@ class Package(object):
         (Chapter 5.6.13).
         See http://www.debian.org/doc/debian-policy/ch-controlfields.html
         for more information.
+
+        .. deprecated:: 0.7.9
         """
         return getattr(self.candidate, "description", None)
 
     @DeprecatedProperty
-    def rawDescription(self):
-        """return the long description (raw)."""
+    def rawDescription(self):  #pylint: disable-msg=C0103
+        """return the long description (raw).
+
+        .. deprecated:: 0.7.9"""
         return getattr(self.candidate, "raw_description", None)
 
     @DeprecatedProperty
-    def candidateRecord(self):
-        """Return the Record of the candidate version of the package."""
+    def candidateRecord(self):  #pylint: disable-msg=C0103
+        """Return the Record of the candidate version of the package.
+
+        .. deprecated:: 0.7.9"""
         return getattr(self.candidate, "record", None)
 
     @DeprecatedProperty
-    def installedRecord(self):
-        """Return the Record of the candidate version of the package."""
+    def installedRecord(self):  #pylint: disable-msg=C0103
+        """Return the Record of the candidate version of the package.
+
+        .. deprecated:: 0.7.9"""
         return getattr(self.installed, 'record', '')
 
     # depcache states
 
     @property
-    def markedInstall(self):
-        """Return True if the package is marked for install."""
-        return self._pcache._depcache.MarkedInstall(self._pkg)
+    def marked_install(self):
+        """Return ``True`` if the package is marked for install."""
+        return self._pcache._depcache.marked_install(self._pkg)
 
     @property
-    def markedUpgrade(self):
-        """Return True if the package is marked for upgrade."""
-        return self._pcache._depcache.MarkedUpgrade(self._pkg)
+    def marked_upgrade(self):
+        """Return ``True`` if the package is marked for upgrade."""
+        return self._pcache._depcache.marked_upgrade(self._pkg)
 
     @property
-    def markedDelete(self):
-        """Return True if the package is marked for delete."""
-        return self._pcache._depcache.MarkedDelete(self._pkg)
+    def marked_delete(self):
+        """Return ``True`` if the package is marked for delete."""
+        return self._pcache._depcache.marked_delete(self._pkg)
 
     @property
-    def markedKeep(self):
-        """Return True if the package is marked for keep."""
-        return self._pcache._depcache.MarkedKeep(self._pkg)
+    def marked_keep(self):
+        """Return ``True`` if the package is marked for keep."""
+        return self._pcache._depcache.marked_keep(self._pkg)
 
     @property
-    def markedDowngrade(self):
+    def marked_downgrade(self):
         """ Package is marked for downgrade """
-        return self._pcache._depcache.MarkedDowngrade(self._pkg)
+        return self._pcache._depcache.marked_downgrade(self._pkg)
 
     @property
-    def markedReinstall(self):
-        """Return True if the package is marked for reinstall."""
-        return self._pcache._depcache.MarkedReinstall(self._pkg)
+    def marked_reinstall(self):
+        """Return ``True`` if the package is marked for reinstall."""
+        return self._pcache._depcache.marked_reinstall(self._pkg)
 
     @property
-    def isInstalled(self):
-        """Return True if the package is installed."""
-        return (self._pkg.CurrentVer is not None)
+    def is_installed(self):
+        """Return ``True`` if the package is installed."""
+        return (self._pkg.current_ver is not None)
 
     @property
-    def isUpgradable(self):
-        """Return True if the package is upgradable."""
-        return (self.isInstalled and
-                self._pcache._depcache.IsUpgradable(self._pkg))
+    def is_upgradable(self):
+        """Return ``True`` if the package is upgradable."""
+        return (self.is_installed and
+                self._pcache._depcache.is_upgradable(self._pkg))
 
     @property
-    def isAutoRemovable(self):
-        """Return True if the package is no longer required.
+    def is_auto_removable(self):
+        """Return ``True`` if the package is no longer required.
 
         If the package has been installed automatically as a dependency of
         another package, and if no packages depend on it anymore, the package
         is no longer required.
         """
-        return self.isInstalled and self._pcache._depcache.IsGarbage(self._pkg)
+        return self.is_installed and \
+               self._pcache._depcache.is_garbage(self._pkg)
 
+    @property
+    def is_auto_installed(self):
+        """Return whether the package is marked as automatically installed."""
+        return self._pcache._depcache.is_auto_installed(self._pkg)
     # sizes
 
     @DeprecatedProperty
-    def packageSize(self):
-        """Return the size of the candidate deb package."""
+    def packageSize(self):  #pylint: disable-msg=C0103
+        """Return the size of the candidate deb package.
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.candidate, "size", None)
 
     @DeprecatedProperty
-    def installedPackageSize(self):
-        """Return the size of the installed deb package."""
+    def installedPackageSize(self):  #pylint: disable-msg=C0103
+        """Return the size of the installed deb package.
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.installed, 'size', 0)
 
     @DeprecatedProperty
-    def candidateInstalledSize(self):
-        """Return the size of the candidate installed package."""
+    def candidateInstalledSize(self):  #pylint: disable-msg=C0103
+        """Return the size of the candidate installed package.
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.candidate, "installed_size", None)
 
     @DeprecatedProperty
-    def installedSize(self):
-        """Return the size of the currently installed package."""
+    def installedSize(self):  #pylint: disable-msg=C0103
+        """Return the size of the currently installed package.
+
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.installed, 'installed_size', 0)
 
     @property
-    def installedFiles(self):
+    def installed_files(self):
         """Return a list of files installed by the package.
 
         Return a list of unicode names of the files which have
@@ -854,24 +963,25 @@ class Package(object):
         except EnvironmentError:
             return []
 
-    def getChangelog(self, uri=None, cancel_lock=None):
+    def get_changelog(self, uri=None, cancel_lock=None):
         """
         Download the changelog of the package and return it as unicode
         string.
 
-        The parameter `uri` refers to the uri of the changelog file. It may
+        The parameter *uri* refers to the uri of the changelog file. It may
         contain multiple named variables which will be substitued. These
         variables are (src_section, prefix, src_pkg, src_ver). An example is
-        the Ubuntu changelog:
+        the Ubuntu changelog::
+
             "http://changelogs.ubuntu.com/changelogs/pool" \\
                 "/%(src_section)s/%(prefix)s/%(src_pkg)s" \\
                 "/%(src_pkg)s_%(src_ver)s/changelog"
 
-        The parameter `cancel_lock` refers to an instance of threading.Lock,
+        The parameter *cancel_lock* refers to an instance of threading.Lock,
         which if set, prevents the download.
         """
         # Return a cached changelog if available
-        if self._changelog != "":
+        if self._changelog != u"":
             return self._changelog
 
         if uri is None:
@@ -886,7 +996,8 @@ class Package(object):
                       "/%(src_section)s/%(prefix)s/%(src_pkg)s" \
                       "/%(src_pkg)s_%(src_ver)s/changelog"
             else:
-                return _("The list of changes is not available")
+                res = _("The list of changes is not available")
+                return res if isinstance(res, unicode) else res.decode("utf-8")
 
         # get the src package name
         src_pkg = self.candidate.source_name
@@ -907,16 +1018,16 @@ class Package(object):
             # this feature only works if the correct deb-src are in the
             # sources.list
             # otherwise we fall back to the binary version number
-            src_records = apt_pkg.GetPkgSrcRecords()
-            src_rec = src_records.Lookup(src_pkg)
+            src_records = apt_pkg.SourceRecords()
+            src_rec = src_records.lookup(src_pkg)
             if src_rec:
-                src_ver = src_records.Version
+                src_ver = src_records.version
                 #if apt_pkg.VersionCompare(binver, srcver) > 0:
                 #    srcver = binver
                 if not src_ver:
                     src_ver = bin_ver
                 #print "srcver: %s" % src_ver
-                section = src_records.Section
+                section = src_records.section
                 #print "srcsect: %s" % section
             else:
                 # fail into the error handler
@@ -924,9 +1035,10 @@ class Package(object):
         except SystemError:
             src_ver = bin_ver
 
-        l = section.split("/")
-        if len(l) > 1:
-            src_section = l[0]
+        section_split = section.split("/", 1)
+        if len(section_split) > 1:
+            src_section = section_split[0]
+        del section_split
 
         # lib is handled special
         prefix = src_pkg[0]
@@ -934,9 +1046,10 @@ class Package(object):
             prefix = "lib" + src_pkg[3]
 
         # stip epoch
-        l = src_ver.split(":")
-        if len(l) > 1:
-            src_ver = "".join(l[1:])
+        src_ver_split = src_ver.split(":", 1)
+        if len(src_ver_split) > 1:
+            src_ver = "".join(src_ver_split[1:])
+        del src_ver_split
 
         uri = uri % {"src_section": src_section,
                      "prefix": prefix,
@@ -954,15 +1067,15 @@ class Package(object):
 
                 # Check if the download was canceled
                 if cancel_lock and cancel_lock.isSet():
-                    return ""
+                    return u""
                 changelog_file = urllib2.urlopen(uri)
                 # do only get the lines that are new
-                changelog = ""
+                changelog = u""
                 regexp = "^%s \((.*)\)(.*)$" % (re.escape(src_pkg))
                 while True:
                     # Check if the download was canceled
                     if cancel_lock and cancel_lock.isSet():
-                        return ""
+                        return u""
                     # Read changelog line by line
                     line_raw = changelog_file.readline()
                     if line_raw == "":
@@ -976,14 +1089,15 @@ class Package(object):
                     if match:
                         # strip epoch from installed version
                         # and from changelog too
-                        installed = self.installedVersion
+                        installed = getattr(self.installed, 'version', None)
                         if installed and ":" in installed:
                             installed = installed.split(":", 1)[1]
                         changelog_ver = match.group(1)
                         if changelog_ver and ":" in changelog_ver:
                             changelog_ver = changelog_ver.split(":", 1)[1]
-                        if (installed and apt_pkg.VersionCompare(changelog_ver,
-                                                              installed) <= 0):
+
+                        if (installed and apt_pkg.version_compare(
+                                          changelog_ver, installed) <= 0):
                             break
                     # EOF (shouldn't really happen)
                     changelog += line
@@ -991,126 +1105,184 @@ class Package(object):
                 # Print an error if we failed to extract a changelog
                 if len(changelog) == 0:
                     changelog = _("The list of changes is not available")
+                    if not isinstance(changelog, unicode):
+                        changelog = changelog.decode("utf-8")
                 self._changelog = changelog
 
             except urllib2.HTTPError:
-                return _("The list of changes is not available yet.\n\n"
+                res = _("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.") % (src_pkg, src_ver)
+                return res if isinstance(res, unicode) else res.decode("utf-8")
             except (IOError, httplib.BadStatusLine):
-                return _("Failed to download the list of changes. \nPlease "
+                res = _("Failed to download the list of changes. \nPlease "
                          "check your Internet connection.")
+                return res if isinstance(res, unicode) else res.decode("utf-8")
         finally:
             socket.setdefaulttimeout(timeout)
         return self._changelog
 
     @DeprecatedProperty
-    def candidateOrigin(self):
-        """Return a list of Origin() objects for the candidate version."""
+    def candidateOrigin(self):  #pylint: disable-msg=C0103
+        """Return a list of `Origin()` objects for the candidate version.
+
+        .. deprecated:: 0.7.9
+        """
         return getattr(self.candidate, "origins", None)
 
     @property
     def versions(self):
         """Return a VersionList() object for all available versions.
 
-        :since: 0.7.9
+        .. versionadded:: 0.7.9
         """
         return VersionList(self)
 
     @property
     def is_inst_broken(self):
         """Return True if the to-be-installed package is broken."""
-        return self._pcache._depcache.IsInstBroken(self._pkg)
+        return self._pcache._depcache.is_inst_broken(self._pkg)
 
     @property
     def is_now_broken(self):
         """Return True if the installed package is broken."""
-        return self._pcache._depcache.IsNowBroken(self._pkg)
+        return self._pcache._depcache.is_now_broken(self._pkg)
 
     # depcache actions
 
-    def markKeep(self):
+    def mark_keep(self):
         """Mark a package for keep."""
-        self._pcache.cachePreChange()
-        self._pcache._depcache.MarkKeep(self._pkg)
-        self._pcache.cachePostChange()
+        self._pcache.cache_pre_change()
+        self._pcache._depcache.mark_keep(self._pkg)
+        self._pcache.cache_post_change()
 
-    def markDelete(self, autoFix=True, purge=False):
+    @deprecated_args
+    def mark_delete(self, auto_fix=True, purge=False):
         """Mark a package for install.
 
-        If autoFix is True, the resolver will be run, trying to fix broken
-        packages. This is the default.
+        If *auto_fix* is ``True``, the resolver will be run, trying to fix
+        broken packages.  This is the default.
 
-        If purge is True, remove the configuration files of the package as
-        well. The default is to keep the configuration.
+        If *purge* is ``True``, remove the configuration files of the package
+        as well.  The default is to keep the configuration.
         """
-        self._pcache.cachePreChange()
-        self._pcache._depcache.MarkDelete(self._pkg, purge)
+        self._pcache.cache_pre_change()
+        self._pcache._depcache.mark_delete(self._pkg, purge)
         # try to fix broken stuffsta
-        if autoFix and self._pcache._depcache.BrokenCount > 0:
-            Fix = apt_pkg.GetPkgProblemResolver(self._pcache._depcache)
-            Fix.Clear(self._pkg)
-            Fix.Protect(self._pkg)
-            Fix.Remove(self._pkg)
-            Fix.InstallProtect()
-            Fix.Resolve()
-        self._pcache.cachePostChange()
-
-    def markInstall(self, autoFix=True, autoInst=True, fromUser=True):
+        if auto_fix and self._pcache._depcache.broken_count > 0:
+            fix = apt_pkg.ProblemResolver(self._pcache._depcache)
+            fix.clear(self._pkg)
+            fix.protect(self._pkg)
+            fix.remove(self._pkg)
+            fix.install_protect()
+            fix.resolve()
+        self._pcache.cache_post_change()
+
+    @deprecated_args
+    def mark_install(self, auto_fix=True, auto_inst=True, from_user=True):
         """Mark a package for install.
 
-        If autoFix is True, the resolver will be run, trying to fix broken
-        packages. This is the default.
+        If *autoFix* is ``True``, the resolver will be run, trying to fix
+        broken packages.  This is the default.
 
-        If autoInst is True, the dependencies of the packages will be installed
-        automatically. This is the default.
+        If *autoInst* is ``True``, the dependencies of the packages will be
+        installed automatically.  This is the default.
 
-        If fromUser is True, this package will not be marked as automatically
-        installed. This is the default. Set it to False if you want to be able
-        to remove the package at a later stage if no other package depends on
-        it.
+        If *fromUser* is ``True``, this package will not be marked as
+        automatically installed. This is the default. Set it to False if you
+        want to be able to automatically remove the package at a later stage
+        when no other package depends on it.
         """
-        self._pcache.cachePreChange()
-        self._pcache._depcache.MarkInstall(self._pkg, autoInst, fromUser)
+        self._pcache.cache_pre_change()
+        self._pcache._depcache.mark_install(self._pkg, auto_inst, from_user)
         # try to fix broken stuff
-        if autoFix and self._pcache._depcache.BrokenCount > 0:
-            fixer = apt_pkg.GetPkgProblemResolver(self._pcache._depcache)
-            fixer.Clear(self._pkg)
-            fixer.Protect(self._pkg)
-            fixer.Resolve(True)
-        self._pcache.cachePostChange()
-
-    def markUpgrade(self):
+        if auto_fix and self._pcache._depcache.broken_count > 0:
+            fixer = apt_pkg.ProblemResolver(self._pcache._depcache)
+            fixer.clear(self._pkg)
+            fixer.protect(self._pkg)
+            fixer.resolve(True)
+        self._pcache.cache_post_change()
+
+    def mark_upgrade(self):
         """Mark a package for upgrade."""
-        if self.isUpgradable:
-            fromUser = not self._pcache._depcache.IsAutoInstalled(self._pkg)
-            self.markInstall(fromUser=fromUser)
+        if self.is_upgradable:
+            from_user = not self._pcache._depcache.is_auto_installed(self._pkg)
+            self.mark_install(from_user=from_user)
         else:
             # FIXME: we may want to throw a exception here
             sys.stderr.write(("MarkUpgrade() called on a non-upgrable pkg: "
-                              "'%s'\n") % self._pkg.Name)
+                              "'%s'\n") % self._pkg.name)
+
+    def mark_auto(self, auto=True):
+        """Mark a package as automatically installed.
+
+        Call this function to mark a package as automatically installed. If the
+        optional parameter *auto* is set to ``False``, the package will not be
+        marked as automatically installed anymore. The default is ``True``.
+        """
+        self._pcache._depcache.mark_auto(self._pkg, auto)
 
     def commit(self, fprogress, iprogress):
         """Commit the changes.
 
-        The parameter `fprogress` refers to a FetchProgress() object, as
-        found in apt.progress.
+        The parameter *fprogress* refers to a apt_pkg.AcquireProgress() object,
+        like apt.progress.text.AcquireProgress().
 
-        The parameter `iprogress` refers to an InstallProgress() object, as
-        found in apt.progress.
+        The parameter *iprogress* refers to an InstallProgress() object, as
+        found in apt.progress.base.
         """
-        self._pcache._depcache.Commit(fprogress, iprogress)
+        self._pcache._depcache.commit(fprogress, iprogress)
+
+
+    if not apt_pkg._COMPAT_0_7:
+        del installedVersion
+        del candidateVersion
+        del candidateDependencies
+        del installedDependencies
+        del architecture
+        del candidateDownloadable
+        del installedDownloadable
+        del sourcePackageName
+        del homepage
+        del priority
+        del installedPriority
+        del summary
+        del description
+        del rawDescription
+        del candidateRecord
+        del installedRecord
+        del packageSize
+        del installedPackageSize
+        del candidateInstalledSize
+        del installedSize
+        del candidateOrigin
+    else:
+        markedInstalled = AttributeDeprecatedBy('marked_installed')
+        markedInstall = AttributeDeprecatedBy('marked_install')
+        markedUpgrade = AttributeDeprecatedBy('marked_upgrade')
+        markedDelete = AttributeDeprecatedBy('marked_delete')
+        markedKeep = AttributeDeprecatedBy('marked_keep')
+        markedDowngrade = AttributeDeprecatedBy('marked_downgrade')
+        markedReinstall = AttributeDeprecatedBy('marked_reinstall')
+        isInstalled = AttributeDeprecatedBy('is_installed')
+        isUpgradable = AttributeDeprecatedBy('is_upgradable')
+        isAutoRemovable = AttributeDeprecatedBy('is_auto_removable')
+        installedFiles = AttributeDeprecatedBy('installed_files')
+        getChangelog = function_deprecated_by(get_changelog)
+        markDelete = function_deprecated_by(mark_delete)
+        markInstall = function_deprecated_by(mark_install)
+        markKeep = function_deprecated_by(mark_keep)
+        markUpgrade = function_deprecated_by(mark_upgrade)
 
 
 def _test():
     """Self-test."""
     print "Self-test for the Package modul"
     import random
-    import apt
     apt_pkg.init()
-    progress = apt.progress.OpTextProgress()
+    progress = apt.progress.text.OpProgress()
     cache = apt.Cache(progress)
     pkg = cache["apt-utils"]
     print "Name: %s " % pkg.name
@@ -1132,21 +1304,21 @@ def _test():
     print "Recommends: %s" % pkg.installed.recommends
     for dep in pkg.candidate.dependencies:
         print ",".join("%s (%s) (%s) (%s)" % (o.name, o.version, o.relation,
-                        o.preDepend) for o in dep.or_dependencies)
+                        o.pre_depend) for o in dep.or_dependencies)
     print "arch: %s" % pkg.candidate.architecture
     print "homepage: %s" % pkg.candidate.homepage
     print "rec: ", pkg.candidate.record
 
 
-    print cache["2vcard"].getChangelog()
+    print cache["2vcard"].get_changelog()
     for i in True, False:
         print "Running install on random upgradable pkgs with AutoFix: %s " % i
         for pkg in cache:
-            if pkg.isUpgradable:
+            if pkg.is_upgradable:
                 if random.randint(0, 1) == 1:
-                    pkg.markInstall(i)
-        print "Broken: %s " % cache._depcache.BrokenCount
-        print "InstCount: %s " % cache._depcache.InstCount
+                    pkg.mark_install(i)
+        print "Broken: %s " % cache._depcache.broken_count
+        print "InstCount: %s " % cache._depcache.inst_count
 
     print
     # get a new cache
@@ -1156,11 +1328,11 @@ def _test():
         for name in cache.keys():
             if random.randint(0, 1) == 1:
                 try:
-                    cache[name].markDelete(i)
+                    cache[name].mark_delete(i)
                 except SystemError:
                     print "Error trying to remove: %s " % name
-        print "Broken: %s " % cache._depcache.BrokenCount
-        print "DelCount: %s " % cache._depcache.DelCount
+        print "Broken: %s " % cache._depcache.broken_count
+        print "DelCount: %s " % cache._depcache.del_count
 
 # self-test
 if __name__ == "__main__":
diff --git a/apt/progress/__init__.py b/apt/progress/__init__.py
index 8694de77..10c11021 100644
--- a/apt/progress/__init__.py
+++ b/apt/progress/__init__.py
@@ -1,405 +1,35 @@
-# progress.py - progress reporting classes
+# apt/progress/__init__.py - Initialization file for apt.progress.
 #
-#  Copyright (c) 2005-2009 Canonical
+# Copyright (c) 2009 Julian Andres Klode <jak@debian.org>
 #
-#  Author: Michael Vogt <michael.vogt@ubuntu.com>
+# 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 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.
 #
-#  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
-"""progress reporting classes.
-
-This module provides classes for progress reporting. They can be used with
-e.g., for reporting progress on the cache opening process, the cache update
-progress, or the package install progress.
+# 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
+"""Progress reporting.
+
+This package provides progress reporting for the python-apt package. The module
+'base' provides classes with no output, the module 'gtk2' provides classes for
+GTK+ applications, and the module 'text' provides classes for terminals, etc.
 """
-
-import errno
-import fcntl
-import os
-import re
-import select
-import sys
-
 import apt_pkg
 
 
-__all__ = ('CdromProgress', 'DpkgInstallProgress', 'DumbInstallProgress',
-          'FetchProgress', 'InstallProgress', 'OpProgress', 'OpTextProgress',
-          'TextFetchProgress')
-
-
-class OpProgress(object):
-    """Abstract class to implement reporting on cache opening.
-
-    Subclass this class to implement simple Operation progress reporting.
-    """
-
-    def __init__(self):
-        self.op = None
-        self.subOp = None
-
-    def update(self, percent):
-        """Called periodically to update the user interface."""
-
-    def done(self):
-        """Called once an operation has been completed."""
-
-
-class OpTextProgress(OpProgress):
-    """A simple text based cache open reporting class."""
-
-    def __init__(self):
-        OpProgress.__init__(self)
-
-    def update(self, percent):
-        """Called periodically to update the user interface."""
-        sys.stdout.write("\r%s: %.2i  " % (self.subOp, percent))
-        sys.stdout.flush()
-
-    def done(self):
-        """Called once an operation has been completed."""
-        sys.stdout.write("\r%s: Done\n" % self.op)
-
-
-class FetchProgress(object):
-    """Report the download/fetching progress.
-
-    Subclass this class to implement fetch progress reporting
-    """
-
-    # download status constants
-    dlDone = 0
-    dlQueued = 1
-    dlFailed = 2
-    dlHit = 3
-    dlIgnored = 4
-    dlStatusStr = {dlDone: "Done",
-                   dlQueued: "Queued",
-                   dlFailed: "Failed",
-                   dlHit: "Hit",
-                   dlIgnored: "Ignored"}
-
-    def __init__(self):
-        self.eta = 0.0
-        self.percent = 0.0
-        # Make checking easier
-        self.currentBytes = 0
-        self.currentItems = 0
-        self.totalBytes = 0
-        self.totalItems = 0
-        self.currentCPS = 0
-
-    def start(self):
-        """Called when the fetching starts."""
-
-    def stop(self):
-        """Called when all files have been fetched."""
-
-    def updateStatus(self, uri, descr, shortDescr, status):
-        """Called when the status of an item changes.
-
-        This happens eg. when the downloads fails or is completed.
-        """
-    def update_status_full(self, uri, descr, short_descr, status, file_size,
-                           partial_size):
-        """Called when the status of an item changes.
-
-        This happens eg. when the downloads fails or is completed. This
-        version include information on current filesize and partial size
-        """
-
-    def pulse(self):
-        """Called periodically to update the user interface.
-
-        Return True to continue or False to cancel.
-        """
-        self.percent = (((self.currentBytes + self.currentItems) * 100.0) /
-                        float(self.totalBytes + self.totalItems))
-        if self.currentCPS > 0:
-            self.eta = ((self.totalBytes - self.currentBytes) /
-                        float(self.currentCPS))
-        return True
-
-    def pulse_items(self, items):
-        """Called periodically to update the user interface.
-        This function includes details about the items being fetched
-        Return True to continue or False to cancel.
-
-        """
-        self.percent = (((self.currentBytes + self.currentItems) * 100.0) /
-                        float(self.totalBytes + self.totalItems))
-        if self.currentCPS > 0:
-            self.eta = ((self.totalBytes - self.currentBytes) /
-                        float(self.currentCPS))
-        return True
-
-    def mediaChange(self, medium, drive):
-        """react to media change events."""
-
-
-class TextFetchProgress(FetchProgress):
-    """ Ready to use progress object for terminal windows """
-
-    def __init__(self):
-        FetchProgress.__init__(self)
-        self.items = {}
-
-    def updateStatus(self, uri, descr, shortDescr, status):
-        """Called when the status of an item changes.
-
-        This happens eg. when the downloads fails or is completed.
-        """
-        if status != self.dlQueued:
-            print "\r%s %s" % (self.dlStatusStr[status], descr)
-        self.items[uri] = status
-
-    def pulse(self):
-        """Called periodically to update the user interface.
-
-        Return True to continue or False to cancel.
-        """
-        FetchProgress.pulse(self)
-        if self.currentCPS > 0:
-            s = "[%2.f%%] %sB/s %s" % (self.percent,
-                                       apt_pkg.SizeToStr(int(self.currentCPS)),
-                                       apt_pkg.TimeToStr(int(self.eta)))
-        else:
-            s = "%2.f%% [Working]" % (self.percent)
-        print "\r%s" % (s),
-        sys.stdout.flush()
-        return True
-
-    def stop(self):
-        """Called when all files have been fetched."""
-        print "\rDone downloading            "
-
-    def mediaChange(self, medium, drive):
-        """react to media change events."""
-        print ("Media change: please insert the disc labeled "
-               "'%s' in the drive '%s' and press enter") % (medium, drive)
-
-        return raw_input() not in ('c', 'C')
-
-
-class DumbInstallProgress(object):
-    """Report the install progress.
-
-    Subclass this class to implement install progress reporting.
-    """
-
-    def startUpdate(self):
-        """Start update."""
-
-    def run(self, pm):
-        """Start installation."""
-        return pm.DoInstall()
-
-    def finishUpdate(self):
-        """Called when update has finished."""
-
-    def updateInterface(self):
-        """Called periodically to update the user interface"""
-
-
-class InstallProgress(DumbInstallProgress):
-    """An InstallProgress that is pretty useful.
-
-    It supports the attributes 'percent' 'status' and callbacks for the dpkg
-    errors and conffiles and status changes.
-    """
-
-    def __init__(self):
-        DumbInstallProgress.__init__(self)
-        self.selectTimeout = 0.1
-        (read, write) = os.pipe()
-        self.writefd = write
-        self.statusfd = os.fdopen(read, "r")
-        fcntl.fcntl(self.statusfd.fileno(), fcntl.F_SETFL, os.O_NONBLOCK)
-        self.read = ""
-        self.percent = 0.0
-        self.status = ""
-
-    def error(self, pkg, errormsg):
-        """Called when a error is detected during the install."""
-
-    def conffile(self, current, new):
-        """Called when a conffile question from dpkg is detected."""
-
-    def statusChange(self, pkg, percent, status):
-        """Called when the status changed."""
-
-    def updateInterface(self):
-        """Called periodically to update the interface."""
-        if self.statusfd is None:
-            return
-        try:
-            while not self.read.endswith("\n"):
-                r = os.read(self.statusfd.fileno(), 1)
-                if not r:
-                    return
-                self.read += r
-        except OSError, (errno_, errstr):
-            # resource temporarly unavailable is ignored
-            if errno_ != errno.EAGAIN and errno_ != errno.EWOULDBLOCK:
-                print errstr
-        if not self.read.endswith("\n"):
-            return
-
-        s = self.read
-        #print s
-        try:
-            (status, pkg, percent, status_str) = s.split(":", 3)
-        except ValueError:
-            # silently ignore lines that can't be parsed
-            self.read = ""
-            return
-        #print "percent: %s %s" % (pkg, float(percent)/100.0)
-        if status == "pmerror":
-            self.error(pkg, status_str)
-        elif status == "pmconffile":
-            # we get a string like this:
-            # 'current-conffile' 'new-conffile' useredited distedited
-            match = re.match("\s*\'(.*)\'\s*\'(.*)\'.*", status_str)
-            if match:
-                self.conffile(match.group(1), match.group(2))
-        elif status == "pmstatus":
-            if float(percent) != self.percent or status_str != self.status:
-                self.statusChange(pkg, float(percent),
-                                  status_str.strip())
-                self.percent = float(percent)
-                self.status = status_str.strip()
-        self.read = ""
-
-    def fork(self):
-        """Fork."""
-        return os.fork()
-
-    def waitChild(self):
-        """Wait for child progress to exit.
-
-        The return values is the full status returned from os.waitpid()
-        (not only the return code).
-        """
-        while True:
-            try:
-                select.select([self.statusfd], [], [], self.selectTimeout)
-            except select.error, (errno_, errstr):
-                if errno_ != errno.EINTR:
-                    raise
-            self.updateInterface()
-            try:
-                (pid, res) = os.waitpid(self.child_pid, os.WNOHANG)
-                if pid == self.child_pid:
-                    break
-            except OSError, (errno_, errstr):
-                if errno_ == errno.ECHILD:
-                    break
-                if errno_ != errno.EINTR:
-                    raise
-        return res
-
-    def run(self, pm):
-        """Start installing. 
-        
-        Returns the PackageManager status:
-        (pm.ResultCompleted, pm.ResultFailed, pm.ResultIncomplete)
-        """
-        pid = self.fork()
-        if pid == 0:
-            # pm.DoInstall might raise a exception,
-            # when this happens, we need to catch
-            # it, otherwise os._exit() is not run
-            # and the execution continues in the 
-            # parent code leading to very confusing bugs
-            try:
-                res = pm.DoInstall(self.writefd)
-            except Exception, e:
-                os._exit(pm.ResultFailed)
-            os._exit(res)
-        self.child_pid = pid
-        res = self.waitChild()
-        return os.WEXITSTATUS(res)
-
-
-class CdromProgress(object):
-    """Report the cdrom add progress.
-
-    Subclass this class to implement cdrom add progress reporting.
-    """
-
-    def __init__(self):
-        pass
-
-    def update(self, text, step):
-        """Called periodically to update the user interface."""
-
-    def askCdromName(self):
-        """Called to ask for the name of the cdrom."""
-
-    def changeCdrom(self):
-        """Called to ask for the cdrom to be changed."""
-
-
-class DpkgInstallProgress(InstallProgress):
-    """Progress handler for a local Debian package installation."""
-
-    def run(self, debfile):
-        """Start installing the given Debian package."""
-        self.debfile = debfile
-        self.debname = os.path.basename(debfile).split("_")[0]
-        pid = self.fork()
-        if pid == 0:
-            # child
-            res = os.system("/usr/bin/dpkg --status-fd %s -i %s" % \
-                            (self.writefd, debfile))
-            os._exit(os.WEXITSTATUS(res))
-        self.child_pid = pid
-        res = self.waitChild()
-        return res
+__all__ = []
 
-    def updateInterface(self):
-        """Process status messages from dpkg."""
-        if self.statusfd is None:
-            return
-        while True:
-            try:
-                self.read += os.read(self.statusfd.fileno(), 1)
-            except OSError, (errno_, errstr):
-                # resource temporarly unavailable is ignored
-                if errno_ != 11:
-                    print errstr
-                break
-            if not self.read.endswith("\n"):
-                continue
 
-            statusl = self.read.split(":")
-            if len(statusl) < 3:
-                print "got garbage from dpkg: '%s'" % self.read
-                self.read = ""
-                break
-            pkg_name = statusl[1].strip()
-            status = statusl[2].strip()
-            #print status
-            if status == "error":
-                self.error(pkg_name, status)
-            elif status == "conffile-prompt":
-                # we get a string like this:
-                # 'current-conffile' 'new-conffile' useredited distedited
-                match = re.match("\s*\'(.*)\'\s*\'(.*)\'.*", statusl[3])
-                if match:
-                    self.conffile(match.group(1), match.group(2))
-            else:
-                self.status = status
-            self.read = ""
+if apt_pkg._COMPAT_0_7:
+    from apt.progress.old import (CdromProgress, DpkgInstallProgress,
+                                  DumbInstallProgress, FetchProgress,
+                                  InstallProgress, OpProgress,
+                                  OpTextProgress, TextFetchProgress)
diff --git a/apt/progress/base.py b/apt/progress/base.py
new file mode 100644
index 00000000..6822b74a
--- /dev/null
+++ b/apt/progress/base.py
@@ -0,0 +1,304 @@
+# apt/progress/base.py - Base classes for progress reporting.
+#
+# Copyright (C) 2009 Julian Andres Klode <jak@debian.org>
+#
+# 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
+# pylint: disable-msg = R0201
+"""Base classes for progress reporting.
+
+Custom progress classes should inherit from these classes. They can also be
+used as dummy progress classes which simply do nothing.
+"""
+import errno
+import fcntl
+import os
+import re
+import select
+
+import apt_pkg
+
+__all__ = ['AcquireProgress', 'CdromProgress', 'InstallProgress', 'OpProgress']
+
+
+class AcquireProgress(object):
+    """Monitor object for downloads controlled by the Acquire class.
+
+    This is an mostly abstract class. You should subclass it and implement the
+    methods to get something useful.
+    """
+
+    current_bytes = current_cps = fetched_bytes = last_bytes = total_bytes \
+                  = 0.0
+    current_items = elapsed_time = total_items = 0
+
+    def done(self, item):
+        """Invoked when an item is successfully and completely fetched."""
+
+    def fail(self, item):
+        """Invoked when an item could not be fetched."""
+
+    def fetch(self, item):
+        """Invoked when some of the item's data is fetched."""
+
+    def ims_hit(self, item):
+        """Invoked when an item is confirmed to be up-to-date.
+
+        Invoked when an item is confirmed to be up-to-date. For instance,
+        when an HTTP download is informed that the file on the server was
+        not modified.
+        """
+
+    def media_change(self, media, drive):
+        """Prompt the user to change the inserted removable media.
+
+        The parameter 'media' decribes the name of the the media type that
+        should be changed, whereas the parameter 'drive' should be the
+        identifying name of the drive whose media should be changed.
+
+        This method should not return until the user has confirmed to the user
+        interface that the media change is complete. It must return True if
+        the user confirms the media change, or False to cancel it.
+        """
+        return False
+
+    def pulse(self, owner):
+        """Periodically invoked while the Acquire process is underway.
+
+        This method gets invoked while the Acquire progress given by the
+        parameter 'owner' is underway. It should display information about
+        the current state.
+
+        This function returns a boolean value indicating whether the
+        acquisition should be continued (True) or cancelled (False).
+        """
+        return True
+
+    def start(self):
+        """Invoked when the Acquire process starts running."""
+        # Reset all our values.
+        self.current_bytes = 0.0
+        self.current_cps = 0.0
+        self.current_items = 0
+        self.elapsed_time = 0
+        self.fetched_bytes = 0.0
+        self.last_bytes = 0.0
+        self.total_bytes = 0.0
+        self.total_items = 0
+
+    def stop(self):
+        """Invoked when the Acquire process stops running."""
+
+
+class CdromProgress(object):
+    """Base class for reporting the progress of adding a cdrom.
+
+    Can be used with apt_pkg.Cdrom to produce an utility like apt-cdrom. The
+    attribute 'total_steps' defines the total number of steps and can be used
+    in update() to display the current progress.
+    """
+
+    total_steps = 0
+
+    def ask_cdrom_name(self):
+        """Ask for the name of the cdrom.
+
+        If a name has been provided, return it. Otherwise, return None to
+        cancel the operation.
+        """
+
+    def change_cdrom(self):
+        """Ask for the CD-ROM to be changed.
+
+        Return True once the cdrom has been changed or False to cancel the
+        operation.
+        """
+
+    def update(self, text, current):
+        """Periodically invoked to update the interface.
+
+        The string 'text' defines the text which should be displayed. The
+        integer 'current' defines the number of completed steps.
+        """
+
+
+class InstallProgress(object):
+    """Class to report the progress of installing packages."""
+
+    child_pid, percent, select_timeout, status = 0, 0.0, 0.1, ""
+
+    def __init__(self):
+        (self.statusfd, self.writefd) = os.pipe()
+        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)
+
+    def start_update(self):
+        """(Abstract) Start update."""
+
+    def finish_update(self):
+        """(Abstract) Called when update has finished."""
+
+    def error(self, pkg, errormsg):
+        """(Abstract) Called when a error is detected during the install."""
+
+    def conffile(self, current, new):
+        """(Abstract) Called when a conffile question from dpkg is detected."""
+
+    def status_change(self, pkg, percent, status):
+        """(Abstract) Called when the APT status changed."""
+
+    def dpkg_status_change(self, pkg, status):
+        """(Abstract) Called when the dpkg status changed."""
+
+    def processing(self, pkg, stage):
+        """(Abstract) Sent just before a processing stage starts.
+
+        The parameter 'stage' is one of "upgrade", "install"
+        (both sent before unpacking), "configure", "trigproc", "remove",
+        "purge". This method is used for dpkg only.
+        """
+
+    def run(self, obj):
+        """Install using the object 'obj'.
+
+        This functions runs install actions. The parameter 'obj' may either
+        be a PackageManager object in which case its do_install() method is
+        called or the path to a deb file.
+
+        If the object is a PackageManager, the functions returns the result
+        of calling its do_install() method. Otherwise, the function returns
+        the exit status of dpkg. In both cases, 0 means that there were no
+        problems.
+        """
+        pid = self.fork()
+        if pid == 0:
+            # pm.do_install might raise a exception,
+            # when this happens, we need to catch
+            # it, otherwise os._exit() is not run
+            # and the execution continues in the
+            # parent code leading to very confusing bugs
+            try:
+                os._exit(obj.do_install(self.write_stream.fileno()))
+            except AttributeError:
+                os._exit(os.spawnlp(os.P_WAIT, "dpkg", "dpkg", "--status-fd",
+                                    str(self.write_stream.fileno()), "-i",
+                                    obj))
+            except Exception:
+                os._exit(apt_pkg.PackageManager.RESULT_FAILED)
+
+        self.child_pid = pid
+        res = self.wait_child()
+        return os.WEXITSTATUS(res)
+
+    def fork(self):
+        """Fork."""
+        return os.fork()
+
+    def update_interface(self):
+        """Update the interface."""
+        try:
+            line = self.status_stream.readline()
+        except IOError, err:
+            # resource temporarly unavailable is ignored
+            if err.errno != errno.EAGAIN and err.errno != errno.EWOULDBLOCK:
+                print err.strerror
+            return
+
+        pkgname = status = status_str = percent = base = ""
+
+        if line.startswith('pm'):
+            try:
+                (status, pkgname, percent, status_str) = line.split(":", 3)
+            except ValueError:
+                # silently ignore lines that can't be parsed
+                return
+        elif line.startswith('status'):
+            try:
+                (base, pkgname, status, status_str) = line.split(":", 3)
+            except ValueError:
+                (base, pkgname, status) = line.split(":", 2)
+        elif line.startswith('processing'):
+            (status, status_str, pkgname) = line.split(":", 2)
+            self.processing(pkgname.strip(), status_str.strip())
+
+        # Always strip the status message
+        pkgname = pkgname.strip()
+        status_str = status_str.strip()
+        status = status.strip()
+
+        if status == 'pmerror' or status == 'error':
+            self.error(pkgname, status_str)
+        elif status == 'conffile-prompt' or status == 'pmconffile':
+            match = re.match("\s*\'(.*)\'\s*\'(.*)\'.*", status_str)
+            if match:
+                self.conffile(match.group(1), match.group(2))
+        elif status == "pmstatus":
+            # FIXME: Float comparison
+            if float(percent) != self.percent or status_str != self.status:
+                self.status_change(pkgname, float(percent), status_str.strip())
+                self.percent = float(percent)
+                self.status = status_str.strip()
+        elif base == "status":
+            self.dpkg_status_change(pkgname, status)
+
+    def wait_child(self):
+        """Wait for child progress to exit.
+
+        This method is responsible for calling update_interface() from time to
+        time. It exits once the child has exited. The return values is the
+        full status returned from os.waitpid() (not only the return code).
+        """
+        (pid, res) = (0, 0)
+        while True:
+            try:
+                select.select([self.status_stream], [], [],
+                              self.select_timeout)
+            except select.error, (errno_, _errstr):
+                if errno_ != errno.EINTR:
+                    raise
+
+            self.update_interface()
+            try:
+                (pid, res) = os.waitpid(self.child_pid, os.WNOHANG)
+                if pid == self.child_pid:
+                    break
+            except OSError, err:
+                if err.errno == errno.ECHILD:
+                    break
+                if err.errno != errno.EINTR:
+                    raise
+
+        return res
+
+
+class OpProgress(object):
+    """Monitor objects for operations.
+
+    Display the progress of operations such as opening the cache."""
+
+    major_change, op, percent, subop = False, "", 0.0, ""
+
+    def update(self, percent=None):
+        """Called periodically to update the user interface.
+
+        You may use the optional argument 'percent' to set the attribute
+        'percent' in this call.
+        """
+        if percent is not None:
+            self.percent = percent
+
+    def done(self):
+        """Called once an operation has been completed."""
diff --git a/apt/progress/gtk2.py b/apt/progress/gtk2.py
index f872e34f..acb01eed 100644
--- a/apt/progress/gtk2.py
+++ b/apt/progress/gtk2.py
@@ -11,7 +11,7 @@
 #  published by the Free Software Foundation; either version 2 of the
 #  License, or (at your option) any later version.
 #
-#  his program is distributed in the hope that it will be useful,
+#  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.
@@ -22,7 +22,6 @@
 #  USA
 """GObject-powered progress classes and a GTK+ status widget."""
 
-from gettext import gettext as _
 import os
 import time
 
@@ -37,8 +36,17 @@ import gobject
 import pango
 import vte
 
-import apt
 import apt_pkg
+from apt_pkg import gettext as _
+from apt.deprecation import function_deprecated_by, AttributeDeprecatedBy
+from apt.progress import base
+
+if apt_pkg._COMPAT_0_7:
+    from apt.progress import old
+
+
+__all__ = ['GAcquireProgress', 'GInstallProgress', 'GOpProgress',
+           'GtkAptProgress']
 
 
 def mksig(params=(), run=gobject.SIGNAL_RUN_FIRST, rettype=gobject.TYPE_NONE):
@@ -52,7 +60,7 @@ def mksig(params=(), run=gobject.SIGNAL_RUN_FIRST, rettype=gobject.TYPE_NONE):
     return (run, rettype, params)
 
 
-class GOpProgress(gobject.GObject, apt.progress.OpProgress):
+class GOpProgress(gobject.GObject, base.OpProgress):
     """Operation progress with GObject signals.
 
     Signals:
@@ -68,22 +76,28 @@ class GOpProgress(gobject.GObject, apt.progress.OpProgress):
                     "status-finished": mksig()}
 
     def __init__(self):
-        apt.progress.OpProgress.__init__(self)
+        base.OpProgress.__init__(self)
         gobject.GObject.__init__(self)
         self._context = glib.main_context_default()
 
-    def update(self, percent):
+    def update(self, percent=None):
         """Called to update the percentage done"""
-        self.emit("status-changed", self.op, percent)
+        base.OpProgress.update(self, percent)
+        self.emit("status-changed", self.op, self.percent)
         while self._context.pending():
             self._context.iteration()
 
     def done(self):
         """Called when all operation have finished."""
+        base.OpProgress.done(self)
         self.emit("status-finished")
 
+    if apt_pkg._COMPAT_0_7:
+        subOp = AttributeDeprecatedBy('subop')
+        Op = AttributeDeprecatedBy('op')
 
-class GInstallProgress(gobject.GObject, apt.progress.InstallProgress):
+
+class GInstallProgress(gobject.GObject, base.InstallProgress):
     """Installation progress with GObject signals.
 
     Signals:
@@ -107,19 +121,20 @@ class GInstallProgress(gobject.GObject, apt.progress.InstallProgress):
                     "status-finished": mksig()}
 
     def __init__(self, term):
-        apt.progress.InstallProgress.__init__(self)
+        base.InstallProgress.__init__(self)
         gobject.GObject.__init__(self)
         self.finished = False
+        self.apt_status = -1
         self.time_last_update = time.time()
         self.term = term
         reaper = vte.reaper_get()
-        reaper.connect("child-exited", self.childExited)
+        reaper.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 childExited(self, term, pid, status):
+    def child_exited(self, term, pid, status):
         """Called when a child process exits"""
         self.apt_status = os.WEXITSTATUS(status)
         self.finished = True
@@ -138,21 +153,31 @@ class GInstallProgress(gobject.GObject, apt.progress.InstallProgress):
         """
         self.emit("status-conffile")
 
-    def startUpdate(self):
+    def start_update(self):
         """Called when the update starts.
 
         Emits: status-started()
         """
         self.emit("status-started")
 
-    def finishUpdate(self):
+    def run(self, obj):
+        """Run."""
+        self.finished = False
+        return base.InstallProgress.run(self, obj)
+
+    def finish_update(self):
         """Called when the update finished.
 
         Emits: status-finished()
         """
         self.emit("status-finished")
 
-    def statusChange(self, pkg, percent, status):
+    def processing(self, pkg, stage):
+        """Called when entering a new stage in dpkg."""
+        # We have no percentage or alike, send -1 to let the bar pulse.
+        self.emit("status-changed", ("Installing %s...") % pkg, -1)
+
+    def status_change(self, pkg, percent, status):
         """Called when the status changed.
 
         Emits: status-changed(status, percent)
@@ -160,12 +185,12 @@ class GInstallProgress(gobject.GObject, apt.progress.InstallProgress):
         self.time_last_update = time.time()
         self.emit("status-changed", status, percent)
 
-    def updateInterface(self):
+    def update_interface(self):
         """Called periodically to update the interface.
 
         Emits: status-timeout() [When a timeout happens]
         """
-        apt.progress.InstallProgress.updateInterface(self)
+        base.InstallProgress.update_interface(self)
         while self._context.pending():
             self._context.iteration()
         if self.time_last_update + self.INSTALL_TIMEOUT < time.time():
@@ -175,40 +200,25 @@ class GInstallProgress(gobject.GObject, apt.progress.InstallProgress):
         """Fork the process."""
         return self.term.forkpty(envv=self.env)
 
-    def waitChild(self):
+    def wait_child(self):
         """Wait for the child process to exit."""
         while not self.finished:
-            self.updateInterface()
+            self.update_interface()
         return self.apt_status
 
+    if apt_pkg._COMPAT_0_7:
+        updateInterface = function_deprecated_by(update_interface)
+        startUpdate = function_deprecated_by(start_update)
+        finishUpdate = function_deprecated_by(finish_update)
+        statusChange = function_deprecated_by(status_change)
+        waitChild = function_deprecated_by(wait_child)
+        childExited = function_deprecated_by(child_exited)
 
-class GDpkgInstallProgress(apt.progress.DpkgInstallProgress, GInstallProgress):
-    """An InstallProgress for local installations.
-
-    Signals:
-
-        * status-changed(str: status, int: percent)
-        * status-started()  - Not Implemented yet
-        * status-finished()
-        * status-timeout() - When the maintainer script hangs
-        * status-error() - When an error happens
-        * status-conffile() - On Conffile
-    """
-
-    def run(self, debfile):
-        """Install the given package."""
-        apt.progress.DpkgInstallProgress.run(self, debfile)
-
-    def updateInterface(self):
-        """Called periodically to update the interface.
 
-        Emits: status-timeout() [When a timeout happens]"""
-        apt.progress.DpkgInstallProgress.updateInterface(self)
-        if self.time_last_update + self.INSTALL_TIMEOUT < time.time():
-            self.emit("status-timeout")
+GDpkgInstallProgress = GInstallProgress
 
 
-class GFetchProgress(gobject.GObject, apt.progress.FetchProgress):
+class GAcquireProgress(gobject.GObject, base.AcquireProgress):
     """A Fetch Progress with GObject signals.
 
     Signals:
@@ -216,6 +226,8 @@ class GFetchProgress(gobject.GObject, apt.progress.FetchProgress):
         * status-changed(str: description, int: percent)
         * status-started()
         * status-finished()
+
+    DEPRECATED.
     """
 
     __gsignals__ = {"status-changed": mksig((str, int)),
@@ -223,40 +235,98 @@ class GFetchProgress(gobject.GObject, apt.progress.FetchProgress):
                     "status-finished": mksig()}
 
     def __init__(self):
-        apt.progress.FetchProgress.__init__(self)
+        base.AcquireProgress.__init__(self)
         gobject.GObject.__init__(self)
         self._continue = True
         self._context = glib.main_context_default()
 
     def start(self):
+        base.AcquireProgress.start(self)
         self.emit("status-started")
 
     def stop(self):
+        base.AcquireProgress.stop(self)
         self.emit("status-finished")
 
     def cancel(self):
         self._continue = False
 
-    def pulse(self):
-        apt.progress.FetchProgress.pulse(self)
-        currentItem = self.currentItems + 1
-        if currentItem > self.totalItems:
-            currentItem = self.totalItems
-        if self.currentCPS > 0:
+    def pulse(self, owner):
+        base.AcquireProgress.pulse(self, owner)
+        current_item = self.current_items + 1
+        if current_item > self.total_items:
+            current_item = self.total_items
+        if self.current_cps > 0:
             text = (_("Downloading file %(current)li of %(total)li with "
                       "%(speed)s/s") % \
-                      {"current": currentItem,
-                       "total": self.totalItems,
-                       "speed": apt_pkg.SizeToStr(self.currentCPS)})
+                      {"current": current_item,
+                       "total": self.total_items,
+                       "speed": apt_pkg.size_to_str(self.current_cps)})
         else:
             text = (_("Downloading file %(current)li of %(total)li") % \
-                      {"current": currentItem,
-                       "total": self.totalItems})
-        self.emit("status-changed", text, self.percent)
+                      {"current": current_item,
+                       "total": self.total_items})
+
+        percent = (((self.current_bytes + self.current_items) * 100.0) /
+                        float(self.total_bytes + self.total_items))
+        self.emit("status-changed", text, percent)
         while self._context.pending():
             self._context.iteration()
         return self._continue
 
+if apt_pkg._COMPAT_0_7:
+
+    class GFetchProgress(gobject.GObject, old.FetchProgress):
+        """A Fetch Progress with GObject signals.
+
+        Signals:
+
+            * status-changed(str: description, int: percent)
+            * status-started()
+            * status-finished()
+
+        DEPRECATED.
+        """
+
+        __gsignals__ = {"status-changed": mksig((str, int)),
+                        "status-started": mksig(),
+                        "status-finished": mksig()}
+
+        def __init__(self):
+            old.FetchProgress.__init__(self)
+            gobject.GObject.__init__(self)
+            self._continue = True
+            self._context = glib.main_context_default()
+
+        def start(self):
+            self.emit("status-started")
+
+        def stop(self):
+            self.emit("status-finished")
+
+        def cancel(self):
+            self._continue = False
+
+        def pulse(self):
+            old.FetchProgress.pulse(self)
+            current_item = self.currentItems + 1
+            if current_item > self.totalItems:
+                current_item = self.totalItems
+            if self.current_cps > 0:
+                text = (_("Downloading file %(current)li of %(total)li with "
+                          "%(speed)s/s") % \
+                          {"current": current_item,
+                           "total": self.totalItems,
+                           "speed": apt_pkg.size_to_str(self.currentCPS)})
+            else:
+                text = (_("Downloading file %(current)li of %(total)li") % \
+                          {"current": current_item,
+                           "total": self.totalItems})
+            self.emit("status-changed", text, self.percent)
+            while self._context.pending():
+                self._context.iteration()
+            return self._continue
+
 
 class GtkAptProgress(gtk.VBox):
     """Graphical progress for installation/fetch/operations.
@@ -291,11 +361,15 @@ class GtkAptProgress(gtk.VBox):
         self._progress_open.connect("status-started", self._on_status_started)
         self._progress_open.connect("status-finished",
                                     self._on_status_finished)
-        self._progress_fetch = GFetchProgress()
-        self._progress_fetch.connect("status-changed", self._on_status_changed)
-        self._progress_fetch.connect("status-started", self._on_status_started)
-        self._progress_fetch.connect("status-finished",
+        self._progress_acquire = GAcquireProgress()
+        self._progress_acquire.connect("status-changed",
+                                       self._on_status_changed)
+        self._progress_acquire.connect("status-started",
+                                       self._on_status_started)
+        self._progress_acquire.connect("status-finished",
                                      self._on_status_finished)
+
+        self._progress_fetch = None
         self._progress_install = GInstallProgress(self._terminal)
         self._progress_install.connect("status-changed",
                                        self._on_status_changed)
@@ -309,19 +383,6 @@ class GtkAptProgress(gtk.VBox):
                                      self._on_status_timeout)
         self._progress_install.connect("status-conffile",
                                      self._on_status_timeout)
-        self._progress_dpkg_install = GDpkgInstallProgress(self._terminal)
-        self._progress_dpkg_install.connect("status-changed",
-                                       self._on_status_changed)
-        self._progress_dpkg_install.connect("status-started",
-                                       self._on_status_started)
-        self._progress_dpkg_install.connect("status-finished",
-                                     self._on_status_finished)
-        self._progress_dpkg_install.connect("status-timeout",
-                                     self._on_status_timeout)
-        self._progress_dpkg_install.connect("status-error",
-                                     self._on_status_timeout)
-        self._progress_dpkg_install.connect("status-conffile",
-                                     self._on_status_timeout)
 
     def clear(self):
         """Reset all status information."""
@@ -342,12 +403,27 @@ class GtkAptProgress(gtk.VBox):
     @property
     def dpkg_install(self):
         """Return the install progress handler for dpkg."""
-        return self._dpkg_progress_install
+        return self._progress_install
+
+    if apt_pkg._COMPAT_0_7:
+
+        @property
+        def fetch(self):
+            """Return the fetch progress handler."""
+            if self._progress_fetch is None:
+                self._progress_fetch = GFetchProgress()
+                self._progress_fetch.connect("status-changed",
+                                            self._on_status_changed)
+                self._progress_fetch.connect("status-started",
+                                            self._on_status_started)
+                self._progress_fetch.connect("status-finished",
+                                            self._on_status_finished)
+            return self._progress_fetch
 
     @property
-    def fetch(self):
-        """Return the fetch progress handler."""
-        return self._progress_fetch
+    def acquire(self):
+        """Return the acquire progress handler."""
+        return self._progress_acquire
 
     def _on_status_started(self, progress):
         """Called when something starts."""
@@ -364,7 +440,7 @@ class GtkAptProgress(gtk.VBox):
     def _on_status_changed(self, progress, status, percent):
         """Called when the status changed."""
         self._label.set_text(status)
-        if percent is None:
+        if percent is None or percent == -1:
             self._progressbar.pulse()
         else:
             self._progressbar.set_fraction(percent/100.0)
@@ -412,6 +488,7 @@ def _test():
     """Test function"""
     import sys
 
+    import apt
     from apt.debfile import DebPackage
 
     win = gtk.Window()
@@ -422,18 +499,19 @@ def _test():
     win.show()
     cache = apt.cache.Cache(apt_progress.open)
     pkg = cache["xterm"]
-    if pkg.isInstalled:
-        pkg.markDelete()
+    if pkg.is_installed:
+        pkg.mark_delete()
     else:
-        pkg.markInstall()
+        pkg.mark_install()
     apt_progress.show_terminal(True)
     try:
-        cache.commit(apt_progress.fetch, apt_progress.install)
+        cache.commit(apt_progress.acquire, apt_progress.install)
     except Exception, exc:
         print >> sys.stderr, "Exception happened:", exc
     if len(sys.argv) > 1:
         deb = DebPackage(sys.argv[1], cache)
         deb.install(apt_progress.dpkg_install)
+    win.connect("destroy", gtk.main_quit)
     gtk.main()
 
 
diff --git a/apt/progress/old.py b/apt/progress/old.py
new file mode 100644
index 00000000..4bd79f2e
--- /dev/null
+++ b/apt/progress/old.py
@@ -0,0 +1,258 @@
+# progress.py - progress reporting classes
+#
+#  Copyright (c) 2005-2009 Canonical
+#
+#  Author: Michael Vogt <michael.vogt@ubuntu.com>
+#
+#  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
+# pylint: disable-msg = C0103
+"""Deprecated progress reporting classes.
+
+This module provides classes for compatibility with python-apt 0.7. They are
+completely deprecated and should not be used anymore.
+"""
+
+
+import os
+import sys
+
+import apt_pkg
+from apt.deprecation import AttributeDeprecatedBy, function_deprecated_by
+import warnings
+from apt.progress import base, text
+
+__all__ = []
+
+
+class OpProgress(base.OpProgress):
+    """Abstract class to implement reporting on cache opening."""
+
+    def __init__(self):
+        base.OpProgress.__init__(self)
+        warnings.warn("apt.progress.OpProgress is deprecated.",
+                      DeprecationWarning, stacklevel=2)
+
+    subOp = AttributeDeprecatedBy('subop')
+    Op = AttributeDeprecatedBy('op')
+
+
+class OpTextProgress(OpProgress, text.OpProgress):
+    """A simple text based cache open reporting class."""
+
+    def __init__(self):
+        text.OpProgress.__init__(self)
+        warnings.warn("apt.progress.OpTextProgress is deprecated.",
+                      DeprecationWarning, stacklevel=2)
+
+
+class FetchProgress(object):
+    """Report the download/fetching progress."""
+
+    # download status constants
+    (dlDone, dlQueued, dlFailed, dlHit, dlIgnored) = range(5)
+    dlStatusStr = {dlDone: "Done", dlQueued: "Queued", dlFailed: "Failed",
+                     dlHit: "Hit", dlIgnored: "Ignored"}
+
+    def __init__(self):
+        self.eta = 0.0
+        self.percent = 0.0
+        # Make checking easier
+        self.currentBytes = 0
+        self.currentItems = 0
+        self.totalBytes = 0
+        self.totalItems = 0
+        self.currentCPS = 0
+        warnings.warn("apt.progress.FetchProgress is deprecated.",
+                      DeprecationWarning, stacklevel=2)
+
+    def start(self):
+        """Called when the fetching starts."""
+
+    def stop(self):
+        """Called when all files have been fetched."""
+
+    def updateStatus(self, uri, descr, short_descr, status):
+        """Called when the status of an item changes.
+
+        This happens eg. when the downloads fails or is completed.
+        """
+
+    def update_status_full(self, uri, descr, short_descr, status, file_size,
+                           partial_size):
+        """Called when the status of an item changes.
+
+        This happens eg. when the downloads fails or is completed. This
+        version include information on current filesize and partial size
+        """
+
+    def pulse(self):
+        """Called periodically to update the user interface.
+
+        Return True to continue or False to cancel.
+        """
+        self.percent = (((self.currentBytes + self.currentItems) * 100.0) /
+                        float(self.totalBytes + self.totalItems))
+        if self.currentCPS > 0:
+            self.eta = ((self.totalBytes - self.currentBytes) /
+                        float(self.currentCPS))
+        return True
+
+    def pulse_items(self, items):
+        """Called periodically to update the user interface.
+        This function includes details about the items being fetched
+        Return True to continue or False to cancel.
+
+        """
+        self.percent = (((self.currentBytes + self.currentItems) * 100.0) /
+                        float(self.totalBytes + self.totalItems))
+        if self.currentCPS > 0:
+            self.eta = ((self.totalBytes - self.currentBytes) /
+                        float(self.currentCPS))
+        return True
+
+    def mediaChange(self, medium, drive):
+        """react to media change events."""
+
+
+class TextFetchProgress(FetchProgress):
+    """ Ready to use progress object for terminal windows """
+
+    def __init__(self):
+        FetchProgress.__init__(self)
+        self.items = {}
+
+    def updateStatus(self, uri, descr, short_descr, status):
+        """Called when the status of an item changes.
+
+        This happens eg. when the downloads fails or is completed.
+        """
+        if status != self.dlQueued:
+            print "\r%s %s" % (self.dlStatusStr[status], descr)
+        self.items[uri] = status
+
+    def pulse(self):
+        """Called periodically to update the user interface.
+
+        Return True to continue or False to cancel.
+        """
+        FetchProgress.pulse(self)
+        if self.currentCPS > 0:
+            s = "[%2.f%%] %sB/s %s" % (self.percent,
+                                    apt_pkg.size_to_str(int(self.currentCPS)),
+                                    apt_pkg.time_to_str(int(self.eta)))
+        else:
+            s = "%2.f%% [Working]" % (self.percent)
+        print "\r%s" % (s),
+        sys.stdout.flush()
+        return True
+
+    def stop(self):
+        """Called when all files have been fetched."""
+        print "\rDone downloading            "
+
+    def mediaChange(self, medium, drive):
+        """react to media change events."""
+        print ("Media change: please insert the disc labeled "
+               "'%s' in the drive '%s' and press enter") % (medium, drive)
+
+        return raw_input() not in ('c', 'C')
+
+
+class CdromProgress(object):
+    """Report the cdrom add progress."""
+
+    def __init__(self):
+        warnings.warn("apt.progress.CdromProgress is deprecated.",
+                      DeprecationWarning, stacklevel=2)
+
+    def askCdromName(self):
+        """Ask for a cdrom name"""
+
+    def changeCdrom(self):
+        """Change cdrom"""
+
+    def update(self, text, current):
+        """Update."""
+
+
+class DumbInstallProgress(base.InstallProgress):
+    """Report the install progress."""
+
+    def __init__(self):
+        base.InstallProgress.__init__(self)
+        warnings.warn("apt.progress.*InstallProgress are deprecated.",
+                      DeprecationWarning, stacklevel=2)
+
+    def updateInterface(self):
+        # *_stream were not available in the old progress reporting classes,
+        # create the attributes if they do not exist yet; as they are used
+        # in base.InstallProgress.update_interface().
+        if hasattr(self, "writefd") and not hasattr(self, "write_stream"):
+            self.write_stream = os.fdopen(self.writefd, "w")
+        if hasattr(self, "statusfd") and not hasattr(self, "status_stream"):
+            self.status_stream = os.fdopen(self.statusfd, "r")
+        return base.InstallProgress.update_interface(self)
+
+    def update_interface(self):
+        return self.updateInterface()
+
+    def startUpdate(self):
+        return base.InstallProgress.start_update(self)
+
+    def start_update(self):
+        return self.startUpdate()
+
+    def finishUpdate(self):
+        return base.InstallProgress.finish_update(self)
+
+    def finish_update(self):
+        return self.finishUpdate()
+
+
+class InstallProgress(DumbInstallProgress, base.InstallProgress):
+    """An InstallProgress that is pretty useful.
+
+    It supports the attributes 'percent' 'status' and callbacks for the dpkg
+    errors and conffiles and status changes.
+    """
+
+    selectTimeout = AttributeDeprecatedBy('select_timeout')
+
+    def statusChange(self, pkg, percent, status):
+        return base.InstallProgress.status_change(self, pkg, percent, status)
+
+    def status_change(self, pkg, percent, status):
+        return self.statusChange(pkg, percent, status)
+
+    def waitChild(self):
+        return base.InstallProgress.wait_child(self)
+
+    def wait_child(self):
+        return self.waitChild()
+
+
+class DpkgInstallProgress(InstallProgress):
+    """Progress handler for a local Debian package installation."""
+
+    debfile = ""
+    debname = ""
+
+    def run(self, debfile):
+        """Start installing the given Debian package."""
+        # Deprecated stuff
+        self.debfile = debfile
+        self.debname = os.path.basename(debfile).split("_")[0]
+        return base.InstallProgress.run(self, debfile)
diff --git a/apt/progress/text.py b/apt/progress/text.py
new file mode 100644
index 00000000..95f18831
--- /dev/null
+++ b/apt/progress/text.py
@@ -0,0 +1,259 @@
+# Copyright (c) 2009 Julian Andres Klode <jak@debian.org>
+#
+# 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
+"""Progress reporting for text interfaces."""
+import sys
+
+import apt_pkg
+from apt.progress import base
+
+__all__ = ['AcquireProgress', 'CdromProgress', 'OpProgress']
+
+
+def _(msg):
+    """Translate the message, also try apt if translation is missing."""
+    res = apt_pkg.gettext(msg)
+    if res == msg:
+        res = apt_pkg.gettext(msg, "apt")
+    return res
+
+
+class TextProgress(object):
+    """Internal Base class for text progress classes."""
+
+    def __init__(self, outfile=None):
+        self._file = outfile or sys.stdout
+        self._width = 0
+
+    def _write(self, msg, newline=True, maximize=False):
+        """Write the message on the terminal, fill remaining space."""
+        self._file.write("\r")
+        self._file.write(msg)
+
+        # Fill remaining stuff with whitespace
+        if self._width > len(msg):
+            self._file.write((self._width - len(msg)) * ' ')
+        elif maximize: # Needed for OpProgress.
+            self._width = max(self._width, len(msg))
+        if newline:
+            self._file.write("\n")
+        else:
+            #self._file.write("\r")
+            self._file.flush()
+
+
+class OpProgress(base.OpProgress, TextProgress):
+    """Operation progress reporting.
+
+    This closely resembles OpTextProgress in libapt-pkg.
+    """
+
+    def __init__(self, outfile=None):
+        TextProgress.__init__(self, outfile)
+        base.OpProgress.__init__(self)
+        self.old_op = ""
+
+    def update(self, percent=None):
+        """Called periodically to update the user interface."""
+        base.OpProgress.update(self, percent)
+        if self.major_change and self.old_op:
+            self._write(self.old_op)
+        self._write("%s... %i%%\r" % (self.op, self.percent), False, True)
+        self.old_op = self.op
+
+    def done(self):
+        """Called once an operation has been completed."""
+        base.OpProgress.done(self)
+        if self.old_op:
+            self._write(_("%c%s... Done") % ('\r', self.old_op), True, True)
+        self.old_op = ""
+
+
+class AcquireProgress(base.AcquireProgress, TextProgress):
+    """AcquireProgress for the text interface."""
+
+    def __init__(self, outfile=None):
+        TextProgress.__init__(self, outfile)
+        base.AcquireProgress.__init__(self)
+        self._signal = None
+        self._width = 80
+        self._id = 1
+
+    def start(self):
+        """Start an Acquire progress.
+
+        In this case, the function sets up a signal handler for SIGWINCH, i.e.
+        window resize signals. And it also sets id to 1.
+        """
+        base.AcquireProgress.start(self)
+        import signal
+        self._signal = signal.signal(signal.SIGWINCH, self._winch)
+        # Get the window size.
+        self._winch()
+        self._id = 1L
+
+    def _winch(self, *dummy):
+        """Signal handler for window resize signals."""
+        import fcntl
+        import termios
+        import struct
+        buf = fcntl.ioctl(self._file, termios.TIOCGWINSZ, 8 * ' ')
+        dummy, col, dummy, dummy = struct.unpack('hhhh', buf)
+        self._width = col - 1 # 1 for the cursor
+
+    def ims_hit(self, item):
+        """Called when an item is update (e.g. not modified on the server)."""
+        base.AcquireProgress.ims_hit(self, item)
+        line = _('Hit ') + item.description
+        if item.owner.filesize:
+            line += ' [%sB]' % apt_pkg.size_to_str(item.owner.filesize)
+        self._write(line)
+
+    def fail(self, item):
+        """Called when an item is failed."""
+        base.AcquireProgress.fail(self, item)
+        if item.owner.status == item.owner.STAT_DONE:
+            self._write(_("Ign ") + item.description)
+        else:
+            self._write(_("Err ") + item.description)
+            self._write("  %s" % item.owner.error_text)
+
+    def fetch(self, item):
+        """Called when some of the item's data is fetched."""
+        base.AcquireProgress.fetch(self, item)
+        # It's complete already (e.g. Hit)
+        if item.owner.complete:
+            return
+        item.owner.id = self._id
+        self._id += 1
+        line = _("Get:") + "%s %s" % (item.owner.id, item.description)
+        if item.owner.filesize:
+            line += (" [%sB]" % apt_pkg.size_to_str(item.owner.filesize))
+
+        self._write(line)
+
+    def pulse(self, owner):
+        """Periodically invoked while the Acquire process is underway.
+
+        Return False if the user asked to cancel the whole Acquire process."""
+        base.AcquireProgress.pulse(self, owner)
+        percent = (((self.current_bytes + self.current_items) * 100.0) /
+                        float(self.total_bytes + self.total_items))
+
+        shown = False
+        tval = '%i%%' % percent
+
+        end = ""
+        if self.current_cps:
+            eta = int(float(self.total_bytes - self.current_bytes) /
+                      self.current_cps)
+            end = " %sB/s %s" % (apt_pkg.size_to_str(self.current_cps),
+                                 apt_pkg.time_to_str(eta))
+
+        for worker in owner.workers:
+            val = ''
+            if not worker.current_item:
+                if worker.status:
+                    val = ' [%s]' % worker.status
+                    if len(tval) + len(val) + len(end) >= self._width:
+                        break
+                    tval += val
+                    shown = True
+                continue
+            shown = True
+
+            if worker.current_item.owner.id:
+                val += " [%i %s" % (worker.current_item.owner.id,
+                                    worker.current_item.shortdesc)
+            else:
+                val += ' [%s' % worker.current_item.description
+            if worker.current_item.owner.mode:
+                val += ' %s' % worker.current_item.owner.mode
+
+            val += ' %sB' % apt_pkg.size_to_str(worker.current_size)
+
+            # Add the total size and percent
+            if worker.total_size and not worker.current_item.owner.complete:
+                val += "/%sB %i%%" % (apt_pkg.size_to_str(worker.total_size),
+                                worker.current_size*100.0/worker.total_size)
+
+            val += ']'
+
+            if len(tval) + len(val) + len(end) >= self._width:
+                # Display as many items as screen width
+                break
+            else:
+                tval += val
+
+        if not shown:
+            tval += _(" [Working]")
+
+        if self.current_cps:
+            tval += (self._width - len(end) - len(tval)) * ' ' + end
+
+        self._write(tval, False)
+        return True
+
+    def media_change(self, medium, drive):
+        """Prompt the user to change the inserted removable media."""
+        base.AcquireProgress.media_change(self, medium, drive)
+        self._write(_("Media change: please insert the disc labeled\n"
+                      " '%s'\n"
+                      "in the drive '%s' and press enter\n") % (medium, drive))
+        return raw_input() not in ('c', 'C')
+
+    def stop(self):
+        """Invoked when the Acquire process stops running."""
+        base.AcquireProgress.stop(self)
+        # Trick for getting a translation from apt
+        self._write((_("Fetched %sB in %s (%sB/s)\n") % (
+                    apt_pkg.size_to_str(self.fetched_bytes),
+                    apt_pkg.time_to_str(self.elapsed_time),
+                    apt_pkg.size_to_str(self.current_cps))).rstrip("\n"))
+
+        # Delete the signal again.
+        import signal
+        signal.signal(signal.SIGWINCH, self._signal)
+
+
+class CdromProgress(base.CdromProgress, TextProgress):
+    """Text CD-ROM progress."""
+
+    def ask_cdrom_name(self):
+        """Ask the user to provide a name for the disc."""
+        base.CdromProgress.ask_cdrom_name(self)
+        self._write(_("Please provide a name for this Disc, such as "
+                      "'Debian 2.1r1 Disk 1'"), False)
+        try:
+            return raw_input(":")
+        except KeyboardInterrupt:
+            return
+
+    def update(self, text, current):
+        """Set the current progress."""
+        base.CdromProgress.update(self, text, current)
+        if text:
+            self._write(text, False)
+
+    def change_cdrom(self):
+        """Ask the user to change the CD-ROM."""
+        base.CdromProgress.change_cdrom(self)
+        self._write(_("Please insert a Disc in the drive and press enter"),
+                    False)
+        try:
+            return (raw_input() == '')
+        except KeyboardInterrupt:
+            return False
diff --git a/apt/utils.py b/apt/utils.py
index df1d0397..80ba6d65 100644
--- a/apt/utils.py
+++ b/apt/utils.py
@@ -17,9 +17,11 @@
 # this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-import apt_pkg
 import os.path
 
+import apt_pkg
+
+
 def get_maintenance_end_date(release_date, m_months):
     """
     get the (year, month) tuple when the maintenance for the distribution
@@ -28,49 +30,53 @@ def get_maintenance_end_date(release_date, m_months):
     """
     years = m_months / 12
     months = m_months % 12
-    support_end_year = release_date.year + years + (release_date.month + months)/12
+    support_end_year = (release_date.year + years +
+                        (release_date.month + months)/12)
     support_end_month = (release_date.month + months) % 12
     return (support_end_year, support_end_month)
 
+
 def get_release_date_from_release_file(path):
     """
     return the release date as time_t for the given release file
     """
     if not path or not os.path.exists(path):
         return None
-    tag = apt_pkg.ParseTagFile(open(path))
-    tag.Step()
-    if not tag.Section.has_key("Date"):
+    tag = apt_pkg.TagFile(open(path))
+    section = tag.next()
+    if not "Date" in section:
         return None
-    date = tag.Section["Date"]
-    return apt_pkg.StrToTime(date)
+    date = section["Date"]
+    return apt_pkg.str_to_time(date)
+
 
 def get_release_filename_for_pkg(cache, pkgname, label, release):
     " get the release file that provides this pkg "
-    if not cache.has_key(pkgname):
+    if pkgname not in cache:
         return None
     pkg = cache[pkgname]
     ver = None
     # look for the version that comes from the repos with
     # the given label and origin
-    for aver in pkg._pkg.VersionList:
-        if aver == None or aver.FileList == None:
+    for aver in pkg._pkg.version_list:
+        if aver is None or aver.file_list is None:
             continue
-        for verFile, index in aver.FileList:
+        for ver_file, _index in aver.file_list:
             #print verFile
-            if (verFile.Origin == label and
-                verFile.Label == label and
-                verFile.Archive == release):
+            if (ver_file.origin == label and
+                ver_file.label == label and
+                ver_file.archive == release):
                 ver = aver
     if not ver:
         return None
-    indexfile = cache._list.FindIndex(ver.FileList[0][0])
-    for metaindex in cache._list.List:
-        for m in metaindex.IndexFiles:
+    indexfile = cache._list.find_index(ver.file_list[0][0])
+    for metaindex in cache._list.list:
+        for m in metaindex.index_files:
             if (indexfile and
-                indexfile.Describe == m.Describe and
-                indexfile.IsTrusted):
-                dir = apt_pkg.Config.FindDir("Dir::State::lists")
-                name = apt_pkg.URItoFileName(metaindex.URI)+"dists_%s_Release" % metaindex.Dist
-                return dir+name
+                indexfile.describe == m.describe and
+                indexfile.is_trusted):
+                dirname = apt_pkg.config.find_dir("Dir::State::lists")
+                name = (apt_pkg.uri_to_filename(metaindex.uri) +
+                        "dists_%s_Release" % metaindex.dist)
+                return dirname + name
     return None
diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py
index ce44e48b..19308348 100644
--- a/aptsources/distinfo.py
+++ b/aptsources/distinfo.py
@@ -21,9 +21,11 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 
+import errno
 import os
 import gettext
 from os import getenv
+from subprocess import Popen, PIPE
 import ConfigParser
 import re
 
@@ -34,7 +36,7 @@ def _(s):
     return gettext.dgettext("python-apt", s)
 
 
-class Template:
+class Template(object):
 
     def __init__(self):
         self.name = None
@@ -64,7 +66,7 @@ class Template:
             return False
 
 
-class Component:
+class Component(object):
 
     def __init__(self, name, desc=None, long_desc=None):
         self.name = name
@@ -89,7 +91,7 @@ class Component:
         return self.description_long
 
 
-class Mirror:
+class Mirror(object):
     ''' Storage for mirror related information '''
 
     def __init__(self, proto, hostname, dir, location=None):
@@ -122,7 +124,7 @@ class Mirror:
         self.location = location
 
 
-class Repository:
+class Repository(object):
 
     def __init__(self, proto, dir):
         self.proto = proto
@@ -137,18 +139,20 @@ class Repository:
 
 def split_url(url):
     ''' split a given URL into the protocoll, the hostname and the dir part '''
-    return map(lambda a, b: a, re.split(":*\/+", url, maxsplit=2),
-               [None, None, None])
+    split = re.split(":*\/+", url, maxsplit=2)
+    while len(split) < 3:
+        split.append(None)
+    return split
 
 
-class DistInfo:
+class DistInfo(object):
 
     def __init__(self,
                  dist = None,
                  base_dir = "/usr/share/python-apt/templates"):
         self.metarelease_uri = ''
         self.templates = []
-        self.arch = apt_pkg.Config.Find("APT::Architecture")
+        self.arch = apt_pkg.config.find("APT::Architecture")
 
         location = None
         match_loc = re.compile(r"^#LOC:(.+)$")
@@ -158,10 +162,13 @@ class DistInfo:
         #match_mirror_line = re.compile(r".+")
 
         if not dist:
-            pipe = os.popen("lsb_release -i -s")
-            dist = pipe.read().strip()
-            pipe.close()
-            del pipe
+            try:
+                dist = Popen(["lsb_release", "-i", "-s"],
+                             stdout=PIPE).communicate()[0].strip()
+            except OSError, exc:
+                if exc.errno != errno.ENOENT:
+                    print 'WARNING: lsb_release failed, using defaults:', exc
+                dist = "Debian"
 
         self.dist = dist
 
@@ -213,6 +220,9 @@ class DistInfo:
                 template.match_uri = value
             elif (field == 'MirrorsFile' or
                   field == 'MirrorsFile-%s' % self.arch):
+                # Make the path absolute.
+                value = os.path.isabs(value) and value or \
+                        os.path.abspath(os.path.join(base_dir, value))
                 if value not in map_mirror_sets:
                     mirror_set = {}
                     try:
diff --git a/aptsources/distro.py b/aptsources/distro.py
index 5398d4a3..e51fbe9f 100644
--- a/aptsources/distro.py
+++ b/aptsources/distro.py
@@ -38,7 +38,7 @@ class NoDistroTemplateException(Exception):
     pass
 
 
-class Distribution:
+class Distribution(object):
 
     def __init__(self, id, codename, description, release):
         """ Container for distribution specific informations """
@@ -438,6 +438,24 @@ class UbuntuDistribution(Distribution):
             self, mirror_template="http://%s.archive.ubuntu.com/ubuntu/")
 
 
+def _lsb_release():
+    """Call lsb_release --idrc and return a mapping."""
+    from subprocess import Popen, PIPE
+    import errno
+    result = {'Codename': 'sid', 'Distributor ID': 'Debian',
+              'Description': 'Debian GNU/Linux unstable (sid)',
+              'Release': 'unstable'}
+    try:
+        out = Popen(['lsb_release', '-idrc'], stdout=PIPE).communicate()[0]
+        # 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:
+        if exc.errno != errno.ENOENT:
+            print 'WARNING: lsb_release failed, using defaults:', exc
+    return result
+
+
 def get_distro(id=None, codename=None, description=None, release=None):
     """
     Check the currently used distribution and return the corresponding
@@ -448,12 +466,11 @@ def get_distro(id=None, codename=None, description=None, release=None):
     """
     # make testing easier
     if not (id and codename and description and release):
-        lsb_info = []
-        for lsb_option in ["-i", "-c", "-d", "-r"]:
-            pipe = os.popen("lsb_release %s -s" % lsb_option)
-            lsb_info.append(pipe.read().strip())
-            del pipe
-        (id, codename, description, release) = lsb_info
+        result = _lsb_release()
+        id = result['Distributor ID']
+        codename = result['Codename']
+        description = result['Description']
+        release = result['Release']
     if id == "Ubuntu":
         return UbuntuDistribution(id, codename, description, release)
     elif id == "Debian":
diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py
index 1dfd870f..76bea43a 100644
--- a/aptsources/sourceslist.py
+++ b/aptsources/sourceslist.py
@@ -33,6 +33,7 @@ import time
 
 import apt_pkg
 from aptsources.distinfo import DistInfo
+from apt.deprecation import function_deprecated_by
 
 
 # some global helpers
@@ -73,7 +74,7 @@ def uniq(s):
     return list(set(s))
 
 
-class SourceEntry:
+class SourceEntry(object):
     """ single sources.list entry """
 
     def __init__(self, line, file=None):
@@ -87,8 +88,8 @@ class SourceEntry:
         self.comment = ""               # (optional) comment
         self.line = line                # the original sources.list line
         if file is None:
-            file = apt_pkg.Config.FindDir(
-                "Dir::Etc")+apt_pkg.Config.Find("Dir::Etc::sourcelist")
+            file = apt_pkg.config.find_dir(
+                "Dir::Etc")+apt_pkg.config.find("Dir::Etc::sourcelist")
         self.file = file               # the file that the entry is located in
         self.parse(line)
         self.template = None           # type DistInfo.Suite
@@ -236,10 +237,10 @@ class SourcesList(object):
         """ update the list of known entries """
         self.list = []
         # read sources.list
-        file = apt_pkg.Config.FindFile("Dir::Etc::sourcelist")
+        file = apt_pkg.config.find_file("Dir::Etc::sourcelist")
         self.load(file)
         # read sources.list.d
-        partsdir = apt_pkg.Config.FindDir("Dir::Etc::sourceparts")
+        partsdir = apt_pkg.config.find_dir("Dir::Etc::sourceparts")
         for file in glob.glob("%s/*.list" % partsdir):
             self.load(file)
         # check if the source item fits a predefined template
@@ -309,18 +310,21 @@ class SourcesList(object):
         """ remove the specified entry from the sources.list """
         self.list.remove(source_entry)
 
-    def restoreBackup(self, backup_ext):
+    def restore_backup(self, backup_ext):
         " restore sources.list files based on the backup extension "
-        file = apt_pkg.Config.FindFile("Dir::Etc::sourcelist")
+        file = apt_pkg.config.find_file("Dir::Etc::sourcelist")
         if os.path.exists(file+backup_ext) and \
             os.path.exists(file):
             shutil.copy(file+backup_ext, file)
         # now sources.list.d
-        partsdir = apt_pkg.Config.FindDir("Dir::Etc::sourceparts")
+        partsdir = apt_pkg.config.find_dir("Dir::Etc::sourceparts")
         for file in glob.glob("%s/*.list" % partsdir):
             if os.path.exists(file+backup_ext):
                 shutil.copy(file+backup_ext, file)
 
+    if apt_pkg._COMPAT_0_7:
+        restoreBackup = function_deprecated_by(restore_backup)
+
     def backup(self, backup_ext=None):
         """ make a backup of the current source files, if no backup extension
             is given, the current date/time is used (and returned) """
@@ -351,7 +355,7 @@ class SourcesList(object):
         files = {}
         # write an empty default config file if there aren't any sources
         if len(self.list) == 0:
-            path = apt_pkg.Config.FindFile("Dir::Etc::sourcelist")
+            path = apt_pkg.config.find_file("Dir::Etc::sourcelist")
             header = (
                 "## See sources.list(5) for more information, especialy\n"
                 "# Remember that you can only use http, ftp or file URIs\n"
@@ -390,7 +394,7 @@ class SourcesList(object):
         return (parents, used_child_templates)
 
 
-class SourceEntryMatcher:
+class SourceEntryMatcher(object):
     """ matcher class to make a source entry look nice
         lots of predefined matchers to make it i18n/gettext friendly
         """
@@ -429,7 +433,7 @@ class SourceEntryMatcher:
 
 # some simple tests
 if __name__ == "__main__":
-    apt_pkg.InitConfig()
+    apt_pkg.init_config()
     sources = SourcesList()
 
     for entry in sources:
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 1000f38c..00000000
--- a/configure.in
+++ /dev/null
@@ -1,34 +0,0 @@
-dnl Find the version of python we are using and ensure the library and header
-dnl are available.. Also get all the paths and options from the python setup
-dnl makefile.
-AC_CACHE_CHECK("python version", ac_cv_ver_python, [ac_cv_ver_python=`python -c 'import sys;print sys.version[[:3]]' 2> /dev/null`])
-AC_CACHE_CHECK("python prefix", ac_cv_prefix_python, [ac_cv_prefix_python=`python -c 'import sys;print sys.prefix' 2> /dev/null`])
-AC_CACHE_CHECK("python exec prefix", ac_cv_execprefix_python, [ac_cv_execprefix_python=`python -c 'import sys;print sys.exec_prefix' 2> /dev/null`])
-if test "x$ac_cv_ver_python" != "x"; then
-
-   cat > pytest << EOF
-include $ac_cv_execprefix_python/lib/python$ac_cv_ver_python/config/Makefile
-.PHONY: libs include
-libs:
-	@echo \$(MODLIBS) \$(LIBS) \$(SYSLIBS)
-include:
-	@echo \$(INCLUDEPY)
-EOF
-
-   AC_CACHE_CHECK("python libs", ac_cv_libs_python, [ac_cv_libs_python=`make -s -f pytest libs 2> /dev/null`])
-   AC_CACHE_CHECK("python include", ac_cv_include_python, [ac_cv_include_python=`make -s -f pytest include 2> /dev/null`])
-   AC_CHECK_HEADER(python$ac_cv_ver_python/Python.h,
-     [AC_CHECK_LIB(python$ac_cv_ver_python,PyArg_ParseTuple,
-        [AC_DEFINE(HAVE_PYTHONLIB) PYTHONLIB="-lpython$ac_cv_ver_python $ac_cv_libs_python"],[],$ac_cv_libs_python)])
-   AC_SUBST(PYTHONLIB)
-
-   PYTHONVER=$ac_cv_ver_python
-   PYTHONPREFIX=$ac_cv_prefix_python
-   PYTHONEXECPREFIX=$ac_cv_execprefix_python
-   PYTHONINCLUDE=$ac_cv_include_python
-   AC_SUBST(PYTHONVER)
-   AC_SUBST(PYTHONPREFIX)
-   AC_SUBST(PYTHONEXECPREFIX)
-   AC_SUBST(PYTHONINCLUDE)
-fi
-
diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in
index e5a1b424..b9f70940 100644
--- a/data/templates/Debian.info.in
+++ b/data/templates/Debian.info.in
@@ -3,8 +3,8 @@ _ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changel
 Suite: squeeze
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
-MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
+MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org
+MirrorsFile: Debian.mirrors
 _Description: Debian 6.0 'Squeeze' 
 Component: main
 _CompDescription: Officially supported
@@ -28,8 +28,8 @@ _Description: Security updates
 Suite: lenny
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
-MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
+MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org
+MirrorsFile: Debian.mirrors
 _Description: Debian 5.0 'Lenny' 
 Component: main
 _CompDescription: Officially supported
@@ -53,8 +53,8 @@ _Description: Security updates
 Suite: etch
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
-MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
+MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org
+MirrorsFile: Debian.mirrors
 _Description: Debian 4.0 'Etch'
 Component: main
 _CompDescription: Officially supported
@@ -78,8 +78,8 @@ _Description: Security updates
 Suite: sarge
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
-MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
+MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org
+MirrorsFile: Debian.mirrors
 _Description: Debian 3.1 'Sarge'
 Component: main
 _CompDescription: Officially supported
@@ -103,8 +103,8 @@ _Description: Security updates
 Suite: stable
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
-MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
+MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org
+MirrorsFile: Debian.mirrors
 _Description: Debian current stable release
 Component: main
 _CompDescription: Officially supported
@@ -116,8 +116,8 @@ _CompDescription: Non-DFSG-compatible Software
 Suite: testing
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
-MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
+MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org
+MirrorsFile: Debian.mirrors
 _Description: Debian testing
 Component: main
 _CompDescription: Officially supported
@@ -129,8 +129,8 @@ _CompDescription: Non-DFSG-compatible Software
 Suite: sid
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
-MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
+MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org
+MirrorsFile: Debian.mirrors
 _Description: Debian 'Sid' (unstable)
 Component: main
 _CompDescription: Officially supported
@@ -142,7 +142,8 @@ _CompDescription: Non-DFSG-compatible Software
 Suite: unstable
 RepositoryType: deb
 BaseURI: http://http.us.debian.org/debian/
-MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
+MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org
+MirrorsFile: Debian.mirrors
 _Description: Debian 'Sid' (unstable)
 Component: main
 _CompDescription: Officially supported
diff --git a/data/templates/Debian.mirrors b/data/templates/Debian.mirrors
index be6f4798..f7c24139 100644
--- a/data/templates/Debian.mirrors
+++ b/data/templates/Debian.mirrors
@@ -1,586 +1,693 @@
 #LOC:AR
-http://debian.logiclinux.com/debian/
-ftp://ftp.ccc.uba.ar/pub/linux/debian/debian/
 ftp://debian.torredehanoi.org/debian/
+ftp://ftp.ccc.uba.ar/pub/linux/debian/debian/
+http://debian.logiclinux.com/debian/
+http://debian.torredehanoi.org/debian/
+http://ftp.ccc.uba.ar/pub/linux/debian/debian/
 #LOC:AT
-ftp://ftp.at.debian.org/debian/
-ftp://debian.sil.at/debian/
-ftp://ftp.debian.at/debian/
-ftp://gd.tuwien.ac.at/opsys/linux/debian/
-ftp://ftp.tuwien.ac.at/opsys/linux/debian/
+ftp://debian.inode.at/debian/
+ftp://debian.lagis.at/debian/
 ftp://debian.mur.at/debian/
-ftp://algo.mur.at/debian/
-ftp://spider.mur.at/debian/
+ftp://ftp.at.debian.org/debian/
 ftp://ftp.tu-graz.ac.at/mirror/debian/
-ftp://ftp.tugraz.at/mirror/debian/
 ftp://ftp.univie.ac.at/systems/linux/debian/debian/
-ftp://debian.inode.at/debian/
-ftp://debian.lagis.at/debian/
+ftp://gd.tuwien.ac.at/opsys/linux/debian/
+http://debian.inode.at/debian/
+http://debian.lagis.at/debian/
+http://debian.mur.at/debian/
+http://ftp.at.debian.org/debian/
+http://ftp.tu-graz.ac.at/mirror/debian/
+http://ftp.univie.ac.at/systems/linux/debian/debian/
+http://gd.tuwien.ac.at/opsys/linux/debian/
 #LOC:AU
 ftp://ftp.au.debian.org/debian/
-ftp://mirror.linux.org.au/debian/
-ftp://mirror.aarnet.edu.au/debian/
+ftp://ftp.iinet.net.au/debian/debian/
 ftp://ftp.monash.edu.au/pub/linux/debian/
+ftp://ftp.netspace.net.au/pub/debian/
 ftp://ftp.uwa.edu.au/debian/
+ftp://mirror.aarnet.edu.au/debian/
+ftp://mirror.cse.unsw.edu.au/debian/
 ftp://mirror.eftel.com/debian/
-ftp://mirror.q-net.net.au/debian/
-ftp://mirror.datafast.net.au/debian/
-ftp://mirror.pacific.net.au/debian/
-ftp://ftp.iinet.net.au/debian/debian/
 ftp://mirror.optus.net/debian/
-ftp://mirror.optusnet.com.au/debian/
-ftp://mirror.cse.unsw.edu.au/debian/
-ftp://ftp.netspace.net.au/pub/debian/
+ftp://mirror.pacific.net.au/debian/
+ftp://mirror.transact.net.au/debian/
 ftp://mirror.waia.asn.au/debian/
+http://ftp.au.debian.org/debian/
+http://ftp.iinet.net.au/debian/debian/
+http://ftp.monash.edu.au/pub/linux/debian/
+http://ftp.netspace.net.au/pub/debian/
+http://ftp.uwa.edu.au/debian/
+http://mirror.aarnet.edu.au/debian/
+http://mirror.cse.unsw.edu.au/debian/
+http://mirror.eftel.com/debian/
+http://mirror.optus.net/debian/
+http://mirror.pacific.net.au/debian/
+http://mirror.transact.net.au/debian/
+http://mirror.waia.asn.au/debian/
 #LOC:BA
 ftp://ftp.ba.debian.org/debian/
-ftp://mirror.debian.com.ba/debian/
+http://ftp.ba.debian.org/debian/
 #LOC:BE
 ftp://ftp.be.debian.org/debian/
-ftp://mirror.be.gbxs.net/debian/
-ftp://ftp.kulnet.kuleuven.ac.be/debian/
-ftp://ftp.easynet.be/debian/
 ftp://ftp.belnet.be/debian/
 ftp://ftp.debian.skynet.be/debian/
+ftp://ftp.easynet.be/debian/
+http://ftp.be.debian.org/debian/
+http://ftp.belnet.be/debian/
+http://ftp.debian.skynet.be/ftp/debian/
+http://ftp.easynet.be/ftp/debian/
 #LOC:BG
-ftp://ftp.bg.debian.org/debian/
-ftp://debian.spnet.net/debian/
+ftp://debian.ipacct.com/debian/
 ftp://debian.ludost.net/debian/
-ftp://marla.ludost.net/debian/
-ftp://ftp.uni-sofia.bg/debian/
-ftp://debian.telecoms.bg/debian/
 ftp://debian.mnet.bg/debian/
 ftp://debian.networx-bg.com/debian/
+ftp://debian.telecoms.bg/debian/
+ftp://ftp.bg.debian.org/debian/
+ftp://ftp.uni-sofia.bg/debian/
+http://debian.ipacct.com/debian/
+http://debian.ludost.net/debian/
+http://debian.mnet.bg/debian/
+http://debian.networx-bg.com/debian/
+http://debian.telecoms.bg/debian/
+http://ftp.bg.debian.org/debian/
+http://ftp.uni-sofia.bg/debian/
 #LOC:BR
-ftp://ftp.br.debian.org/debian/
-ftp://debian.c3sl.ufpr.br/debian/
 ftp://debian.das.ufsc.br/pub/debian/
-http://download.unesp.br/linux/debian/
-http://sft.if.usp.br/debian/
-http://fma.if.usp.br/debian/
-ftp://linorg.usp.br/debian/
-http://linux.iq.usp.br/debian/
-http://torio.iq.usp.br/debian/
-ftp://ftp.pucpr.br/debian/
 ftp://debian.las.ic.unicamp.br/debian/
+ftp://debs.ifsul.edu.br/debian/
+ftp://ftp.br.debian.org/debian/
+ftp://ftp.pucpr.br/debian/
+ftp://linorg.usp.br/debian/
+http://debian.las.ic.unicamp.br/debian/
 http://debian.pop-sc.rnp.br/debian/
-http://mirror.pop-sc.rnp.br/debian/
+http://debs.ifsul.edu.br/debian/
+http://download.unesp.br/linux/debian/
+http://ftp.br.debian.org/debian/
+http://linorg.usp.br/debian/
+http://linux.iq.usp.br/debian/
+http://sft.if.usp.br/debian/
 #LOC:BY
-http://linux.org.by/debian/
 ftp://ftp.mgts.by/debian/
+http://ftp.mgts.by/debian/
+http://linux.org.by/debian/
 #LOC:CA
+ftp://debian.mirror.iweb.ca/debian/
+ftp://debian.mirror.rafal.ca/debian/
+ftp://debian.savoirfairelinux.net/debian/
 ftp://ftp.ca.debian.org/debian/
-http://debian.yorku.ca/debian/
 ftp://ftp3.nrc.ca/debian/
-ftp://ftp3.ca.debian.org/debian/
-ftp://gulus.usherbrooke.ca/debian/
-ftp://gulus.usherb.ca/debian/
-ftp://ftp1.ca.debian.org/debian/
 ftp://mirror.cpsc.ucalgary.ca/debian/
-http://mirror.peer1.net/debian/
-ftp://debian.mirror.rafal.ca/debian/
-ftp://mirror.mountaincable.net/debian/
-ftp://ftp4.ca.debian.org/debian/
-ftp://debian.savoirfairelinux.net/debian/
-ftp://gpl.savoirfairelinux.net/debian/
-ftp://debian.mirror.iweb.ca/debian/
-ftp://ftp2.ca.debian.org/debian/
 ftp://mirror.csclub.uwaterloo.ca/debian/
+ftp://mirror.its.dal.ca/debian/
+http://debian.mirror.iweb.ca/debian/
+http://debian.mirror.rafal.ca/debian/
+http://debian.savoirfairelinux.net/debian/
+http://debian.yorku.ca/debian/
+http://ftp.ca.debian.org/debian/
+http://ftp3.nrc.ca/debian/
+http://mirror.cpsc.ucalgary.ca/mirror/debian.org/debian/
+http://mirror.csclub.uwaterloo.ca/debian/
+http://mirror.its.dal.ca/debian/
+http://mirror.peer1.net/debian/
 #LOC:CH
 ftp://ftp.ch.debian.org/debian/
-ftp://debian.ethz.ch/debian/
 ftp://mirror.switch.ch/mirror/debian/
 http://debian.csg.uzh.ch/debian/
+http://ftp.ch.debian.org/debian/
+http://mirror.switch.ch/ftp/mirror/debian/
 #LOC:CL
-http://debian.ubiobio.cl/debian/
+ftp://ftp.cl.debian.org/debian/
 http://debian.ciencias.uchile.cl/debian/
+http://debian.ubiobio.cl/debian/
 http://debian.utalca.cl/debian/
-http://mirror.debian.cl/debian/
-http://core.debian.cl/debian/
-ftp://debian.netlinux.cl/debian/
+http://ftp.cl.debian.org/debian/
 #LOC:CN
 ftp://mirrors.geekbone.org/debian/
 ftp://www.anheng.com.cn/debian/
-ftp://debian.bjlx.org.cn/debian/
-ftp://www.watertest.com.cn/debian/
-ftp://www.anheng.com.cn/debian/
-#LOC:CO
+http://mirrors.geekbone.org/debian/
+http://www.anheng.com.cn/debian/
+#LOC:CR
+ftp://mirrors.ucr.ac.cr/debian/
+http://mirrors.ucr.ac.cr/debian/
 #LOC:CZ
-ftp://ftp.cz.debian.org/debian/
-ftp://ftp.debian.cz/debian/
-ftp://www.debian.cz/debian/
-ftp://debian.sh.cvut.cz/debian/
-ftp://ftp.sh.cvut.cz/debian/
-ftp://ftp.zcu.cz/mirrors/debian/
-ftp://debian.mirror.web4u.cz/
-ftp://ftp.cvut.cz/debian/
-ftp://ftp.fs.cvut.cz/debian/
 ftp://debian.ignum.cz/debian/
-ftp://ucho.ignum.cz/debian/
 ftp://debian.mirror.dkm.cz/debian/
+ftp://debian.mirror.web4u.cz/
+ftp://debian.sh.cvut.cz/debian/
 ftp://debian.superhosting.cz/debian/
+ftp://ftp.cvut.cz/debian/
+ftp://ftp.cz.debian.org/debian/
+ftp://ftp.zcu.cz/mirrors/debian/
+http://debian.ignum.cz/debian/
+http://debian.mirror.dkm.cz/debian/
+http://debian.mirror.web4u.cz/
+http://debian.sh.cvut.cz/debian/
+http://debian.superhosting.cz/debian/
+http://ftp.cvut.cz/debian/
+http://ftp.cz.debian.org/debian/
+http://ftp.zcu.cz/mirrors/debian/
 #LOC:DE
-ftp://ftp.de.debian.org/debian/
-ftp://ftp1.de.debian.org/debian/
-ftp://debian.inf.tu-dresden.de/debian/
-ftp://ftp2.de.debian.org/debian/
-ftp://ftp.rfc822.org/debian/
-ftp://source.rfc822.org/debian/
-ftp://ftp.tu-clausthal.de/pub/linux/debian/
-ftp://pegasus.rz.tu-clausthal.de/pub/linux/debian/
+ftp://artfiles.org/debian/
+ftp://debian.cruisix.net/debian/
+ftp://debian.morphium.info/debian/
+ftp://debian.netcologne.de/debian/
+ftp://debian.tu-bs.de/debian/
 ftp://debian.uni-duisburg-essen.de/debian/
-ftp://ftp.freenet.de/debian/
-ftp://ftp.informatik.rwth-aachen.de/pub/Linux/debian/
-ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/debian/
 ftp://ftp-stud.fht-esslingen.de/debian/
-ftp://ftp.stw-bonn.de/debian/
+ftp://ftp.de.debian.org/debian/
+ftp://ftp.freenet.de/debian/
 ftp://ftp.fu-berlin.de/pub/unix/linux/mirrors/debian/
-ftp://Hefe.ZEDAT.FU-Berlin.DE/pub/unix/linux/mirrors/debian/
-ftp://debian.tu-bs.de/debian/
-ftp://ftp.uni-koeln.de/debian/
+ftp://ftp.hosteurope.de/pub/linux/debian/
+ftp://ftp.informatik.hu-berlin.de/pub/Linux/debian/
+ftp://ftp.informatik.rwth-aachen.de/pub/Linux/debian/
+ftp://ftp.informatik.uni-frankfurt.de/pub/Mirrors/debian.org/debian/
 ftp://ftp.mpi-sb.mpg.de/pub/linux/debian/
+ftp://ftp.plusline.de/pub/debian/
+ftp://ftp.rrzn.uni-hannover.de/debian/debian/
+ftp://ftp.stw-bonn.de/debian/
 ftp://ftp.tu-chemnitz.de/pub/linux/debian/debian/
-ftp://ftp.uni-kl.de/debian/
+ftp://ftp.tu-clausthal.de/pub/linux/debian/
 ftp://ftp.uni-bayreuth.de/debian/
-ftp://btr0x2.rz.uni-bayreuth.de/debian/
-ftp://ftp.informatik.hu-berlin.de/pub/Linux/debian/
+ftp://ftp.uni-kl.de/debian/
+ftp://ftp.uni-koeln.de/debian/
+ftp://ftp2.de.debian.org/debian/
 ftp://ftp5.gwdg.de/pub/linux/debian/debian/
-ftp://ftp.hosteurope.de/pub/linux/debian/
-ftp://ftp.informatik.uni-frankfurt.de/pub/Mirrors/debian.org/debian/
-ftp://ftp.cs.uni-frankfurt.de/pub/Mirrors/debian.org/debian/
-ftp://debian.netcologne.de/debian/
-ftp://artfiles.org/debian/
-http://debian.intergenia.de/debian/
-http://debian.server4you.de/debian/
-http://debian.vserver.de/debian/
-http://debian.plusserver.de/debian/
-ftp://debian.cruisix.net/debian/
-ftp://ftp.rrzn.uni-hannover.de/debian/debian/
-http://debian.charite.de/debian/
-ftp://ftp.plusline.de/pub/debian/
 ftp://mirror.ayous.org/debian/
-ftp://debian.morphium.info/debian/
+ftp://mirror.giantix-server.de/debian/
+http://artfiles.org/debian/
+http://debian.charite.de/debian/
+http://debian.cruisix.net/debian/
+http://debian.intergenia.de/debian/
+http://debian.morphium.info/debian/
+http://debian.netcologne.de/debian/
+http://debian.tu-bs.de/debian/
+http://debian.uni-duisburg-essen.de/debian/
+http://ftp-stud.fht-esslingen.de/debian/
+http://ftp.de.debian.org/debian/
+http://ftp.freenet.de/debian/
+http://ftp.hosteurope.de/pub/linux/debian/
+http://ftp.informatik.rwth-aachen.de/ftp/pub/Linux/debian/
+http://ftp.informatik.uni-frankfurt.de/debian/
+http://ftp.plusline.de/debian/
+http://ftp.stw-bonn.de/debian/
+http://ftp.tu-chemnitz.de/pub/linux/debian/debian/
+http://ftp.tu-clausthal.de/pub/linux/debian/
+http://ftp.uni-bayreuth.de/debian/
+http://ftp.uni-kl.de/debian/
+http://ftp.uni-koeln.de/debian/
+http://ftp2.de.debian.org/debian/
+http://ftp5.gwdg.de/pub/linux/debian/debian/
+http://mirror.ayous.org/debian/
+http://mirror.giantix-server.de/debian/
 #LOC:DK
 ftp://ftp.dk.debian.org/debian/
-ftp://mirrors.dotsrc.org/debian/
-ftp://ftp.dkuug.dk/pub/debian/
-http://debian.uni-c.dk/debian/
-http://mirror.uni-c.dk/debian/
 ftp://mirrors.telianet.dk/debian/
-ftp://mirrors.dk.telia.net/debian/
-http://debianmirror.wwi.dk/debian/
+http://ftp.dk.debian.org/debian/
+http://mirrors.telianet.dk/debian/
 #LOC:EE
 ftp://ftp.ee.debian.org/debian/
-ftp://ftp.aso.ee/debian/
-ftp://ftp.ria.ee/debian/
+http://ftp.ee.debian.org/debian/
 #LOC:ES
-ftp://ftp.es.debian.org/debian/
-ftp://ftp.gul.uc3m.es/debian/
-ftp://ftp.gul.es/debian/
-ftp://ftp.rediris.es/debian/
-ftp://ftp.cica.es/debian/
+ftp://debian.grn.cat/debian/
 ftp://ftp.caliu.cat/debian/
+ftp://ftp.cica.es/debian/
+ftp://ftp.es.debian.org/debian/
 ftp://ftp.gva.es/mirror/debian/
-ftp://frigga.gva.es/mirror/debian/
-ftp://ftp.um.es/mirror/debian/
 ftp://ftp.udc.es/debian/
-ftp://debian.grn.cat/debian/
-ftp://ftp.grn.es/debian/
-ftp://ftp.grn.cat/debian/
-http://debian.com.es/debian/
-http://selene.servytec.es/debian/
+http://debian.grn.cat/debian/
+http://ftp.caliu.cat/debian/
+http://ftp.cica.es/debian/
+http://ftp.es.debian.org/debian/
+http://ftp.gva.es/mirror/debian/
+http://ftp.udc.es/debian/
 #LOC:FI
 ftp://ftp.fi.debian.org/debian/
-ftp://trumpetti.atm.tut.fi/debian/
 ftp://ftp.funet.fi/pub/linux/mirrors/debian/
 ftp://ftp.jyu.fi/debian/
-ftp://lennon.cc.jyu.fi/debian/
 ftp://ftp.seclan.com/debian/
+http://ftp.fi.debian.org/debian/
+http://ftp.funet.fi/pub/linux/mirrors/debian/
+http://ftp.jyu.fi/debian/
+http://ftp.seclan.com/debian/
 #LOC:FR
+ftp://debian.advalem.net/debian/
+ftp://debian.cict.fr/debian/
+ftp://debian.ens-cachan.fr/debian/
+ftp://debian.med.univ-tours.fr/debian/
+ftp://debian.mines.inpl-nancy.fr/debian/
+ftp://debian.mirror.inra.fr/debian/
+ftp://debian.mirrors.easynet.fr/debian/
+ftp://debian.polytech-lille.fr/debian/
+ftp://debian.revolsys.fr/debian/
+ftp://debian.univ-reims.fr/debian/
+ftp://ftp.crihan.fr/debian/
 ftp://ftp.fr.debian.org/debian/
-ftp://debian.proxad.net/debian/
-ftp://ftpmirror.proxad.net/debian/
-ftp://ftp2.fr.debian.org/debian/
-ftp://ftp.oleane.net/debian/
 ftp://ftp.iut-bm.univ-fcomte.fr/debian/
-ftp://debian.iut-bm.univ-fcomte.fr/debian/
-ftp://ftp.eudil.fr/debian/
-ftp://ftp.proxad.net/mirrors/ftp.debian.org/
-ftp://ftp.free.fr/mirrors/ftp.debian.org/
-ftp://ftp.online.fr/mirrors/ftp.debian.org/
-ftp://ftp.proxad.fr/mirrors/ftp.debian.org/
 ftp://ftp.lip6.fr/pub/linux/distributions/debian/
-ftp://debian.ens-cachan.fr/debian/
-ftp://ftp.ens-cachan.fr/debian/
+ftp://ftp.nerim.net/debian/
+ftp://ftp.proxad.net/mirrors/ftp.debian.org/
 ftp://ftp.u-picardie.fr/mirror/debian/
-ftp://debian.mirrors.easynet.fr/debian/
-ftp://tengu.easynet.fr/debian/
 ftp://ftp.u-strasbg.fr/debian/
-ftp://debian.cict.fr/debian/
+ftp://ftp.univ-nantes.fr/debian/
+ftp://ftp.univ-pau.fr/pub/mirrors/debian/
+ftp://ftp2.fr.debian.org/debian/
 ftp://mir1.ovh.net/debian/
-http://mir2.ovh.net/debian/
-http://mirror.ovh.net/debian/
-ftp://ftp.nerim.net/debian/
-ftp://ftp.crihan.fr/debian/
-ftp://debian.mines.inpl-nancy.fr/debian/
-ftp://ftp.mines.inpl-nancy.fr/debian/
-ftp://webb.ens-cachan.fr/debian/
-ftp://debian.ens-cachan.fr/debian/
 ftp://mirrors.ircam.fr/pub/debian/
-ftp://debian.mirror.inra.fr/debian/
-ftp://debian.med.univ-tours.fr/debian/
-ftp://ftp.univ-pau.fr/pub/mirrors/debian/
-ftp://ftp.univ-nantes.fr/debian/
-ftp://vacuum.univ-nantes.fr/debian/
+ftp://webb.ens-cachan.fr/debian/
+http://debian.advalem.net/debian/
+http://debian.cict.fr/debian/
+http://debian.ens-cachan.fr/ftp/debian/
+http://debian.med.univ-tours.fr/debian/
+http://debian.mines.inpl-nancy.fr/debian/
+http://debian.mirror.inra.fr/debian/
+http://debian.mirrors.easynet.fr/
+http://debian.polytech-lille.fr/debian/
+http://debian.revolsys.fr/debian/
+http://debian.univ-reims.fr/debian/
+http://ftp.crihan.fr/debian/
+http://ftp.fr.debian.org/debian/
+http://ftp.iut-bm.univ-fcomte.fr/debian/
+http://ftp.lip6.fr/pub/linux/distributions/debian/
+http://ftp.nerim.net/debian/
+http://ftp.u-picardie.fr/mirror/debian/
+http://ftp.u-strasbg.fr/debian/
+http://ftp.univ-pau.fr/linux/mirrors/debian/
+http://ftp2.fr.debian.org/debian/
+http://mir1.ovh.net/debian/
+http://mir2.ovh.net/debian/
 http://mirrors.compuscene.org/debian/
-http://ns34892.ovh.net/debian/
-ftp://debian.univ-reims.fr/debian/
+http://mirrors.ircam.fr/pub/debian/
+http://webb.ens-cachan.fr/debian/
 #LOC:GB
-ftp://ftp.uk.debian.org/debian/
-ftp://debian.hands.com/debian/
-ftp://open.hands.com/debian/
-http://debian.man.ac.uk/debian/
-http://www.mirrorservice.org/sites/ftp.debian.org/debian/
 ftp://ftp.mirrorservice.org/sites/ftp.debian.org/debian/
 ftp://ftp.ticklers.org/debian/
-ftp://rib.ticklers.org/debian/
-ftp://debian.virginmedia.com/mirrors/ftp.debian.org
-ftp://mirror2.blueyonder.co.uk debian.blueyonder.co.uk/mirrors/ftp.debian.org
+ftp://ftp.uk.debian.org/debian/
+ftp://mirror.ox.ac.uk/debian/
 ftp://mirror.positive-internet.com/debian/
+ftp://mirror.sov.uk.goscomb.net/debian/
+ftp://mirrors.melbourne.co.uk/debian/
 ftp://the.earth.li/debian/
 ftp://ukdebian.mirror.anlx.net/debian/
-ftp://mirror.ox.ac.uk/debian/
-ftp://debian.zetnet.co.uk/debian/
-ftp://mirror.sov.uk.goscomb.net/debian/
+http://debian.man.ac.uk/debian/
+http://ftp.ticklers.org/debian/
+http://ftp.uk.debian.org/debian/
+http://mirror.ox.ac.uk/debian/
+http://mirror.positive-internet.com/debian/
+http://mirror.sov.uk.goscomb.net/debian/
+http://mirrors.melbourne.co.uk/debian/
+http://the.earth.li/debian/
+http://ukdebian.mirror.anlx.net/debian/
+http://www.mirrorservice.org/sites/ftp.debian.org/debian/
 #LOC:GR
-ftp://ftp.gr.debian.org/debian/
-ftp://ftp.ntua.gr/debian/
 ftp://debian.otenet.gr/pub/linux/debian/
-ftp://ftp.duth.gr/debian/
-ftp://stalker.duth.gr/debian/
-http://ftp.softnet.tuc.gr/ftp/linux/debian/
-http://antirix.softnet.tuc.gr/ftp/linux/debian/
 ftp://ftp.cc.uoc.gr/mirrors/linux/debian/
+ftp://ftp.gr.debian.org/debian/
+ftp://ftp.uoi.gr/debian/
+http://debian.otenet.gr/debian/
+http://ftp.cc.uoc.gr/mirrors/linux/debian/
+http://ftp.gr.debian.org/debian/
+http://ftp.uoi.gr/debian/
 #LOC:HK
 ftp://ftp.hk.debian.org/debian/
+http://ftp.hk.debian.org/debian/
 #LOC:HR
+ftp://debian.iskon.hr/debian/
+ftp://ftp.carnet.hr/debian/
 ftp://ftp.hr.debian.org/debian/
-ftp://debian.carnet.hr/debian/
 ftp://ftp.irb.hr/debian/
-ftp://ftp.carnet.hr/debian/
-ftp://debian.iskon.hr/debian/
+http://debian.iskon.hr/debian/
+http://ftp.carnet.hr/debian/
+http://ftp.hr.debian.org/debian/
+http://ftp.irb.hr/debian/
 #LOC:HU
-ftp://ftp.hu.debian.org/debian/
-ftp://ftp.fsn.hu/debian/
-ftp://ftp.kfki.hu/pub/linux/debian/
-ftp://ftp.bme.hu/OS/Linux/dist/debian/
 ftp://debian.mirrors.crysys.hu/debian/
 ftp://debian.sth.sze.hu/debian/
-ftp://mirrors.sth.sze.hu/debian/
+ftp://ftp.bme.hu/debian/
+ftp://ftp.hu.debian.org/debian/
+ftp://ftp.kfki.hu/pub/linux/debian/
+http://debian.mirrors.crysys.hu/debian/
+http://debian.sth.sze.hu/debian/
+http://ftp.bme.hu/debian/
+http://ftp.hu.debian.org/debian/
+http://ftp.kfki.hu/linux/debian/
 #LOC:ID
 ftp://kebo.vlsm.org/debian/
-ftp://surabaya.vlsm.org/debian/
-ftp://katmai.its.ac.id/debian/
 ftp://mirror.unej.ac.id/debian/
+http://kebo.vlsm.org/debian/
+http://mirror.unej.ac.id/debian/
 #LOC:IE
-ftp://ftp.ie.debian.org/debian/
-ftp://debian.heanet.ie/debian/
-ftp://canyonero.heanet.ie/debian/
 ftp://ftp.esat.net/pub/linux/debian/
+ftp://ftp.ie.debian.org/debian/
+http://ftp.esat.net/pub/linux/debian/
+http://ftp.ie.debian.org/debian/
 #LOC:IL
 http://debian.co.il/debian/
-http://debian.interhost.co.il/debian/
 http://mirror.isoc.org.il/pub/debian/
 #LOC:IN
 ftp://ftp.iitm.ac.in/debian/
+ftp://mirror.cse.iitk.ac.in/debian/
+http://ftp.iitm.ac.in/debian/
+http://mirror.cse.iitk.ac.in/debian/
 #LOC:IS
 ftp://ftp.is.debian.org/debian/
-ftp://ftp.rhnet.is/debian/
+http://ftp.is.debian.org/debian/
 #LOC:IT
+ftp://debian.bononia.it/debian/
+ftp://debian.dynamica.it/debian/
+ftp://debian.fastbull.org/debian/
+ftp://debian.fastweb.it/debian/
+ftp://freedom.dicea.unifi.it/pub/linux/debian/
 ftp://ftp.it.debian.org/debian/
-ftp://ftp.bofh.it/debian/
-ftp://vlad-tepes.bofh.it/debian/
 ftp://giano.com.dist.unige.it/debian/
-ftp://ftp.bononia.it/debian/
-ftp://freedom.dicea.unifi.it/pub/linux/debian/
 ftp://mi.mirror.garr.it/mirrors/debian/
-ftp://debian.fastweb.it/debian/
-ftp://ftp.unina.it/pub/linux/distributions/debian/
-ftp://debian.fastbull.org/debian/
-ftp://debian.dynamica.it/debian/
+http://debian.bononia.it/debian/
+http://debian.dynamica.it/debian/
+http://debian.fastbull.org/debian/
+http://debian.fastweb.it/debian/
+http://freedom.dicea.unifi.it/ftp/pub/linux/debian/
+http://ftp.it.debian.org/debian/
+http://giano.com.dist.unige.it/debian/
+http://mi.mirror.garr.it/mirrors/debian/
 http://mirror.units.it/debian/
 #LOC:JP
-ftp://ftp2.jp.debian.org/debian/
-ftp://ftp.debian.or.jp/debian/
-ftp://http.debian.or.jp/debian/
-http://ftp.jp.debian.org/debian/
-http://cdn.debian.or.jp/debian/
-ftp://ftp.nara.wide.ad.jp/debian/
-ftp://ftp.aist-nara.ac.jp/debian/
-ftp://ftp.dti.ad.jp/pub/Linux/debian/
+ftp://dennou-h.gfd-dennou.org/debian/
 ftp://dennou-k.gfd-dennou.org/debian/
-ftp://dennou-k.gaia.h.kyoto-u.ac.jp/debian/
 ftp://dennou-q.gfd-dennou.org/debian/
-ftp://dennou-q.geo.kyushu-u.ac.jp/debian/
-ftp://ftp.yz.yamagata-u.ac.jp/debian/
-ftp://linux.yz.yamagata-u.ac.jp/debian/
-ftp://sb.itc.u-tokyo.ac.jp/DEBIAN/
-ftp://ftp.ecc.u-tokyo.ac.jp/DEBIAN/
-ftp://ftp.riken.jp/Linux/debian/debian/
-ftp://ftp.riken.go.jp/Linux/debian/debian/
-http://debian.shimpinomori.net/debian/
+ftp://ftp.dti.ad.jp/pub/Linux/debian/
 ftp://ftp.jaist.ac.jp/pub/Linux/Debian/
+ftp://ftp.jp.debian.org/debian/
+ftp://ftp.nara.wide.ad.jp/debian/
+ftp://ftp.riken.jp/Linux/debian/debian/
+ftp://ftp.yz.yamagata-u.ac.jp/debian/
+ftp://ftp2.jp.debian.org/debian/
+http://dennou-h.gfd-dennou.org/debian/
+http://dennou-k.gfd-dennou.org/debian/
+http://dennou-q.gfd-dennou.org/debian/
+http://ftp.dti.ad.jp/pub/Linux/debian/
+http://ftp.jaist.ac.jp/pub/Linux/Debian/
+http://ftp.jp.debian.org/debian/
+http://ftp.nara.wide.ad.jp/debian/
+http://ftp.riken.jp/Linux/debian/debian/
+http://ftp.yz.yamagata-u.ac.jp/debian/
+http://ftp2.jp.debian.org/debian/
 http://www.cohsoft.com/debian/
-ftp://dennou-h.gfd-dennou.org/debian/
-ftp://dennou-h.ees.hokudai.ac.jp/debian/
 #LOC:KR
-ftp://ftp.kr.debian.org/debian/
-ftp://ftp.kaist.ac.kr/debian/
 ftp://ftp.daum.net/debian/
+ftp://ftp.kr.debian.org/debian/
+http://ftp.daum.net/debian/
+http://ftp.kr.debian.org/debian/
 #LOC:KZ
 ftp://mirror.neolabs.kz/debian/
+http://mirror.neolabs.kz/debian/
 #LOC:LT
-ftp://ftp.litnet.lt/debian/
-ftp://debina.ktu.lt/debian/
 ftp://debian.balt.net/debian/
+ftp://ftp.litnet.lt/debian/
+http://debian.balt.net/debian/
+http://ftp.litnet.lt/debian/
 #LOC:LU
-ftp://debian.lu.prunk.si/debian/
-ftp://lux.prunk.si/debian/
+ftp://debian.mirror.root.lu/debian/
+http://debian.mirror.root.lu/debian/
 #LOC:LV
+ftp://debian.linux.edu.lv/debian/
 ftp://koyanet.lv/debian/
-ftp://ftp.koyanet.lv/debian/
+http://debian.linux.edu.lv/debian/
+http://koyanet.lv/debian/
 #LOC:MD
 ftp://debian.md/debian/
+http://debian.md/debian/
 #LOC:MN
 ftp://mirror.debian.mn/debian/
+http://mirror.debian.mn/debian/
 #LOC:MT
-http://debian.eng.um.edu.mt/debian/
+http://debian.res.um.edu.mt/debian/
 #LOC:MX
 ftp://ftp.mx.debian.org/debian/
-ftp://debian.unam.mx/debian/
-ftp://nisamox.fciencias.unam.mx/debian/
 ftp://mmc.geofisica.unam.mx/debian/
-#LOC:MY
-ftp://mirror.publicns.net/debian/
+http://ftp.mx.debian.org/debian/
+http://mmc.geofisica.unam.mx/debian/
 #LOC:NC
 ftp://ftp.nc.debian.org/debian/
-ftp://debian.nautile.nc/debian/
+http://ftp.nc.debian.org/debian/
 #LOC:NI
 http://debian.uni.edu.ni/debian/
 #LOC:NL
+ftp://debian.mirror.cambrium.nl/debian/
+ftp://ftp.debian.nl/debian/
 ftp://ftp.nl.debian.org/debian/
-ftp://ftp.snt.utwente.nl/debian/
 ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/
-ftp://mirrors.nl.kernel.org/debian/
 ftp://ftp.surfnet.nl/pub/os/Linux/distr/debian/
-ftp://ftp.debian.nl/debian/
-ftp://download.xs4all.nl/debian/
 ftp://ftp.tiscali.nl/pub/mirrors/debian/
-ftp://debian.mirror.cambrium.nl/debian/
+ftp://mirrors.nl.kernel.org/debian/
+http://debian.mirror.cambrium.nl/debian/
+http://ftp.debian.nl/debian/
+http://ftp.nl.debian.org/debian/
+http://ftp.nluug.nl/pub/os/Linux/distr/debian/
+http://ftp.surfnet.nl/os/Linux/distr/debian/
+http://ftp.tiscali.nl/debian/
+http://mirrors.nl.kernel.org/debian/
 #LOC:NO
 ftp://ftp.no.debian.org/debian/
-ftp://ftp.uninett.no/debian/
-ftp://ftp.uio.no/debian/
+http://ftp.no.debian.org/debian/
 #LOC:NZ
 ftp://ftp.nz.debian.org/debian/
-ftp://ftp.citylink.co.nz/debian/
+http://ftp.nz.debian.org/debian/
 #LOC:PF
 ftp://repository.linux.pf/debian/
+http://repository.linux.pf/debian/
 #LOC:PL
-ftp://ftp.pl.debian.org/debian/
-ftp://ftp.task.gda.pl/debian/
 ftp://ftp.icm.edu.pl/pub/Linux/debian/
-ftp://sunsite.icm.edu.pl/pub/Linux/debian/
+ftp://ftp.man.poznan.pl/pub/linux/debian/debian/
 ftp://ftp.man.szczecin.pl/pub/Linux/debian/
-ftp://rubycon.man.szczecin.pl/pub/Linux/debian/
-ftp://ftp.vectranet.pl/debian/
+ftp://ftp.pl.debian.org/debian/
 ftp://ftp.pwr.wroc.pl/debian/
-ftp://ftp.man.poznan.pl/pub/linux/debian/debian/
+ftp://ftp.vectranet.pl/debian/
 ftp://piotrkosoft.net/pub/mirrors/debian/
-ftp://ftp.man.oswiecim.pl/pub/mirrors/debian/
+http://ftp.icm.edu.pl/pub/Linux/debian/
+http://ftp.man.poznan.pl/pub/linux/debian/debian/
+http://ftp.pl.debian.org/debian/
+http://ftp.pwr.wroc.pl/debian/
+http://ftp.vectranet.pl/debian/
+http://piotrkosoft.net/pub/mirrors/debian/
 #LOC:PT
-ftp://ftp.pt.debian.org/debian/
-ftp://ftp.uevora.pt/debian/
-ftp://ftp.eq.uc.pt/pub/software/Linux/debian/
-ftp://debian.ua.pt/debian/
-ftp://ftp.ua.pt/debian/
-ftp://mirrors.nfsi.pt/pub/debian/
-ftp://neacm.fe.up.pt/pub/debian/
 ftp://cesium.di.uminho.pt/pub/debian/
 ftp://debian.netvisao.pt/debian/
-http://debian.dcc.fc.up.pt/debian/
+ftp://debian.ua.pt/debian/
+ftp://ftp.eq.uc.pt/pub/software/Linux/debian/
+ftp://ftp.pt.debian.org/debian/
 ftp://mirror.sim.ul.pt/debian/
+ftp://mirrors.fe.up.pt/debian/
+ftp://mirrors.nfsi.pt/debian/
+http://cesium.di.uminho.pt/pub/debian/
+http://debian.dcc.fc.up.pt/debian/
+http://debian.netvisao.pt/
+http://debian.ua.pt/debian/
+http://ftp.eq.uc.pt/software/Linux/debian/
+http://ftp.pt.debian.org/debian/
+http://mirror.sim.ul.pt/debian/
+http://mirrors.fe.up.pt/debian/
+http://mirrors.nfsi.pt/debian/
 #LOC:RO
-ftp://ftp.ro.debian.org/debian/
-ftp://ftp.iasi.roedu.net/debian/
 ftp://ftp.lug.ro/debian/
-ftp://ftp.mikesnet.ro/debian/
-ftp://debian.mikesnet.ro/debian/
+ftp://ftp.ro.debian.org/debian/
+http://ftp.lug.ro/debian/
+http://ftp.ro.debian.org/debian/
 #LOC:RU
-ftp://ftp.ru.debian.org/debian/
-ftp://ftp.chg.ru/debian/
 ftp://debian.nsu.ru/debian/
-ftp://ftp.psn.ru/debian/
-ftp://server.psn.ru/debian/
 ftp://ftp.corbina.net/debian/
-ftp://ftp.mipt.ru/debian/
-ftp://petrel.telecom.mipt.ru/debian/
-ftp://mirror.yandex.ru/debian/
-ftp://ftp.yandex.ru/debian/
 ftp://ftp.debian.chuvsu.ru/debian/
-ftp://debian.chuvsu.ru/debian/
+ftp://ftp.psn.ru/debian/
+ftp://ftp.ru.debian.org/debian/
+ftp://mirror.svk.su/debian/
+ftp://mirror.yandex.ru/debian/
+ftp://mirror2.corbina.ru/debian/
+http://debian.nsu.ru/debian/
+http://ftp.debian.chuvsu.ru/debian/
+http://ftp.psn.ru/debian/
+http://ftp.ru.debian.org/debian/
+http://mirror.svk.su/debian/
+http://mirror.yandex.ru/debian/
+http://mirror2.corbina.ru/debian/
 #LOC:SE
-ftp://ftp.se.debian.org/debian/
-ftp://ftp.acc.umu.se/debian/
-ftp://ftp.sunet.se/pub/Linux/distributions/debian/
-ftp://mirrors.se.kernel.org/debian/
-ftp://ftp.port80.se/debian/
-ftp://ftp.ds.karen.hj.se/debian/
-ftp://ftp.ds.hj.se/debian/
 ftp://debian.bsnet.se/debian/
-ftp://gelehallon.bsnet.se/debian/
 ftp://debian.lth.se/debian/
-ftp://ftp.ddg.lth.se/debian/
 ftp://ftp.df.lth.se/debian/
+ftp://ftp.ds.karen.hj.se/debian/
+ftp://ftp.port80.se/debian/
+ftp://ftp.se.debian.org/debian/
+ftp://ftp.sunet.se/pub/Linux/distributions/debian/
+ftp://mirrors.se.kernel.org/debian/
+http://debian.bsnet.se/debian/
+http://debian.lth.se/debian/
+http://ftp.df.lth.se/debian/
+http://ftp.ds.karen.hj.se/debian/
+http://ftp.port80.se/debian/
+http://ftp.se.debian.org/debian/
+http://ftp.sunet.se/pub/Linux/distributions/debian/
+http://mirrors.se.kernel.org/debian/
 #LOC:SG
 ftp://mirror.nus.edu.sg/pub/Debian/
-ftp://mirror.comp.nus.edu.sg/pub/Debian/
+http://mirror.nus.edu.sg/Debian/
 #LOC:SI
-ftp://ftp.si.debian.org/debian/
-ftp://ftp.camtp.uni-mb.si/debian/
 ftp://debian.camtp.uni-mb.si/debian/
 ftp://ftp.arnes.si/packages/debian/
-ftp://debian.prunk.si/debian/
+ftp://ftp.si.debian.org/debian/
+http://debian.camtp.uni-mb.si/debian/
+http://ftp.arnes.si/pub/packages/debian/
+http://ftp.si.debian.org/debian/
 #LOC:SK
-ftp://ftp.sk.debian.org/debian/
-ftp://ftp.debian.sk/debian/
-ftp://debian.sk/debian/
-ftp://mirrors.nextra.sk/debian/
 ftp://debian.ynet.sk/debian/
-ftp://mirror.ynet.sk/debian/
 ftp://ftp.antik.sk/debian/
-ftp://debian.antik.sk/debian/
-ftp://ubuntu.antik.sk/debian/
+ftp://ftp.sk.debian.org/debian/
+http://debian.ynet.sk/debian/
+http://ftp.antik.sk/debian/
+http://ftp.sk.debian.org/debian/
 #LOC:SV
 http://debian.ues.edu.sv/debian/
-http://linux.ues.edu.sv/debian/
 #LOC:TH
-ftp://ftp.coe.psu.ac.th/debian/
-ftp://debian.coe.psu.ac.th/debian/
-http://debian.thaios.net/debian/
 ftp://ftp.debianclub.org/debian/
+ftp://ftp.th.debian.org/debian/
+ftp://ftp.v6.coe.psu.ac.th/debian/
+http://debian.thaios.net/debian/
+http://ftp.debianclub.org/debian/
+http://ftp.th.debian.org/debian/
+http://ftp.v6.coe.psu.ac.th/debian/
 #LOC:TR
-ftp://ftp.tr.debian.org/debian/
-ftp://debian.ankara.edu.tr/debian/
-ftp://ftp.ankara.edu.tr/debian/
+ftp://debian.comu.edu.tr/debian/
 ftp://ftp.linux.org.tr/debian/
+ftp://ftp.metu.edu.tr/debian/
+ftp://ftp.tr.debian.org/debian/
 ftp://godel.cs.bilgi.edu.tr/debian/
+http://debian.comu.edu.tr/debian/
 http://debian.eso-es.net/debian/
-ftp://debian.comu.edu.tr/debian/
-ftp://ftp.metu.edu.tr/debian/
+http://ftp.linux.org.tr/debian/
+http://ftp.metu.edu.tr/debian/
+http://ftp.tr.debian.org/debian/
+http://godel.cs.bilgi.edu.tr/debian/
 #LOC:TW
-ftp://ftp.tw.debian.org/debian/
-ftp://debian.linux.org.tw/debian/
+ftp://debian.csie.nctu.edu.tw/debian/
 ftp://debian.csie.ntu.edu.tw/pub/debian/
-ftp://ftp.twaren.net/debian/
-ftp://linux.cdpa.nsysu.edu.tw/debian/
-ftp://opensource.nchc.org.tw/debian/
-ftp://os.nchc.org.tw/debian/
-ftp://ftp.isu.edu.tw/debian/
 ftp://debian.nctu.edu.tw/debian/
-ftp://mirror.nttu.edu.tw/debian/
-ftp://debian.csie.nctu.edu.tw/debian/
-ftp://ftp.ncnu.edu.tw/debian/
-ftp://ftp4.ncnu.edu.tw/debian/
 ftp://ftp.cse.yzu.edu.tw/pub/Linux/debian/debian/
-ftp://ftp.oss.tw/pub/Linux/debian/debian/
+ftp://ftp.isu.edu.tw/debian/
+ftp://ftp.ncnu.edu.tw/debian/
 ftp://ftp.tcc.edu.tw/debian/
+ftp://ftp.tku.edu.tw/debian/
+ftp://ftp.tw.debian.org/debian/
+ftp://ftp.twaren.net/debian/
+ftp://mirror.nttu.edu.tw/debian/
+ftp://opensource.nchc.org.tw/debian/
+http://debian.csie.nctu.edu.tw/debian/
+http://debian.csie.ntu.edu.tw/debian/
+http://debian.nctu.edu.tw/debian/
+http://ftp.cse.yzu.edu.tw/pub/Linux/debian/debian/
+http://ftp.isu.edu.tw/debian/
+http://ftp.ncnu.edu.tw/debian/
+http://ftp.tcc.edu.tw/debian/
+http://ftp.tku.edu.tw/debian/
+http://ftp.tw.debian.org/debian/
+http://ftp.twaren.net/debian/
+http://mirror.nttu.edu.tw/debian/
+http://opensource.nchc.org.tw/debian/
 #LOC:UA
-ftp://ftp.ua.debian.org/debian/
-ftp://debian.org.ua/debian/
-ftp://lumpy.3logic.net/debian/
 ftp://debian.osdn.org.ua/pub/Debian/debian/
 ftp://ftp.3logic.net/debian/
-ftp://borg.3logic.net/debian/
-ftp://mirror.mirohost.net/debian/
-ftp://deb.mirohost.net/debian/
+ftp://ftp.ua.debian.org/debian/
 ftp://ftp2.debian.org.ua/debian/
-ftp://mirror.3logic.net/debian/
+ftp://mirror.mirohost.net/debian/
+http://debian.osdn.org.ua/debian/
+http://ftp.ua.debian.org/debian/
+http://ftp2.debian.org.ua/debian/
+http://mirror.mirohost.net/debian/
 #LOC:US
-ftp://ftp.us.debian.org/debian/
-ftp://http.us.debian.org/debian/
-ftp://ftp.gtlib.gatech.edu/pub/debian/
-ftp://zaphod.gtlib.gatech.edu/pub/debian/
-ftp://ftp.egr.msu.edu/debian/
-ftp://ike.egr.msu.edu/debian/
+ftp://carroll.aset.psu.edu/pub/linux/distributions/debian/
+ftp://debian.cites.uiuc.edu/pub/debian/
+ftp://debian.cs.binghamton.edu/debian/
+ftp://debian.lcs.mit.edu/debian/
+ftp://debian.mirror.frontiernet.net/debian/
+ftp://debian.mirrors.tds.net/debian/
+ftp://debian.osuosl.org/debian/
+ftp://debian.secsup.org/pub/linux/debian/
+ftp://debian.uchicago.edu/debian/
 ftp://distro.ibiblio.org/debian/
 ftp://ftp-mirror.internap.com/pub/debian/
-ftp://mirror.cs.wisc.edu/debian/
-ftp://ftp.uwsg.indiana.edu/linux/debian/
-ftp://uwsg.iu.edu/linux/debian/
-ftp://ftp.ndlug.nd.edu/debian/
-ftp://debian.uchicago.edu/debian/
-ftp://linux.uchicago.edu/debian/
-ftp://carroll.aset.psu.edu/pub/linux/distributions/debian/
-ftp://carroll.cac.psu.edu/pub/linux/distributions/debian/
-ftp://gladiator.real-time.com/linux/debian/
-ftp://mirrors.kernel.org/debian/
-ftp://mirrors.xmission.com/debian/
-ftp://mirror.xmission.com/debian/
+ftp://ftp.egr.msu.edu/debian/
+ftp://ftp.grokthis.net/debian/
+ftp://ftp.gtlib.gatech.edu/pub/debian/
+ftp://ftp.keystealth.org/debian/
 ftp://ftp.lug.udel.edu/pub/debian/
-ftp://debian.lcs.mit.edu/debian/
-ftp://debian.ipv6.lcs.mit.edu/debian/
-ftp://debian.csail.mit.edu/debian/
-http://linux.csua.berkeley.edu/debian/
-http://screwdriver.csua.berkeley.edu/debian/
+ftp://ftp.ndlug.nd.edu/debian/
 ftp://ftp.silug.org/pub/debian/
-ftp://ftp.luci.org/pub/debian/
-ftp://ftp.kspei.com/pub/debian/
-ftp://debian.secsup.org/pub/linux/debian/
-ftp://debian.osuosl.org/debian/
-ftp://debian.oregonstate.edu/debian/
-ftp://ftp.oregonstate.edu/debian/
-ftp://ftp.osuosl.org/debian/
-ftp://mirror.anl.gov/pub/debian/
-http://sluglug.ucsc.edu/debian/
-ftp://mirrors.geeks.org/debian/
-ftp://mirrors.usc.edu/pub/linux/distributions/debian/
-ftp://debian.mirrors.pair.com/
+ftp://ftp.uga.edu/debian/
+ftp://ftp.us.debian.org/debian/
+ftp://ftp.uwsg.indiana.edu/linux/debian/
+ftp://gladiator.real-time.com/linux/debian/
 ftp://lug.mtu.edu/debian/
-ftp://debian.mirrors.tds.net/debian/
-ftp://debian.cites.uiuc.edu/pub/debian/
-ftp://bazaar.cites.uiuc.edu/pub/debian/
-ftp://cosmos.cites.uiuc.edu/pub/debian/
-ftp://mirrors.tummy.com/debian/
-ftp://debian.mirror.frontiernet.net/debian/
-http://cudlug.cudenver.edu/debian/
+ftp://mirror.anl.gov/pub/debian/
 ftp://mirror.cc.columbia.edu/pub/linux/debian/debian/
-ftp://ftp.grokthis.net/debian/
-http://mirrors.xenir.com/debian/
-http://debian.mirrors.easynews.com/linux/debian/
-http://mirrors.easynews.com/linux/debian/
-http://debian.ams.sunysb.edu/debian/
-http://mirrors.acm.jhu.edu/debian/
-http://astrolabe.acm.jhu.edu/debian/
-ftp://ftp.uga.edu/debian/
-ftp://linuxserv.uga.edu/debian/
-http://mirror.steadfast.net/debian/
-ftp://ftp.utexas.edu/pub/debian/
-ftp://ftp.the.net/pub/debian/
+ftp://mirror.cs.wisc.edu/debian/
 ftp://mirror.fdcservers.net/debian/
+ftp://mirror.its.uidaho.edu/debian/
 ftp://mirror.rit.edu/debian/
+ftp://mirrors.bloomu.edu/debian/
+ftp://mirrors.geeks.org/debian/
+ftp://mirrors.hosef.org/debian/
+ftp://mirrors.kernel.org/debian/
+ftp://mirrors.tummy.com/debian/
+ftp://mirrors.usc.edu/pub/linux/distributions/debian/
+ftp://mirrors.xmission.com/debian/
+http://carroll.aset.psu.edu/pub/linux/distributions/debian/
+http://debian.cites.uiuc.edu/pub/debian/
 http://debian.corenetworks.net/debian/
-ftp://mirror.its.uidaho.edu/debian/
-ftp://debian.cs.binghamton.edu/debian/
+http://debian.cs.binghamton.edu/debian/
+http://debian.lcs.mit.edu/debian/
+http://debian.mirror.frontiernet.net/debian/
+http://debian.mirrors.easynews.com/linux/debian/
+http://debian.mirrors.tds.net/debian/
+http://debian.osuosl.org/debian/
+http://debian.secsup.org/
+http://debian.uchicago.edu/debian/
+http://debian.usu.edu/debian/
+http://distro.ibiblio.org/debian/
+http://ftp-mirror.internap.com/pub/debian/
+http://ftp.egr.msu.edu/debian/
+http://ftp.grokthis.net/debian/
+http://ftp.gtlib.gatech.edu/debian/
+http://ftp.keystealth.orgdebian/
+http://ftp.lug.udel.edu/pub/debian/
+http://ftp.ndlug.nd.edu/mirrors/debian/
+http://ftp.silug.org/pub/debian/
+http://ftp.uga.edu/debian/
+http://ftp.us.debian.org/debian/
+http://ftp.utexas.edu/debian/
+http://ftp.uwsg.indiana.edu/linux/debian/
+http://linux.csua.berkeley.edu/debian/
+http://lug.mtu.edu/debian/
+http://mirror.anl.gov/debian/
+http://mirror.cc.columbia.edu/pub/linux/debian/debian/
+http://mirror.cs.wisc.edu/debian/
+http://mirror.fdcservers.net/debian/
 http://mirror.hmc.edu/debian/
-http://worblehat.math.hmc.edu/debian/
-ftp://mirrors.hosef.org/debian/
+http://mirror.its.uidaho.edu/pub/debian/
+http://mirror.rit.edu/debian/
+http://mirror.steadfast.net/debian/
+http://mirrors.bloomu.edu/debian/
+http://mirrors.geeks.org/debian/
+http://mirrors.hosef.org/debian/
+http://mirrors.kernel.org/debian/
+http://mirrors.modwest.com/debian/
+http://mirrors.tummy.com/debian/
+http://mirrors.usc.edu/pub/linux/distributions/debian/
+http://mirrors.xenir.com/debian/
+http://mirrors.xmission.com/debian/
+http://sluglug.ucsc.edu/debian/
 #LOC:UZ
 ftp://debian.stream.uz/debian/
-ftp://debian.uz/debian/
+http://debian.stream.uz/debian/
 #LOC:VE
 http://debian.unesr.edu.ve/debian/
 #LOC:ZA
-ftp://ftp.sun.ac.za/debian/
 ftp://debian.mirror.ac.za/debian/
 ftp://ftp.is.co.za/debian/
+ftp://ftp.sun.ac.za/debian/
+http://debian.mirror.ac.za/debian/
+http://ftp.sun.ac.za/ftp/debian/
diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in
index 775761e3..6874fdc9 100644
--- a/data/templates/Ubuntu.info.in
+++ b/data/templates/Ubuntu.info.in
@@ -8,8 +8,8 @@ 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: /usr/share/python-apt/templates/Ubuntu.mirrors
-MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 10.04 'Lucid Lynx'
 Component: main
 _CompDescription: Officially supported
@@ -69,8 +69,8 @@ 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: /usr/share/python-apt/templates/Ubuntu.mirrors
-MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 9.10 'Karmic Koala'
 Component: main
 _CompDescription: Officially supported
@@ -130,8 +130,8 @@ 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: /usr/share/python-apt/templates/Ubuntu.mirrors
-MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 9.04 'Jaunty Jackalope'
 Component: main
 _CompDescription: Officially supported
@@ -191,8 +191,8 @@ 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: /usr/share/python-apt/templates/Ubuntu.mirrors
-MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 8.10 'Intrepid Ibex'
 Component: main
 _CompDescription: Officially supported
@@ -253,8 +253,8 @@ 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: /usr/share/python-apt/templates/Ubuntu.mirrors
-MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 8.04 'Hardy Heron'
 Component: main
 _CompDescription: Officially supported
@@ -317,7 +317,7 @@ BaseURI-i386: http://archive.ubuntu.com/ubuntu/
 MatchURI-i386: archive.ubuntu.com/ubuntu
 BaseURI-sparc: http://archive.ubuntu.com/ubuntu/
 MatchURI-sparc: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
+MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 7.10 'Gutsy Gibbon'
 Component: main
 _CompDescription: Officially supported
@@ -380,7 +380,7 @@ BaseURI-ia64: http://ports.ubuntu.com/
 MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
 BaseURI-hppa: http://ports.ubuntu.com/
 MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
-MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
+MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 7.04 'Feisty Fawn'
 Component: main
 _CompDescription: Officially supported
@@ -440,7 +440,7 @@ BaseURI-ia64: http://ports.ubuntu.com/
 MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
 BaseURI-hppa: http://ports.ubuntu.com/
 MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
-MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
+MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 6.10 'Edgy Eft'
 Component: main
 _CompDescription: Officially supported
@@ -500,7 +500,7 @@ BaseURI-ia64: http://ports.ubuntu.com/
 MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
 BaseURI-hppa: http://ports.ubuntu.com/
 MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
-MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
+MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 6.06 LTS 'Dapper Drake'
 Component: main
 _CompDescription: Officially supported
@@ -556,7 +556,7 @@ Suite: breezy
 RepositoryType: deb
 BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu
-MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
+MirrorsFile: Ubuntu.mirrors
 BaseURI-ia64: http://ports.ubuntu.com/
 MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
 BaseURI-hppa: http://ports.ubuntu.com/
@@ -611,7 +611,7 @@ BaseURI-ia64: http://ports.ubuntu.com/
 MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
 BaseURI-hppa: http://ports.ubuntu.com/
 MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
-MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors
+MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 5.04 'Hoary Hedgehog'
 Component: main
 _CompDescription: Officially supported
diff --git a/data/templates/Ubuntu.mirrors b/data/templates/Ubuntu.mirrors
index 0084d671..068b013d 100644
--- a/data/templates/Ubuntu.mirrors
+++ b/data/templates/Ubuntu.mirrors
@@ -1,63 +1,71 @@
 #LOC:AR
+http://ftp.ccc.uba.ar/pub/linux/ubuntu/
+http://ubuntu.innova-red.net/ubuntu/
 http://ubuntu.patan.com.ar/ubuntu/
 #LOC:AT
-http://ubuntu.uni-klu.ac.at/ubuntu/
-http://ubuntu.lagis.at/ubuntu/
-http://ubuntu.inode.at/ubuntu/
 http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/
+http://ubuntu.inode.at/ubuntu/
+http://ubuntu.lagis.at/ubuntu/
+http://ubuntu.uni-klu.ac.at/ubuntu/
 #LOC:AU
 http://ftp.iinet.net.au/pub/ubuntu/
-http://mirror.optus.net/ubuntu/
-http://mirror.aarnet.edu.au/pub/ubuntu/archive/
-http://mirror.pacific.net.au/linux/ubuntu/
 http://ftp.netspace.net.au/pub/ubuntu/
+http://mirror.aarnet.edu.au/pub/ubuntu/archive/
+http://mirror.files.bigpond.com/ubuntu/
 http://mirror.internode.on.net/pub/ubuntu/ubuntu/
 http://mirror.netspace.net.au/pub/ubuntu/
+http://mirror.optus.net/ubuntu/
+http://mirror.waia.asn.au/ubuntu/
 #LOC:BA
 http://archive.ubuntu.com.ba/ubuntu/
 #LOC:BE
-http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ubuntu/
 http://ftp.belnet.be/mirror/ubuntu.com/ubuntu/
 http://gaosu.rave.org/ubuntu/
+http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ubuntu/
 #LOC:BG
 http://ubuntu.hitsol.net/ubuntu/
-http://ubuntu.nano-box.net/ubuntu/
-http://ubuntu.linux-bg.org/ubuntu/
-http://mirrors.hitsol.net/ubuntu/
 http://ubuntu.ipacct.com/ubuntu/
+http://ubuntu.linux-bg.org/ubuntu/
+http://ubuntu.nano-box.net/ubuntu/
+#LOC:BO
+http://espejo.softwarelibre.gob.bo/archive.ubuntu.com/ubuntu/
 #LOC:BR
-http://mirror.globo.com/ubuntu/archive/
-http://ubuntu.interlegis.gov.br/ubuntu/
 http://br.archive.ubuntu.com/ubuntu/
 http://espelhos.edugraf.ufsc.br/ubuntu/
-http://www.las.ic.unicamp.br/pub/ubuntu/
+http://mirror.globo.com/ubuntu/archive/
 http://sft.if.usp.br/ubuntu/
-#LOC:BW
-http://bw.archive.ubuntu.com/ubuntu/
+http://ubuntu.interlegis.gov.br/ubuntu/
+http://ubuntu.mirror.pop-sc.rnp.br/ubuntu/
+http://ubuntu.ufba.br/ubuntu/
+http://www.las.ic.unicamp.br/pub/ubuntu/
 #LOC:BY
+http://ftp.byfly.by/ubuntu/
 http://linux.org.by/ubuntu/
 http://mirror.datacenter.by/ubuntu/
-http://ftp.byfly.by/ubuntu/
 #LOC:CA
 ftp://ftp.cs.mun.ca/pub/mirror/ubuntu/
-http://gulus.usherbrooke.ca/ubuntu/
-http://ubuntu.mirror.iweb.ca/
+http://gpl.savoirfairelinux.net/pub/mirrors/ubuntu/
+http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/packages/
 http://mirror.csclub.uwaterloo.ca/ubuntu/
+http://mirror.its.dal.ca/ubuntu/
+http://ubuntu.arcticnetwork.ca/
+http://ubuntu.mirror.iweb.ca/
 http://ubuntu.mirror.rafal.ca/ubuntu/
-http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/packages/
 #LOC:CH
 http://mirror.switch.ch/ftp/mirror/ubuntu/
-http://mirror.powermongo.org/ubuntu/
 #LOC:CL
-http://mirror.gnucv.cl/ubuntu/
-http://cl.archive.ubuntu.com/ubuntu/
 http://ftp.tecnoera.com/ubuntu/
+http://mirror.gnucv.cl/ubuntu/
 #LOC:CN
-http://mirrors.shlug.org/ubuntu/
-http://ubuntu.dormforce.net/ubuntu/
+http://mirror.bjtu.edu.cn/ubuntu/
 http://mirror.lupaworld.com/ubuntu/
 http://mirror.rootguide.org/ubuntu/
+http://mirrors.163.com/ubuntu/
+http://mirrors.shlug.org/ubuntu/
+http://mirrors.sohu.com/ubuntu/
 http://ubuntu.cn99.com/ubuntu/
+http://ubuntu.dormforce.net/ubuntu/
+http://ubuntu.srt.cn/ubuntu/
 #LOC:CO
 http://matematicas.unal.edu.co/ubuntu/
 #LOC:CR
@@ -65,298 +73,346 @@ http://mirrors.ucr.ac.cr/ubuntu/
 #LOC:CY
 http://mirrors.cytanet.com.cy/linux/ubuntu/archive/
 #LOC:CZ
-http://ftp.sh.cvut.cz/MIRRORS/ubuntu/
 http://archive.ubuntu.mirror.dkm.cz/
 http://cz.archive.ubuntu.com/ubuntu/
-http://ucho.ignum.cz/ubuntu/
-http://ubuntu.supp.name/ubuntu/
 http://ftp.cvut.cz/ubuntu/
+http://ftp.sh.cvut.cz/MIRRORS/ubuntu/
 http://ubuntu.sh.cvut.cz/
+http://ucho.ignum.cz/ubuntu/
 #LOC:DE
-ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu
-http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu/
-http://de.archive.ubuntu.com/ubuntu/
 ftp://ftp.fu-berlin.de/linux/ubuntu/
-http://suse.uni-leipzig.de/pub/releases.ubuntu.com/ubuntu/
-http://mirror.netcologne.de/ubuntu/
-http://ftp5.gwdg.de/pub/linux/debian/ubuntu/
-http://debian.charite.de/ubuntu/
-http://ftp.tu-ilmenau.de/mirror/ubuntu/
-http://ubuntu.intergenia.de/ubuntu/
+ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu
 http://archive.ubuntu.uasw.edu/
-ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu/
-http://ftp.tu-chemnitz.de/pub/linux/ubuntu/
-http://ftp.stw-bonn.de/ubuntu/
-http://ftp.uni-kl.de/pub/linux/ubuntu/
-http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/
+http://debian.charite.de/ubuntu/
+http://ftp-stud.hs-esslingen.de/ubuntu/
 http://ftp.hosteurope.de/mirror/archive.ubuntu.com/
-http://ftp-stud.fht-esslingen.de/Mirrors/ubuntu/
+http://ftp.stw-bonn.de/ubuntu/
+http://ftp.tu-chemnitz.de/pub/linux/ubuntu/
+http://ftp.tu-ilmenau.de/mirror/ubuntu/
 http://ftp.uni-bayreuth.de/linux/ubuntu/ubuntu/
+http://ftp.uni-erlangen.de/mirrors/ubuntu/
+http://ftp.uni-kl.de/pub/linux/ubuntu/
 http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/
-http://swtsrv.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/
-http://ftp-stud.hs-esslingen.de/ubuntu/
+http://ftp5.gwdg.de/pub/linux/debian/ubuntu/
+http://mirror.bauhuette.fh-aachen.de/ubuntu/
+http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/
+http://mirror.netcologne.de/ubuntu/
+http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/
+http://suse.uni-leipzig.de/pub/releases.ubuntu.com/ubuntu/
+http://ubuntu.intergenia.de/ubuntu/
+http://ubuntu.mirror.tudos.de/ubuntu/
+http://ubuntu.unitedcolo.de/ubuntu/
+http://www.osnt.org/ubuntu/
 #LOC:DK
-http://dk.archive.ubuntu.com/ubuntu/
-http://mirrors.dotsrc.org/ubuntu/
-http://mirror.uni-c.dk/ubuntu/
 http://ftp.klid.dk/ftp/ubuntu/
+http://mirrors.dotsrc.org/ubuntu/
+http://mirrors.telianet.dk/ubuntu/
 #LOC:EE
 http://ftp.estpak.ee/ubuntu/
 #LOC:ES
+http://dafi.inf.um.es/ubuntu/
+http://ftp.caliu.cat/pub/distribucions/ubuntu/archive/
+http://ftp.dat.etsit.upm.es/ubuntu/
 http://ftp.gui.uva.es/sites/ubuntu.com/ubuntu/
-http://sunsite.rediris.es/mirror/ubuntu-archive/
+http://ftp.udc.es/ubuntu/
+http://mirror.ousli.org/ubuntu/
 http://peloto.pantuflo.es/ubuntu/
-http://ftp.caliu.cat/pub/distribucions/ubuntu/archive/
 http://softlibre.unizar.es/ubuntu/archive/
-http://mirror.ousli.org/ubuntu/
+http://sunsite.rediris.es/mirror/ubuntu-archive/
+http://ubuntu.cica.es/ubuntu/
 http://ubuntu.grn.cat/ubuntu/
-http://es.archive.ubuntu.com/ubuntu/
-http://ftp.udc.es/ubuntu/
-http://ftp.dat.etsit.upm.es/ubuntu/
+http://ubuntu.uc3m.es/ubuntu/
 #LOC:FI
-http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com/
 http://mirrors.nic.funet.fi/ubuntu/
+http://ubuntu.trumpetti.atm.tut.fi/ubuntu/
+http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com/
 #LOC:FR
-http://mirror.ovh.net/ubuntu/
-http://wwwftp.ciril.fr/pub/linux/ubuntu/archives/
-http://ubuntu.univ-nantes.fr/ubuntu/
-http://ftp.free.org/mirrors/archive.ubuntu.com/ubuntu/
 http://archive.monubuntu.fr/
-http://ubuntu.univ-reims.fr/ubuntu/
+http://distrib-coffee.ipsl.jussieu.fr/ubuntu/
+http://ftp.crihan.fr/ubuntu/
+http://ftp.free.org/mirrors/archive.ubuntu.com/ubuntu/
 http://ftp.oleane.net/ubuntu/
 http://ftp.u-picardie.fr/mirror/ubuntu/ubuntu/
+http://mirror.ovh.net/ubuntu/
+http://mirrors.ircam.fr/pub/ubuntu/archive/
 http://ubuntu-archive.mirrors.proxad.net/ubuntu/
-http://ftp.crihan.fr/ubuntu/
+http://ubuntu.univ-nantes.fr/ubuntu/
+http://ubuntu.univ-reims.fr/ubuntu/
+http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/
+http://wwwftp.ciril.fr/pub/linux/ubuntu/archives/
 #LOC:GB
-http://ubuntu-archive.datahop.it/ubuntu/
-http://mirror.as29550.net/archive.ubuntu.com/
+http://archive.ubuntu.com/ubuntu/
 http://ftp.ticklers.org/archive.ubuntu.org/ubuntu/
+http://mirror.as29550.net/archive.ubuntu.com/
+http://mirror.bytemark.co.uk/ubuntu/
+http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/
+http://mirror.sov.uk.goscomb.net/ubuntu/
+http://mirrors.melbourne.co.uk/ubuntu/
+http://ubuntu.datahop.net/ubuntu/
+http://ubuntu.positive-internet.com/ubuntu/
+http://ubuntu.retrosnub.co.uk/ubuntu/
 http://ubuntu.virginmedia.com/archive/
 http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/
-http://ubuntu.positive-internet.com/ubuntu/
-http://ubuntu.retrosnub.co.uk/
-http://mirror.sov.uk.goscomb.net/ubuntu/
-http://archive.ubuntu.com/ubuntu/
-http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/
 #LOC:GE
 http://ubuntu.eriders.ge/ubuntu/
+#LOC:GL
+http://mirror.greennet.gl/ubuntu/
 #LOC:GR
 http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/
-http://gr.archive.ubuntu.com/ubuntu/
 http://ftp.ntua.gr/pub/linux/ubuntu/
-http://ftp.duth.gr/pub/ubuntu/
 http://ubuntu.otenet.gr/
 #LOC:HK
 http://ftp.hostrino.com/pub/ubuntu/archive/
 #LOC:HR
 http://hr.archive.ubuntu.com/ubuntu/
 #LOC:HU
-http://ftp.kfki.hu/linux/ubuntu/
 http://ftp.freepark.org/ubuntu/
+http://ftp.kfki.hu/linux/ubuntu/
+http://ubuntu.mirrors.crysys.hu/
+http://ubuntu.sth.sze.hu/ubuntu/
 #LOC:ID
-http://repo.undip.ac.id/ubuntu/
+http://dl2.foss-id.web.id/ubuntu/
 http://kambing.ui.ac.id/ubuntu/
 http://kebo.vlsm.org/ubuntu/
-http://dl2.foss-id.web.id/ubuntu/
-http://ubuntu.indika.net.id/
+http://repo.undip.ac.id/ubuntu/
 http://ubuntu.indika.net.id/ubuntu/
-http://mirror.unej.ac.id/ubuntu/
 http://ubuntu.pesat.net.id/archive/
 #LOC:IE
-http://ftp.heanet.ie/pub/ubuntu/
 http://ftp.esat.net/mirrors/archive.ubuntu.com/
-http://ie.archive.ubuntu.com/ubuntu/
+http://ftp.heanet.ie/pub/ubuntu/
 #LOC:IL
 http://mirror.isoc.org.il/pub/ubuntu/
 #LOC:IN
+ftp://ftp.iitb.ac.in/distributions/ubuntu/archives/
 http://ftp.iitm.ac.in/ubuntu/
+http://mirror.cse.iitk.ac.in/ubuntu/
+http://ubuntuarchive.hnsdc.com/
 #LOC:IS
+http://speglar.simnet.is/ubuntu/
 http://ubuntu.lhi.is/ubuntu/
 #LOC:IT
 http://giano.com.dist.unige.it/ubuntu/
-http://ubuntu.mirror.garr.it/mirrors/ubuntu-archive/
-http://ubuntu.ictvalleumbra.it/ubuntu/
-http://fileserver.uniroma1.it/ubuntu/
 http://ubuntu.fastbull.org/ubuntu/
+http://ubuntu.ictvalleumbra.it/ubuntu/
+http://ubuntu.mirror.garr.it/mirrors/ubuntu-archive/
 #LOC:JP
-http://ftp.ecc.u-tokyo.ac.jp/ubuntu/
-http://www.ftp.ne.jp/Linux/packages/ubuntu/archive/
-http://ubuntutym.u-toyama.ac.jp/ubuntu/
-http://ubuntu-ashisuto.ubuntulinux.jp/ubuntu/
 http://ftp.riken.jp/Linux/ubuntu/
 http://ftp.yz.yamagata-u.ac.jp/pub/linux/ubuntu/archives/
-http://ftp.jaist.ac.jp/pub/Linux/ubuntu/
+http://ubuntu-ashisuto.ubuntulinux.jp/ubuntu/
 http://ubuntu.mithril-linux.org/archives/
+http://ubuntutym.u-toyama.ac.jp/ubuntu/
+http://www.ftp.ne.jp/Linux/packages/ubuntu/archive/
 #LOC:KG
 http://ubuntu.mega.kg/ubuntu/
 #LOC:KR
 http://ftp.daum.net/ubuntu/
-http://mirror.khlug.org/ubuntu/
 http://kr.archive.ubuntu.com/ubuntu/
+http://mirror.khlug.org/ubuntu/
 http://mirror.korea.ac.kr/ubuntu/
+#LOC:KW
+http://ubuntu.qualitynet.net/ubuntu/
 #LOC:KZ
 http://mirror.neolabs.kz/ubuntu/
+http://mirror.space.kz/ubuntu/
+#LOC:LK
+http://archive.ubuntu.schoolnet.lk/ubuntu/
 #LOC:LT
+http://ftp.litnet.lt/ubuntu/
 http://mirror.soften.ktu.lt/ubuntu/
-http://ftp.litnet.lt/pub/ubuntu/
 #LOC:LV
 http://ubuntu-arch.linux.edu.lv/ubuntu/
 http://ubuntu.load.lv/ubuntu/
+#LOC:MD
+http://mirrors.bsd.md/ubuntu/
 #LOC:MN
 http://archive.ubuntu.mnosi.org/ubuntu/
 #LOC:MT
-http://mt.archive.ubuntu.com/ubuntu/
+http://mirror.linux.org.mt/ubuntu/
 #LOC:MX
-http://tezcatl.fciencias.unam.mx/ubuntu/
+http://ubuntu.ujed.mx/ubuntu/
 #LOC:MY
-http://www.mirror.upm.edu.my/ubuntu/
 http://archive.mmu.edu.my/ubuntu/
 http://mirror.oscc.org.my/ubuntu/
 http://mirror.upm.edu.my/ubuntu/
+http://ubuntu.bytecraft.com.my/ubuntu/
 http://ubuntu.mmu.edu.my/ubuntu/
+http://www.mirror.upm.edu.my/ubuntu/
 #LOC:NA
 http://ubuntu-archive.polytechnic.edu.na/ubuntu/
+#LOC:NC
+http://archive.ubuntu.nautile.nc/ubuntu/
 #LOC:NL
-http://ubuntu.tiscali.nl/
-http://ubuntu.mirror.cambrium.nl/ubuntu/
-http://mirrors.nl.eu.kernel.org/ubuntu/
-http://nl3.archive.ubuntu.com/ubuntu/
+ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/
+http://ftp.snt.utwente.nl/pub/os/linux/ubuntu-archive/
 http://ftp.telfort.nl/ubuntu/
 http://ftp.tudelft.nl/archive.ubuntu.com/
-http://ftp.snt.utwente.nl/pub/os/linux/ubuntu-archive/
-ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/
-http://ubuntuarchive.eweka.nl/ubuntu/
+http://mirror.leaseweb.com/ubuntu/
+http://mirror.liteserver.nl/pub/ubuntu/
+http://mirrors.nl.eu.kernel.org/ubuntu/
 http://nl.archive.ubuntu.com/ubuntu/
+http://nl3.archive.ubuntu.com/ubuntu/
+http://osmirror.rug.nl/ubuntu/
+http://ubuntu.mirror.cambrium.nl/ubuntu/
+http://ubuntu.tiscali.nl/
+http://ubuntuarchive.eweka.nl/ubuntu/
 #LOC:NO
 http://ftp.uninett.no/ubuntu/
+http://no.archive.ubuntu.com/ubuntu/
+http://ubuntu.uib.no/archive/
 #LOC:NP
 http://archive.mitra.net.np/ubuntu/
 #LOC:NZ
-http://nz2.archive.ubuntu.com/ubuntu/
 http://mirror.ihug.co.nz/ubuntu/
-http://nz.archive.ubuntu.com/ubuntu/
+http://ucmirror.canterbury.ac.nz/ubuntu/
 #LOC:PF
 http://pf.archive.ubuntu.com/ubuntu/
 #LOC:PL
-http://ftp.wcss.pl/ubuntu/
-http://ftp.vectranet.pl/ubuntu/
 ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu/
+http://ftp.vectranet.pl/ubuntu/
+http://ftp.wcss.pl/ubuntu/
+http://piotrkosoft.net/pub/mirrors/ubuntu/
 http://ubuntu.task.gda.pl/ubuntu/
 #LOC:PT
-http://mosel.estg.ipleiria.pt/mirror/distros/ubuntu/archive/
 ftp://ftp.ua.pt/pub/ubuntu/
+http://archive.ubuntumirror.dei.uc.pt/ubuntu/
 http://darkstar.ist.utl.pt/ubuntu/archive/
-http://pathfinder.ipcb.pt/ubuntu/
-http://ftp.dei.uc.pt/pub/linux/ubuntu/archive/
-http://neacm.fe.up.pt/ubuntu/
+http://deis-mirrors.isec.pt/ubuntu/
+http://ftp.rnl.ist.utl.pt/pub/ubuntu/archive/
+http://mirrors.fe.up.pt/ubuntu/
 http://mirrors.nfsi.pt/ubuntu/
+http://mosel.estg.ipleiria.pt/mirror/distros/ubuntu/archive/
+http://pathfinder.ipcb.pt/ubuntu/
 http://ubuntu.dcc.fc.up.pt/
 #LOC:QA
 http://ubuntu.qatar.cmu.edu/ubuntu/
 #LOC:RO
-http://mirror.pub.ro/ubuntu/
-http://ftp.gts.lug.ro/ubuntu/
 http://ftp.astral.ro/mirrors/ubuntu.com/ubuntu/
+http://ftp.gts.lug.ro/ubuntu/
+http://ftp.info.uvt.ro/ubuntu/
+http://ftp.roedu.net/mirrors/ubuntulinux.org/ubuntu/
 http://mirror.arlug.ro/pub/ubuntu/ubuntu/
+http://mirror.pub.ro/ubuntu/
 #LOC:RS
+http://rpm.scl.rs/linux/ubuntu/archive/
 http://ubuntu.etf.bg.ac.rs/ubuntu/
 #LOC:RU
-ftp://ftp.mipt.ru/mirror/ubuntu/
-http://ftp.chg.ru/pub/Linux/ubuntu/archive/
-http://mirror.yandex.ru/ubuntu/
 ftp://ftp.corbina.net/pub/Linux/ubuntu/
+ftp://ftp.mipt.ru/mirror/ubuntu/
 http://89.148.222.236/ubuntu/
+http://ftp.chg.ru/pub/Linux/ubuntu/archive/
 http://ftp.mtu.ru/pub/ubuntu/archive/
+http://linux.nsu.ru/ubuntu/
 http://mirror.rol.ru/ubuntu/
+http://mirror.yandex.ru/ubuntu/
+http://mirror2.corbina.ru/ubuntu/
 #LOC:SA
 http://ubuntu.mirrors.isu.net.sa/ubuntu/
+http://ubuntu.saudi.net.sa/
 #LOC:SE
+http://ftp.acc.umu.se/ubuntu/
+http://ftp.df.lth.se/ubuntu/
+http://ftp.ds.karen.hj.se/ubuntu/
 http://ftp.port80.se/ubuntu/
-http://mirrors.se.eu.kernel.org/ubuntu/
-http://se.archive.ubuntu.com/ubuntu/
 http://ftp.sunet.se/pub/os/Linux/distributions/ubuntu/ubuntu/
-http://ftp.ds.karen.hj.se/ubuntu/
-http://ftp.sunet.se/pub/Linux/distributions/ubuntu/ubuntu/
-http://ftp.df.lth.se/ubuntu/
+http://mirrors.se.eu.kernel.org/ubuntu/
 http://ubuntu.mirror.su.se/ubuntu/
 #LOC:SG
-http://ubuntu.oss.eznetsols.org/ubuntu/
 http://ftp.science.nus.edu.sg/ubuntu/
+http://linux.ntuoss.org/ubuntu/
+http://ubuntu.oss.eznetsols.org/ubuntu/
+#LOC:SI
+http://ftp.arnes.si/pub/mirrors/ubuntu/
+http://mirror.lihnidos.org/ubuntu/ubuntu/
 #LOC:SK
+http://ftp.antik.sk/ubuntu/
 http://ftp.energotel.sk/pub/linux/ubuntu/
 http://ubuntu.ynet.sk/ubuntu/
-http://ftp.antik.sk/ubuntu/
 #LOC:TH
 http://mirror.in.th/osarchive/ubuntu/
-http://ubuntu-archive.sit.kmutt.ac.th/
 http://mirror1.ku.ac.th/ubuntu/
-http://th.archive.ubuntu.com/ubuntu/
+http://ubuntu-archive.sit.kmutt.ac.th/
 #LOC:TR
-http://ftp.linux.org.tr/ubuntu/
 http://ftp.ankara.edu.tr/ubuntu/
-http://ubuntu.gnu.gen.tr/ubuntu/
-http://russell.cs.bilgi.edu.tr/ubuntu/
+http://ftp.linux.org.tr/ubuntu/
 http://ftp.metu.edu.tr/ubuntu/
+http://russell.cs.bilgi.edu.tr/ubuntu/
+http://ubuntu.gnu.gen.tr/ubuntu/
 #LOC:TW
 ftp://ftp.chu.edu.tw/Linux/Ubuntu/archives/
+http://debian.nctu.edu.tw/ubuntu/
+http://free.nchc.org.tw/ubuntu/
+http://ftp.cs.pu.edu.tw/Linux/Ubuntu/ubuntu/
+http://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu/
+http://ftp.nchu.edu.tw/Linux/Ubuntu/
 http://ftp.ncnu.edu.tw/Linux/ubuntu/ubuntu/
-http://tw.archive.ubuntu.com/ubuntu/
-http://mirror.nttu.edu.tw/ubuntu/
+http://ftp.nsysu.edu.tw/Linux/Ubuntu/ubuntu/
 http://ftp.tcc.edu.tw/Linux/ubuntu/
-http://ubuntu.cs.nctu.edu.tw/ubuntu/
-http://ftp.nchu.edu.tw/Linux/Ubuntu/
-http://debian.nctu.edu.tw/ubuntu/
+http://ftp.tku.edu.tw/ubuntu/
 http://ftp.twaren.net/Linux/Ubuntu/ubuntu/
-http://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu/
+http://mirror.nttu.edu.tw/ubuntu/
+http://tw.archive.ubuntu.com/ubuntu/
+http://ubuntu.cs.nctu.edu.tw/ubuntu/
 http://ubuntu.stu.edu.tw/ubuntu/
-http://free.nchc.org.tw/ubuntu/
-http://ftp.cs.pu.edu.tw/Linux/Ubuntu/ubuntu/
+http://www.mirror.tw/pub/ubuntu/ubuntu/
 #LOC:UA
 http://mirror.mirohost.net/ubuntu/
+http://mirrors.dnepr.com/pub/mirrors/ubuntu/
+http://ubuntu.org.ua/ubuntu/
 #LOC:US
-http://ubuntu.wallawalla.edu/ubuntu/
+ftp://ftp.egr.msu.edu/pub/ubuntu/archive/
+http://76.73.4.58/ubuntu/
+http://archive.linux.duke.edu/ubuntu/
+http://astromirror.uchicago.edu/ubuntu/
+http://cudlug.cudenver.edu/ubuntu/
+http://ftp.unina.it/pub/linux/distributions/ubuntu/
+http://ftp.usf.edu/pub/ubuntu/
+http://ftp.ussg.iu.edu/linux/ubuntu/
+http://ftp.utexas.edu/ubuntu/
+http://lug.mtu.edu/ubuntu/
+http://mira.sunsite.utk.edu/ubuntu/
+http://mirror.anl.gov/pub/ubuntu/
+http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/
+http://mirror.clarkson.edu/ubuntu/
+http://mirror.cs.umn.edu/ubuntu/
+http://mirror.its.uidaho.edu/pub/ubuntu/
 http://mirror.math.ucdavis.edu/ubuntu/
+http://mirror.peer1.net/ubuntu/
+http://mirror.pnl.gov/ubuntu/
 http://mirror.umoss.org/ubuntu/
-http://ubuntu.securedservers.com/
-http://ubuntu.media.mit.edu/ubuntu/
-http://mirrors.cs.wmich.edu/ubuntu/
-http://mirrors.login.com/ubuntu/
-http://mirrors.rit.edu/ubuntu/
+http://mirror.uoregon.edu/ubuntu/
+http://mirrors.acm.jhu.edu/ubuntu/
+http://mirrors.bloomu.edu/ubuntu/
 http://mirrors.cat.pdx.edu/ubuntu/
-http://ubuntu-mirror.cs.colorado.edu/ubuntu/
-http://ubuntu.mirror.frontiernet.net/ubuntu/
-http://mirror.uoregon.edu/ubuntu/archives/
-http://ftp.ussg.iu.edu/linux/ubuntu/
-http://lug.mtu.edu/ubuntu/
+http://mirrors.cavecreek.net/ubuntu/
 http://mirrors.ccs.neu.edu/ubuntu/
-http://ftp.utexas.edu/ubuntu/
-http://www.gtlib.gatech.edu/pub/ubuntu/
-http://mirror.its.uidaho.edu/pub/ubuntu/
-http://archive.linux.duke.edu/ubuntu/
-http://mirror.clarkson.edu/pub/ubuntu/
-http://ftp.unina.it/pub/linux/distributions/ubuntu/
-http://ubuntu.secsup.org/
+http://mirrors.cs.wmich.edu/ubuntu/
 http://mirrors.easynews.com/linux/ubuntu/
-http://ubuntu.osuosl.org/ubuntu/
-ftp://ftp.egr.msu.edu/pub/ubuntu/archive/
+http://mirrors.pavlovmedia.net/ubuntu/
+http://mirrors.rit.edu/ubuntu/
 http://mirrors.us.kernel.org/ubuntu/
-http://mirror.cps.cmich.edu/ubuntu/
-http://astromirror.uchicago.edu/ubuntu/
-http://ubuntu.cs.uaf.edu/ubuntu/
-http://mirror.anl.gov/pub/ubuntu/
 http://mirrors.xmission.com/ubuntu/
-http://mirror.lcsee.wvu.edu/ubuntu/
-http://mirrors.acm.jhu.edu/ubuntu/
 http://samaritan.ucmerced.edu/ubuntu/
-http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/
-http://ftp.usf.edu/pub/ubuntu/
-http://mirror.cs.umn.edu/ubuntu/
+http://ubuntu.cs.utah.edu/ubuntu/
+http://ubuntu.eecs.wsu.edu/
+http://ubuntu.media.mit.edu/ubuntu/
+http://ubuntu.mirror.frontiernet.net/ubuntu/
+http://ubuntu.mirrors.tds.net/pub/ubuntu/
+http://ubuntu.osuosl.org/ubuntu/
 http://ubuntu.secs.oakland.edu/
+http://ubuntu.secsup.org/
+http://ubuntu.securedservers.com/
+http://ubuntu.wallawalla.edu/ubuntu/
+http://ubuntu.washdc-linux.com/ubuntu/
+http://ubuntu.wikimedia.org/ubuntu/
+http://www.club.cc.cmu.edu/pub/ubuntu/
+http://www.gtlib.gatech.edu/pub/ubuntu/
+http://www.lug.bu.edu/mirror/ubuntu/
 #LOC:UZ
 http://ubuntu.uz/ubuntu/
 #LOC:VN
 http://mirror-fpt-telecom.fpt.net/ubuntu/
 #LOC:ZA
-http://ubuntu.saix.net/ubuntu-archive/
-http://ftp.leg.uct.ac.za/pub/linux/ubuntu/
+http://ftp.leg.uct.ac.za/ubuntu/
+http://ftp.sun.ac.za/ftp/ubuntu/
 http://ubuntu.mirror.ac.za/ubuntu-archive/
+http://ubuntu.saix.net/ubuntu-archive/
diff --git a/debian/changelog b/debian/changelog
index 38aba67f..c01286f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,296 @@
+python-apt (0.7.94.3) UNRELEASED; urgency=low
+
+  [ Julian Andres Klode ]
+  * python/generic.cc:
+    - Fix a memory leak when using old attribute names.
+  * debian/control:
+    - Change priority to standard, keep -doc and -dev on optional.
+
+  [ Michael Vogt ]
+  * apt/cache.py:
+    - make cache open silent by default (use apt.progress.base.OpProgress)
+  
+ -- Julian Andres Klode <jak@debian.org>  Mon, 15 Mar 2010 17:04:49 +0100
+
+python-apt (0.7.94.2) unstable; urgency=low
+
+  * Revert 0.7.93.3 and just set APT::Architecture to i386 for
+    test_aptsources; fixes FTBFS on powerpc.
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 12 Mar 2010 19:22:57 +0100
+
+python-apt (0.7.94.1) unstable; urgency=low
+
+  * Pass --exclude=migrate-0.8.py to dh_pycentral; in order to not depend
+    on python2.6; but recommend python2.6.
+  * Use dh_link instead of ln for python-apt-doc (Closes: #573523).
+  * Pass --link-doc=python-apt to dh_installdocs.
+  * Install examples to python-apt-doc instead of python-apt.
+  * tests/test_all.py: Write information header to stderr, not stdout.
+  * Build documentation only when needed (when building python-apt-doc).
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 12 Mar 2010 14:36:48 +0100
+
+python-apt (0.7.94) unstable; urgency=low
+
+  * Move documentation into python-apt-doc (Closes: #572617)
+  * Build documentation only once on the default Python version.
+  * python/acquire-item.cc:
+    - Add AcquireItem.partialsize member.
+  * python/apt_pkgmodule.cc:
+    - Treat '>>' and '>', '<<' and '<' as identical in check_dep (LP: #535667).
+  * python/generic.cc:
+    - Map UntranslatedDepType to dep_type_untranslated.
+  * python/tag.cc:
+    - Hack the TagFile iterator to not use shared storage (Closes: #572596):
+      Scan once, duplicate the section data, and scan again.
+  * apt/package.py:
+    - Create a string class BaseDependency.__dstr which makes '>' equal to
+      '>>' and '<' equal to '<<' (compatibility).
+    - Use the binary package version in Version.fetch_source() if the
+      source version is not specified (i.e. in the normal case).
+    - Always return unicode strings in Package.get_changelog (Closes: #572998).
+  * apt/progress/text.py:
+    - Drop InstallProgress, it's useless to keep this alias around.
+  * apt/progress/old.py:
+    - Let the new method call the old one; e.g. status_update() now calls
+      self.statusUpdate(). This improves compatibility for sub classes.
+  * Merge with Ubuntu:
+    - util/get_ubuntu_mirrors_from_lp.py:
+      + rewritten to use +archivemirrors-rss and feedburner
+    - pre-build.sh: update ubuntu mirrors on bzr-buildpackage (and also do this
+      for Debian mirrors)
+    - add break for packagekit-backend-apt (<= 0.4.8-0ubuntu4)
+  * tests:
+    - test_deps: Add tests for apt_pkg.CheckDep, apt_pkg.check_dep,
+      apt_pkg.parse_depends and apt_pkg.parse_src_depends.
+  * tests/data/aptsources/sources.list.testDistribution:
+    - change one mirror which is not on the mirror list anymore.
+  * utils/get_debian_mirrors.py:
+    - Parse Mirrors.masterlist instead of the HTML web page.
+  * utils/get_ubuntu_mirrors_from_lp.py:
+    - Sort the mirror list of each country.
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 10 Mar 2010 16:10:27 +0100
+
+python-apt (0.7.93.3) unstable; urgency=low
+
+  * data/templates/Ubuntu.info.in:
+    - Use generic MirrorsFile key instead of per-architecture ones in
+      order to fix FTBFS on !amd64 !i386 (Closes: #571752)
+
+ -- Julian Andres Klode <jak@debian.org>  Sat, 27 Feb 2010 23:26:45 +0100
+
+python-apt (0.7.93.2) unstable; urgency=low
+
+  [ Julian Andres Klode ]
+  * Fix some places where the old API was still used:
+    - apt/utils.py: Completely ported, previous one was old-API from Ubuntu.
+    - apt/cache.py: Use the new progress classes instead of the old ones.
+    - apt/package.py: Various smaller issues fixed, probably caused by merge.
+  * utils/migrate-0.8.py:
+    - Improve C++ parsing and add apt.progress.old to the modules, reduces
+      false positives.
+    - Ship the list of deprecated things in the apt_pkg and apt_inst modules
+      inside the script itself, so we don't have to parse the source code
+      anymore.
+  * python:
+    - Handle deprecated attributes and methods in the tp_gettattro slot, this
+      allows us to easily warn if a deprecated function is used.
+  * python/tagfile.cc:
+    - Implement the iterator protocol in TagFile.
+  * python/cache.cc:
+    - Implement Cache.__len__() and Cache.__contains__() (Closes: #571443).
+  * data/templates/Debian.info.in:
+    - Replace the MatchURI with one that really matches something.
+  * aptsources/distro.py:
+    - Call lsb_release with -idrc instead of --all.
+  * tests:
+    - Fix aptsources tests to use local data files if available.
+    - test_all.py: Use local modules instead of system ones if possible.
+  * data/templates/*.in: Switch MirrorsFile to relative filenames.
+    - setup.py: Copy the mirror lists to the build directory
+    - aptsources/distinfo.py: Support relative filenames for MirrorsFile.
+  * debian/rules:
+    - Run tests during build time.
+  * debian/python-apt.install:
+    - Install utils/migrate-0.8.py to /usr/share/python-apt/.
+  
+  [ Michael Vogt ]
+  * apt/cache.py:
+    - call install_progress.startUpdate()/finishUpdate() to keep
+      compatibility with older code
+  * apt/progress/base.py:
+    - restore "self.statusfd, self.writefd" type, provide additional
+      self.status_stream and self.write_stream file like objects
+  * python/progress.cc:
+    - try to call compatibility functions first, then new functions
+
+ -- Julian Andres Klode <jak@debian.org>  Sat, 27 Feb 2010 18:33:11 +0100
+
+python-apt (0.7.93.1) unstable; urgency=low
+
+  [ Julian Andres Klode ]
+  * Fix reference counting for old progress classes (Closes: #566370).
+  * apt/cache.py:
+    - Fix Cache.update() to not raise errors on successful updates.
+  * python/progress.cc:
+    - Fix some threading issues (add some missing PyCbObj_BEGIN_ALLOW_THREADS)
+  * python/acquire-item.cc:
+    - Support items without an owner set.
+  * python/tarfile.cc:
+    - When extracting, only allocate a new buffer if the old one was too small.
+    - Do not segfault if TarFile.go() is called without a member name.
+    - Clone all pkgDirStream::Item's so apt_pkg.TarMember object can be used
+      outside of the callback function passed to go().
+    - If only one member is requested, extract just that one.
+  * Drop the segfault prevention measures from the Acquire code, as they fail
+    to work. A replacement will be added once destruction callbacks are added
+    in APT.
+  * Merge the CppOwnedPyObject C++ class into CppPyObject.
+  * Remove inline functions from the C++ API, export them instead.
+  * Localization
+    - de.po: Update against new template
+  * python/arfile.cc:
+    - Handle the case where ararchive_new returns NULL in debfile_new.
+  * apt/progress/base.py:
+    - select.error objects do not have an errno attribute (Closes: #568005)
+  * doc/client-example.cc: Update against the new API.
+  * Fix typos of separated in multiple files (reported by lintian).
+  * debian/control:
+    - Make python-apt-dev depend on ${misc:Depends} and recommend python-dev.
+    - Set Standards-Version to 3.8.4.
+
+  [ Michael Vogt ]
+  * apt/utils.py:
+    - add some misc utils like get_release_filename_for_pkg()
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 05 Feb 2010 17:45:39 +0100
+
+python-apt (0.7.93) unstable; urgency=low
+
+  [ Julian Andres Klode ]
+  * Merge debian-sid and debian-experimental.
+  * Add a tutorial on how to do things which are possible with apt-get,
+    like apt-get --print-uris update (cf. #551164).
+  * Build for Python 2.5, 2.6 and 3.1; 2.6 and 3.1 hit unstable on Jan 16.
+    - Use DH_PYCENTRAL=nomove for now because include-links seems broken
+  * Merge lp:~forest-bond/python-apt/cache-is-virtual-package-catch-key-error
+    - Return False in Cache.is_virtual_package if the package does not exist.
+  * Make all class-level constants have uppercase names.
+  * Rewrite apt.progress.gtk2 documentation by hand and drop python-gtk2
+    build-time dependency.
+  * aptsources:
+    - Make all classes subclasses of object.
+    - distro.py: Support Python 3, decode lsb_release results using utf-8.
+  * apt/progress/base.py:
+    - Fix some parsing of dpkg status fd.
+  * apt/progress/text.py:
+    - Replace one print statement with a .write() call.
+  * Rename apt_pkg.PackageIndexFile to apt_pkg.IndexFile.
+
+  [ Colin Watson ]
+  * apt/progress/__init__.py:
+    - Fix InstallProgress.updateInterface() to cope with read() returning 0
+      on non-blocking file descriptors (LP: #491027).
+  
+  [ Michael Vogt ]
+  * apt/cache.py: 
+    - improved docstring for the cache
+    - add "enhances" property
+  * data/templates/Ubuntu.info.in:
+    - add lucid
+  * python/cache.cc:
+    - add UntranslatedDepType attribute to DependencyType
+    - add DepTypeEnum that returns a value from 
+      {DepDepends, DepPreDepends, ...}
+  * python/apt_pkgmodule.cc:
+    - add DepDpkgBreaks, DepEnhances constants
+  * doc/source/apt_pkg/{cache.rst, index.rst}:
+    - update documentation as well
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 20 Jan 2010 17:06:20 +0100
+
+python-apt (0.7.92) experimental; urgency=low
+
+  * New features:
+    - Provide a C++ API in the package python-apt-dev (Closes: #334923).
+    - Add apt_pkg.HashString and apt_pkg.IndexRecords (Closes: #456141).
+    - Add apt_pkg.Policy class (Closes: #382725).
+    - Add apt_pkg.Hashes class.
+    - Allow types providing __new__() to be subclassed.
+    - Add apt_pkg.DepCache.mark_auto() and apt.Package.mark_auto() methods to
+      mark a package as automatically installed.
+    - Make AcquireFile a subclass of AcquireItem, thus inheriting attributes.
+    - New progress handling in apt.progress.base and apt.progress.text. Still
+      missing Qt4 progress handlers.
+    - Classes in apt_inst (Closes: #536096)
+      + You can now use apt_inst.DebFile.data to access the data.tar.* member
+        regardless of its compression (LP: #44493)
+
+  * Unification of dependency handling:
+    - apt_pkg.parse_[src_]depends() now use CompType instead of CompTypeDeb
+      (i.e. < instead of <<) to match the interface of Version.depends_list_str
+    - apt_pkg.SourceRecords.build_depends matches exactly the interface of
+      Version.depends_list_str just with different keys (e.g. Build-Depends).
+      + Closes: #468123 - there is no need anymore for binding CompType or
+        CompTypeDeb, because we don't return integer values for CompType
+        anymore.
+
+  * Bugfixes:
+    - Delete pointers correctly, fixing memory leaks (LP: #370149).
+    - Drop open() and close() in apt_pkg.Cache as they cause segfaults.
+    - Raise ValueError in AcquireItem if the Acquire process is shut down
+      instead of segfaulting.
+
+  * Other stuff:
+    - Merge releases 0.7.10.4 - 0.7.12.1 from unstable.
+    - Merge Configuration,ConfigurationPtr,ConfigurationSub into one type.
+    - Simplify the whole build process by using a single setup.py.
+    - The documentation has been restructured and enhanced with tutorials.
+    - Only recommend lsb-release instead of depending on it. Default to
+      Debian unstable if lsb_release is not available.
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 18 Aug 2009 16:42:56 +0200
+
+python-apt (0.7.91) experimental; urgency=low
+
+  [ Julian Andres Klode ]
+  * Rename where needed according to PEP 8 conventions (Closes: #481061)
+  * Where possible, derive apt.package.Record from collections.Mapping.
+  * ActionGroups can be used as a context manager for the 'with' statement.
+  * utils/migrate-0.8.py: Helper to check Python code for deprecated functions,
+    attributes,etc. Has to be run from the python-apt source tree, but can be
+    used for all Python code using python-apt.
+  * debian/control: Only recommend libjs-jquery (Closes: #527543).
+
+  [ Stefano Zacchiroli ]
+  * debian/python-apt.doc-base: register the documentation with the
+    doc-base system (Closes: #525134)
+
+  [ Sebastian Heinlein ]
+  * apt/package.py: Add Package.get_version() which returns a Version instance
+    for the given version string or None (Closes: #523998)
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 05 Jun 2009 19:36:45 +0200
+
+python-apt (0.7.90) experimental; urgency=low
+
+  * Introduce support for Python 3 (Closes: #523645)
+
+  * Support the 'in' operator (e.g. "k in d") in Configuration{,Ptr,Sub}
+    objects (e.g. apt_pkg.Config) and in TagSections (apt_pkg.ParseSection())
+  * Replace support for file objects with a more generic support for any object
+    providing a fileno() method and for file descriptors (integers).
+  * Add support for the Breaks fields
+  * Only create Package objects when they are requested, do not keep them in
+    a dict. Saves 10MB for 25,000 packages on my machine.
+  * apt/package.py: Allow to set the candidate of a package (Closes: #523997)
+    - Support assignments to the 'candidate' property of Package objects.
+    - Initial patch by Sebastian Heinlein
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 15 Apr 2009 13:47:42 +0200
+
 python-apt (0.7.13.4ubuntu5) lucid; urgency=low
 
   [ Michael Vogt ]
@@ -386,6 +679,17 @@ python-apt (0.7.10.2) unstable; urgency=low
 
  -- Julian Andres Klode <jak@debian.org>  Sun, 12 Apr 2009 19:00:07 +0200
 
+python-apt (0.7.10.1) unstable; urgency=low
+
+  * Fix FTBFS with python-debian (>= 0.1.13) on Python 2.4 by not using it to
+    get a version number in setup.py (Closes: #523473)
+  * apt/package.py:
+    - (Package.candidateRecord): Fix missing 'd' in 'record'
+    - (DeprecatedProperty.__get__): Only warn when used on objects, this
+      makes it easier to use e.g. pydoc,sphinx,pychecker.
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 10 Apr 2009 17:51:07 +0200
+
 python-apt (0.7.10) unstable; urgency=low
 
   * Build-Depend on python-debian, use it to get version number from changelog
@@ -589,6 +893,41 @@ python-apt (0.7.9~exp2) experimental; urgency=low
 
  -- Julian Andres Klode <jak@debian.org>  Sun, 11 Jan 2009 20:01:59 +0100
 
+python-apt (0.7.9~exp1) experimental; urgency=low
+
+  * Merged python-apt consolidation branch by Sebastian
+    Heinlein (many thanks)
+  * apt/cache.py:
+    - new method "isVirtualPackage()"
+    - new method "getProvidingPackages()"
+    - new method "getRequiredDownload()"
+    - new method "additionalRequiredSpace()"
+  * apt/debfile.py:
+    - move a lot of the gdebi code into this file, this
+      provides interfaces for querrying and installing
+      .deb files and .dsc files
+  * apt/package.py:
+    - better description parsing
+    - new method "installedFiles()"
+    - new method "getChangelog()"
+  * apt/gtk/widgets.py:
+    - new gobject GOpProgress
+    - new gobject GFetchProgress
+    - new gobject GInstallProgress
+    - new gobject GDpkgInstallProgress
+    - new widget GtkAptProgress
+  * doc/examples/gui-inst.py:
+    - updated to use the new widgets
+  * debian/control:
+    - add suggests for python-gtk2 and python-vte
+  * setup.py:
+    - build html/ help of the apt and aptsources modules
+      into /usr/share/doc/python-apt/html
+  * apt/__init__.py:
+    - remove the future warning
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 15 Dec 2008 14:29:47 +0100
+
 python-apt (0.7.8ubuntu1) jaunty; urgency=low
 
   * Merged python-apt consolidation branch by Sebastian
@@ -688,6 +1027,14 @@ python-apt (0.7.8~ubuntu1) jaunty; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 03 Nov 2008 11:46:54 +0100
 
+python-apt (0.7.7.1+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * data/templates/Debian.info.in: Set the BaseURI to security.debian.org for
+    lenny/updates, etch/updates and sarge/updates. (Closes: #503237)
+
+ -- Jonny Lamb <jonny@debian.org>  Fri, 24 Oct 2008 12:44:33 +0100
+
 python-apt (0.7.7.1ubuntu4) intrepid; urgency=low
 
   * apt/package.py:
@@ -728,6 +1075,15 @@ python-apt (0.7.7.1ubuntu1) intrepid; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 30 Jul 2008 10:26:53 +0200
 
+python-apt (0.7.7.1) unstable; urgency=low
+
+  * data/templates/Debian.info.in:
+    - add 'lenny' template info (closes: #476364)
+  * aptsources/distinfo.py:
+    - fix template matching for arch specific code (LP: #244093)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Jul 2008 18:34:28 +0200
+
 python-apt (0.7.7ubuntu2) intrepid; urgency=low
 
   * python/metaindex.cc
@@ -745,23 +1101,6 @@ python-apt (0.7.7ubuntu2) intrepid; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Mon, 24 Nov 2008 10:24:30 +0200
 
-python-apt (0.7.7.1+nmu1) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * data/templates/Debian.info.in: Set the BaseURI to security.debian.org for
-    lenny/updates, etch/updates and sarge/updates. (Closes: #503237)
-
- -- Jonny Lamb <jonny@debian.org>  Fri, 24 Oct 2008 12:44:33 +0100
-
-python-apt (0.7.7.1) unstable; urgency=low
-
-  * data/templates/Debian.info.in:
-    - add 'lenny' template info (closes: #476364)
-  * aptsources/distinfo.py:
-    - fix template matching for arch specific code (LP: #244093)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Jul 2008 18:34:28 +0200
-
 python-apt (0.7.7ubuntu1) intrepid; urgency=low
 
   * merged from debian-sid
diff --git a/debian/control b/debian/control
index 1bd55d2a..904dff0a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,29 @@
 Source: python-apt
 Section: python
-Priority: optional
+Priority: standard
 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
-Standards-Version: 3.8.3
-XS-Python-Version: all
+Standards-Version: 3.8.4
+XS-Python-Version: 2.5, 2.6, 3.1
 Build-Depends: apt-utils,
                debhelper (>= 7.3.5),
-               libapt-pkg-dev (>= 0.7.21),
+               libapt-pkg-dev (>= 0.7.22~),
                python-all-dbg,
                python-all-dev,
                python-central (>= 0.5),
-               python-debian,
-               python-distutils-extra (>= 1.9.0),
-               python-gtk2 [!kfreebsd-amd64 !kfreebsd-i386],
-               python-sphinx (>= 0.5),
-               python-vte [!kfreebsd-amd64 !kfreebsd-i386]
+               python-distutils-extra (>= 2.0),
+               python-sphinx (>= 0.5)
 Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid
 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}, lsb-release
-Recommends: iso-codes, libjs-jquery
+Recommends: iso-codes
 Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4)
 Provides: ${python:Provides}
-Suggests: python-apt-dbg, python-gtk2, python-vte
+Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc
 XB-Python-Version: ${python:Versions}
 Description: Python interface to libapt-pkg
  The apt_pkg Python interface will provide full access to the internal
@@ -41,15 +38,44 @@ Description: Python interface to libapt-pkg
  The included 'aptsources' Python interface provides an abstraction of
  the sources.list configuration on the repository and the distro level.
 
+Package: python-apt-doc
+Priority: optional
+Architecture: all
+Section: doc
+Depends: libjs-jquery, ${misc:Depends}
+Enhances: python-apt
+Replaces: python-apt (<< 0.7.94)
+Description: Python interface to libapt-pkg (API documentation)
+ The apt_pkg Python interface will provide full access to the internal
+ libapt-pkg structures allowing Python programs to easily perform a
+ variety of functions.
+ .
+ This package contains the API documentation of python-apt.
+
 Package: python-apt-dbg
 Priority: extra
 Architecture: any
 Section: debug
 Depends: python-dbg, python-apt (= ${binary:Version}), ${shlibs:Depends},
          ${misc:Depends}
+XB-Python-Version: ${python:Versions}
 Description: Python interface to libapt-pkg (debug extension)
  The apt_pkg Python interface will provide full access to the internal
  libapt-pkg structures allowing Python programs to easily perform a
  variety of functions.
  .
  This package contains the extension built for the Python debug interpreter.
+
+Package: python-apt-dev
+Priority: optional
+Architecture: all
+Depends: python-apt (>= ${source:Version}), libapt-pkg-dev (>= 0.7.10),
+         ${misc:Depends}
+Recommends: python-dev
+Description: Python interface to libapt-pkg (development files)
+ The apt_pkg Python interface will provide full access to the internal
+ libapt-pkg structures allowing Python programs to easily perform a
+ variety of functions.
+ .
+ This package contains the header files needed to use python-apt objects from
+ C++ applications.
diff --git a/debian/copyright b/debian/copyright
index 8599328a..2df6807a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,17 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=443
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=59
 
 Files: *
 Copyright: © 2004-2009 Canonical Ltd.
+           © 2009 Julian Andres Klode <jak@debian.org>
 License: GPL-2+
 
+Files: tests/test_all.py, tests/test_hashes.py, utils/doclint.py
+Copyright: © 2009 Julian Andres Klode <jak@debian.org>
+License:
+ 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.
+
 Files: aptsources/*.py
 Copyright: © 2004-2009 Canonical Ltd.
 Copyright: © 2005 Gustavo Noronha Silva
diff --git a/debian/python-apt-dev.examples b/debian/python-apt-dev.examples
new file mode 100644
index 00000000..39f7bf97
--- /dev/null
+++ b/debian/python-apt-dev.examples
@@ -0,0 +1 @@
+doc/client-example.cc
diff --git a/debian/python-apt-dev.install b/debian/python-apt-dev.install
new file mode 100644
index 00000000..2a1405fd
--- /dev/null
+++ b/debian/python-apt-dev.install
@@ -0,0 +1,2 @@
+python/python-apt.h usr/include/python-apt/
+python/generic.h usr/include/python-apt/
diff --git a/debian/python-apt.doc-base b/debian/python-apt-doc.doc-base
index d25926b7..4f3c4d31 100644
--- a/debian/python-apt.doc-base
+++ b/debian/python-apt-doc.doc-base
@@ -4,8 +4,5 @@ Abstract: API reference manual for Python bindings to libapt-pkg
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-apt/html/index.html
-Files: /usr/share/doc/python-apt/html/*
-
-Format: Text
-Files: /usr/share/doc/python-apt/text/*
+Index: /usr/share/doc/python-apt-doc/html/index.html
+Files: /usr/share/doc/python-apt-doc/html/*
diff --git a/debian/python-apt-doc.docs b/debian/python-apt-doc.docs
new file mode 100644
index 00000000..f85adafd
--- /dev/null
+++ b/debian/python-apt-doc.docs
@@ -0,0 +1 @@
+build/sphinx/html/
diff --git a/debian/examples b/debian/python-apt-doc.examples
index e4a93ea1..e4a93ea1 100644
--- a/debian/examples
+++ b/debian/python-apt-doc.examples
diff --git a/debian/python-apt-doc.links b/debian/python-apt-doc.links
new file mode 100644
index 00000000..40f834f2
--- /dev/null
+++ b/debian/python-apt-doc.links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/python-apt-doc/html/_static/jquery.js
diff --git a/debian/python-apt.docs b/debian/python-apt.docs
index 177b5837..a53a1ccc 100644
--- a/debian/python-apt.docs
+++ b/debian/python-apt.docs
@@ -3,5 +3,3 @@ AUTHORS
 TODO
 apt/README.apt
 data/templates/README.templates
-build/doc/html/
-build/doc/text/
diff --git a/debian/python-apt.install b/debian/python-apt.install
index ca86ed11..29028531 100644
--- a/debian/python-apt.install
+++ b/debian/python-apt.install
@@ -4,3 +4,5 @@ usr/lib/python*/*/*/
 usr/lib/python*/*/*.egg-info
 usr/share/locale
 usr/share/python-apt
+# Install the migration helper
+utils/migrate-0.8.py usr/share/python-apt
diff --git a/debian/rules b/debian/rules
index 08705a86..cc1cabee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,33 @@
 #!/usr/bin/make -f
-export DH_PYCENTRAL=include-links
+# Should be include-links, but that somehow fails.
+export DH_PYCENTRAL=nomove
 export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-export CFLAGS=-Wno-write-strings
+export CFLAGS=-Wno-write-strings -DCOMPAT_0_7
 
 %:
 	dh --with python-central $@
 
+override_dh_auto_build:
+	dh_auto_build
+
 override_dh_installdocs:
-	dh_installdocs
-	ln -sf ../../../../javascript/jquery/jquery.js \
-	       debian/python-apt/usr/share/doc/python-apt/html/_static/jquery.js
-	rm -rf debian/python-apt-dbg/usr/share/doc/python-apt-dbg
-	ln -s python-apt debian/python-apt-dbg/usr/share/doc/python-apt-dbg
+	set -e; if [ -z $(filter -a,$(DH_INTERNAL_OPTIONS)) ]; then \
+		python setup.py build_sphinx; \
+		dh_installdirs -ppython-apt-doc usr/share/doc/python-apt; \
+	fi
+	dh_installdirs -ppython-apt-dev usr/share/doc/python-apt
+	dh_installdocs --link-doc=python-apt
 
 override_dh_strip:
 	dh_strip --dbg-package=python-apt-dbg
 
 override_dh_compress:
 	dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv
+
+override_dh_auto_test:
+	set -e; for python in $(shell pyversions -r); do \
+		$$python tests/test_all.py -q; \
+	done;
+
+override_dh_pycentral:
+	dh_pycentral --exclude=migrate-0.8.py
diff --git a/doc/client-example.cc b/doc/client-example.cc
new file mode 100644
index 00000000..73fa3eed
--- /dev/null
+++ b/doc/client-example.cc
@@ -0,0 +1,68 @@
+/*
+ * client-example.cc - A simple example for using the python-apt C++ API.
+ *
+ * Copyright 2009 Julian Andres Klode <jak@debian.org>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <python-apt/python-apt.h>
+#include <apt-pkg/hashes.h>
+
+// The module initialization.
+extern "C" void initclient() {
+    if (import_apt_pkg() < 0)
+        return;
+    // Initialize a module.
+    PyObject *Module = Py_InitModule("client", NULL);
+
+    // Create a HashString, which will be added to the module.
+    HashString *hash = new HashString("0966a120bb936bdc6fdeac445707aa6b");
+    // Create a Python object for the hashstring and add it to the module
+    PyModule_AddObject(Module, "hash", PyHashString_FromCpp(hash, false, NULL));
+
+    // Another example: Add the HashString type to the module.
+    Py_INCREF(&PyHashString_Type);
+    PyModule_AddObject(Module, "HashString", (PyObject*)(&PyHashString_Type));
+}
+
+int main(int argc, char *argv[]) {
+    // Return value.
+    int ret = 0;
+    // Initialize python 
+    Py_Initialize();
+    // Make the client module importable
+    PyImport_AppendInittab("client", &initclient);
+    // Set the commandline arguments.
+    PySys_SetArgv(argc, argv);
+
+    // Import the module, so the user does not have to import it.
+    if (PyRun_SimpleString("import client\n") < 0) {
+        // Failure (should never be reached)
+        ret = 1;
+        goto end;
+    }
+
+    // Run IPython if available, otherwise a normal interpreter.
+    if (PyRun_SimpleString("from IPython.Shell import start\n") == 0)
+        PyRun_SimpleString("start(user_ns=dict(client=client)).mainloop()\n");
+    else
+        Py_Main(argc, argv);
+
+end:
+    Py_Finalize();
+    return ret;
+}
diff --git a/doc/examples/acquire.py b/doc/examples/acquire.py
index 41a38588..96426a32 100644
--- a/doc/examples/acquire.py
+++ b/doc/examples/acquire.py
@@ -4,10 +4,10 @@ import apt_pkg
 import os
 
 
-def get_file(fetcher, uri, destFile):
+def get_file(fetcher, uri, destfile):
     # get the file
-    af = apt_pkg.GetPkgAcqFile(fetcher, uri=uri, descr="sample descr",
-                               destFile=destFile)
+    af = apt_pkg.AcquireFile(fetcher, uri=uri, descr="sample descr",
+                               destfile=destfile)
     res = fetcher.Run()
     if res != fetcher.ResultContinue:
         return False
@@ -19,21 +19,21 @@ apt_pkg.init()
 #apt_pkg.Config.Set("Debug::pkgPackageManager","1");
 #apt_pkg.Config.Set("Debug::pkgDPkgProgressReporting","1");
 
-cache = apt_pkg.GetCache()
-depcache = apt_pkg.GetDepCache(cache)
+cache = apt_pkg.Cache()
+depcache = apt_pkg.DepCache(cache)
 
-recs = apt_pkg.GetPkgRecords(cache)
-list = apt_pkg.GetPkgSourceList()
+recs = apt_pkg.PackageRecords(cache)
+list = apt_pkg.SourceList()
 list.ReadMainList()
 
 # show the amount fetch needed for a dist-upgrade
 depcache.Upgrade(True)
 progress = apt.progress.TextFetchProgress()
-fetcher = apt_pkg.GetAcquire(progress)
-pm = apt_pkg.GetPackageManager(depcache)
+fetcher = apt_pkg.Acquire(progress)
+pm = apt_pkg.PackageManager(depcache)
 pm.GetArchives(fetcher, list, recs)
 print "%s (%s)" % (apt_pkg.SizeToStr(fetcher.FetchNeeded), fetcher.FetchNeeded)
-actiongroup = apt_pkg.GetPkgActionGroup(depcache)
+actiongroup = apt_pkg.ActionGroup(depcache)
 for pkg in cache.Packages:
     depcache.MarkKeep(pkg)
 
@@ -48,9 +48,9 @@ pkg = cache["3ddesktop"]
 depcache.MarkInstall(pkg)
 
 progress = apt.progress.TextFetchProgress()
-fetcher = apt_pkg.GetAcquire(progress)
-#fetcher = apt_pkg.GetAcquire()
-pm = apt_pkg.GetPackageManager(depcache)
+fetcher = apt_pkg.Acquire(progress)
+#fetcher = apt_pkg.Acquire()
+pm = apt_pkg.PackageManager(depcache)
 
 print pm
 print fetcher
diff --git a/doc/examples/action.py b/doc/examples/action.py
index 8ee86eb7..512945df 100644
--- a/doc/examples/action.py
+++ b/doc/examples/action.py
@@ -10,7 +10,7 @@ from progress import TextFetchProgress
 apt_pkg.init()
 
 progress = OpTextProgress()
-cache = apt_pkg.GetCache(progress)
+cache = apt_pkg.Cache(progress)
 print "Available packages: %s " % cache.PackageCount
 
 print "Fetching"
@@ -25,7 +25,7 @@ print "example package iter: %s" % iter
 
 # get depcache
 print "\n\n depcache"
-depcache = apt_pkg.GetDepCache(cache, progress)
+depcache = apt_pkg.DepCache(cache, progress)
 depcache.ReadPinFile()
 print "got a depcache: %s " % depcache
 print "Marked for install: %s " % depcache.InstCount
diff --git a/doc/examples/build-deps.py b/doc/examples/build-deps.py
index b5ac88a2..656f1361 100755
--- a/doc/examples/build-deps.py
+++ b/doc/examples/build-deps.py
@@ -21,11 +21,11 @@ def get_source_pkg(pkg, records, depcache):
 
 # main
 apt_pkg.init()
-cache = apt_pkg.GetCache()
-depcache = apt_pkg.GetDepCache(cache)
+cache = apt_pkg.Cache()
+depcache = apt_pkg.DepCache(cache)
 depcache.Init()
-records = apt_pkg.GetPkgRecords(cache)
-srcrecords = apt_pkg.GetPkgSrcRecords()
+records = apt_pkg.PackageRecords(cache)
+srcrecords = apt_pkg.SourceRecords()
 
 # base package that we use for build-depends calculation
 if len(sys.argv) < 2:
diff --git a/doc/examples/cdrom.py b/doc/examples/cdrom.py
index 408bd720..78f2a8af 100644
--- a/doc/examples/cdrom.py
+++ b/doc/examples/cdrom.py
@@ -10,7 +10,7 @@ from progress import TextCdromProgress
 # init
 apt_pkg.init()
 
-cdrom = apt_pkg.GetCdrom()
+cdrom = apt_pkg.Cdrom()
 print cdrom
 
 progress = TextCdromProgress()
diff --git a/doc/examples/checkstate.py b/doc/examples/checkstate.py
index 3368d500..41040b6c 100755
--- a/doc/examples/checkstate.py
+++ b/doc/examples/checkstate.py
@@ -8,7 +8,7 @@
 import apt_pkg
 apt_pkg.init()
 
-cache = apt_pkg.GetCache()
+cache = apt_pkg.Cache()
 packages = cache.Packages
 
 uninstalled, updated, upgradable = {}, {}, {}
diff --git a/doc/examples/config.py b/doc/examples/config.py
index 9d4e51fc..0dff4cac 100755
--- a/doc/examples/config.py
+++ b/doc/examples/config.py
@@ -21,7 +21,7 @@ import posixpath
 # configuration object apt_pkg.Config which is used interally by apt-pkg
 # routines to control unusual situations. I recommend using the sytem global
 # whenever possible..
-Cnf = apt_pkg.newConfiguration()
+Cnf = apt_pkg.Configuration()
 
 print "Command line is", sys.argv
 
diff --git a/doc/examples/configisc.py b/doc/examples/configisc.py
index 8da1ad0a..fe3d161b 100755
--- a/doc/examples/configisc.py
+++ b/doc/examples/configisc.py
@@ -17,7 +17,7 @@ if len(ConfigFile) != 1:
     print "Must have exactly 1 file name"
     sys.exit(0)
 
-Cnf = apt_pkg.newConfiguration()
+Cnf = apt_pkg.Configuration()
 apt_pkg.ReadConfigFileISC(Cnf, ConfigFile[0])
 
 # Print the configuration space
diff --git a/doc/examples/deb_inspect.py b/doc/examples/deb_inspect.py
index cc0d04be..54c52b7b 100755
--- a/doc/examples/deb_inspect.py
+++ b/doc/examples/deb_inspect.py
@@ -25,7 +25,7 @@ if __name__ == "__main__":
 
     print "Now extracting the control file:"
     control = apt_inst.debExtractControl(open(file))
-    sections = apt_pkg.ParseSection(control)
+    sections = apt_pkg.TagSection(control)
 
     print "Maintainer is: "
     print sections["Maintainer"]
diff --git a/doc/examples/depcache.py b/doc/examples/depcache.py
index de038fe8..858e45a4 100644
--- a/doc/examples/depcache.py
+++ b/doc/examples/depcache.py
@@ -9,7 +9,7 @@ from progress import TextProgress
 apt_pkg.init()
 
 progress = TextProgress()
-cache = apt_pkg.GetCache(progress)
+cache = apt_pkg.Cache(progress)
 print "Available packages: %s " % cache.PackageCount
 
 iter = cache["base-config"]
@@ -17,7 +17,7 @@ print "example package iter: %s" % iter
 
 # get depcache
 print "\n\n depcache"
-depcache = apt_pkg.GetDepCache(cache)
+depcache = apt_pkg.DepCache(cache)
 depcache.ReadPinFile()
 # init is needed after the creation/pin file reading
 depcache.Init(progress)
diff --git a/doc/examples/desc.py b/doc/examples/desc.py
index 2febf348..d50aa0ce 100644
--- a/doc/examples/desc.py
+++ b/doc/examples/desc.py
@@ -6,8 +6,8 @@ apt_pkg.init()
 
 apt_pkg.Config.Set("APT::Acquire::Translation", "de")
 
-cache = apt_pkg.GetCache()
-depcache = apt_pkg.GetDepCache(cache)
+cache = apt_pkg.Cache()
+depcache = apt_pkg.DepCache(cache)
 
 pkg = cache["gcc"]
 cand = depcache.GetCandidateVer(pkg)
@@ -18,7 +18,7 @@ print desc
 print desc.FileList
 (f, index) = desc.FileList.pop(0)
 
-records = apt_pkg.GetPkgRecords(cache)
+records = apt_pkg.PackageRecords(cache)
 records.Lookup((f, index))
 desc = records.LongDesc
 print len(desc)
diff --git a/doc/examples/indexfile.py b/doc/examples/indexfile.py
index 2f1f27f8..cc5070aa 100644
--- a/doc/examples/indexfile.py
+++ b/doc/examples/indexfile.py
@@ -4,11 +4,11 @@ import apt_pkg
 
 apt_pkg.init()
 
-sources = apt_pkg.GetPkgSourceList()
+sources = apt_pkg.SourceList()
 sources.ReadMainList()
 
-cache = apt_pkg.GetCache()
-depcache = apt_pkg.GetDepCache(cache)
+cache = apt_pkg.Cache()
+depcache = apt_pkg.DepCache(cache)
 pkg = cache["libimlib2"]
 cand = depcache.GetCandidateVer(pkg)
 for (f, i) in cand.FileList:
diff --git a/doc/examples/metaindex.py b/doc/examples/metaindex.py
index 816a3fd7..bbb4ac47 100644
--- a/doc/examples/metaindex.py
+++ b/doc/examples/metaindex.py
@@ -4,7 +4,7 @@ import apt_pkg
 
 apt_pkg.init()
 
-sources = apt_pkg.GetPkgSourceList()
+sources = apt_pkg.SourceList()
 sources.ReadMainList()
 
 
diff --git a/doc/examples/print_uris.py b/doc/examples/print_uris.py
index 3b678e83..c64a4b54 100755
--- a/doc/examples/print_uris.py
+++ b/doc/examples/print_uris.py
@@ -13,7 +13,7 @@ upgradable = filter(lambda p: p.isUpgradable, cache)
 
 for pkg in upgradable:
     pkg._lookupRecord(True)
-    path = apt_pkg.ParseSection(pkg._records.Record)["Filename"]
+    path = apt_pkg.TagSection(pkg._records.Record)["Filename"]
     cand = pkg._depcache.GetCandidateVer(pkg._pkg)
     for (packagefile, i) in cand.FileList:
         indexfile = cache._list.FindIndex(packagefile)
diff --git a/doc/examples/recommends.py b/doc/examples/recommends.py
index f0b3b1be..0ecd5882 100755
--- a/doc/examples/recommends.py
+++ b/doc/examples/recommends.py
@@ -3,7 +3,7 @@
 import apt_pkg
 apt_pkg.init()
 
-cache = apt_pkg.GetCache()
+cache = apt_pkg.Cache()
 
 
 class Wanted:
diff --git a/doc/examples/sources.py b/doc/examples/sources.py
index 49652982..bc08ad69 100644
--- a/doc/examples/sources.py
+++ b/doc/examples/sources.py
@@ -4,10 +4,10 @@ import apt_pkg
 
 apt_pkg.init()
 
-#cache = apt_pkg.GetCache()
-#sources = apt_pkg.GetPkgSrcRecords(cache)
+#cache = apt_pkg.Cache()
+#sources = apt_pkg.SourceRecords(cache)
 
-sources = apt_pkg.GetPkgSrcRecords()
+sources = apt_pkg.SourceRecords()
 sources.Restart()
 while sources.Lookup('hello'):
     print sources.Package, sources.Version, sources.Maintainer, \
diff --git a/doc/examples/tagfile.py b/doc/examples/tagfile.py
index 4faf08ac..770e40de 100755
--- a/doc/examples/tagfile.py
+++ b/doc/examples/tagfile.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import apt_pkg
 
-Parse = apt_pkg.ParseTagFile(open("/var/lib/dpkg/status", "r"))
+Parse = apt_pkg.TagFile(open("/var/lib/dpkg/status", "r"))
 
 while Parse.Step() == 1:
     print Parse.Section.get("Package")
diff --git a/doc/source/apt/index.rst b/doc/source/apt/index.rst
deleted file mode 100644
index bf39354f..00000000
--- a/doc/source/apt/index.rst
+++ /dev/null
@@ -1,61 +0,0 @@
-:mod:`apt` --- Highlevel apt package
-=====================================
-The highlevel apt package provides a lot of functionality, all
-with an easy-to-use interface.
-
-.. warning::
-    The API of this package is not considered stable. Evenmore, it is considered
-    to change the naming conventions in future to lowercase_with_underscores.
-
-    In case this happens, the API will still be kept compatible, with the old
-    functions provided as deprecated ones.
-
-.. automodule:: apt
-    :members:
-
-
-
-
-.. toctree::
-   :maxdepth: 2
-   :glob:
-
-   *
-
-
-Classes exported in apt
-------------------------
-These classes are defined in the submodules, but are also exported directly
-in the package.
-
-.. class:: Cache
-
-    Please see :class:`apt.cache.Cache` for documentation.
-
-.. class:: Cdrom
-
-    Please see :class:`apt.cdrom.Cdrom` for documentation.
-
-.. class:: CdromProgress
-
-    Please see :class:`apt.progress.CdromProgress` for documentation.
-
-.. class:: FetchProgress
-
-    Please see :class:`apt.progress.FetchProgress` for documentation.
-
-.. class:: InstallProgress
-
-    Please see :class:`apt.progress.InstallProgress` for documentation.
-
-.. class:: OpProgress
-
-    Please see :class:`apt.progress.OpProgress` for documentation.
-
-.. class:: Package
-
-    Please see :class:`apt.package.Package` for documentation.
-
-.. class:: ProblemResolver
-
-    Please see :class:`apt.cache.ProblemResolver` for documentation.
diff --git a/doc/source/apt/progress.gtk2.rst b/doc/source/apt/progress.gtk2.rst
deleted file mode 100644
index a83ab111..00000000
--- a/doc/source/apt/progress.gtk2.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-:mod:`apt.progress.gtk2` --- GTK widgets
-========================================
-.. automodule:: apt.progress.gtk2
-
-
-GObject progress classes
--------------------------
-
-.. autoclass:: GDpkgInstallProgress
-    :members:
-
-.. autoclass:: GFetchProgress
-    :members:
-
-.. autoclass:: GInstallProgress
-    :members:
-
-.. autoclass:: GOpProgress
-    :members:
-
-GTK+ Class
-----------
-.. autoclass:: GtkAptProgress
-    :members:
-
-
-Example
--------
-.. literalinclude:: ../examples/apt-gtk.py
diff --git a/doc/source/apt/progress.rst b/doc/source/apt/progress.rst
deleted file mode 100644
index 8989aa27..00000000
--- a/doc/source/apt/progress.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-:mod:`apt.progress` --- Classes for progress reporting
-======================================================
-.. automodule:: apt.progress
-
-.. warning::
-
-    This class is currently under re-organisation. Therefore, the API may
-    change soon. The old names will still be kept until it is safe to remove
-    them.
-
-
-
-Classes without output
-----------------------
-.. autoclass:: FetchProgress
-    :members:
-.. autoclass:: OpProgress
-    :members:
-.. autoclass:: CdromProgress
-    :members:
-.. autoclass:: DumbInstallProgress
-    :members:
-
-Implementing classes for text output
-------------------------------------
-.. autoclass:: TextFetchProgress
-    :members:
-.. autoclass:: OpTextProgress
-    :members:
-.. autoclass:: InstallProgress
-    :members:
-.. autoclass:: DpkgInstallProgress
-    :members:
-
-
-
-
diff --git a/doc/source/apt_inst.rst b/doc/source/apt_inst.rst
deleted file mode 100644
index 97705f61..00000000
--- a/doc/source/apt_inst.rst
+++ /dev/null
@@ -1,96 +0,0 @@
-:mod:`apt_inst` - Working with local Debian packages
-====================================================
-.. module:: apt_inst
-
-The :mod:`apt_inst` extension provides access to functions for working with
-locally available Debian packages (.deb files) and tar files.
-
-
-Checking packages
-------------------
-.. function:: arCheckMember(file, membername)
-
-    Check if the member specified by the parameter *membername* exists in
-    the AR file referenced by the :class:`file` object *file*.
-
-
-Listing contents
------------------
-.. function:: debExtract(file, func, chunk)
-
-    Call the function referenced by *func* for each member of the tar file
-    *chunk* which is contained in the AR file referenced by the file object
-    *file*.
-
-    An example would be::
-
-        debExtract(open("package.deb"), my_callback, "data.tar.gz")
-
-    See :ref:`emulating-dpkg-contents` for a more detailed example.
-
-.. function:: tarExtract(file,func,comp)
-
-    Call the function *func* for each member of the tar file *file*.
-
-    *Comp* is a string determining the compressor used. Possible options are
-    "lzma", "bzip2" and "gzip".
-
-
-Callback
-^^^^^^^^^
-Both of these functions expect a callback with the signature
-``(what, name, link, mode, uid, gid, size, mtime, major, minor)``.
-
-The parameter *what* describes the type of the member. It can be 'FILE',
-'DIR', or 'HARDLINK'.
-
-The parameter *name* refers to the name of the member. In case of links,
-*link* refers to the target of the link.
-
-
-Extracting contents
--------------------
-
-.. function:: debExtractArchive(file, rootdir)
-
-    Extract the archive referenced by the :class:`file` object *file*
-    into the directory specified by *rootdir*.
-
-    See :ref:`emulating-dpkg-extract` for an example.
-
-    .. warning::
-
-        If the directory given by *rootdir* does not exist, the package is
-        extracted into the current directory.
-
-.. function:: debExtractControl(file[, member='control'])
-
-    Return the indicated file from the control tar. The default is 'control'.
-
-    If you want to print the control file of a given package, you could do
-    something like::
-
-        print debExtractControl(open("package.deb"))
-
-    :return: The contents of the file, as :class:`str`.
-
-
-.. _emulating-dpkg-extract:
-
-Example: Emulating :program:`dpkg` :option:`--extract`
--------------------------------------------------------
-Here is a code snippet which emulates dpkg -x. It can be run as
-:program:`tool` :option:`pkg.deb` :option:`outdir`.
-
-.. literalinclude:: examples/dpkg-extract.py
-
-
-.. _emulating-dpkg-contents:
-
-Example: Emulating :program:`dpkg` :option:`--contents`
--------------------------------------------------------
-.. literalinclude:: examples/dpkg-contents.py
-
-Example: Emulating :program:`dpkg` :option:`--info`
-----------------------------------------------------
-.. literalinclude:: examples/dpkg-info.py
diff --git a/doc/source/apt_pkg/cache.rst b/doc/source/apt_pkg/cache.rst
deleted file mode 100644
index ca9f8b49..00000000
--- a/doc/source/apt_pkg/cache.rst
+++ /dev/null
@@ -1,1239 +0,0 @@
-Classes in apt_pkg
-==================
-
-.. todo::
-
-    This should be split and cleaned up a bit.
-
-:class:`Acquire`
-----------------
-.. class:: Acquire
-
-    .. method:: Run()
-
-        Fetch all the items which have been added by
-        :func:`apt_pkg.GetPkgAcqFile`.
-
-    .. method:: Shutdown
-
-        Shut the fetcher down.
-
-:class:`PkgAcqFile`
--------------------
-.. class:: PkgAcqFile
-
-    This class provides no methods or attributes
-
-:class:`AcquireItem`
----------------------
-
-.. class:: AcquireItem
-
-    .. attribute:: ID
-
-        The ID of the item.
-
-    .. attribute:: Complete
-
-        Is the item completely acquired?
-
-    .. attribute:: Local
-
-        Is the item a local file?
-
-    .. attribute:: IsTrusted
-
-        Can the file be trusted?
-
-    .. attribute:: FileSize
-
-        The size of the file, in bytes.
-
-    .. attribute:: ErrorText
-
-        The error message. For example, when a file does not exist on a http
-        server, this will contain a 404 error message.
-
-    .. attribute:: DestFile
-
-        The location the file is saved as.
-
-    .. attribute:: DescURI
-
-        The source location.
-
-    **Status**:
-
-    .. attribute:: Status
-
-        Integer, representing the status of the item.
-
-    .. attribute:: StatIdle
-
-        Constant for comparing :attr:`AcquireItem.Status`.
-
-    .. attribute:: StatFetching
-
-        Constant for comparing :attr:`AcquireItem.Status`
-
-    .. attribute:: StatDone
-
-        Constant for comparing :attr:`AcquireItem.Status`
-
-    .. attribute:: StatError
-
-        Constant for comparing :attr:`AcquireItem.Status`
-
-    .. attribute:: StatAuthError
-
-        Constant for comparing :attr:`AcquireItem.Status`
-
-:class:`ActionGroup`
---------------------
-
-.. class:: ActionGroup
-
-    Normally, apt checkes the package cache after every modification for
-    packages which are automatically installed but on which no package depends
-    anymore (it collects the package garbage).
-
-    Using ActionGroups you can turn this off and therefore make your code
-    much faster.
-
-    Initialize it using :func:`apt_pkg.GetPkgActionGroup`, eg::
-
-        apt_pkg.GetPkgActionGroup(depcache)
-
-    .. method:: release
-
-        Release the ActionGroup. This will reactive the collection of package
-        garbage.
-
-
-:class:`Configuration`
-----------------------
-
-.. class:: Configuration
-
-    The Configuration objects store the configuration of apt.
-
-    .. describe:: conf[key]
-
-        Return the value of the option given key *key*. If it does not
-        exist, raise :exc:`KeyError`.
-
-    .. describe:: conf[key] = value
-
-        Set the option at *key* to *value*.
-
-    .. method:: Find(key[, default=''])
-
-        Return the value for the given key *key*. This is the same as
-        :meth:`Configuration.get`.
-
-        If *key* does not exist, return *default*.
-
-    .. method:: FindFile(key[, default=''])
-
-        Return the filename hold by the configuration at *key*. This formats the
-        filename correctly and supports the Dir:: stuff in the configuration.
-
-        If *key* does not exist, return *default*.
-
-    .. method:: FindDir(key[, default='/'])
-
-        Return the absolute path to the directory specified in *key*. A
-        trailing slash is appended.
-
-        If *key* does not exist, return *default*.
-
-    .. method:: FindI(key[, default=0])
-
-        Return the integer value stored at *key*.
-
-        If *key* does not exist, return *default*.
-
-    .. method:: FindB(key[, default=0])
-
-        Return the boolean value stored at *key*. This returns an integer, but
-        it should be treated like True/False.
-
-        If *key* does not exist, return *default*.
-
-    .. method:: Set(key, value)
-
-        Set the value of *key* to *value*.
-
-    .. method:: Exists(key)
-
-        Check whether the key *key* exists in the configuration.
-
-    .. method:: SubTree(key)
-
-        Return a sub tree starting at *key*. The resulting object can be used
-        like this one.
-
-    .. method:: List([key])
-
-        List all items at *key*. Normally, return the keys at the top level,
-        eg. APT, Dir, etc.
-
-        Use *key* to specify a key of which the childs will be returned.
-
-    .. method:: ValueList([key])
-
-        Same as :meth:`Configuration.List`, but this time for the values.
-
-    .. method:: MyTag()
-
-        Return the tag name of the current tree. Normally this is an empty
-        string, but for subtrees it is the key of the subtree.
-
-    .. method:: Clear(key)
-
-        Clear the configuration. Remove all values and keys at *key*.
-
-    .. method:: keys([key])
-
-        Return all the keys, recursive. If *key* is specified, ... (FIXME)
-
-    .. method:: has_key(key)
-
-        Return whether the configuration contains the key *key*.
-
-    .. method:: get(key[, default=''])
-
-        This behaves just like :meth:`dict.get` and :meth:`Configuration.Find`,
-        it returns the value of key or if it does not exist, *default*.
-
-
-:class:`pkgCache`
------------------
-.. class:: pkgCache
-
-    The :class:`pkgCache` class prov
-
-    .. describe:: cache[pkgname]
-
-        Return the :class:`Package()` object for the package name given by
-        *pkgname*.
-
-    .. method:: Close()
-
-        Close the package cache.
-
-    .. method:: Open([progress])
-
-        Open the package cache again. The parameter *progress* may be set to
-        an :class:`apt.progress.OpProgress()` object or `None`.
-
-    .. method:: Update(progress, list[, pulseInterval])
-
-        Update the package cache.
-
-        The parameter *progress* points to an :class:`apt.progress.FetchProgress()`
-        object.
-
-        The parameter *list* refers to an object as returned by
-        :func:`apt_pkg.GetPkgSourceList`.
-
-        The optional parameter *pulseInterval* describes the interval between
-        the calls to the :meth:`FetchProgress.pulse` method.
-
-    .. attribute:: DependsCount
-
-        The total number of dependencies.
-
-    .. attribute:: PackageCount
-
-        The total number of packages available in the cache.
-
-    .. attribute:: ProvidesCount
-
-        The number of provided packages.
-
-    .. attribute:: VerFileCount
-
-        .. todo:: Seems to be some mixture of versions and pkgFile.
-
-    .. attribute:: VersionCount
-
-        The total number of package versions available in the cache.
-
-    .. attribute:: PackageFileCount
-
-        The total number of Packages files available (the Packages files
-        listing the packages). This is the same as the length of the list in
-        the attribute :attr:`FileList`.
-
-    .. attribute:: FileList
-
-        A list of :class:`PackageFile` objects.
-
-
-:class:`PackageFile`
---------------------
-.. class:: PackageFile
-
-    A :class:`PackageFile` represents a Packages file, eg.
-    /var/lib/dpkg/status.
-
-    .. attribute:: Architecture
-
-        The architecture of the package file.
-
-    .. attribute:: Archive
-
-        The archive (eg. unstable)
-
-    .. attribute:: Component
-
-        The component (eg. main)
-
-    .. attribute:: FileName
-
-        The name of the file.
-
-    .. attribute:: ID
-
-        The ID of the package. This is an integer which can be used to store
-        further information about the file [eg. as dictionary key].
-
-    .. attribute:: IndexType
-
-        The sort of the index file. In normal cases, this is
-        'Debian Package Index'.
-
-    .. attribute:: Label
-
-        The Label, as set in the Release file
-
-    .. attribute:: NotAutomatic
-
-        Whether packages from this list will be updated automatically. The
-        default for eg. example is 0 (aka false).
-
-    .. attribute:: NotSource
-
-        Whether the file has no source from which it can be updated. In such a
-        case, the value is 1; else 0. /var/lib/dpkg/status is 0 for example.
-
-        Example::
-
-            for pkgfile in cache.FileList:
-                if pkgfile.NotSource:
-                    print 'The file %s has no source.' % pkgfile.FileName
-
-    .. attribute:: Origin
-
-        The Origin, as set in the Release file
-
-    .. attribute:: Site
-
-        The hostname of the site.
-
-    .. attribute:: Size
-
-        The size of the file.
-
-    .. attribute:: Version
-
-        The version, as set in the release file (eg. "4.0" for "Etch")
-
-
-Example
-^^^^^^^
-.. literalinclude:: ../examples/cache-pkgfile.py
-
-
-:class:`Package`
-----------------
-
-.. class:: Package
-
-    The pkgCache::Package objects are an interface to package specific
-    features.
-
-
-    Attributes:
-
-    .. attribute:: CurrentVer
-
-        The version currently installed, or None. This returns a
-        :class:`Version` object.
-
-    .. attribute:: ID
-
-        The ID of the package. This can be used to store information about
-        the package. The ID is an int value.
-
-    .. attribute:: Name
-
-        This is the name of the package.
-
-    .. attribute:: ProvidesList
-
-        A list of packages providing this package. More detailed, this is a
-        list of tuples (str:pkgname, ????, :class:`Version`).
-
-        If you want to check for check for virtual packages, the expression
-        ``pkg.ProvidesList and not pkg.VersionList`` helps you. It detects if
-        the package is provided by something else and is not available as a
-        real package.
-
-    .. attribute:: RevDependsList
-
-        An iterator of :class:`Dependency` objects for dependencies on this
-        package.
-
-    .. attribute:: Section
-
-        The section of the package, as specified in the record. The list of
-        possible sections is defined in the Policy.
-
-    .. attribute:: VersionList
-
-        A list of :class:`Version` objects for all versions available in the
-        cache.
-
-    **States**:
-
-    .. attribute:: SelectedState
-
-        The state we want it to be, ie. if you mark a package for installation,
-        this is :attr:`apt_pkg.SelStateInstall`.
-
-        See :ref:`SelStates` for a list of available states.
-
-    .. attribute:: InstState
-
-        The state the currently installed version is in. This is normally
-        :attr:`apt_pkg.InstStateOK`, unless the installation failed.
-
-        See :ref:`InstStates` for a list of available states.
-
-    .. attribute:: CurState
-
-        The current state of the package (not installed, unpacked, installed,
-        etc). See :ref:`CurStates` for a list of available states.
-
-    **Flags**:
-
-    .. attribute:: Auto
-
-        Whether the package was installed automatically as a dependency of
-        another package. (or marked otherwise as automatically installed)
-
-    .. attribute:: Essential
-
-        Whether the package is essential.
-
-    .. attribute:: Important
-
-        Whether the package is important.
-
-Example:
-^^^^^^^^^
-.. literalinclude:: ../examples/cache-packages.py
-
-
-
-:class:`Version`
-----------------
-.. class:: Version
-
-    The version object contains all information related to a specific package
-    version.
-
-    .. attribute:: VerStr
-
-        The version, as a string.
-
-    .. attribute:: Section
-
-        The usual sections (eg. admin, net, etc.). Prefixed with the component
-        name for packages not in main (eg. non-free/admin).
-
-    .. attribute:: Arch
-
-        The architecture of the package, eg. amd64 or all.
-
-    .. attribute:: FileList
-
-        A list of (:class:`PackageFile`, int: index) tuples for all Package
-        files containing this version of the package.
-
-    .. attribute:: DependsListStr
-
-        A dictionary of dependencies. The key specifies the type of the
-        dependency ('Depends', 'Recommends', etc.).
-
-
-        The value is a list, containing items which refer to the or-groups of
-        dependencies. Each of these or-groups is itself a list, containing
-        tuples like ('pkgname', 'version', 'relation') for each or-choice.
-
-        An example return value for a package with a 'Depends: python (>= 2.4)'
-        would be::
-
-            {'Depends': [
-                            [
-                             ('python', '2.4', '>=')
-                            ]
-                        ]
-            }
-
-        The same for a dependency on A (>= 1) | B (>= 2)::
-
-            {'Depends': [
-                            [
-                                ('A', '1', '>='),
-                                ('B', '2', '>='),
-                            ]
-                        ]
-            }
-
-    .. attribute:: DependsList
-
-        This is basically the same as :attr:`Version.DependsListStr`,
-        but instead of the ('pkgname', 'version', 'relation') tuples,
-        it returns :class:`Dependency` objects, which can assist you with
-        useful functions.
-
-    .. attribute:: ParentPkg
-
-        The :class:`Package` object this version belongs to.
-
-    .. attribute:: ProvidesList
-
-        This returns a list of all packages provided by this version. Like
-        :attr:`Package.ProvidesList`, it returns a list of tuples
-        of the form ('virtualpkgname', ???, :class:`Version`), where as the
-        last item is the same as the object itself.
-
-    .. attribute:: Size
-
-        The size of the .deb file, in bytes.
-
-    .. attribute:: InstalledSize
-
-        The size of the package (in kilobytes), when unpacked on the disk.
-
-    .. attribute:: Hash
-
-        An integer hash value.
-
-    .. attribute:: ID
-
-        An integer id.
-
-    .. attribute:: Priority
-
-        The integer representation of the priority. This can be used to speed
-        up comparisons a lot, compared to :attr:`Version.PriorityStr`.
-
-        The values are defined in the :mod:`apt_pkg` extension, see
-        :ref:`Priorities` for more information.
-
-    .. attribute:: PriorityStr
-
-        Return the priority of the package version, as a string, eg.
-        "optional".
-
-    .. attribute:: Downloadable
-
-        Whether this package can be downloaded from a remote site.
-
-    .. attribute:: TranslatedDescription
-
-        Return a :class:`Description` object.
-
-
-:class:`Dependency`
--------------------
-.. class:: Dependency
-
-    Represent a dependency from one package to another one.
-
-    .. method:: AllTargets
-
-        A list of :class:`Version` objects which satisfy the dependency,
-        and do not conflict with already installed ones.
-
-        From my experience, if you use this method to select the target
-        version, it is the best to select the last item unless any of the
-        other candidates is already installed. This leads to results being
-        very close to the normal package installation.
-
-    .. method:: SmartTargetPkg
-
-        Return a :class:`Version` object of a package which satisfies the
-        dependency and does not conflict with installed packages
-        (the 'natural target').
-
-    .. attribute:: TargetVer
-
-        The target version of the dependency, as string. Empty string if the
-        dependency is not versioned.
-
-    .. attribute:: TargetPkg
-
-        The :class:`Package` object of the target package.
-
-    .. attribute:: ParentVer
-
-        The :class:`Version` object of the parent version, ie. the package
-        which declares the dependency.
-
-    .. attribute:: ParentPkg
-
-        The :class:`Package` object of the package which declares the
-        dependency. This is the same as using ParentVer.ParentPkg.
-
-    .. attribute:: CompType
-
-        The type of comparison (>=, ==, >>, <=), as string.
-
-    .. attribute:: DepType
-
-        The type of the dependency, as translated string, eg. "Depends".
-
-    .. attribute:: UntranslatedDepType
-
-        The type of the dependency, as string, eg. "Depends".
-
-    .. attribute:: DepTypeEnum
-
-        The type of the dependency, as integer that matches a value
-        of :ref:`Dependency types <DependencyTypes>`.
-
-    .. attribute:: ID
-
-        The ID of the package, as integer.
-
-Example: Find all missing dependencies
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-With the help of Dependency.AllTargets(), you can easily find all packages with
-broken dependencies:
-
-.. literalinclude:: ../examples/missing-deps.py
-
-
-:class:`Description`
---------------------
-.. class:: Description
-
-    Represent the description of the package.
-
-    .. attribute:: LanguageCode
-
-        The language code of the description
-
-    .. attribute:: md5
-
-        The md5 hashsum of the description
-
-    .. attribute:: FileList
-
-        A list of tuples (:class:`PackageFile`, int: index).
-
-
-
-:class:`pkgDepCache`
---------------------
-.. class:: pkgDepCache
-
-    The pkgDepCache object contains various methods to manipulate the cache,
-    to install packages, to remove them, and much more.
-
-    .. method:: Commit(fprogress, iprogress)
-
-        Apply all the changes made.
-
-        The parameter *fprogress* has to be set to an instance of
-        apt.progress.FetchProgress or one of its subclasses.
-
-        The parameter *iprogress* has to be set to an instance of
-        apt.progress.InstallProgress or one of its subclasses.
-
-    .. method:: FixBroken()
-
-        Try to fix all broken packages in the cache.
-
-    .. method:: GetCandidateVer(pkg)
-
-        Return the candidate version of the package, ie. the version that
-        would be installed normally.
-
-        The parameter *pkg* refers to an :class:`Package` object,
-        available using the :class:`pkgCache`.
-
-        This method returns a :class:`Version` object.
-
-    .. method:: SetCandidateVer(pkg, version)
-
-        The opposite of :meth:`pkgDepCache.GetCandidateVer`. Set the candidate
-        version of the :class:`Package` *pkg* to the :class:`Version`
-        *version*.
-
-
-    .. method:: Upgrade([distUpgrade=False])
-
-        Perform an upgrade. More detailed, this marks all the upgradable
-        packages for upgrade. You still need to call
-        :meth:`pkgDepCache.Commit` for the changes to apply.
-
-        To perform a dist-upgrade, the optional parameter *distUpgrade* has
-        to be set to True.
-
-    .. method:: FixBroken()
-
-        Fix broken packages.
-
-    .. method:: ReadPinFile()
-
-        Read the policy, eg. /etc/apt/preferences.
-
-    .. method:: MinimizeUpgrade()
-
-        Go over the entire set of packages and try to keep each package marked
-        for upgrade. If a conflict is generated then the package is restored.
-
-        .. todo::
-            Explain better..
-
-    .. method:: MarkKeep(pkg)
-
-        Mark the :class:`Package` *pkg* for keep.
-
-    .. method:: MarkDelete(pkg[, purge])
-
-        Mark the :class:`Package` *pkg* for delete. If *purge* is True,
-        the configuration files will be removed as well.
-
-    .. method:: MarkInstall(pkg[, autoInst=True[, fromUser=True]])
-
-        Mark the :class:`Package` *pkg* for install.
-
-        If *autoInst* is ``True``, the dependencies of the package will be
-        installed as well. This is the default.
-
-        If *fromUser* is ``True``, the package will be marked as manually
-        installed. This is the default.
-
-    .. method:: SetReinstall(pkg)
-
-        Set if the :class:`Package` *pkg* should be reinstalled.
-
-    .. method:: IsUpgradable(pkg)
-
-        Return ``1`` if the package is upgradable.
-
-        The package can be upgraded by calling :meth:`pkgDepCache.MarkInstall`.
-
-    .. method:: IsNowBroken(pkg)
-
-        Return `1` if the package is broken now (including changes made, but
-        not committed).
-
-    .. method:: IsInstBroken(pkg)
-
-        Return ``1`` if the package is broken on the current install. This
-        takes changes which have not been committed not into effect.
-
-    .. method:: IsGarbage(pkg)
-
-        Return ``1`` if the package is garbage, ie. if it is automatically
-        installed and no longer referenced by other packages.
-
-    .. method:: IsAutoInstalled(pkg)
-
-        Return ``1``  if the package is automatically installed (eg. as the
-        dependency of another package).
-
-    .. method:: MarkedInstall(pkg)
-
-        Return ``1`` if the package is marked for install.
-
-    .. method:: MarkedUpgrade(pkg)
-
-        Return ``1`` if the package is marked for upgrade.
-
-    .. method:: MarkedDelete(pkg)
-
-        Return ``1`` if the package is marked for delete.
-
-    .. method:: MarkedKeep(pkg)
-
-        Return ``1`` if the package is marked for keep.
-
-    .. method:: MarkedReinstall(pkg)
-
-        Return ``1`` if the package should be installed.
-
-    .. method:: MarkedDowngrade(pkg)
-
-        Return ``1`` if the package should be downgraded.
-
-    .. attribute:: KeepCount
-
-        Integer, number of packages marked as keep
-
-    .. attribute:: InstCount
-
-        Integer, number of packages marked for installation.
-
-    .. attribute:: DelCount
-
-        Number of packages which should be removed.
-
-    .. attribute:: BrokenCount
-
-        Number of packages which are broken.
-
-    .. attribute:: UsrSize
-
-        The size required for the changes on the filesystem. If you install
-        packages, this is positive, if you remove them its negative.
-
-    .. attribute:: DebSize
-
-        The size of the packages which are needed for the changes to be
-        applied.
-
-
-:class:`MetaIndex`
-------------------
-
-.. todo::
-
-    Complete them
-
-.. class:: MetaIndex
-
-    .. attribute:: URI
-    .. attribute:: Dist
-    .. attribute:: IsTrusted
-    .. attribute:: IndexFiles
-
-
-:class:`PackageIndexFile`
--------------------------
-
-.. class:: PackageIndexFile
-
-    .. method:: ArchiveURI(path)
-
-        Return the full url to path in the archive.
-
-    .. attribute:: Label
-
-        Return the Label.
-
-    .. attribute:: Exists
-
-        Return whether the file exists.
-
-    .. attribute:: HasPackages
-
-        Return whether the file has packages.
-
-    .. attribute:: Size
-
-        Size of the file
-
-    .. attribute:: IsTrusted
-
-        Whether we can trust the file.
-
-
-:class:`PkgManager`
--------------------
-
-.. class:: PkgManager
-
-    Class, as returned by :func:`apt_pkg.GetPackageManager`.
-
-    .. method:: GetArchives(fetcher, list, records)
-
-        Add all the selected packages to the :class:`Acquire()` object
-        *fetcher*.
-
-        The parameter *list* refers to a :class:`PkgSourceList()` object, as
-        returned by :func:`apt_pkg.GetPkgSourceList`.
-
-        The parameter *records* refers to a :class:`pkgRecords()` object, as
-        returned by :func:`apt_pkg.GetPkgRecords`.
-
-    .. method:: DoInstall()
-
-        Install the packages.
-
-    .. method:: FixMissing
-
-        Fix the installation if a package could not be downloaded.
-
-    .. attribute:: ResultCompleted
-
-        A constant for checking whether the the result is 'completed'.
-
-        Compare it against the return value of :meth:`PkgManager.GetArchives`
-        or :meth:`PkgManager.DoInstall`.
-
-    .. attribute:: ResultFailed
-
-        A constant for checking whether the the result is 'failed'.
-
-        Compare it against the return value of :meth:`PkgManager.GetArchives`
-        or :meth:`PkgManager.DoInstall`.
-
-    .. attribute:: ResultIncomplete
-
-        A constant for checking whether the the result is 'incomplete'.
-
-        Compare it against the return value of :meth:`PkgManager.GetArchives`
-        or :meth:`PkgManager.DoInstall`.
-
-:class:`pkgRecords`
---------------------
-
-.. class:: PkgRecords
-
-    Provide access to the packages records. This provides very useful
-    attributes for fast (convient) access to some fields of the record.
-
-    See :func:`apt_pkg.GetPkgRecords` for initialization.
-
-
-    .. method:: Lookup(verfile_iter)
-
-        Change the actual package to the package given by the verfile_iter.
-
-        The parameter *verfile_iter* refers to a tuple consisting
-        of (:class:`PackageFile()`, int: index), as returned by various
-        attributes, including :attr:`Version.FileList`.
-
-        Example (shortened)::
-
-            cand = depcache.GetCandidateVer(cache['python-apt'])
-            records.Lookup(cand.FileList[0])
-            # Now you can access the record
-            print records.SourcePkg # == python-apt
-
-    .. attribute:: FileName
-
-        Return the field 'Filename' of the record. This is the path to the
-        package, relative to the base path of the archive.
-
-    .. attribute:: MD5Hash
-
-        Return the MD5 hashsum of the package This refers to the field
-        'MD5Sum' in the raw record.
-
-    .. attribute:: SHA1Hash
-
-        Return the SHA1 hashsum of the package. This refers to the field 'SHA1'
-        in the raw record.
-
-    .. attribute:: SHA256Hash
-
-        Return the SHA256 hashsum of the package. This refers to the field
-        'SHA256' in the raw record.
-
-        .. versionadded:: 0.7.9
-
-    .. attribute:: SourcePkg
-
-        Return the source package.
-
-    .. attribute:: SourceVer
-
-        Return the source version.
-
-    .. attribute:: Maintainer
-
-        Return the maintainer of the package.
-
-    .. attribute:: ShortDesc
-
-        Return the short description. This is the summary on the first line of
-        the 'Description' field.
-
-    .. attribute:: LongDesc
-
-        Return the long description. These are lines 2-END from the
-        'Description' field.
-
-    .. attribute:: Name
-
-        Return the name of the package. This is the 'Package' field.
-
-    .. attribute:: Homepage
-
-        Return the Homepage. This is the 'Homepage' field.
-
-    .. attribute:: Record
-
-        Return the whole record as a string. If you want to access fields of
-        the record not available as an attribute, you can use
-        :func:`apt_pkg.ParseSection` to parse the record and access the field
-        name.
-
-        Example::
-
-            section = apt_pkg.ParseSection(records.Record)
-            print section['SHA256']
-
-:class:`PkgSrcRecords`
-----------------------
-
-.. class:: PkgSrcRecords
-
-    This represents the entries in the Sources files, ie. the dsc files of
-    the source packages.
-
-    .. note::
-
-        If the Lookup failed, because no package could be found, no error is
-        raised. Instead, the attributes listed below are simply not existing
-        anymore (same applies when no Lookup has been made, or when it has
-        been restarted).
-
-    .. method:: Lookup(pkgname)
-
-        Lookup the record for the package named *pkgname*. To access all
-        available records, you need to call it multiple times.
-
-        Imagine a package P with two versions X, Y. The first ``Lookup(P)``
-        would set the record to version X and the second ``Lookup(P)`` to
-        version Y.
-
-    .. method:: Restart()
-
-        Restart the lookup.
-
-        Imagine a package P with two versions X, Y. The first ``Lookup(P)``
-        would set the record to version X and the second ``Lookup(P)`` to
-        version Y.
-
-        If you now call ``Restart()``, the internal position will be cleared.
-        Now you can call ``Lookup(P)`` again to move to X.
-
-    .. attribute:: Package
-
-        The name of the source package.
-
-    .. attribute:: Version
-
-        A string describing the version of the source package.
-
-    .. attribute:: Maintainer
-
-        A string describing the name of the maintainer.
-
-    .. attribute:: Section
-
-        A string describing the section.
-
-    .. attribute:: Record
-
-        The whole record, as a string. You can use :func:`apt_pkg.ParseSection`
-        if you need to parse it.
-
-        You need to parse the record if you want to access fields not available
-        via the attributes, eg. 'Standards-Version'
-
-    .. attribute:: Binaries
-
-        Return a list of strings describing the package names of the binaries
-        created by the source package. This matches the 'Binary' field in the
-        raw record.
-
-    .. attribute:: Index
-
-        The index in the Sources files.
-
-    .. attribute:: Files
-
-        The list of files. This returns a list of tuples with the contents
-        ``(str: md5, int: size, str: path, str:type)``.
-
-    .. attribute:: BuildDepends
-
-        Return the list of Build dependencies, as
-        ``(str: package, str: version, int: op, int: type)``.
-
-        .. table:: Values of *op*
-
-            ===== =============================================
-            Value      Meaning
-            ===== =============================================
-            0x0   No Operation (no versioned build dependency)
-            0x10  | (or) - this will be added to the other values
-            0x1   <= (less than or equal)
-            0x2   >= (greater than or equal)
-            0x3   << (less than)
-            0x4   >> (greater than)
-            0x5   == (equal)
-            0x6   != (not equal)
-            ===== =============================================
-
-        .. table:: Values of *type*
-
-            ===== ===================
-            Value Meaning
-            ===== ===================
-            0     Build-Depends
-            1     Build-Depends-Indep
-            2     Build-Conflicts
-            3     Build-Conflicts-Indep
-            ===== ===================
-
-        **Example**: In the following content, we will imagine a
-        build-dependency::
-
-            Build-Depends: A (>= 1) | B (>= 1), C
-
-        This results in::
-
-            [('A', '1', 18, 0), # 18 = 16 + 2 = 0x10 + 0x2
-             ('B', '1', 2, 0),
-             ('C', '', 0, 0)]
-
-        This is **not** the same as returned by
-        :func:`apt_pkg.ParseSrcDepends`.
-
-
-:class:`PkgSourceList`
------------------------
-
-.. class:: PkgSourceList
-
-    This is for :file:`/etc/apt/sources.list`.
-
-    .. method:: FindIndex(pkgfile)
-
-        Return a :class:`PackageIndexFile` object for the :class:`PackageFile`
-        *pkgfile*.
-
-    .. method:: ReadMainList
-
-        Read the main list.
-
-    .. method:: GetIndexes(acq[, all])
-
-        Add the index files to the :class:`Acquire()` object *acq*. If *all* is
-        given and ``True``, all files are fetched.
-
-
-:class:`ProblemResolver`
-------------------------
-.. class:: ProblemResolver
-
-    The problem resolver helps when there are problems in the package
-    selection. An example is a package which conflicts with another, already
-    installed package.
-
-    .. method:: Protect(pkg)
-
-        Protect the :class:`Package()` object given by the parameter *pkg*.
-
-        .. todo::
-
-            Really document it.
-
-    .. method:: InstallProtect()
-
-        Protect all installed packages from being removed.
-
-    .. method:: Remove(pkg)
-
-        Remove the :class:`Package()` object given by the parameter *pkg*.
-
-        .. todo::
-
-            Really document it.
-
-    .. method:: Clear(pkg)
-
-        Reset the :class:`Package()` *pkg* to the default state.
-
-        .. todo::
-
-            Really document it.
-
-    .. method:: Resolve()
-
-        Try to resolve problems by installing and removing packages.
-
-    .. method:: ResolveByKeep()
-
-        Try to resolve problems only by using keep.
-
-
-:class:`TagFile`
-----------------
-
-.. class:: TagFile
-
-    An object which represents a typical debian control file. Can be used for
-    Packages, Sources, control, Release, etc.
-
-    Use :func:`apt_pkg.ParseTagFile` to parse a file.
-
-    .. method:: Step
-
-        Step forward to the next section. This simply returns ``1`` if OK, and
-        ``0`` if there is no section
-
-    .. method:: Offset
-
-        Return the current offset (in bytes) from the beginning of the file.
-
-    .. method:: Jump(offset)
-
-        Jump back/forward to *offset*. Use ``Jump(0)`` to jump to the
-        beginning of the file again.
-
-    .. attribute:: Section
-
-        This is the current :class:`TagSection()` instance.
-
-:class:`TagSection`
--------------------
-
-.. class:: TagSection
-
-    Represent a single section of a debian control file.
-
-    .. describe:: section[key]
-
-        Return the value of the field at *key*. If *key* is not available,
-        raise :exc:`KeyError`.
-
-    .. method:: Bytes
-
-        The number of bytes in the section.
-
-    .. method:: Find(key, default='')
-
-        Return the value of the field at the key *key* if available,
-        else return *default*.
-
-    .. method:: FindFlag(key)
-
-        Find a yes/no value for the key *key*. An example for such a
-        field is 'Essential'.
-
-    .. method:: get(key, default='')
-
-        Return the value of the field at the key *key* if available, else
-        return *default*.
-
-    .. method:: has_key(key)
-
-        Check whether the field with named by *key* exists.
-
-    .. method:: keys()
-
-        Return a list of keys in the section.
diff --git a/doc/source/apt_pkg/index.rst b/doc/source/apt_pkg/index.rst
deleted file mode 100644
index 4256d971..00000000
--- a/doc/source/apt_pkg/index.rst
+++ /dev/null
@@ -1,396 +0,0 @@
-:mod:`apt_pkg` --- The low-level bindings for apt-pkg
-=====================================================
-.. module:: apt_pkg
-
-The apt_pkg extensions provides a more low-level way to work with apt. It can
-do everything apt can, and is written in C++. It has been in python-apt since
-the beginning.
-
-
-.. toctree::
-    :maxdepth: 2
-    :glob:
-
-    *
-
-
-Module Initialization
----------------------
-
-
-.. function:: initConfig
-
-    Initialize the configuration of apt. This is needed for most operations.
-
-.. function:: initSystem
-
-    Initialize the system.
-
-.. function:: init
-
-    Deprecated function. Use initConfig() and initSystem() instead.
-
-Object initialization
-----------------------
-.. function:: GetCache([progress])
-
-    Return a :class:`pkgCache` object. The optional parameter *progress*
-    specifies an instance of :class:`apt.progress.OpProgress()` which will
-    display the open progress.
-
-.. function:: GetCdrom()
-
-    Return a Cdrom object with the following methods:
-
-    .. method:: Cdrom.Ident(progress)
-
-        Identify the cdrom. The parameter *progress* refers to an
-        :class:`apt.progress.CdromProgress()` object.
-
-    .. method:: Cdrom.Add(progress)
-
-        Add the cdrom to the sources.list file. The parameter *progress*
-        refers to an :class:`apt.progress.CdromProgress()` object.
-
-
-.. function:: GetDepCache(cache)
-
-    Return a :class:`pkgDepCache` object. The parameter *cache* specifies an
-    instance of :class:`pkgCache` (see :func:`GetCache()`).
-
-
-.. function:: GetPkgSourceList()
-
-    Return a :class:`PkgSourceList` object.
-
-.. function:: GetPackageManager(depcache)
-
-    Return a new :class:`PkgManager` object. The parameter *depcache* specifies
-    a :class:`pkgDepCache` object as returned by :func:`GetDepCache`.
-
-.. function:: GetPkgActionGroup(depcache)
-
-    Return a new :class:`ActionGroup` object. The parameter *depcache*
-    specifies a :class:`pkgDepCache` object as returned by :func:`GetDepCache`.
-
-.. function:: GetPkgProblemResolver(depcache)
-
-    Return a new :class:`ProblemResolver` object. The parameter *depcache*
-    specifies a :class:`pkgDepCache` object as returned by :func:`GetDepCache`.
-
-.. function:: GetPkgRecords(cache)
-
-    Return a new :class:`PkgRecords` object.
-
-    The parameter *cache* refers to an :class:`pkgCache` object, as returned
-    by :func:`GetCache`.
-
-.. function:: GetPkgSrcRecords()
-
-    Return a new :class:`PkgSrcRecords` object.
-
-.. function:: newConfiguration()
-
-    Return a new :class:`Configuration` object.
-
-
-The Acquire interface
-----------------------
-.. function:: GetAcquire([progress])
-
-    Return an :class:`Acquire` object. This is a class which allows you
-    to fetch files, or archive contents. The parameter *progress* refers to
-    an :class:`apt.progress.FetchProgress()` object.
-
-    Acquire items have multiple methods:
-
-    .. method:: Acquire.Run()
-
-        Fetch all the items which have been added by :func:`GetPkgAcqFile`.
-
-    .. method:: Acquire.Shutdown()
-
-        Shut the fetcher down.
-
-    .. attribute:: Acquire.TotalNeeded
-
-        The total amount of bytes needed (including those of files which are
-        already present)
-
-    .. attribute:: Acquire.FetchNeeded
-
-        The total amount of bytes which need to be fetched.
-
-    .. attribute:: Acquire.PartialPresent
-
-        Whether some files have been acquired already. (???)
-
-
-.. function:: GetPkgAcqFile(aquire, uri[, md5, size, descr, shortDescr, destDir, destFile])
-
-    Create a new :class:`PkgAcqFile()` object and register it with *acquire*,
-    so it will be fetched.
-
-    The parameter *acquire* refers to an :class:`Acquire()` object as returned
-    by :func:`GetAcquire`. The file will be added to the Acquire queue
-    automatically.
-
-    The parameter *uri* refers to the location of the file, any protocol
-    of apt is supported.
-
-    The parameter *md5* refers to the md5sum of the file. This can be used
-    for checking the file.
-
-    The parameter *size* can be used to specify the size of the package,
-    which can then be used to calculate the progress and validate the download.
-
-    The parameter *descr* is a descripition of the download. It may be
-    used to describe the item in the progress class. *shortDescr* is the
-    short form of it.
-
-    You can use *destDir* to manipulate the directory where the file will
-    be saved in. Instead of *destDir*, you can also specify the full path to
-    the file using the parameter *destFile*. You can not combine both.
-
-
-
-Hash functions
---------------
-The apt_pkg module also provides several hash functions. If you develop
-applications with python-apt it is often easier to use these functions instead
-of the ones provides in Python's :mod:`hashlib` module.
-
-.. function:: md5sum(object)
-
-    Return the md5sum of the object. *object* may either be a string, in
-    which case the md5sum of the string is returned, or a :class:`file()`
-    object, in which case the md5sum of its contents is returned.
-
-.. function:: sha1sum(object)
-
-    Return the sha1sum of the object. *object* may either be a string, in
-    which case the sha1sum of the string is returned, or a :class:`file()`
-    object, in which case the sha1sum of its contents is returned.
-
-.. function:: sha256sum(object)
-
-    Return the sha256sum of the object. *object* may either be a string, in
-    which case the sha256sum of the string is returned, or a :class:`file()`
-    object, in which case the sha256sum of its contents is returned.
-
-Other functions
-----------------
-
-.. note::
-
-    This documentation is (in parts) created automatically, and still needs to
-    be improved.
-
-.. autofunction:: Base64Encode
-.. autofunction:: CheckDep
-.. autofunction:: CheckDomainList
-.. autofunction:: DeQuoteString
-.. autofunction:: GetLock
-
-.. autofunction:: ParseCommandLine
-.. autofunction:: ParseDepends
-.. autofunction:: ParseSection
-.. autofunction:: ParseSrcDepends
-.. autofunction:: ParseTagFile
-.. autofunction:: PkgSystemLock
-.. autofunction:: PkgSystemUnLock
-.. autofunction:: QuoteString
-.. autofunction:: ReadConfigFile
-.. autofunction:: ReadConfigDir()
-.. autofunction:: ReadConfigFileISC
-.. autofunction:: RewriteSection
-
-.. function:: SizeToStr(size)
-
-    Return a string presenting the human-readable version of the integer
-    *size*. When calculating the units (k,M,G,etc.) the size is divided by the
-    factor 1000.
-
-    Example::
-
-        >>> apt_pkg.SizeToStr(10000)
-        '10.0k'
-
-.. function:: StringToBool(input)
-
-    Parse the string *input* and return one of **-1**, **0**, **1**.
-
-    .. table:: Return values
-
-        ===== =============================================
-        Value      Meaning
-        ===== =============================================
-         -1   The string *input* is not recognized.
-          0   The string *input* evaluates to **False**.
-         +1   The string *input* evaluates to **True**.
-        ===== =============================================
-
-    Example::
-
-        >>> apt_pkg.StringToBool("yes")
-        1
-        >>> apt_pkg.StringToBool("no")
-        0
-        >>> apt_pkg.StringToBool("not-recognized")
-        -1
-
-.. function:: StrToTime(rfc_time)
-
-    Convert the :rfc:`1123` conforming string *rfc_time* to the unix time, and
-    return the integer. This is the opposite of :func:`TimeRFC1123`.
-
-    Example::
-
-        >> apt_pkg.StrToTime('Thu, 01 Jan 1970 00:00:00 GMT')
-        0
-
-.. function:: TimeRFC1123(seconds)
-
-    Format the unix time specified by the integer *seconds*, according to the
-    requirements of :rfc:`1123`.
-
-    Example::
-
-        >>> apt_pkg.TimeRFC1123(0)
-        'Thu, 01 Jan 1970 00:00:00 GMT'
-
-
-.. function:: TimeToStr(seconds)
-
-    Format a given duration in a human-readable manner. The parameter *seconds*
-    refers to a number of seconds, given as an integer. The return value is a
-    string with a unit like 's' for seconds.
-
-    Example::
-
-        >>> apt_pkg.TimeToStr(3601)
-        '1h0min1s'
-
-
-
-.. function:: UpstreamVersion(version)
-
-    Return the string *version*, eliminating everything following the last
-    '-'. Thus, this should be equivalent to ``version.rsplit('-', 1)[0]``.
-
-.. function:: URItoFileName(uri)
-
-    Take a string *uri* as parameter and return a filename which can be used to
-    store the file, based on the URI.
-
-    Example::
-
-        >>> apt_pkg.URItoFileName('http://debian.org/index.html')
-        'debian.org_index.html'
-
-
-.. function:: VersionCompare(a, b)
-
-    Compare two versions, *a* and *b*, and return an integer value which has
-    the same characteristic as the built-in :func:`cmp` function.
-
-    .. table:: Return values
-
-        ===== =============================================
-        Value      Meaning
-        ===== =============================================
-        > 0   The version *a* is greater than version *b*.
-        = 0   Both versions are equal.
-        < 0   The version *a* is less than version *b*.
-        ===== =============================================
-
-
-Data
------
-
-.. data:: Config
-
-    An :class:`Configuration()` object with the default configuration. Actually,
-    this is a bit different object, but it is compatible.
-
-.. data:: RewritePackageOrder
-
-.. data:: RewriteSourceOrder
-
-
-.. _CurStates:
-
-Package States
-^^^^^^^^^^^^^^^
-.. data:: CurStateConfigFiles
-.. data:: CurStateHalfConfigured
-.. data:: CurStateHalfInstalled
-.. data:: CurStateInstalled
-.. data:: CurStateNotInstalled
-.. data:: CurStateUnPacked
-
-.. _DependencyTypes:
-
-
-Dependency types
-^^^^^^^^^^^^^^^^
-.. data:: DepConflicts
-.. data:: DepDepends
-.. data:: DepDpkgBreaks
-.. data:: DepEnhances
-.. data:: DepObsoletes
-.. data:: DepPreDepends
-.. data:: DepRecommends
-.. data:: DepReplaces
-.. data:: DepSuggests
-
-
-.. _InstStates:
-
-Installed states
-^^^^^^^^^^^^^^^^^
-.. data:: InstStateHold
-.. data:: InstStateHoldReInstReq
-.. data:: InstStateOk
-.. data:: InstStateReInstReq
-
-.. _Priorities:
-
-Priorities
-^^^^^^^^^^
-.. data:: PriExtra
-.. data:: PriImportant
-.. data:: PriOptional
-.. data:: PriRequired
-.. data:: PriStandard
-
-
-.. _SelStates:
-
-Select states
-^^^^^^^^^^^^^^
-.. data:: SelStateDeInstall
-.. data:: SelStateHold
-.. data:: SelStateInstall
-.. data:: SelStatePurge
-.. data:: SelStateUnknown
-
-
-Build information
-^^^^^^^^^^^^^^^^^
-.. data:: Date
-
-    The date on which this extension has been compiled.
-
-.. data:: LibVersion
-
-    The version of the apt_pkg library. This is **not** the version of apt,
-    nor the version of python-apt.
-
-.. data:: Time
-
-    The time this extension has been built.
-
-.. data:: Version
-
-    The version of apt (not of python-apt).
diff --git a/doc/source/aptsources/index.rst b/doc/source/aptsources/index.rst
deleted file mode 100644
index 898fbf74..00000000
--- a/doc/source/aptsources/index.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-:mod:`aptsources` --- Working with sources.list
-=====================================================
-.. automodule:: aptsources
-
-.. toctree::
-    :maxdepth: 2
-    :glob:
-
-    *
-
diff --git a/doc/source/c++/api.rst b/doc/source/c++/api.rst
new file mode 100644
index 00000000..e807f4bb
--- /dev/null
+++ b/doc/source/c++/api.rst
@@ -0,0 +1,801 @@
+Python APT C++ API
+==================
+The C++ API provides functions to create Python objects from C++ objects and
+to retrieve the C++ object stored in the Python object. An object may have
+another Python object as its owner and keeps its owner alive for its
+lifetime. Some objects require an owner of a specific type, while others
+require none. Refer to the sections below for details.
+
+The C++ API names use the name of the class in apt_pkg and are prefixed with
+Py. For each supported class, there is a _Type object, a _Check() function,
+a _CheckExact() function, a _FromCpp() and a _ToCpp() function.
+
+.. note::
+
+    This API is experimental and should not be used in stable program
+    releases.
+
+Acquire (pkgAcquire)
+--------------------
+.. cvar:: PyTypeObject PyAcquire_Type
+
+    The type object for :class:`apt_pkg.Acquire` objects.
+
+.. cfunction:: int PyAcquire_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Acquire` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyAcquire_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Acquire` object and no
+    subclass thereof.
+
+.. cfunction:: PyObject* PyAcquire_FromCpp(pkgAcquire *acquire, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.Acquire` object from the :ctype:`pkgAcquire`
+    pointer given by the parameter *acquire*. If the parameter *delete* is
+    true, the object pointed to by *acquire* will be deleted when the refcount
+    of the return value reaches 0.
+
+.. cfunction:: pkgAcquire* PyAcquire_ToCpp(PyObject *acquire)
+
+    Return the :ctype:`pkgAcquire` pointer contained in the Python object
+    *acquire*.
+
+
+AcquireFile (pkgAcqFile)
+------------------------
+.. cvar:: PyTypeObject PyAcquireFile_Type
+
+    The type object for :class:`apt_pkg.AcquireFile` objects.
+
+.. cfunction:: int PyAcquireFile_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.AcquireFile` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyAcquireFile_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.AcquireFile` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyAcquireFile_FromCpp(pkgAcqFile *file, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.AcquireFile` object from the :ctype:`pkgAcqFile`
+    pointer given by the parameter *file*. If the parameter *delete* is
+    true, the object pointed to by *file* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* should point
+    to a :class:`apt_pkg.Acquire` object.
+
+.. cfunction:: pkgAcqFile* PyAcquireFile_ToCpp(PyObject *acquire)
+
+    Return the :ctype:`pkgAcqFile` pointer contained in the Python object
+    *acquire*.
+
+AcquireItem (pkgAcquire::Item)
+------------------------------
+.. cvar:: PyTypeObject PyAcquireItem_Type
+
+    The type object for :class:`apt_pkg.AcquireItem` objects.
+
+.. cfunction:: int PyAcquireItem_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.AcquireItem` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyAcquireItem_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.AcquireItem` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyAcquireItem_FromCpp(pkgAcquire::Item *item, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.AcquireItem` object from the :ctype:`pkgAcquire::Item`
+    pointer given by the parameter *item*. If the parameter *delete* is
+    true, the object pointed to by *item* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* should point
+    to a :class:`apt_pkg.Acquire` object.
+
+.. cfunction:: pkgAcquire::Item* PyAcquireItem_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgAcquire::Item` pointer contained in the Python object
+    *object*.
+
+AcquireItemDesc (pkgAcquire::ItemDesc)
+--------------------------------------
+.. cvar:: PyTypeObject PyAcquireItemDesc_Type
+
+    The type object for :class:`apt_pkg.AcquireItemDesc` objects.
+
+.. cfunction:: int PyAcquireItemDesc_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.AcquireItemDesc` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyAcquireItemDesc_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.AcquireItemDesc` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyAcquireItemDesc_FromCpp(pkgAcquire::ItemDesc *desc, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.AcquireItemDesc` object from the :ctype:`pkgAcquire::ItemDesc`
+    pointer given by the parameter *desc*. If the parameter *delete* is
+    true, the object pointed to by *desc* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* should point
+    to a :class:`apt_pkg.AcquireItem` object.
+
+.. cfunction:: pkgAcquire::ItemDesc* PyAcquireItemDesc_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgAcquire::ItemDesc` pointer contained in the Python object
+    *object*.
+
+AcquireWorker (pkgAcquire::Worker)
+----------------------------------
+.. cvar:: PyTypeObject PyAcquireWorker_Type
+
+    The type object for :class:`apt_pkg.AcquireWorker` objects.
+
+.. cfunction:: int PyAcquireWorker_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.AcquireWorker` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyAcquireWorker_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.AcquireWorker` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyAcquireWorker_FromCpp(pkgAcquire::Worker *worker, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.AcquireWorker` object from the :ctype:`pkgAcquire::Worker`
+    pointer given by the parameter *worker*. If the parameter *delete* is
+    true, the object pointed to by *worker* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* should point
+    to a :class:`apt_pkg.Acquire` object.
+
+.. cfunction:: pkgAcquire::Worker* PyAcquireWorker_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgAcquire::Worker` pointer contained in the Python object
+    *object*.
+
+ActionGroup (pkgDepCache::ActionGroup)
+--------------------------------------
+.. cvar:: PyTypeObject PyActionGroup_Type
+
+    The type object for :class:`apt_pkg.ActionGroup` objects.
+
+.. cfunction:: int PyActionGroup_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.ActionGroup` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyActionGroup_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.ActionGroup` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyActionGroup_FromCpp(pkgDepCache::ActionGroup *agroup, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.ActionGroup` object from the :ctype:`pkgDepCache::ActionGroup`
+    pointer given by the parameter *agroup*. If the parameter *delete* is
+    true, the object pointed to by *agroup* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* should point
+    to a :class:`apt_pkg.DepCache` object.
+
+.. cfunction:: pkgDepCache::ActionGroup* PyActionGroup_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgDepCache::ActionGroup` pointer contained in the
+    Python object *object*.
+
+Cache (pkgCache)
+------------------------
+.. cvar:: PyTypeObject PyCache_Type
+
+    The type object for :class:`apt_pkg.Cache` objects.
+
+.. cfunction:: int PyCache_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Cache` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyCache_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Cache` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyCache_FromCpp(pkgCache *cache, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.Cache` object from the :ctype:`pkgCache`
+    pointer given by the parameter *cache*. If the parameter *delete* is
+    true, the object pointed to by *cache* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* shall point
+    to a object of the type :cdata:`PyCacheFile_Type`.
+
+.. cfunction:: pkgCache* PyCache_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgCache` pointer contained in the Python object
+    *object*.
+
+
+CacheFile (pkgCacheFile)
+------------------------
+.. cvar:: PyTypeObject PyCacheFile_Type
+
+    The type object for CacheFile. This type is internal and not exported to
+    Python anywhere.
+
+.. cfunction:: int PyCacheFile_Check(PyObject *object)
+
+    Check that the object *object* is of the type :cdata:`PyCacheFile_Type` or
+    a subclass thereof.
+
+.. cfunction:: int PyCacheFile_CheckExact(PyObject *object)
+
+    Check that the object *object* is of the type :cdata:`PyCacheFile_Type` and
+    no subclass thereof.
+
+.. cfunction:: PyObject* PyCacheFile_FromCpp(pkgCacheFile *file, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.CacheFile` object from the :ctype:`pkgCacheFile`
+    pointer given by the parameter *file* If the parameter *delete* is
+    true, the object pointed to by *file* will be deleted when the reference
+    count of the returned object reaches 0.
+
+.. cfunction:: pkgCacheFile* PyCacheFile_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgCacheFile` pointer contained in the Python object
+    *object*.
+
+Cdrom (pkgCdrom)
+------------------------
+.. cvar:: PyTypeObject PyCdrom_Type
+
+    The type object for :class:`apt_pkg.Cdrom` objects.
+
+.. cfunction:: int PyCdrom_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Cdrom` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyCdrom_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Cdrom` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyCdrom_FromCpp(pkgCdrom &cdrom, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.Cdrom` object from the :ctype:`pkgCdrom`
+    reference given by the parameter *cdrom*. If the parameter *delete* is
+    true, *cdrom* will be deleted when the reference count of the returned
+    object reaches 0.
+
+.. cfunction:: pkgCdrom& PyCdrom_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgCdrom` reference contained in the Python object
+    *object*.
+
+Configuration (Configuration)
+-------------------------------
+.. cvar:: PyTypeObject PyConfiguration_Type
+
+    The type object for :class:`apt_pkg.Configuration` objects.
+
+.. cfunction:: int PyConfiguration_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Configuration` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyConfiguration_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Configuration` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyConfiguration_FromCpp(Configuration *cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.Configuration` object from the :ctype:`Configuration`
+    pointer given by the parameter *cpp*. If the parameter *delete* is
+    true, the object pointed to by *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* may refer to
+    a parent object (e.g. when exposing a sub tree of a configuration object).
+
+.. cfunction:: Configuration* PyConfiguration_ToCpp(PyObject *object)
+
+    Return the :ctype:`Configuration` pointer contained in the Python object
+    *object*.
+
+DepCache (pkgDepCache)
+------------------------
+.. cvar:: PyTypeObject PyDepCache_Type
+
+    The type object for :class:`apt_pkg.DepCache` objects.
+
+.. cfunction:: int PyDepCache_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.DepCache` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyDepCache_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.DepCache` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyDepCache_FromCpp(pkgDepCache *cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.DepCache` object from the :ctype:`pkgDepCache`
+    pointer given by the parameter *cpp*. If the parameter *delete* is
+    true, the object pointed to by *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* must be
+    a PyObject of the type :cdata:`PyCache_Type`.
+
+.. cfunction:: pkgDepCache* PyDepCache_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgDepCache` pointer contained in the Python object
+    *object*.
+
+Dependency (pkgCache::DepIterator)
+----------------------------------
+.. cvar:: PyTypeObject PyDependency_Type
+
+    The type object for :class:`apt_pkg.Dependency` objects.
+
+.. cfunction:: int PyDependency_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Dependency` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyDependency_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Dependency` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyDependency_FromCpp(pkgCache::DepIterator &cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.Dependency` object from the :ctype:`pkgCache::DepIterator`
+    reference given by the parameter *cpp*. If the parameter *delete* is
+    true, *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* must be
+    a PyObject of the type :cdata:`PyPackage_Type`.
+
+.. cfunction:: pkgCache::DepIterator& PyDependency_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgCache::DepIterator` reference contained in the
+    Python object *object*.
+
+Description (pkgCache::DescIterator)
+------------------------------------
+.. cvar:: PyTypeObject PyDescription_Type
+
+    The type object for :class:`apt_pkg.Description` objects.
+
+.. cfunction:: int PyDescription_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Description` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyDescription_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Description` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyDescription_FromCpp(pkgCache::DescIterator &cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.Description` object from the :ctype:`pkgCache::DescIterator`
+    reference given by the parameter *cpp*. If the parameter *delete* is
+    true, *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* must be
+    a PyObject of the type :cdata:`PyPackage_Type`.
+
+.. cfunction:: pkgCache::DescIterator& PyDescription_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgCache::DescIterator` reference contained in the
+    Python object *object*.
+
+Hashes (Hashes)
+----------------------------------
+.. cvar:: PyTypeObject PyHashes_Type
+
+    The type object for :class:`apt_pkg.Hashes` objects.
+
+.. cfunction:: int PyHashes_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Hashes` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyHashes_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Hashes` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyHashes_FromCpp(Hashes &cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.Hashes` object from the :ctype:`Hashes`
+    reference given by the parameter *cpp*. If the parameter *delete* is
+    true, *cpp* will be deleted when the reference count of the returned
+    object reaches 0.
+
+.. cfunction:: Hashes& PyHashes_ToCpp(PyObject *object)
+
+    Return the :ctype:`Hashes` reference contained in the
+    Python object *object*.
+
+HashString (HashString)
+------------------------
+.. cvar:: PyTypeObject PyHashString_Type
+
+    The type object for :class:`apt_pkg.HashString` objects.
+
+.. cfunction:: int PyHashString_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.HashString` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyHashString_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.HashString` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyHashString_FromCpp(HashString *cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.HashString` object from the :ctype:`HashString`
+    pointer given by the parameter *cpp*. If the parameter *delete* is
+    true, the object pointed to by *cpp* will be deleted when the reference
+    count of the returned object reaches 0.
+
+.. cfunction:: HashString* PyHashString_ToCpp(PyObject *object)
+
+    Return the :ctype:`HashString` pointer contained in the Python object
+    *object*.
+
+IndexRecords (indexRecords)
+----------------------------
+.. cvar:: PyTypeObject PyIndexRecords_Type
+
+    The type object for :class:`apt_pkg.IndexRecords` objects.
+
+.. cfunction:: int PyIndexRecords_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.IndexRecords` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyIndexRecords_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.IndexRecords` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyIndexRecords_FromCpp(indexRecords *cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.IndexRecords` object from the :ctype:`indexRecords`
+    pointer given by the parameter *cpp*. If the parameter *delete* is
+    true, the object pointed to by *cpp* will be deleted when the reference
+    count of the returned object reaches 0.
+
+.. cfunction:: indexRecords* PyIndexRecords_ToCpp(PyObject *object)
+
+    Return the :ctype:`indexRecords` pointer contained in the Python object
+    *object*.
+
+
+MetaIndex (metaIndex)
+------------------------
+.. cvar:: PyTypeObject PyMetaIndex_Type
+
+    The type object for :class:`apt_pkg.MetaIndex` objects.
+
+.. cfunction:: int PyMetaIndex_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.MetaIndex` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyMetaIndex_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.MetaIndex` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyMetaIndex_FromCpp(metaIndex *cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.MetaIndex` object from the :ctype:`metaIndex`
+    pointer given by the parameter *cpp*. If the parameter *delete* is
+    true, the object pointed to by *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* should be
+    a PyObject of the type :cdata:`PySourceList_Type`.
+
+.. cfunction:: metaIndex* PyMetaIndex_ToCpp(PyObject *object)
+
+    Return the :ctype:`metaIndex` pointer contained in the Python object
+    *object*.
+
+Package (pkgCache::PkgIterator)
+----------------------------------
+.. cvar:: PyTypeObject PyPackage_Type
+
+    The type object for :class:`apt_pkg.Package` objects.
+
+.. cfunction:: int PyPackage_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Package` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyPackage_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Package` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyPackage_FromCpp(pkgCache::PkgIterator &cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.Package` object from the :ctype:`pkgCache::PkgIterator`
+    reference given by the parameter *cpp*. If the parameter *delete* is
+    true, *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* should be
+    a PyObject of the type :cdata:`PyCache_Type`.
+
+.. cfunction:: pkgCache::PkgIterator& PyPackage_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgCache::PkgIterator` reference contained in the
+    Python object *object*.
+
+PackageFile (pkgCache::PkgFileIterator)
+----------------------------------------
+.. cvar:: PyTypeObject PyPackageFile_Type
+
+    The type object for :class:`apt_pkg.PackageFile` objects.
+
+.. cfunction:: int PyPackageFile_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.PackageFile` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyPackageFile_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.PackageFile` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyPackageFile_FromCpp(pkgCache::PkgFileIterator &cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.PackageFile` object from the :ctype:`pkgCache::PkgFileIterator`
+    reference given by the parameter *cpp*. If the parameter *delete* is
+    true, *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* should be
+    a PyObject of the type :cdata:`PyCache_Type`.
+
+.. cfunction:: pkgCache::PkgFileIterator& PyPackageFile_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgCache::PkgFileIterator` reference contained in the
+    Python object *object*.
+
+IndexFile (pkgIndexFile)
+--------------------------------------
+.. cvar:: PyTypeObject PyIndexFile_Type
+
+    The type object for :class:`apt_pkg.IndexFile` objects.
+
+.. cfunction:: int PyIndexFile_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.IndexFile` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyIndexFile_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.IndexFile` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyIndexFile_FromCpp(pkgIndexFile *cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.IndexFile` object from the :ctype:`pkgIndexFile`
+    pointer given by the parameter *cpp*. If the parameter *delete* is
+    true, the object pointed to by *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* should be
+    a PyObject of the type :cdata:`PyMetaIndex_Type`.
+
+.. cfunction:: pkgIndexFile* PyIndexFile_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgIndexFile` pointer contained in the Python object
+    *object*.
+
+
+PackageManager (pkgPackageManager)
+----------------------------------
+.. cvar:: PyTypeObject PyPackageManager_Type
+
+    The type object for :class:`apt_pkg.PackageManager` objects.
+
+.. cfunction:: int PyPackageManager_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.PackageManager` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyPackageManager_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.PackageManager` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyPackageManager_FromCpp(pkgPackageManager *cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.PackageManager` object from the :ctype:`pkgPackageManager`
+    pointer given by the parameter *cpp*. If the parameter *delete* is
+    true, the object pointed to by *cpp* will be deleted when the reference
+    count of the returned object reaches 0.
+
+.. cfunction:: pkgPackageManager* PyPackageManager_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgPackageManager` pointer contained in the Python object
+    *object*.
+
+
+Policy (pkgPolicy)
+------------------
+.. cvar:: PyTypeObject PyPolicy_Type
+
+    The type object for :class:`apt_pkg.Policy` objects.
+
+.. cfunction:: int PyPolicy_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Policy` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyPolicy_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Policy` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyPolicy_FromCpp(pkgPolicy *cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.Policy` object from the :ctype:`pkgPolicy`
+    pointer given by the parameter *cpp*. If the parameter *delete* is
+    true, the object pointed to by *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* must be
+    a PyObject of the type :cdata:`PyCache_Type`.
+
+.. cfunction:: pkgPolicy* PyPolicy_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgPolicy` pointer contained in the Python object
+    *object*.
+
+
+ProblemResolver (pkgProblemResolver)
+--------------------------------------
+.. cvar:: PyTypeObject PyProblemResolver_Type
+
+    The type object for :class:`apt_pkg.ProblemResolver` objects.
+
+.. cfunction:: int PyProblemResolver_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.ProblemResolver` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyProblemResolver_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.ProblemResolver` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyProblemResolver_FromCpp(pkgProblemResolver *cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.ProblemResolver` object from the :ctype:`pkgProblemResolver`
+    pointer given by the parameter *cpp*. If the parameter *delete* is
+    true, the object pointed to by *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* must be
+    a PyObject of the type :cdata:`PyDepCache_Type`.
+
+.. cfunction:: pkgProblemResolver* PyProblemResolver_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgProblemResolver` pointer contained in the Python object
+    *object*.
+
+
+
+SourceList (pkgSourceList)
+---------------------------
+.. cvar:: PyTypeObject PySourceList_Type
+
+    The type object for :class:`apt_pkg.SourceList` objects.
+
+.. cfunction:: int PySourceList_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.SourceList` object, or
+    a subclass thereof.
+
+.. cfunction:: int PySourceList_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.SourceList` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PySourceList_FromCpp(pkgSourceList *cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.SourceList` object from the :ctype:`pkgSourceList`
+    pointer given by the parameter *cpp*. If the parameter *delete* is
+    true, the object pointed to by *cpp* will be deleted when the reference
+    count of the returned object reaches 0.
+
+.. cfunction:: pkgSourceList* PySourceList_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgSourceList` pointer contained in the Python object
+    *object*.
+
+
+TagFile (pkgTagFile)
+----------------------------------
+.. cvar:: PyTypeObject PyTagFile_Type
+
+    The type object for :class:`apt_pkg.TagFile` objects.
+
+.. cfunction:: int PyTagFile_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.TagFile` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyTagFile_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.TagFile` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyTagFile_FromCpp(pkgTagFile &cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.TagFile` object from the :ctype:`pkgTagFile`
+    reference given by the parameter *cpp*. If the parameter *delete* is
+    true, *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* may be any
+    Python object.
+
+.. cfunction:: pkgTagFile& PyTagFile_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgTagFile` reference contained in the
+    Python object *object*.
+
+TagSection (pkgTagSection)
+----------------------------------
+.. cvar:: PyTypeObject PyTagSection_Type
+
+    The type object for :class:`apt_pkg.TagSection` objects.
+
+.. cfunction:: int PyTagSection_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.TagSection` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyTagSection_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.TagSection` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyTagSection_FromCpp(pkgTagSection &cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.TagSection` object from the :ctype:`pkgTagSection`
+    reference given by the parameter *cpp*. If the parameter *delete* is
+    true, *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* may be
+    a PyObject of the type :cdata:`PyTagFile_Type`.
+
+.. cfunction:: pkgTagSection& PyTagSection_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgTagSection` reference contained in the
+    Python object *object*.
+
+Version (pkgCache::VerIterator)
+----------------------------------
+.. cvar:: PyTypeObject PyVersion_Type
+
+    The type object for :class:`apt_pkg.Version` objects.
+
+.. cfunction:: int PyVersion_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Version` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyVersion_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Version` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyVersion_FromCpp(pkgCache::VerIterator &cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.Version` object from the :ctype:`pkgCache::VerIterator`
+    reference given by the parameter *cpp*. If the parameter *delete* is
+    true, *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* must be
+    a PyObject of the type :cdata:`PyPackage_Type`.
+
+.. cfunction:: pkgCache::VerIterator& PyVersion_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgCache::VerIterator` reference contained in the
+    Python object *object*.
diff --git a/doc/source/c++/embedding.rst b/doc/source/c++/embedding.rst
new file mode 100644
index 00000000..754ad398
--- /dev/null
+++ b/doc/source/c++/embedding.rst
@@ -0,0 +1,34 @@
+.. highlightlang:: c++
+
+Embedding Python APT
+====================
+This is a very basic tutorial for working with the C++ bindings.
+
+Basics
+-------
+To use the python-apt C++ bindings, first include the
+``python-apt/python-apt.h`` header::
+
+    #include <python-apt/python-apt.h>
+
+Now, the module needs to be initialized. This is done by calling the function
+:cfunc:`import_apt_pkg`. This function returns 0 on success and a negative
+value in case of failure::
+
+    if (import_apt_pkg() < 0)
+        return;
+
+Longer example
+--------------
+The following code will create a standalone application which provides a
+module ``client`` with the attribute ``hash`` which stores an object of the
+type :class:`apt_pkg.HashString`:
+
+.. literalinclude:: ../../client-example.cc
+
+
+.. highlightlang:: sh
+
+If this file were called client-example.cc, you could compile it using::
+
+    g++ -lapt-pkg -lpython2.5 -I/usr/include/python2.5 -o client client-example.cc
diff --git a/doc/source/c++/index.rst b/doc/source/c++/index.rst
new file mode 100644
index 00000000..8f598f3f
--- /dev/null
+++ b/doc/source/c++/index.rst
@@ -0,0 +1,8 @@
+Python APT and C++
+==================
+
+.. toctree::
+    :maxdepth: 1
+
+    api
+    embedding
diff --git a/doc/source/coding.rst b/doc/source/coding.rst
deleted file mode 100644
index 1357ce14..00000000
--- a/doc/source/coding.rst
+++ /dev/null
@@ -1,168 +0,0 @@
-Coding for python-apt
-======================
-Let's say you need a new feature, you can develop it, and you want to get it
-included in python-apt. Then be sure to follow the following guidelines.
-
-Available branches
--------------------
-First of all, let's talk a bit about the bzr branches of python-apt. In the
-following parts, we will assume that you use bzr to create your changes and
-submit them.
-
-**mvo:** http://people.ubuntu.com/~mvo/bzr/python-apt/mvo
-    This is Michael Vogt's branch. Most of the development of apt happens here,
-    as he is the lead maintainer of python-apt.
-
-    This branch is also available from Launchpads super mirror, via
-    ``lp:python-apt``. Checkouts from Launchpad are generally faster and can
-    use the bzr protocoll.
-
-    VCS-Browser: https://code.launchpad.net/~mvo/python-apt/python-apt--mvo
-
-**debian-sid:** http://bzr.debian.org/apt/python-apt/debian-sid
-    This is the official Debian branch of python-apt. All code which will be
-    uploaded to Debian is here. It is not as up-to-date as the mvo branch,
-    because this branch often gets updated just right before the release
-    happens.
-
-    VCS-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes
-
-**jak:** http://bzr.debian.org/users/jak/python-apt/jak
-    This is Julian Andres Klode's (the documentation author's) branch. This
-    is the place where cleanup and documentation updates happen. It is based
-    off debian-sid or mvo.
-
-    VCS-Browser: http://bzr.debian.org/loggerhead/users/jak/python-apt/jak/changes
-
-**ubuntu:** ``lp:~ubuntu-core-dev/python-apt/ubuntu``
-    This is the official Ubuntu development branch. The same notes apply as
-    for the debian-sid branch above.
-
-    VCS-Browser: https://code.launchpad.net/~ubuntu-core-dev/python-apt/ubuntu
-
-
-C++ Coding style
-----------------
-When you work on the C++ code in the python/ directory, you should follow some
-basic rules.
-
-The indentation of the code is a bit non-standard. We currently use 3 spaces
-indentation for the C++ code.
-
-When you create new functions, you should follow some naming conventions. All
-C++ functions are named according to the ``CamelCase`` convention.
-
-The resulting Python functions should be ``CamelCase`` as well in apt_pkg, or
-``mixedCase`` in apt_inst. The same applies for variables, parameters,
-attributes, etc.
-
-.. note::
-
-    This coding style guidelines are incomplete. If you have any questions
-    send an email to deity@lists.debian.org.
-
-.. note::
-
-    The coding style may be changed completely during the port to Python 3.0.
-    But this will not happen very soon.
-
-
-Python Coding Style
--------------------
-The coding style for all code written in python is :PEP:`8`. For modules added
-from version 0.7.9 on, there are no exceptions.
-
-Modules introduced prior to 0.7.9 use mixedCase names for methods, functions
-and variables. These names will be replaced by names conforming to :PEP:`8`
-in a future release of python-apt.
-
-Therefore, try to reduce the introduction of the mixedName code to the absolute
-minimum (sometimes you can also use shorter names).
-
-To prepare the port to Python 3.0, code should not use any functionality which
-is deprecated as of Python 2.6.
-
-The has_key() functionality may be used only on TagSection objects; as they
-provide no other way to do this. If someone is willing to adapt TagSection to
-support ``key in mapping`` and ``iter(mapping)``, this would be great.
-
-.. note::
-
-    You can use the tool pep8.py from http://svn.browsershots.org/trunk/devtools/pep8/
-    to validate your code. Please also run pylint, pychecker, and pyflakes and
-    fix all new **errors** they report (undefined names, etc.).
-
-Submitting your patch
----------------------
-First of all, the patch you create should be based against the debian-sid
-branch of python-apt.
-
-Once you have made your change, check that it:
-
-    * conforms to :PEP:`8` (checked with pep8.py). It should, at least not
-      introduce new errors. (and never have whitespace at end of line)
-    * produces no new errors in pychecker, pyflakes and pylint (unless you
-      can't fix them, but please tell so when requesting the merge, so it can
-      be fixed before hitting one of the main branches).
-    * does not change the behaviour of existing code in a non-compatible way.
-
-If your change follows all points of the checklist, you can commit it to your
-repository. (You could commit it first, and check later, and then commit the
-fixes, but commits should be logical and it makes no sense to have to commits
-for one logical unit).
-
-Once you have made all your changes,  you can run ``bzr send -o patch-name``
-to create a so called *merge-directive*, which contains your changes and
-allows us to preserve the history of your changes. (But please replace patch-name
-with something useful).
-
-Now report a bug against the python-apt package, attach the merge directive
-you created in the previous step, and tag it with 'patch'. It might also be
-a good idea to prefix the bug report with '[PATCH]'.
-
-If your patch introduces new functions, parameters, etc. , but does not update
-the content of this documentation, please CC. jak@debian.org, and add a short
-notice to the bug report. Also see `Documentation updates`
-
-Once your patch got merged, you can *pull* the branch into which it has been
-merged into your local one. If you have made changes since you submitted your
-patch, you may need to *merge* the branch instead.
-
-.. note::
-
-    If you plan to work on python-apt for a longer time, it may be a good
-    idea to publish your branch somewhere. Alioth (http://alioth.debian.org)
-    and Launchpad (https://launchpad.net) provide bzr hosting. You can also
-    use any webspace with ftp or sftp connection (for the upload). Then you do
-    not need to send *merge directives*, but you can point to your branch
-    instead.
-
-
-Documentation updates
----------------------
-If you want to update the documentation, please follow the procedure as written
-above. But please CC: jak@debian.org in the bug report.
-
-You can send your content in plain text, but reStructuredText is the preferred
-format. I (Julian Andres Klode) will review your patch and will forward them to
-Michael Vogt, for inclusion in his branch. On release, this will be merged into
-the debian-sid branch.
-
-
-Example patch session
-----------------------
-In the following example, we edit a file, create a merge directive (an enhanced
-patch), and report a wishlist bug with this patch against the python-apt
-package::
-
-    user@pc:~$ bzr clone http://bzr.debian.org/apt/python-apt/debian-sid/
-    user@pc:~$ cd debian-sid
-    user@pc:~/debian-sid$ editor FILES
-    user@pc:~/debian-sid$ pep8.py FILES # PEP 8 check, see above.
-    user@pc:~/debian-sid$ pylint -e FILES # Check with pylint
-    user@pc:~/debian-sid$ pyflakes FILES  # Check with pyflakes
-    user@pc:~/debian-sid$ pychecker FILES # Check with pychecker
-    user@pc:~/debian-sid$ bzr commit
-    user@pc:~/debian-sid$ bzr send -o my-patch
-    user@pc:~/debian-sid$ reportbug --severity=wishlist --tag=patch --attach=my-patch python-apt
-    user@pc:~/debian-sid$ # Add --list-cc=jak@debian.org if you change docs.
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 40154a6f..5f82d5eb 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -16,20 +16,27 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 import os
+import glob
 import sys
 
-# If your extensions are in another directory, add it here. If the directory
-# is relative to the documentation root, use os.path.abspath to make it
-# absolute, like shown here.
-sys.path.insert(0, os.path.abspath('..'))
-sys.path.insert(0, os.path.abspath('../..'))
-
 # Find the path to the built apt_pkg and apt_inst extensions
 if os.path.exists("../../build"):
     version = '.'.join(str(x) for x in sys.version_info[:2])
-    for dirname in os.listdir('../../build'):
-        if version in dirname:
-            sys.path.insert(0, os.path.abspath('../../build/' + dirname))
+    for apt_pkg_path in glob.glob('../../build/lib*%s/*.so' % version):
+        sys.path.insert(0, os.path.abspath(os.path.dirname(apt_pkg_path)))
+        try:
+            import apt_pkg
+        except ImportError, exc:
+            # Not the correct version
+            sys.stderr.write('W: Ignoring error %s\n' % exc)
+            sys.path.pop(0)
+        else:
+            sys.stdout.write('I: Found apt_pkg.so in %s\n' % sys.path[0])
+            # Hack: Disable compatibility mode
+            apt_pkg._COMPAT_0_7 = 0
+            break
+
+
 
 # General configuration
 # ---------------------
@@ -41,7 +48,7 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest',
 intersphinx_mapping = {'http://docs.python.org/': None}
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['.templates']
+templates_path = ['templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -50,23 +57,39 @@ source_suffix = '.rst'
 #source_encoding = 'utf-8'
 
 # The master toctree document.
-master_doc = 'index'
+#master_doc = 'contents'
 
 # General information about the project.
 project = u'python-apt'
-copyright = u'2009, Julian Andres Klode <jak@debian.org>'
+copyright = u'2009-2010, Julian Andres Klode <jak@debian.org>'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-from debian_bundle.changelog import Changelog
 
-changes = Changelog(open('../../debian/changelog'))
-# The short X.Y version.
-version = '.'.join(changes.full_version.split('.')[:2])
-# The full version, including alpha/beta/rc tags.
-release = changes.full_version
+try:
+    release=os.environ['DEBVER']
+except KeyError:
+    from subprocess import Popen, PIPE
+    p1 = Popen(["dpkg-parsechangelog", "-l../../debian/changelog"],
+               stdout=PIPE)
+    p2 = Popen(["sed", "-n", 's/^Version: //p'], stdin=p1.stdout, stdout=PIPE)
+    release = p2.communicate()[0]
+
+# Handle the alpha release scheme
+if int(release.split("~")[0].split(".")[2]) >= 90:
+    version_s = release.split("~")[0].split(".")[:3]
+    # Set the version to 0.X.100 if the release is 0.X.9Y (0.7.90 => 0.7.100)
+    # Use
+    #  version_s[1] = str(int(version_s[1]) + 1)
+    #  version_s[2] = "0"
+    # if the version of a 0.X.9Y release should be 0.X+1.0 (0.7.90=>0.8)
+    version_s[2] = "100"
+    version = '.'.join(version_s)
+    del version_s
+else:
+    version = '.'.join(release.split("~")[0].split('.')[:3])
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -134,7 +157,7 @@ html_static_path = ['.static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
@@ -145,7 +168,7 @@ html_static_path = ['.static']
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+html_additional_pages = {"index": "indexcontent.html"}
 
 # If false, no module index is generated.
 #html_use_modindex = True
@@ -183,7 +206,7 @@ htmlhelp_basename = 'python-aptdoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source index, target name, title, author, document class [howto/manual]).
 latex_documents = [
-  ('index', 'python-apt.tex', ur'python-apt Documentation',
+  ('contents', 'python-apt.tex', ur'python-apt Documentation',
    ur'Julian Andres Klode <jak@debian.org>', 'manual'),
 ]
 
diff --git a/doc/source/contents.rst b/doc/source/contents.rst
new file mode 100644
index 00000000..3c9fb511
--- /dev/null
+++ b/doc/source/contents.rst
@@ -0,0 +1,20 @@
+Python APT Documentation contents
+======================================
+
+Contents:
+
+.. toctree::
+
+   whatsnew/index
+   library/index
+   tutorials/index
+   c++/index
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/doc/source/examples/apt-cdrom.py b/doc/source/examples/apt-cdrom.py
new file mode 100644
index 00000000..cb23e97d
--- /dev/null
+++ b/doc/source/examples/apt-cdrom.py
@@ -0,0 +1,71 @@
+#!/usr/bin/python
+import sys
+
+import apt_pkg
+import apt
+
+
+def show_help():
+    print ("apt %s compiled on %s %s" % (apt_pkg.VERSION,
+                    apt_pkg.DATE, apt_pkg.TIME))
+    if apt_pkg.config.find_b("version"):
+        return 0
+
+    # Copied from apt-cdrom
+    print ("Usage: apt-cdrom [options] command\n"
+           "\n"
+           "apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
+           "CDROM mount point and device information is taken from apt.conf\n"
+           "and /etc/fstab.\n"
+           "\n"
+           "Commands:\n"
+           "   add - Add a CDROM\n"
+           "   ident - Report the identity of a CDROM\n"
+           "\n"
+           "Options:\n"
+           "  -h   This help text\n"
+           "  -d   CD-ROM mount point\n"
+           "  -r   Rename a recognized CD-ROM\n"
+           "  -m   No mounting\n"
+           "  -f   Fast mode, don't check package files\n"
+           "  -a   Thorough scan mode\n"
+           "  -c=? Read this configuration file\n"
+           "  -o=? Set an arbitrary configuration option, eg -o "
+           "dir::cache=/tmp\n"
+           "See fstab(5)")
+    return 0
+
+
+def main(args):
+    arguments = apt_pkg.parse_commandline(apt_pkg.config,
+                    [('h', "help", "help"),
+                     ('v', "version", "version"),
+                     ('d', "cdrom", "Acquire::cdrom::mount", "HasArg"),
+                     ('r', "rename", "APT::CDROM::Rename"),
+                     ('m', "no-mount", "APT::CDROM::NoMount"),
+                     ('f', "fast", "APT::CDROM::Fast"),
+                     ('n', "just-print", "APT::CDROM::NoAct"),
+                     ('n', "recon", "APT::CDROM::NoAct"),
+                     ('n', "no-act", "APT::CDROM::NoAct"),
+                     ('a', "thorough", "APT::CDROM::Thorough"),
+                     ('c', "config-file", "", "ConfigFile"),
+                     ('o', "option", "", "ArbItem")], args)
+
+    if apt_pkg.config.find_b("help") or apt_pkg.config.find_b("version"):
+        return show_help()
+
+    progress = apt.progress.text.CdromProgress()
+    cdrom = apt_pkg.Cdrom()
+
+    if not arguments:
+        return show_help()
+    elif arguments[0] == 'add':
+        cdrom.add(progress)
+    elif arguments[0] == 'ident':
+        cdrom.ident(progress)
+    else:
+        sys.stderr.write('E: Invalid operation %s\n' % arguments[0])
+        return 1
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))
diff --git a/doc/source/examples/apt-gtk.py b/doc/source/examples/apt-gtk.py
index 835ea4ee..ad46454e 100644
--- a/doc/source/examples/apt-gtk.py
+++ b/doc/source/examples/apt-gtk.py
@@ -17,10 +17,10 @@ def main():
     progress.show()
     win.show()
     cache = apt.cache.Cache(progress.open)
-    if cache["xterm"].isInstalled:
-        cache["xterm"].markDelete()
+    if cache["xterm"].is_installed:
+        cache["xterm"].mark_delete()
     else:
-        cache["xterm"].markInstall()
+        cache["xterm"].mark_install()
     progress.show_terminal(expanded=True)
     cache.commit(progress.fetch, progress.install)
     gtk.main()
diff --git a/doc/source/examples/cache-packages.py b/doc/source/examples/cache-packages.py
index 1abe7cf2..72534303 100644
--- a/doc/source/examples/cache-packages.py
+++ b/doc/source/examples/cache-packages.py
@@ -6,17 +6,17 @@ import apt_pkg
 
 def main():
     """Main."""
-    apt_pkg.InitConfig()
-    apt_pkg.InitSystem()
-    cache = apt_pkg.GetCache()
+    apt_pkg.init_config()
+    apt_pkg.init_system()
+    cache = apt_pkg.Cache()
     print "Essential packages:"
-    for pkg in cache.Packages:
-        if pkg.Essential:
-            print " ", pkg.Name
+    for pkg in cache.packages:
+        if pkg.essential:
+            print " ", pkg.name
     print "Important packages:"
-    for pkg in cache.Packages:
-        if pkg.Important:
-            print " ", pkg.Name
+    for pkg in cache.packages:
+        if pkg.important:
+            print " ", pkg.name
 
 if __name__ == "__main__":
     main()
diff --git a/doc/source/examples/cache-pkgfile.py b/doc/source/examples/cache-pkgfile.py
index f25975d3..f4cc2e66 100644
--- a/doc/source/examples/cache-pkgfile.py
+++ b/doc/source/examples/cache-pkgfile.py
@@ -5,20 +5,20 @@ import apt_pkg
 def main():
     """Example for PackageFile()"""
     apt_pkg.init()
-    cache = apt_pkg.GetCache()
-    for pkgfile in cache.FileList:
-        print 'Package-File:', pkgfile.FileName
-        print 'Index-Type:', pkgfile.IndexType # 'Debian Package Index'
-        if pkgfile.NotSource:
+    cache = apt_pkg.Cache()
+    for pkgfile in cache.file_list:
+        print 'Package-File:', pkgfile.filename
+        print 'Index-Type:', pkgfile.index_type # 'Debian Package Index'
+        if pkgfile.not_source:
             print 'Source: None'
         else:
-            if pkgfile.Site:
+            if pkgfile.site:
                 # There is a source, and a site, print the site
-                print 'Source:', pkgfile.Site
+                print 'Source:', pkgfile.site
             else:
                 # It seems to be a local repository
                 print 'Source: Local package file'
-        if pkgfile.NotAutomatic:
+        if pkgfile.not_automatic:
             # The system won't be updated automatically (eg. experimental)
             print 'Automatic: No'
         else:
diff --git a/doc/source/examples/dpkg-contents.py b/doc/source/examples/dpkg-contents.py
index 99d1596f..24d7ce98 100644
--- a/doc/source/examples/dpkg-contents.py
+++ b/doc/source/examples/dpkg-contents.py
@@ -28,7 +28,7 @@ def format_mode(what, mode):
 
 
 def callback(what, name, link, mode, uid, gid, size, mtime, major, minor):
-    """callback for debExtract"""
+    """callback for deb_extract"""
     s_mode = format_mode(what, mode)
     s_owner = "%s/%s" % (pwd.getpwuid(uid)[0], grp.getgrgid(gid)[0])
     s_size = "%9d" % size
@@ -47,7 +47,7 @@ def main():
 
     fobj = open(sys.argv[1])
     try:
-        apt_inst.debExtract(fobj, callback, "data.tar.gz")
+        apt_inst.deb_extract(fobj, callback, "data.tar.gz")
     finally:
         fobj.close()
 
diff --git a/doc/source/examples/dpkg-extract.py b/doc/source/examples/dpkg-extract.py
index ced8652f..8d144029 100644
--- a/doc/source/examples/dpkg-extract.py
+++ b/doc/source/examples/dpkg-extract.py
@@ -17,7 +17,7 @@ def main():
 
     fobj = open(sys.argv[1])
     try:
-        apt_inst.debExtractArchive(fobj, sys.argv[2])
+        apt_inst.deb_extract_archive(fobj, sys.argv[2])
     finally:
         fobj.close()
 
diff --git a/doc/source/examples/dpkg-info.py b/doc/source/examples/dpkg-info.py
index ff98d8b1..6be8595c 100644
--- a/doc/source/examples/dpkg-info.py
+++ b/doc/source/examples/dpkg-info.py
@@ -2,7 +2,7 @@
 """Emulate dpkg --info package.deb control-file"""
 import sys
 
-from apt_inst import debExtractControl
+from apt_inst import deb_extract_control
 
 
 def main():
@@ -12,7 +12,7 @@ def main():
         sys.exit(0)
     fobj = open(sys.argv[1])
     try:
-        print debExtractControl(fobj, sys.argv[2])
+        print deb_extract_control(fobj, sys.argv[2])
     finally:
         fobj.close()
 
diff --git a/doc/source/examples/missing-deps.py b/doc/source/examples/missing-deps.py
index 3ca16e45..7af18128 100644
--- a/doc/source/examples/missing-deps.py
+++ b/doc/source/examples/missing-deps.py
@@ -5,9 +5,9 @@ import apt_pkg
 
 def fmt_dep(dep):
     """Format a Dependency object [of apt_pkg] as a string."""
-    ret = dep.TargetPkg.Name
-    if dep.TargetVer:
-        ret += " (%s %s)" % (dep.CompType, dep.TargetVer)
+    ret = dep.target_pkg.name
+    if dep.target_ver:
+        ret += " (%s %s)" % (dep.comp_type, dep.target_ver)
     return ret
 
 
@@ -15,15 +15,15 @@ def check_version(pkgver):
     """Check the version of the package"""
     missing = []
 
-    for or_group in pkgver.DependsList.get("Pre-Depends", []) + \
-                    pkgver.DependsList.get("Depends", []):
-        if not any(dep.AllTargets() for dep in or_group):
+    for or_group in pkgver.depends_list.get("Pre-Depends", []) + \
+                    pkgver.depends_list.get("Depends", []):
+        if not any(dep.all_targets() for dep in or_group):
             # If none of the or-choices can be satisfied, add it to missing
             missing.append(or_group)
 
     if missing:
-        print "Package:", pkgver.ParentPkg.Name
-        print "Version:", pkgver.VerStr
+        print "Package:", pkgver.parent_pkg.name
+        print "Version:", pkgver.ver_str
         print "Missing:",
         print ", ".join(" | ".join(fmt_dep(dep) for dep in or_group)
                         for or_group in missing)
@@ -32,18 +32,18 @@ def check_version(pkgver):
 
 def main():
     """The main function."""
-    apt_pkg.InitConfig()
-    apt_pkg.InitSystem()
+    apt_pkg.init_config()
+    apt_pkg.init_system()
 
-    cache = apt_pkg.GetCache()
+    cache = apt_pkg.Cache()
 
-    for pkg in sorted(cache.Packages, key=lambda pkg: pkg.Name):
+    for pkg in sorted(cache.packages, key=lambda pkg: pkg.name):
         # pkg is from a list of packages, sorted by name.
-        for version in pkg.VersionList:
+        for version in pkg.version_list:
             # Check every version
-            for pfile, _ in version.FileList:
-                if (pfile.Origin == "Debian" and pfile.Component == "main" and
-                    pfile.Archive == "unstable"):
+            for pfile, _ in version.file_list:
+                if (pfile.origin == "Debian" and pfile.component == "main" and
+                    pfile.archive == "unstable"):
                     # We only want packages from Debian unstable main.
                     check_version(version)
                     break
diff --git a/doc/source/examples/update-print-uris.py b/doc/source/examples/update-print-uris.py
new file mode 100644
index 00000000..dbe1dfde
--- /dev/null
+++ b/doc/source/examples/update-print-uris.py
@@ -0,0 +1,23 @@
+#!/usr/bin/python
+"""Print out the URIs of all indexes files.
+
+This behaves somewhat like apt-get --print-uris update."""
+import apt_pkg
+
+
+def main():
+    apt_pkg.init_config()
+    apt_pkg.init_system()
+    acquire = apt_pkg.Acquire()
+    slist = apt_pkg.SourceList()
+    # Read the list
+    slist.read_main_list()
+    # Add all indexes to the fetcher.
+    slist.get_indexes(acquire, True)
+
+    # Now print the URI of every item.
+    for item in acquire.items:
+        print item.desc_uri
+
+if __name__ == '__main__':
+    main()
diff --git a/doc/source/index.rst b/doc/source/index.rst
deleted file mode 100644
index 23ea4cca..00000000
--- a/doc/source/index.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-Welcome to python-apt's documentation!
-======================================
-
-.. note::
-
-    This documentation can not be considered complete at the moment. But it
-    provides better documentation than the documentation available through
-    pydoc.
-
-.. note::
-
-
-    This documentation has been created by Sphinx, using reStructuredText files
-    written by Julian Andres Klode <jak@debian.org>, and in case of the apt
-    package, from the documentation shipped in the modules.
-
-
-Contents:
-
-.. toctree::
-   :maxdepth: 2
-
-   apt/index
-   apt_pkg/index
-   apt_inst
-   aptsources/index
-   coding
-
-
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-
-
-TODO
-======
-.. todolist::
diff --git a/doc/source/apt/cache.rst b/doc/source/library/apt.cache.rst
index beae74a2..d0e44598 100644
--- a/doc/source/apt/cache.rst
+++ b/doc/source/library/apt.cache.rst
@@ -66,8 +66,8 @@ packages whose state has been changed, eg. packages marked for installation::
     >>> from apt.cache import FilteredCache, Cache, MarkedChangesFilter
     >>> cache = apt.Cache()
     >>> changed = apt.FilteredCache(cache)
-    >>> changed.setFilter(MarkedChangesFilter())
-    >>> print len(changed) == len(cache.GetChanges()) # Both need to have same length
+    >>> changed.set_filter(MarkedChangesFilter())
+    >>> print len(changed) == len(cache.get_changes()) # Both need to have same length
     True
 
 The ProblemResolver class
diff --git a/doc/source/apt/cdrom.rst b/doc/source/library/apt.cdrom.rst
index 56381f14..56381f14 100644
--- a/doc/source/apt/cdrom.rst
+++ b/doc/source/library/apt.cdrom.rst
diff --git a/doc/source/apt/debfile.rst b/doc/source/library/apt.debfile.rst
index 7133b5a8..7133b5a8 100644
--- a/doc/source/apt/debfile.rst
+++ b/doc/source/library/apt.debfile.rst
diff --git a/doc/source/apt/package.rst b/doc/source/library/apt.package.rst
index bb74915e..4b143b8a 100644
--- a/doc/source/apt/package.rst
+++ b/doc/source/library/apt.package.rst
@@ -40,7 +40,7 @@ Dependency Information
 
         The version or None.
 
-    .. attribute:: preDepend
+    .. attribute:: pre_depend
 
         Boolean value whether this is a pre-dependency.
 
@@ -101,9 +101,9 @@ Examples
     print 'python-apt is trusted:', pkg.candidate.origins[0].trusted
 
     # Mark python-apt for install
-    pkg.markInstall()
+    pkg.mark_install()
 
-    print 'python-apt is marked for install:', pkg.markedInstall
+    print 'python-apt is marked for install:', pkg.marked_install
 
     print 'python-apt is (summary):', pkg.candidate.summary
 
diff --git a/doc/source/library/apt.progress.base.rst b/doc/source/library/apt.progress.base.rst
new file mode 100644
index 00000000..3fd2a7a0
--- /dev/null
+++ b/doc/source/library/apt.progress.base.rst
@@ -0,0 +1,335 @@
+:mod:`apt.progress.base` --- Abstract classes for progress reporting
+====================================================================
+.. module:: apt.progress.base
+
+This module provides base classes for progress handlers from which all
+progress classes should inherit from. Progress reporting classes not
+inheriting from those classes may not work and are not supported.
+
+When creating a subclass of one of those classes, all overridden methods should
+call the parent's method first before doing anything else, because the parent
+method may have to set some attributes. Subclasses not doing so may not work
+correctly or may not work at all and are completely unsupported.
+
+AcquireProgress
+---------------
+.. class:: AcquireProgress
+
+    A monitor object for downloads controlled by the Acquire class. This base
+    class does nothing and should only be used as a base class to inherit
+    from. Instances of this class can be passed to the constructor of
+    :class:`apt_pkg.Acquire` and the Acquire object then uses it to report
+    its progress.
+
+    This class provides several methods which may be overridden by subclasses
+    to implement progress reporting:
+
+    .. method:: done(item: apt_pkg.AcquireItemDesc)
+
+        Invoked when an item is successfully and completely fetched.
+
+    .. method:: fail(item: apt_pkg.AcquireItemDesc)
+
+        Invoked when the process of fetching an item encounters a fatal error
+        like a non existing file or no connection to the server.
+
+    .. method:: fetch(item: apt_pkg.AcquireItemDesc)
+
+        Invoked when some of the item's data is fetched. This normally means
+        that the file is being fetched now and e.g. the headers have been
+        retrieved already.
+
+    .. method:: ims_hit(item: apt_pkg.AcquireItemDesc)
+
+        Invoked when an item is confirmed to be up-to-date. For instance,
+        when an HTTP download is informed that the file on the server was
+        not modified.
+
+    .. method:: media_change(media: str, drive: str) -> bool
+
+        Prompt the user to change the inserted removable media. This function
+        is called whenever a media change is needed to ask the user to insert
+        the needed media.
+ 
+        The parameter *media* decribes the name of the the media type that
+        should be changed, whereas the parameter *drive* should be the
+        identifying name of the drive whose media should be changed.
+
+        This method should not return until the user has confirmed to the user
+        interface that the media change is complete. It must return True if
+        the user confirms the media change, or False to cancel it.
+
+    .. method:: pulse(owner: apt_pkg.Acquire) -> bool
+
+        This method gets invoked while the Acquire progress given by the
+        parameter *owner* is underway. It should display information about
+        the current state. It must return ``True`` to continue the acquistion
+        or ``False`` to cancel it. This base implementation always returns
+        ``True``.
+
+    .. method:: start()
+
+        Invoked when the Acquire process starts running.
+
+    .. method:: stop()
+
+        Invoked when the Acquire process stops running.
+
+    In addition to those methods, this class provides several attributes which
+    are set automatically and represent the fetch progress:
+
+    .. attribute:: current_bytes
+
+        The number of bytes fetched.
+
+    .. attribute:: current_cps
+
+        The current rate of download, in bytes per second.
+
+    .. attribute:: current_items
+
+        The number of items that have been successfully downloaded.
+
+    .. attribute:: elapsed_time
+
+        The amount of time that has elapsed since the download started.
+
+    .. attribute:: fetched_bytes
+
+        The total number of bytes accounted for by items that were
+        successfully fetched.
+
+    .. attribute:: last_bytes
+
+        The number of bytes fetched as of the previous call to pulse(),
+        including local items.
+
+    .. attribute:: total_bytes
+
+        The total number of bytes that need to be fetched. This member is
+        inaccurate, as new items might be enqueued while the download is
+        in progress!
+
+    .. attribute:: total_items
+
+        The total number of items that need to be fetched. This member is
+        inaccurate, as new items might be enqueued while the download is
+        in progress!
+
+
+CdromProgress
+-------------
+.. class:: CdromProgress
+
+    Base class for reporting the progress of adding a cdrom which could be
+    used with apt_pkg.Cdrom to produce an utility like apt-cdrom.
+    
+    Methods defined here:
+    
+    .. method:: ask_cdrom_name() -> str
+    
+        Ask for the name of the cdrom. This method is called when a CD-ROM
+        is added (e.g. via :meth:`apt_pkg.Cdrom.add`) and no label for the
+        CD-ROM can be found.
+
+        Implementations should request a label from the user (e.g. via
+        :func:`raw_input`) and return this label from the function. The
+        operation can be cancelled if the function returns ``None`` instead
+        of a string.
+    
+    .. method:: change_cdrom() -> bool
+    
+        Ask for the CD-ROM to be changed. This method should return ``True``
+        if the CD-ROM has been changed or ``False`` if the CD-ROM has not been
+        changed and the operation should be cancelled. This base implementation
+        returns ``False`` and thus cancels the operation.
+    
+    .. method:: update(text: str, current: int)
+    
+        Periodically invoked in order to update the interface and give
+        information about the progress of the operation.
+
+        This method has two parameters. The first parameter *text* defines
+        the text which should be displayed to the user as the progress
+        message. The second parameter *current* is an integer describing how
+        many steps have been completed already.
+
+    .. attribute:: total_steps
+
+        The number of total steps, set automatically by python-apt. It may be
+        used in conjunction with the parameter *current* of the :meth:`update`
+        method to show how far the operation progressed.
+
+
+OpProgress
+----------
+.. class:: OpProgress
+
+    OpProgress classes are used for reporting the progress of operations
+    such as opening the cache. It is based on the concept of one operation
+    consisting of a series of sub operations.
+    
+    Methods defined here:
+    
+    .. method:: done()
+    
+        Called once an operation has been completed.
+    
+    .. method:: update([percent=None])
+    
+        Called periodically to update the user interface. This function should
+        use the attributes defined below to display the progress information.
+
+        The optional parameter *percent* is included for compatibility
+        reasons and may be removed at a later time.
+    
+    The following attributes are available and are changed by the classes
+    wanting to emit progress:
+    
+    .. attribute:: major_change
+    
+        An automatically set boolean value describing whether the current call
+        to update is caused by a major change. In this case, the last operation
+        has finished.
+    
+    .. attribute:: op
+
+        An automatically set string which describes the current operation in
+        an human-readable way.
+    
+    .. attribute:: percent
+    
+        An automatically set float value describing how much of the operation
+        has been completed, in percent.
+    
+    .. attribute:: subop
+
+        An automatically set string which describes the current sub-operation
+        in an human-readable way.
+
+
+InstallProgress
+---------------
+.. class:: InstallProgress
+
+    InstallProgress classes make it possible to monitor the progress of dpkg
+    and APT and emit information at certain stages. It uses file descriptors
+    to read the status lines from APT/dpkg and parses them and afterwards calls
+    the callback methods.
+
+    Subclasses should override the following methods in order to implement
+    progress reporting:
+
+    .. method:: conffile(current, new)
+    
+        Called when a conffile question from dpkg is detected.
+
+        .. note::
+
+            This part of the API is semi-stable and may be extended with 2 more
+            parameters before the release of 0.7.100.
+
+    .. method:: error(pkg, errormsg)
+    
+        (Abstract) Called when a error is detected during the install.
+
+    The following method should be overriden to implement progress reporting
+    for dpkg-based runs i.e. calls to :meth:`run` with a filename:
+
+    .. method:: processing(pkg, stage)
+
+        This method is called just before a processing stage starts. The
+        parameter *pkg* is the name of the package and the parameter *stage*
+        is one of the stages listed in the dpkg manual under the status-fd
+        option, i.e. "upgrade", "install" (both sent before unpacking),
+        "configure", "trigproc", "remove", "purge".
+
+    .. method:: dpkg_status_change(pkg: str, status: str)
+
+        This method is called whenever the dpkg status of the package
+        changes. The parameter *pkg* is the name of the package and the
+        parameter *status* is one of the status strings used in the status
+        file (:file:`/var/lib/dpkg/status`) and documented
+        in :manpage:`dpkg(1)`.
+
+    The following methods should be overriden to implement progress reporting
+    for  :meth:`run` calls with an :class:`apt_pkg.PackageManager` object as
+    their parameter:
+
+    .. method:: status_change(pkg, percent, status)
+
+        This method implements progress reporting for package installation by
+        APT and may be extended to dpkg at a later time.
+
+        This method takes two parameters: The parameter *percent* is a float
+        value describing the overall progress and the parameter *status* is a
+        string describing the current status in an human-readable manner.
+
+    .. method:: start_update()
+    
+        This method is called before the installation of any package starts.
+
+    .. method:: finish_update()
+    
+        This method is called when all changes have been applied.
+
+    There are also several methods which are fully implemented and should not
+    be overriden by subclasses unless the subclass has very special needs:
+
+    .. method:: fork() -> int
+    
+        Fork a child process and return 0 to the child process and the PID of
+        the child to the parent process. This implementation just calls
+        :func:`os.fork` and returns its value.
+
+    .. method:: run(obj)
+        
+        This method runs install actions. The parameter *obj* may either
+        be a PackageManager object in which case its **do_install()** method is
+        called or the path to a deb file.
+    
+        If the object is a :class:`apt_pkg.PackageManager`, the functions
+        returns the result of calling its ``do_install()`` method. Otherwise,
+        the function returns the exit status of dpkg. In both cases, ``0``
+        means that there were no problems and ``!= 0`` means that there were
+        issues.
+
+    .. method:: update_interface()
+    
+        This method is responsible for reading the status from dpkg/APT and
+        calling the correct callback methods. Subclasses should not override
+        this method.
+
+    .. method:: wait_child()
+    
+        This method is responsible for calling :meth:`update_interface` from
+        time to time. It exits once the child has exited. The return value
+        is the full status returned by :func:`os.waitpid` (not only the
+        return code). Subclasses should not override this method.
+
+    The class also provides several attributes which may be useful:
+
+    .. attribute:: percent
+
+        The percentage of completion as it was in the last call to
+        :meth:`status_change`.
+
+    .. attribute:: status
+
+        The status string passed in the last call to :meth:`status_change`.
+
+    .. attribute:: select_timeout
+
+        Used in :meth:`wait_child` to when calling :func:`select.select`
+        on dpkg's/APT's status descriptor. Subclasses may set their own value
+        if needed.
+
+    .. attribute:: statusfd
+
+        A readable :class:`file` object from which the status information from
+        APT or dpkg is read.
+
+    .. attribute:: writefd
+
+        A writable :class:`file` object to which dpkg or APT write their status
+        information.
diff --git a/doc/source/library/apt.progress.gtk2.rst b/doc/source/library/apt.progress.gtk2.rst
new file mode 100644
index 00000000..0d53ad41
--- /dev/null
+++ b/doc/source/library/apt.progress.gtk2.rst
@@ -0,0 +1,131 @@
+:mod:`apt.progress.gtk2` --- Progress reporting for GTK+ interfaces
+===================================================================
+.. module:: apt.progress.gtk2
+
+The :mod:`apt.progress.gtk2` module provides classes with GObject signals and
+a class with a GTK+ widget for progress handling.
+
+
+GObject progress classes
+-------------------------
+.. class:: GInstallProgress
+
+    An implementation of :class:`apt.progress.base.InstallProgress` supporting
+    GObject signals. The class emits the following signals:
+
+    .. describe:: status-changed(status: str, percent: int)
+
+        Emitted when the status of an operation changed.
+
+    .. describe:: status-started()
+
+        Emitted when the installation started.
+
+    .. describe::  status-finished()
+
+        Emitted when the installation finished.
+
+    .. describe:: status-timeout()
+
+        Emitted when a timeout happens
+
+    .. describe:: status-error()
+
+        Emitted in case of an error.
+
+    .. describe:: status-conffile()
+
+        Emitted when a conffile update is happening.
+
+
+.. class:: GAcquireProgress
+
+    An implementation of :class:`apt.progress.base.AcquireProgress` supporting
+    GObject signals. The class emits the following signals:
+
+    .. describe:: status-changed(description: str, percent: int)
+
+        Emitted when the status of the fetcher changed, e.g. when the
+        percentage increased.
+        
+    .. describe:: status-started()
+
+        Emitted when the fetcher starts to fetch.
+
+    .. describe:: status-finished()
+
+        Emitted when the fetcher finished.
+
+
+.. class:: GDpkgInstallProgress
+
+    An implementation of :class:`apt.progress.base.InstallProgress` supporting
+    GObject signals. This is the same as :class:`GInstallProgress` and is thus
+    completely deprecated.
+
+.. class:: GOpProgress
+
+    An implementation of :class:`apt.progress.old.FetchProgress` supporting
+    GObject signals. The class emits the following signals:
+
+    .. describe:: status-changed(operation: str, percent: int)
+
+        Emitted when the status of an operation changed.
+
+    .. describe:: status-started()
+
+        Emitted when it starts - Not implemented yet.
+
+    .. describe:: status-finished()
+
+        Emitted when all operations have finished.
+
+GTK+ Widget
+-----------
+.. class:: GtkAptProgress
+
+    Graphical progress for installation/fetch/operations, providing
+    a progress bar, a terminal and a status bar for showing the progress
+    of package manipulation tasks.
+
+    .. method:: cancel_download()
+
+        Cancel a currently running download.
+        
+    .. method:: clear()
+    
+        Reset all status information.
+
+    .. attribute:: dpkg_install
+
+        Return the install progress handler for dpkg.
+
+    .. attribute:: fetch
+    
+        Return the fetch progress handler.
+
+    .. method:: hide_terminal()
+
+        Hide the expander with the terminal widget.
+
+    .. attribute:: install
+    
+        Return the install progress handler.
+
+    .. attribute:: open
+
+        Return the cache opening progress handler.
+        
+    .. method:: show()
+    
+        Show the Box
+
+    .. method:: show_terminal(expanded=False)
+    
+        Show an expander with a terminal widget which provides a way to
+        interact with dpkg.
+
+
+Example
+-------
+.. literalinclude:: ../examples/apt-gtk.py
diff --git a/doc/source/library/apt.progress.qt4.rst b/doc/source/library/apt.progress.qt4.rst
new file mode 100644
index 00000000..cd06a4e6
--- /dev/null
+++ b/doc/source/library/apt.progress.qt4.rst
@@ -0,0 +1,3 @@
+:mod:`apt.progress.qt4` --- Progress reporting for Qt4 interfaces
+=================================================================
+Not written yet.
diff --git a/doc/source/library/apt.progress.text.rst b/doc/source/library/apt.progress.text.rst
new file mode 100644
index 00000000..4e051e31
--- /dev/null
+++ b/doc/source/library/apt.progress.text.rst
@@ -0,0 +1,21 @@
+:mod:`apt.progress.text` --- Progress reporting for text interfaces
+===================================================================
+.. automodule:: apt.progress.text
+
+
+Acquire Progress Reporting
+--------------------------
+.. autoclass:: AcquireProgress
+    :members:
+
+
+CD-ROM Progress Reporting
+--------------------------
+.. autoclass:: CdromProgress
+    :members:
+
+Operation Progress Reporting
+-----------------------------
+.. autoclass:: OpProgress
+    :members:
+
diff --git a/doc/source/library/apt_inst.rst b/doc/source/library/apt_inst.rst
new file mode 100644
index 00000000..d9403a9e
--- /dev/null
+++ b/doc/source/library/apt_inst.rst
@@ -0,0 +1,354 @@
+:mod:`apt_inst` - Working with local Debian packages
+====================================================
+.. module:: apt_inst
+
+This module provides useful classes and functions to work with archives,
+modelled after the :class:`tarfile.TarFile` class. For working with Debian
+packages, the :class:`DebFile` class should be used as it provides easy access
+to the control.tar.* and data.tar.* members.
+
+The classes are mostly modeled after the :class:`tarfile.TarFile` class and
+enhanced with APT-specific methods. Because APT only provides a stream based
+view on a tar archive, this module's :class:`TarFile` class only provides a
+very small subset of those functions.
+
+AR Archives
+-----------
+.. class:: ArArchive(file)
+
+    An ArArchive object represents an archive in the 4.4 BSD AR format,
+    which is used for e.g. deb packages.
+
+    The parameter *file* may be a string specifying the path of a file, or
+    a :class:`file`-like object providing the :meth:`fileno` method. It may
+    also be an int specifying a file descriptor (returned by e.g.
+    :func:`os.open`). The recommended way is to pass in the path to the file.
+
+    ArArchive (and its subclasses) support the iterator protocol, meaning that
+    an :class:`ArArchive` object can be iterated over yielding the members in
+    the archive (same as :meth:`getmembers`).
+
+    .. describe:: archive[key]
+
+        Return a ArMember object for the member given by *key*. Raise
+        LookupError if there is no ArMember with the given name.
+
+    .. describe:: key in archive
+
+        Return True if a member with the name *key* is found in the archive, it
+        is the same function as :meth:`getmember`.
+
+    .. method:: extract(name[, target: str]) -> bool
+
+        Extract the member given by *name* into the directory given by
+        *target*. If the extraction failed, an error is raised. Otherwise,
+        the method returns True if the owner could be set or False if the
+        owner could not be changed. It may also raise LookupError if there
+        is no member with the given name.
+
+        The parameter *target* is completely optional. If it is not given, the
+        function extracts into the current directory.
+
+    .. method:: extractall([target: str]) -> bool
+
+         Extract all into the directory given by target or the current
+         directory if target is not given. If the extraction failed, an error
+         is raised. Otherwise, the method returns True if the owner could be
+         set or False if the owner could not be changed.
+
+    .. method:: extractdata(name: str) -> bytes
+
+        Return the contents of the member given by *name*, as a bytes object.
+        Raise LookupError if there is no ArMember with the given name.
+
+    .. method:: getmember(name: str) -> ArMember
+
+        Return a ArMember object for the member given by *name*. Raise
+        LookupError if there is no ArMember with the given name.
+
+    .. method:: getmembers() -> list
+
+        Return a list of all members in the AR archive.
+
+    .. method:: getnames() -> list
+
+        Return a list of the names of all members in the AR archive.
+
+    .. method:: gettar(name: str, comp: str) -> TarFile
+
+        Return a TarFile object for the member given by *name* which will be
+        decompressed using the compression algorithm given by *comp*.
+        This is almost equal to::
+
+           member = arfile.getmember(name)
+           tarfile = TarFile(file, member.start, member.size, 'gzip')'
+
+        It just opens a new TarFile on the given position in the stream.
+
+.. class:: ArMember
+
+    An ArMember object represents a single file within an AR archive. For
+    Debian packages this can be e.g. control.tar.gz. This class provides
+    information about this file, such as the mode and size. It has no
+    constructor.
+
+    .. attribute:: gid
+
+        The group id of the owner.
+
+    .. attribute:: mode
+
+        The mode of the file.
+
+    .. attribute:: mtime
+
+        Last time of modification.
+
+    .. attribute:: name
+
+        The name of the file.
+
+    .. attribute:: size
+
+        The size of the files.
+
+    .. attribute:: start
+
+        The offset in the archive where the file starts.
+
+    .. attribute:: uid
+
+        The user id of the owner.
+
+Debian Packages
+---------------
+.. class:: DebFile(file)
+
+    A DebFile object represents a file in the .deb package format. It inherits
+    :class:`ArArchive`. In addition to the attributes and methods from
+    :class:`ArArchive`, DebFile provides the following methods:
+
+    .. attribute:: control
+
+        The :class:`TarFile` object associated with the control.tar.gz member.
+
+    .. attribute:: data
+
+        The :class:`TarFile` object associated with the data.tar.{gz,bz2,lzma}
+        member.
+
+    .. attribute:: debian_binary
+
+        The package version, as contained in debian-binary.
+
+Tar Archives
+-------------
+.. class:: TarFile(file[, min: int, max: int, comp: str])
+
+    A TarFile object represents a single .tar file stream.
+
+    The parameter *file* may be a string specifying the path of a file, or
+    a :class:`file`-like object providing the :meth:`fileno` method. It may
+    also be an int specifying a file descriptor (returned by e.g.
+    :func:`os.open`).
+
+    The parameter *min* describes the offset in the file where the archive
+    begins and the parameter *max* is the size of the archive.
+
+    The compression of the archive is set by the parameter *comp*. It can
+    be set to any program supporting the -d switch, the default being gzip.
+
+    .. method:: extractall([rootdir: str]) -> True
+
+        Extract the archive in the current directory. The argument *rootdir*
+        can be used to change the target directory.
+
+    .. method:: extractdata(member: str) -> bytes
+
+        Return the contents of the member, as a bytes object. Raise
+        LookupError if there is no member with the given name.
+
+    .. method:: go(callback: callable[, member: str]) -> True
+
+        Go through the archive and call the callable *callback* for each
+        member with 2 arguments. The first argument is the :class:`TarMember`
+        and the second one is the data, as bytes.
+
+        The optional parameter *member* can be used to specify the member for
+        which call the callback. If not specified, it will be called for all
+        members. If specified and not found, LookupError will be raised.
+
+.. class:: TarMember
+
+    Represent a single member of a 'tar' archive.
+
+    This class which has been modelled after :class:`tarfile.TarInfo`
+    represents information about a given member in an archive.
+
+    .. method:: isblk()
+
+        Determine whether the member is a block device.
+
+    .. method:: ischr()
+
+        Determine whether the member is a character device.
+
+    .. method:: isdev()
+
+        Determine whether the member is a device (block,character or FIFO).
+
+    .. method:: isdir()
+
+        Determine whether the member is a directory.
+
+    .. method:: isfifo()
+
+        Determine whether the member is a FIFO.
+
+    .. method:: isfile()
+
+        Determine whether the member is a regular file.
+        
+    .. method:: islnk()
+
+        Determine whether the member is a hardlink.
+
+    .. method:: isreg()
+
+        Determine whether the member is a regular file, same as isfile().
+
+    .. method:: issym()
+
+        Determine whether the member is a symbolic link.
+        
+    .. attribute:: gid
+
+        The owner's group id
+
+    .. attribute:: linkname
+
+        The target of the link.
+
+    .. attribute:: major
+
+        The major ID of the device.
+
+    .. attribute:: minor
+
+        The minor ID of the device.
+
+    .. attribute:: mode
+
+        The mode (permissions).
+
+    .. attribute:: mtime
+
+        Last time of modification.
+
+    .. attribute:: name
+
+        The name of the file.
+
+    .. attribute:: size
+
+        The size of the file.
+
+    .. attribute:: uid
+
+        The owner's user id.
+
+
+
+Deprecated functions
+---------------------
+The following functions have been shipped in python-apt for a longer time and
+are deprecated as of release 0.7.92. They are listed here to help developers
+to port their applications to the new API which is completely different. For
+this purpose each function documentation includes an example showing how the
+function can be replaced.
+
+.. function:: arCheckMember(file, membername)
+
+    Check if the member specified by the parameter *membername* exists in
+    the AR file referenced by the parameter *file*, which may be a
+    :class:`file()` object, a file descriptor, or anything implementing a
+    :meth:`fileno` method.
+
+    This function has been replaced by using the :keyword:`in` check on an
+    :class:`ArArchive` object::
+
+        member in ArArchive(file)    
+
+.. function:: debExtract(file, func, chunk)
+
+    Call the function referenced by *func* for each member of the tar file
+    *chunk* which is contained in the AR file referenced by the parameter
+    *file*, which may be a :class:`file()` object, a file descriptor, or
+    anything implementing a :meth:`fileno` method.
+
+    The function *func* is a callback with the signature
+    ``(what, name, link, mode, uid, gid, size, mtime, major, minor)``. The
+    parameter *what* describes the type of the member. It can be 'FILE',
+    'DIR', or 'HARDLINK'. The parameter *name* refers to the name of the
+    member. In case of links, *link* refers to the target of the link.
+
+    This function is deprecated and has been replaced by the :meth:`TarFile.go`
+    method. The following example shows the old code and the new code::
+
+        debExtract(open("package.deb"), my_callback, "data.tar.gz") #old
+
+        DebFile("package.deb").data.go(my_callback)
+
+    Please note that the signature of the callback is different in
+    :meth:`TarFile.go`.
+
+.. function:: tarExtract(file,func,comp)
+
+    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
+    a :class:`file()` object, a file descriptor, or anything implementing
+    a :meth:`fileno` method.
+
+    The function *func* is a callback with the signature
+    ``(what, name, link, mode, uid, gid, size, mtime, major, minor)``. The
+    parameter *what* describes the type of the member. It can be 'FILE',
+    'DIR', or 'HARDLINK'. The parameter *name* refers to the name of the
+    member. In case of links, *link* refers to the target of the link.
+
+    This function is deprecated and has been replaced by the :meth:`TarFile.go`
+    method. The following example shows the old code and the new code::
+
+        tarExtract(open("archive.tar.gz"), my_callback, "gzip") #old
+        TarFile("archive.tar.gz", 0, 0, "gzip").go(my_callback)
+
+    Please note that the signature of the callback is different in
+    :meth:`TarFile.go`.
+
+.. function:: debExtractArchive(file, rootdir)
+
+    Extract the archive referenced by the :class:`file` object *file*
+    into the directory specified by *rootdir*.
+
+    The parameter *file* may be a :class:`file()` object, a file descriptor, or
+    anything implementing a :meth:`fileno` method.
+
+    This function has been replaced by :meth:`TarFile.extractall` and
+    :attr:`DebFile.data`::
+
+        debExtractArchive(open("package.deb"), rootdir) # old
+        DebFile("package.deb").data.extractall(rootdir) # new
+
+.. function:: debExtractControl(file[, member='control'])
+
+    Return the indicated file as a string from the control tar. The default
+    is 'control'. The parameter *file* may be a :class:`file()` object, a
+    file descriptor, or anything implementing a :meth:`fileno` method.
+
+    This function has been replaced by :attr:`DebFile.control` and
+    :meth:`TarFile.extractdata`. In the following example, both commands
+    return the contents of the control file::
+
+        debExtractControl(open("package.deb"))
+        DebFile("package.deb").control.extractdata("control")
diff --git a/doc/source/library/apt_pkg.rst b/doc/source/library/apt_pkg.rst
new file mode 100644
index 00000000..bcdf2f7a
--- /dev/null
+++ b/doc/source/library/apt_pkg.rst
@@ -0,0 +1,2028 @@
+:mod:`apt_pkg` --- The low-level bindings for apt-pkg
+=====================================================
+.. module:: apt_pkg
+
+The apt_pkg extensions provides a more low-level way to work with apt. It can
+do everything apt can, and is written in C++. It has been in python-apt since
+the beginning.
+
+Module Initialization
+---------------------
+
+Initialization is needed for most functions, but not for all of them. Some can
+be called without having run init*(), but will not return the expected value.
+
+.. function:: init_config
+
+    Initialize the configuration of apt. This is needed for most operations.
+
+.. function:: init_system
+
+    Initialize the system.
+
+.. function:: init
+
+    A short cut to calling :func:`init_config` and :func:`init_system`. You
+    can use this if you do not use the command line parsing facilities provided
+    by :func:`parse_commandline`, otherwise call :func:`init_config`, parse
+    the commandline afterwards and finally call :func:`init_system`.
+
+
+Working with the cache
+----------------------
+.. class:: Cache([progress])
+
+    Return a :class:`Cache()` object. The optional parameter *progress*
+    specifies an instance of :class:`apt.progress.OpProgress()` which will
+    display the open progress.
+
+    .. describe:: cache[pkgname]
+
+        Return the :class:`Package()` object for the package name given by
+        *pkgname*.
+
+    .. describe:: pkgname in cache
+
+        Check whether a package with the name given by *pkgname* exists in
+        the cache.
+
+    .. method:: update(progress, list[, pulse_interval])
+
+        Update the package cache.
+
+        The parameter *progress* points to an :class:`apt.progress.FetchProgress()`
+        object. The parameter *list* refers to a :class:`SourceList()` object.
+
+        The optional parameter *pulse_interval* describes the interval between
+        the calls to the :meth:`FetchProgress.pulse` method.
+
+    .. attribute:: depends_count
+
+        The total number of dependencies.
+
+    .. attribute:: package_count
+
+        The total number of packages available in the cache.
+
+    .. attribute:: packages
+
+        A sequence of :class:`Package` objects.
+
+    .. attribute:: provides_count
+
+        The number of provided packages.
+
+    .. attribute:: ver_file_count
+
+        .. todo:: Seems to be some mixture of versions and pkgFile.
+
+    .. attribute:: version_count
+
+        The total number of package versions available in the cache.
+
+    .. attribute:: package_file_count
+
+        The total number of Packages files available (the Packages files
+        listing the packages). This is the same as the length of the list in
+        the attribute :attr:`file_list`.
+
+    .. attribute:: file_list
+
+        A list of :class:`PackageFile` objects.
+
+.. class:: DepCache(cache)
+
+    Return a :class:`DepCache` object. The parameter *cache* specifies an
+    instance of :class:`Cache`.
+
+    The DepCache object contains various methods to manipulate the cache,
+    to install packages, to remove them, and much more.
+
+    .. method:: commit(fprogress, iprogress)
+
+        Apply all the changes made.
+
+        The parameter *fprogress* has to be set to an instance of
+        apt.progress.FetchProgress or one of its subclasses.
+
+        The parameter *iprogress* has to be set to an instance of
+        apt.progress.InstallProgress or one of its subclasses.
+
+    .. method:: fix_broken()
+
+        Try to fix all broken packages in the cache.
+
+    .. method:: get_candidate_ver(pkg)
+
+        Return the candidate version of the package, ie. the version that
+        would be installed normally.
+
+        The parameter *pkg* refers to an :class:`Package` object,
+        available using the :class:`pkgCache`.
+
+        This method returns a :class:`Version` object.
+
+    .. method:: set_candidate_ver(pkg, version)
+
+        The opposite of :meth:`pkgDepCache.get_candidate_ver`. Set the candidate
+        version of the :class:`Package` *pkg* to the :class:`Version`
+        *version*.
+
+    .. method:: upgrade([dist_upgrade=False])
+
+        Perform an upgrade. More detailed, this marks all the upgradable
+        packages for upgrade. You still need to call
+        :meth:`pkgDepCache.commit` for the changes to apply.
+
+        To perform a dist-upgrade, the optional parameter *dist_upgrade* has
+        to be set to True.
+
+    .. method:: fix_broken()
+
+        Fix broken packages.
+
+    .. method:: read_pinfile()
+
+        Read the policy, eg. /etc/apt/preferences.
+
+    .. method:: minimize_upgrade()
+
+        Go over the entire set of packages and try to keep each package marked
+        for upgrade. If a conflict is generated then the package is restored.
+
+        .. todo::
+            Explain better..
+
+    .. method:: mark_auto(pkg)
+
+        Mark the :class:`Package` *pkg* as automatically installed.
+
+    .. method:: mark_keep(pkg)
+
+        Mark the :class:`Package` *pkg* for keep.
+
+    .. method:: mark_delete(pkg[, purge])
+
+        Mark the :class:`Package` *pkg* for delete. If *purge* is True,
+        the configuration files will be removed as well.
+
+    .. method:: mark_install(pkg[, auto_inst=True[, from_user=True]])
+
+        Mark the :class:`Package` *pkg* for install.
+
+        If *auto_inst* is ``True``, the dependencies of the package will be
+        installed as well. This is the default.
+
+        If *from_user* is ``True``, the package will be marked as manually
+        installed. This is the default.
+
+    .. method:: set_reinstall(pkg)
+
+        Set if the :class:`Package` *pkg* should be reinstalled.
+
+    .. method:: is_upgradable(pkg)
+
+        Return ``1`` if the package is upgradable.
+
+        The package can be upgraded by calling :meth:`pkgDepCache.MarkInstall`.
+
+    .. method:: is_now_broken(pkg)
+
+        Return `1` if the package is broken now (including changes made, but
+        not committed).
+
+    .. method:: is_inst_broken(pkg)
+
+        Return ``1`` if the package is broken on the current install. This
+        takes changes which have not been committed not into effect.
+
+    .. method:: is_garbage(pkg)
+
+        Return ``1`` if the package is garbage, ie. if it is automatically
+        installed and no longer referenced by other packages.
+
+    .. method:: is_auto_installed(pkg)
+
+        Return ``1``  if the package is automatically installed (eg. as the
+        dependency of another package).
+
+    .. method:: marked_install(pkg)
+
+        Return ``1`` if the package is marked for install.
+
+    .. method:: marked_upgrade(pkg)
+
+        Return ``1`` if the package is marked for upgrade.
+
+    .. method:: marked_delete(pkg)
+
+        Return ``1`` if the package is marked for delete.
+
+    .. method:: marked_keep(pkg)
+
+        Return ``1`` if the package is marked for keep.
+
+    .. method:: marked_reinstall(pkg)
+
+        Return ``1`` if the package should be installed.
+
+    .. method:: marked_downgrade(pkg)
+
+        Return ``1`` if the package should be downgraded.
+
+    .. attribute:: keep_count
+
+        Integer, number of packages marked as keep
+
+    .. attribute:: inst_count
+
+        Integer, number of packages marked for installation.
+
+    .. attribute:: del_count
+
+        Number of packages which should be removed.
+
+    .. attribute:: broken_count
+
+        Number of packages which are broken.
+
+    .. attribute:: usr_size
+
+        The size required for the changes on the filesystem. If you install
+        packages, this is positive, if you remove them its negative.
+
+    .. attribute:: deb_size
+
+        The size of the packages which are needed for the changes to be
+        applied.
+
+    .. attribute:: policy
+
+        The underlying :class:`Policy` object used by the :class:`DepCache` to
+        select candidate versions.
+
+
+.. class:: PackageManager(depcache)
+
+    Return a new :class:`PackageManager` object. The parameter *depcache*
+    specifies a :class:`DepCache` object.
+
+    :class:`PackageManager` objects provide several methods and attributes,
+    which will be listed here:
+
+    .. method:: get_archives(fetcher, list, records)
+
+        Add all the selected packages to the :class:`Acquire()` object
+        *fetcher*.
+
+        The parameter *list* refers to a :class:`SourceList()` object.
+
+        The parameter *records* refers to a :class:`PackageRecords()` object.
+
+    .. method:: do_install()
+
+        Install the packages.
+
+    .. method:: fix_missing
+
+        Fix the installation if a package could not be downloaded.
+
+    .. attribute:: RESULT_COMPLETED
+
+        A constant for checking whether the the result is 'completed'.
+
+        Compare it against the return value of :meth:`PackageManager.get_archives`
+        or :meth:`PackageManager.do_install`.
+
+    .. attribute:: RESULT_FAILED
+
+        A constant for checking whether the the result is 'failed'.
+
+        Compare it against the return value of :meth:`PackageManager.get_archives`
+        or :meth:`PackageManager.do_install`.
+
+    .. attribute:: RESULT_INCOMPLETE
+
+        A constant for checking whether the the result is 'incomplete'.
+
+        Compare it against the return value of :meth:`PackageManager.get_archives`
+        or :meth:`PackageManager.do_install`.
+
+Improve performance with :class:`ActionGroup`
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. class:: ActionGroup(depcache)
+
+    Create a new :class:`ActionGroup()` object for the :class:`DepCache` object
+    given by the parameter *depcache*.
+
+    :class:`ActionGroup()` objects make operations on the cache faster by
+    delaying certain cleanup operations until the action group is released.
+
+    ActionGroup is also a context manager and therefore supports the
+    :keyword:`with` statement. But because it becomes active as soon as it
+    is created, you should not create an ActionGroup() object before entering
+    the with statement.
+
+    If you want to use ActionGroup as a with statement (which is recommended
+    because it makes it easier to see when an actiongroup is active), always
+    use the following form::
+
+        with apt_pkg.ActionGroup(depcache):
+            ...
+
+    For code which has to run on Python versions prior to 2.5, you can also
+    use the traditional way::
+
+        actiongroup = apt_pkg.ActionGroup(depcache)
+        ...
+        actiongroup.release()
+
+    :class:`ActionGroup` provides the following method:
+
+    .. method:: release()
+
+        Release the ActionGroup. This will reactive the collection of package
+        garbage.
+
+Resolving Dependencies
+^^^^^^^^^^^^^^^^^^^^^^
+
+.. class:: ProblemResolver(depcache)
+
+    Return a new :class:`ProblemResolver` object. The parameter *depcache*
+    specifies a :class:`pDepCache` object.
+
+    The problem resolver helps when there are problems in the package
+    selection. An example is a package which conflicts with another, already
+    installed package.
+
+    .. method:: protect(pkg)
+
+        Protect the :class:`Package()` object given by the parameter *pkg*.
+
+        .. todo::
+
+            Really document it.
+
+    .. method:: install_protect()
+
+        Protect all installed packages from being removed.
+
+    .. method:: remove(pkg)
+
+        Remove the :class:`Package()` object given by the parameter *pkg*.
+
+        .. todo::
+
+            Really document it.
+
+    .. method:: clear(pkg)
+
+        Reset the :class:`Package()` *pkg* to the default state.
+
+        .. todo::
+
+            Really document it.
+
+    .. method:: resolve()
+
+        Try to resolve problems by installing and removing packages.
+
+    .. method:: resolve_by_keep()
+
+        Try to resolve problems only by using keep.
+
+
+:class:`Package`
+^^^^^^^^^^^^^^^^^
+.. class:: Package
+
+    The pkgCache::Package objects are an interface to package specific
+    features.
+
+
+    Attributes:
+
+    .. attribute:: current_ver
+
+        The version currently installed, or None. This returns a
+        :class:`Version` object.
+
+    .. attribute:: id
+
+        The ID of the package. This can be used to store information about
+        the package. The ID is an int value.
+
+    .. attribute:: name
+
+        This is the name of the package.
+
+    .. attribute:: provides_list
+
+        A list of packages providing this package. More detailed, this is a
+        list of tuples (str:pkgname, ????, :class:`Version`).
+
+        If you want to check for check for virtual packages, the expression
+        ``pkg.provides_list and not pkg._version_list`` helps you. It detects if
+        the package is provided by something else and is not available as a
+        real package.
+
+    .. attribute:: rev_depends_list
+
+        An iterator of :class:`Dependency` objects for dependencies on this
+        package.
+
+    .. attribute:: section
+
+        The section of the package, as specified in the record. The list of
+        possible sections is defined in the Policy.
+
+    .. attribute:: version_list
+
+        A list of :class:`Version` objects for all versions available in the
+        cache.
+
+    **States**:
+
+    .. attribute:: selected_state
+
+        The state we want it to be, ie. if you mark a package for installation,
+        this is :attr:`apt_pkg.SELSTATE_INSTALL`.
+
+        See :ref:`SelStates` for a list of available states.
+
+    .. attribute:: inst_state
+
+        The state the currently installed version is in. This is normally
+        :attr:`apt_pkg.INSTSTATE_OK`, unless the installation failed.
+
+        See :ref:`InstStates` for a list of available states.
+
+    .. attribute:: current_state
+
+        The current state of the package (not installed, unpacked, installed,
+        etc). See :ref:`CurStates` for a list of available states.
+
+    **Flags**:
+
+    .. attribute:: auto
+
+        Whether the package was installed automatically as a dependency of
+        another package. (or marked otherwise as automatically installed)
+
+    .. attribute:: essential
+
+        Whether the package is essential.
+
+    .. attribute:: important
+
+        Whether the package is important.
+
+Example:
+~~~~~~~~~
+.. literalinclude:: ../examples/cache-packages.py
+
+
+
+:class:`Version`
+^^^^^^^^^^^^^^^^^
+.. class:: Version
+
+    The version object contains all information related to a specific package
+    version.
+
+    .. attribute:: ver_str
+
+        The version, as a string.
+
+    .. attribute:: section
+
+        The usual sections (eg. admin, net, etc.). Prefixed with the component
+        name for packages not in main (eg. non-free/admin).
+
+    .. attribute:: arch
+
+        The architecture of the package, eg. amd64 or all.
+
+    .. attribute:: file_list
+
+        A list of (:class:`PackageFile`, int: index) tuples for all Package
+        files containing this version of the package.
+
+    .. attribute:: depends_list_str
+
+        A dictionary of dependencies. The key specifies the type of the
+        dependency ('Depends', 'Recommends', etc.).
+
+        The value is a list, containing items which refer to the or-groups of
+        dependencies. Each of these or-groups is itself a list, containing
+        tuples like ('pkgname', 'version', 'relation') for each or-choice.
+
+        An example return value for a package with a 'Depends: python (>= 2.4)'
+        would be::
+
+            {'Depends': [
+                            [
+                             ('python', '2.4', '>=')
+                            ]
+                        ]
+            }
+
+        The same for a dependency on A (>= 1) | B (>= 2)::
+
+            {'Depends': [
+                            [
+                                ('A', '1', '>='),
+                                ('B', '2', '>='),
+                            ]
+                        ]
+            }
+
+    .. attribute:: depends_list
+
+        This is basically the same as :attr:`Version.DependsListStr`,
+        but instead of the ('pkgname', 'version', 'relation') tuples,
+        it returns :class:`Dependency` objects, which can assist you with
+        useful functions.
+
+    .. attribute:: parent_pkg
+
+        The :class:`Package` object this version belongs to.
+
+    .. attribute:: provides_list
+
+        This returns a list of all packages provided by this version. Like
+        :attr:`Package.provides_list`, it returns a list of tuples
+        of the form ('virtualpkgname', ???, :class:`Version`), where as the
+        last item is the same as the object itself.
+
+    .. attribute:: size
+
+        The size of the .deb file, in bytes.
+
+    .. attribute:: installed_size
+
+        The size of the package (in kilobytes), when unpacked on the disk.
+
+    .. attribute:: hash
+
+        An integer hash value.
+
+    .. attribute:: id
+
+        An integer id.
+
+    .. attribute:: priority
+
+        The integer representation of the priority. This can be used to speed
+        up comparisons a lot, compared to :attr:`Version.priority_str`.
+
+        The values are defined in the :mod:`apt_pkg` extension, see
+        :ref:`Priorities` for more information.
+
+    .. attribute:: priority_str
+
+        Return the priority of the package version, as a string, eg.
+        "optional".
+
+    .. attribute:: downloadable
+
+        Whether this package can be downloaded from a remote site.
+
+    .. attribute:: translated_description
+
+        Return a :class:`Description` object.
+
+
+:class:`Dependency`
+^^^^^^^^^^^^^^^^^^^^
+.. class:: Dependency
+
+    Represent a dependency from one package to another one.
+
+    .. method:: all_targets
+
+        A list of :class:`Version` objects which satisfy the dependency,
+        and do not conflict with already installed ones.
+
+        From my experience, if you use this method to select the target
+        version, it is the best to select the last item unless any of the
+        other candidates is already installed. This leads to results being
+        very close to the normal package installation.
+
+    .. method:: smart_target_pkg
+
+        Return a :class:`Version` object of a package which satisfies the
+        dependency and does not conflict with installed packages
+        (the 'natural target').
+
+    .. attribute:: target_ver
+
+        The target version of the dependency, as string. Empty string if the
+        dependency is not versioned.
+
+    .. attribute:: target_pkg
+
+        The :class:`Package` object of the target package.
+
+    .. attribute:: parent_ver
+
+        The :class:`Version` object of the parent version, ie. the package
+        which declares the dependency.
+
+    .. attribute:: parent_pkg
+
+        The :class:`Package` object of the package which declares the
+        dependency. This is the same as using ParentVer.ParentPkg.
+
+    .. attribute:: comp_type
+
+        The type of comparison (>=, ==, >>, <=), as string.
+
+    .. attribute:: dep_type
+
+        The type of the dependency, as string, eg. "Depends".
+
+    .. attribute:: dep_type_enum
+
+        The type of the dependency, as an integer which can be compared to
+        one of the TYPE_* constants below.
+
+    .. attribute:: dep_type_untranslated
+
+        The type of the depndency, as an untranslated string.
+
+    .. attribute:: id
+
+        The ID of the package, as integer.
+
+    .. attribute:: TYPE_CONFLICTS
+
+        Constant for checking against dep_type_enum
+
+    .. attribute:: TYPE_DEPENDS
+
+        Constant for checking against dep_type_enum
+
+    .. attribute:: TYPE_DPKG_BREAKS
+
+        Constant for checking against dep_type_enum
+
+    .. attribute:: TYPE_ENHANCES
+
+        Constant for checking against dep_type_enum
+
+    .. attribute:: TYPE_OBSOLETES
+
+        Constant for checking against dep_type_enum
+
+    .. attribute:: TYPE_PREDEPENDS
+
+        Constant for checking against dep_type_enum
+        
+    .. attribute:: TYPE_RECOMMENDS
+
+        Constant for checking against dep_type_enum
+        
+    .. attribute:: TYPE_REPLACES
+
+        Constant for checking against dep_type_enum
+        
+    .. attribute:: TYPE_SUGGESTS
+
+        Constant for checking against dep_type_enum
+
+Example: Find all missing dependencies
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+With the help of Dependency.AllTargets(), you can easily find all packages with
+broken dependencies:
+
+.. literalinclude:: ../examples/missing-deps.py
+
+
+:class:`Description`
+^^^^^^^^^^^^^^^^^^^^^
+.. class:: Description
+
+    Represent the description of the package.
+
+    .. attribute:: language_code
+
+        The language code of the description
+
+    .. attribute:: md5
+
+        The md5 hashsum of the description
+
+    .. attribute:: file_list
+
+        A list of tuples (:class:`PackageFile`, int: index).
+
+
+
+Index Files
+-------------
+
+
+.. todo::
+
+    Complete them
+
+.. class:: MetaIndex
+
+    .. attribute:: uri
+    .. attribute:: dist
+    .. attribute:: is_trusted
+    .. attribute:: index_files
+
+
+.. class:: IndexFile
+
+    .. method:: archive_uri(path)
+
+        Return the full url to path in the archive.
+
+    .. attribute:: label
+
+        Return the Label.
+
+    .. attribute:: describe
+
+        A description of the :class:`IndexFile`.
+
+    .. attribute:: exists
+
+        Return whether the file exists.
+
+    .. attribute:: has_packages
+
+        Return whether the file has packages.
+
+    .. attribute:: size
+
+        Size of the file
+
+    .. attribute:: is_trusted
+
+        Whether we can trust the file.
+
+
+.. class:: PackageFile
+
+    A :class:`PackageFile` represents a Packages file, eg.
+    /var/lib/dpkg/status.
+
+    .. attribute:: architecture
+
+        The architecture of the package file.
+
+    .. attribute:: archive
+
+        The archive (eg. unstable)
+
+    .. attribute:: component
+
+        The component (eg. main)
+
+    .. attribute:: filename
+
+        The name of the file.
+
+    .. attribute:: id
+
+        The ID of the package. This is an integer which can be used to store
+        further information about the file [eg. as dictionary key].
+
+    .. attribute:: index_type
+
+        The sort of the index file. In normal cases, this is
+        'Debian Package Index'.
+
+    .. attribute:: label
+
+        The Label, as set in the Release file
+
+    .. attribute:: not_automatic
+
+        Whether packages from this list will be updated automatically. The
+        default for eg. example is 0 (aka false).
+
+    .. attribute:: not_source
+
+        Whether the file has no source from which it can be updated. In such a
+        case, the value is 1; else 0. /var/lib/dpkg/status is 0 for example.
+
+        Example::
+
+            for pkgfile in cache.file_list:
+                if pkgfile.not_source:
+                    print 'The file %s has no source.' % pkgfile.filename
+
+    .. attribute:: origin
+
+        The Origin, as set in the Release file
+
+    .. attribute:: site
+
+        The hostname of the site.
+
+    .. attribute:: size
+
+        The size of the file.
+
+    .. attribute:: version
+
+        The version, as set in the release file (eg. "4.0" for "Etch")
+
+
+
+The following example shows how to use PackageFile:
+
+.. literalinclude:: ../examples/cache-pkgfile.py
+
+
+Records
+--------
+
+.. class:: PackageRecords(cache)
+
+    Create a new :class:`PackageRecords` object, for the packages in the cache
+    specified by the parameter *cache*.
+
+    Provide access to the packages records. This provides very useful
+    attributes for fast (convient) access to some fields of the record.
+
+    .. method:: lookup(verfile_iter)
+
+        Change the actual package to the package given by the verfile_iter.
+
+        The parameter *verfile_iter* refers to a tuple consisting
+        of (:class:`PackageFile()`, int: index), as returned by various
+        attributes, including :attr:`Version.file_list`.
+
+        Example (shortened)::
+
+            cand = depcache.GetCandidateVer(cache['python-apt'])
+            records.Lookup(cand.FileList[0])
+            # Now you can access the record
+            print records.SourcePkg # == python-apt
+
+    .. attribute:: filename
+
+        Return the field 'Filename' of the record. This is the path to the
+        package, relative to the base path of the archive.
+
+    .. attribute:: md5_hash
+
+        Return the MD5 hashsum of the package This refers to the field
+        'MD5Sum' in the raw record.
+
+    .. attribute:: sha1_hash
+
+        Return the SHA1 hashsum of the package. This refers to the field 'SHA1'
+        in the raw record.
+
+    .. attribute:: sha256_hash
+
+        Return the SHA256 hashsum of the package. This refers to the field
+        'SHA256' in the raw record.
+
+        .. versionadded:: 0.7.9
+
+    .. attribute:: source_pkg
+
+        Return the source package.
+
+    .. attribute:: source_ver
+
+        Return the source version.
+
+    .. attribute:: maintainer
+
+        Return the maintainer of the package.
+
+    .. attribute:: short_desc
+
+        Return the short description. This is the summary on the first line of
+        the 'Description' field.
+
+    .. attribute:: long_desc
+
+        Return the long description. These are lines 2-END from the
+        'Description' field.
+
+    .. attribute:: name
+
+        Return the name of the package. This is the 'Package' field.
+
+    .. attribute:: homepage
+
+        Return the Homepage. This is the 'Homepage' field.
+
+    .. attribute:: record
+
+        Return the whole record as a string. If you want to access fields of
+        the record not available as an attribute, you can use
+        :class:`apt_pkg.TagSection` to parse the record and access the field
+        name.
+
+        Example::
+
+            section = apt_pkg.TagSection(records.record)
+            print section['SHA256'] # Use records.sha256_hash instead
+
+
+.. class:: SourceRecords
+
+    This represents the entries in the Sources files, ie. the dsc files of
+    the source packages.
+
+    .. note::
+
+        If the Lookup failed, because no package could be found, no error is
+        raised. Instead, the attributes listed below are simply not existing
+        anymore (same applies when no Lookup has been made, or when it has
+        been restarted).
+
+    .. method:: lookup(pkgname)
+
+        Lookup the record for the package named *pkgname*. To access all
+        available records, you need to call it multiple times.
+
+        Imagine a package P with two versions X, Y. The first ``lookup(P)``
+        would set the record to version X and the second ``lookup(P)`` to
+        version Y.
+
+    .. method:: restart()
+
+        Restart the lookup.
+
+        Imagine a package P with two versions X, Y. The first ``Lookup(P)``
+        would set the record to version X and the second ``Lookup(P)`` to
+        version Y.
+
+        If you now call ``restart()``, the internal position will be cleared.
+        Now you can call ``lookup(P)`` again to move to X.
+
+    .. attribute:: package
+
+        The name of the source package.
+
+    .. attribute:: version
+
+        A string describing the version of the source package.
+
+    .. attribute:: maintainer
+
+        A string describing the name of the maintainer.
+
+    .. attribute:: section
+
+        A string describing the section.
+
+    .. attribute:: record
+
+        The whole record, as a string. You can use :func:`apt_pkg.ParseSection`
+        if you need to parse it.
+
+        You need to parse the record if you want to access fields not available
+        via the attributes, eg. 'Standards-Version'
+
+    .. attribute:: binaries
+
+        Return a list of strings describing the package names of the binaries
+        created by the source package. This matches the 'Binary' field in the
+        raw record.
+
+    .. attribute:: index
+
+        The index in the Sources files.
+
+    .. attribute:: files
+
+        The list of files. This returns a list of tuples with the contents
+        ``(str: md5, int: size, str: path, str:type)``.
+
+    .. attribute:: build_depends
+
+        Return a dictionary representing the build-time dependencies of the
+        package. The format is the same as for :attr:`Version.depends_list_str`
+        and possible keys being ``"Build-Depends"``, ``"Build-Depends-Indep"``,
+        ``"Build-Conflicts"`` or ``"Build-Conflicts-Indep"``.
+
+
+The Acquire interface
+----------------------
+The Acquire Interface is responsible for all sorts of downloading in apt. All
+packages, index files, etc. downloading is done using the Acquire functionality.
+
+The :mod:`apt_pkg` module provides a subset of this functionality which allows
+you to implement file downloading in your applications. Together with the
+:class:`PackageManager` class you can also fetch all the packages marked for
+installation.
+
+
+.. class:: Acquire([progress])
+
+    Return an :class:`Acquire` object. The parameter *progress* refers to
+    an :class:`apt.progress.FetchProgress()` object.
+
+    Acquire objects maintaing a list of items which will be fetched or have
+    been fetched already during the lifetime of this object. To add new items
+    to this list, you can create new :class:`AcquireFile` objects which allow
+    you to add single files.
+
+    Acquire items have multiple methods and attributes:
+
+    .. method:: run()
+
+        Fetch all the items which have been added by :class:`AcquireFile`.
+
+    .. method:: shutdown()
+
+        Shut the fetcher down.
+
+    .. attribute:: total_needed
+
+        The total amount of bytes needed (including those of files which are
+        already present)
+
+    .. attribute:: fetch_needed
+
+        The total amount of bytes which need to be fetched.
+
+    .. attribute:: partial_present
+
+        Whether some files have been acquired already. (???)
+
+    .. attribute:: items
+
+        A list of :class:`AcquireItem` objects which are attached to the
+        queue of this object.
+
+    .. attribute:: workers
+
+        A list of :class:`AcquireWorker` objects which are currently active
+        on this instance.
+
+.. class:: AcquireItem
+
+    The :class:`AcquireItem()` objects represent the items of a
+    :class:`Acquire` object. :class:`AcquireItem()` objects can not be created
+    by the user, they are solely available through the :attr:`Acquire.items`
+    list of an :class:`Acquire` object.
+
+    .. attribute:: id
+
+        The ID of the item.
+
+    .. attribute:: complete
+
+        Is the item completely acquired?
+
+    .. attribute:: local
+
+        Is the item a local file?
+
+    .. attribute:: mode
+
+        A string indicating the current mode e.g. ``"Fetching"``.
+
+    .. attribute:: is_trusted
+
+        Can the file be trusted?
+
+    .. attribute:: filesize
+
+        The size of the file, in bytes.
+
+    .. attribute:: error_text
+
+        The error message. For example, when a file does not exist on a http
+        server, this will contain a 404 error message.
+
+    .. attribute:: destfile
+
+        The location the file is saved as.
+
+    .. attribute:: desc_uri
+
+        The source location.
+
+    **Status**:
+
+    .. attribute:: status
+
+        Integer, representing the status of the item.
+
+    .. attribute:: STAT_IDLE
+
+        Constant for comparing :attr:`AcquireItem.status`.
+
+    .. attribute:: STAT_FETCHING
+
+        Constant for comparing :attr:`AcquireItem.status`
+
+    .. attribute:: STAT_DONE
+
+        Constant for comparing :attr:`AcquireItem.status`
+
+    .. attribute:: STAT_ERROR
+
+        Constant for comparing :attr:`AcquireItem.status`
+
+    .. attribute:: STAT_AUTH_ERROR
+
+        Constant for comparing :attr:`AcquireItem.status`
+
+.. class:: AcquireFile(owner, uri[, md5, size, descr, short_descr, destdir, destfile])
+
+    Create a new :class:`AcquireFile()` object and register it with *acquire*,
+    so it will be fetched. You must always keep around a reference to the
+    object, otherwise it will be removed from the Acquire queue again.
+
+    The parameter *owner* refers to an :class:`Acquire()` object as returned
+    by :func:`GetAcquire`. The file will be added to the Acquire queue
+    automatically.
+
+    The parameter *uri* refers to the location of the file, any protocol
+    of apt is supported.
+
+    The parameter *md5* refers to the md5sum of the file. This can be used
+    for checking the file.
+
+    The parameter *size* can be used to specify the size of the package,
+    which can then be used to calculate the progress and validate the download.
+
+    The parameter *descr* is a descripition of the download. It may be
+    used to describe the item in the progress class. *short_descr* is the
+    short form of it.
+
+    You can use *destdir* to manipulate the directory where the file will
+    be saved in. Instead of *destdir*, you can also specify the full path to
+    the file using the parameter *destfile*. You can not combine both.
+
+    In terms of attributes, this class is a subclass of :class:`AcquireItem`
+    and thus inherits all its attributes.
+
+.. class:: AcquireWorker
+
+    An :class:`AcquireWorker` object represents a subprocess responsible for
+    fetching files from remote locations. This class is not instanciable from
+    Python.
+
+    .. attribute:: current_item
+
+        The item which is currently being fetched. This returns an
+        :class:`AcquireItemDesc` object.
+
+    .. attribute:: current_size
+
+        How many bytes of the file have been downloaded. Zero if the current
+        progress of the file cannot be determined.
+
+    .. attribute:: resumepoint
+
+        The amount of the file that was already downloaded prior to starting
+        this worker.
+
+    .. attribute:: status
+
+        The most recent status string received from the subprocess.
+
+    .. attribute:: total_size
+
+        The total number of bytes to be downloaded. Zero if the total size is
+        unknown.
+
+.. class:: AcquireItemDesc
+
+    An :class:`AcquireItemDesc` object stores information about the item which
+    can be used to describe the item.
+
+    .. attribute:: description
+
+        The long description given to the item.
+
+    .. attribute:: owner
+
+        The :class:`AcquireItem` object owning this object.
+
+    .. attribute:: shortdesc
+
+        A short description which has been given to this item.
+
+    .. attribute:: uri
+
+        The URI from which to download this item.
+
+.. class:: AcquireProgress
+
+    A monitor object for downloads controlled by the Acquire class. This is
+    an mostly abstract class. You should subclass it and implement the
+    methods to get something useful.
+
+    Methods defined here:
+
+    .. method:: done(item: AcquireItemDesc)
+
+        Invoked when an item is successfully and completely fetched.
+
+    .. method:: fail(item: AcquireItemDesc)
+
+        Invoked when the process of fetching an item encounters a fatal error.
+
+    .. method:: fetch(item: AcquireItemDesc)
+
+        Invoked when some of an item's data is fetched.
+
+    .. method:: ims_hit(item: AcquireItemDesc)
+
+        Invoked when an item is confirmed to be up-to-date. For instance,
+        when an HTTP download is informed that the file on the server was
+        not modified.
+
+    .. method:: media_change(media: str, drive: str) -> bool
+
+        Invoked when the user should be prompted to change the inserted
+        removable media.
+
+        This method should not return until the user has confirmed to the user
+        interface that the media change is complete.
+
+        The parameter *media* is the name of the media type that should be
+        changed, the parameter *drive* is the identifying name of the drive
+        whose media should be changed.
+
+        Return True if the user confirms the media change, False if it is
+        cancelled.
+
+    .. method:: pulse(owner: Acquire) -> bool
+
+        Periodically invoked while the Acquire process is underway.
+
+        Return False if the user asked to cancel the whole Acquire process.
+
+    .. method:: start()
+
+        Invoked when the Acquire process starts running.
+
+    .. method:: stop()
+
+        Invoked when the Acquire process stops running.
+
+    There are also some data descriptors:
+
+    .. attribute:: current_bytes
+
+        The number of bytes fetched.
+
+    .. attribute:: current_cps
+
+        The current rate of download, in bytes per second.
+
+    .. attribute:: current_items
+
+        The number of items that have been successfully downloaded.
+
+    .. attribute:: elapsed_time
+
+        The amount of time that has elapsed since the download started.
+
+    .. attribute:: fetched_bytes
+
+        The total number of bytes accounted for by items that were
+        successfully fetched.
+
+    .. attribute:: last_bytes
+
+        The number of bytes fetched as of the previous call to pulse(),
+        including local items.
+
+    .. attribute:: total_bytes
+
+        The total number of bytes that need to be fetched. This member is
+        inaccurate, as new items might be enqueued while the download is
+        in progress!
+
+    .. attribute:: total_items
+
+        The total number of items that need to be fetched. This member is
+        inaccurate, as new items might be enqueued while the download is
+        in progress!
+
+
+Hashes
+------
+The apt_pkg module also provides several hash functions. If you develop
+applications with python-apt it is often easier to use these functions instead
+of the ones provides in Python's :mod:`hashlib` module.
+
+The module provides the two classes :class:`Hashes` and :class:`HashString` for
+generic hash support:
+
+.. class:: Hashes(object)
+
+    Calculate all supported hashes of the object. *object* may either be a
+    string, in which cases the hashes of the string are calculated, or a
+    :class:`file()` object or file descriptor, in which case the hashes of
+    its contents is calculated. The calculated hashes are then available via
+    attributes:
+
+    .. attribute:: md5
+
+        The MD5 hash of the data, as string.
+
+    .. attribute:: sha1
+
+        The SHA1 hash of the data, as string.
+
+    .. attribute:: sha256
+
+        The SHA256 hash of the data, as string.
+
+.. class:: HashString(type: str, hash: str)
+
+    HashString objects store the type of a hash and the corresponding hash.
+    They are used by e.g :meth:`IndexRecords.lookup`. The first parameter,
+    *type* refers to one of MD5Sum, SHA1 and SHA256. The second parameter
+    *hash* is the corresponding hash.
+
+    .. describe:: str(hashstring)
+
+        Convert the HashString to a string by joining the hash type and the
+        hash using ':', e.g. ``"MD5Sum:d41d8cd98f00b204e9800998ecf8427e"``.
+
+    .. attribute:: hashtype
+
+        The type of the hash. This may be MD5Sum, SHA1 or SHA256.
+
+    .. method:: verify_file(filename: str) -> bool
+
+        Verify that the file given by the parameter *filename* matches the hash
+        stored in this object.
+
+The :mod:`apt_pkg` module also provides the functions :func:`md5sum`,
+:func:`sha1sum` and :func:`sha256sum` for creating a single hash from a
+:class:`bytes` or :class:`file` object:
+
+.. function:: md5sum(object)
+
+    Return the md5sum of the object. *object* may either be a string, in
+    which case the md5sum of the string is returned, or a :class:`file()`
+    object (or a file descriptor), in which case the md5sum of its contents is
+    returned.
+
+    .. versionchanged:: 0.8.0
+        Added support for using file descriptors.
+
+.. function:: sha1sum(object)
+
+    Return the sha1sum of the object. *object* may either be a string, in
+    which case the sha1sum of the string is returned, or a :class:`file()`
+    object (or a file descriptor), in which case the sha1sum of its contents
+    is returned.
+
+    .. versionchanged:: 0.8.0
+        Added support for using file descriptors.
+
+.. function:: sha256sum(object)
+
+    Return the sha256sum of the object. *object* may either be a string, in
+    which case the sha256sum of the string is returned, or a :class:`file()`
+    object  (or a file descriptor), in which case the sha256sum of its contents
+    is returned.
+
+    .. versionchanged:: 0.8.0
+        Added support for using file descriptors.
+
+Debian control files
+--------------------
+Debian control files are files containing multiple stanzas of :RFC:`822`-style
+header sections. They are widely used in the Debian community, and can represent
+many kinds of information. One example for such a file is the
+:file:`/var/lib/dpkg/status` file which contains a list of the currently
+installed packages.
+
+The :mod:`apt_pkg` module provides two classes to read those files and parts
+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)
+
+    An object which represents a typical debian control file. Can be used for
+    Packages, Sources, control, Release, etc. Such an object provides two
+    kinds of API which should not be used together:
+
+    The first API implements the iterator protocol and should be used whenever
+    possible because it has less side effects than the other one. It may be
+    used e.g. with a for loop::
+
+        tagf = apt_pkg.TagFile(open('/var/lib/dpkg/status'))
+        for section in tagfile:
+            print section['Package']
+        
+    .. method:: next()
+
+        A TagFile is its own iterator. This method is part of the iterator
+        protocol and returns a :class:`TagSection` object for the next
+        section in the file. If there is no further section, this method
+        raises the :exc:`StopIteration` exception.
+
+        From Python 3 on, this method is not available anymore, and the
+        global function ``next()`` replaces it.
+
+    The second API uses a shared :class:`TagSection` object which is exposed
+    through the :attr:`section` attribute. This object is modified by calls
+    to :meth:`step` and :meth:`jump`. This API provides more control and may
+    use less memory, but is not recommended because it works by modifying
+    one object. It can be used like this::
+
+        tagf = apt_pkg.TagFile(open('/var/lib/dpkg/status'))
+        tagf.step()
+        print tagf.section['Package']
+
+    .. method:: step
+
+        Step forward to the next section. This simply returns ``1`` if OK, and
+        ``0`` if there is no section.
+
+    .. method:: offset
+
+        Return the current offset (in bytes) from the beginning of the file.
+
+    .. method:: jump(offset)
+
+        Jump back/forward to *offset*. Use ``jump(0)`` to jump to the
+        beginning of the file again.
+
+    .. attribute:: section
+
+        This is the current :class:`TagSection()` instance.
+
+.. class:: TagSection(text)
+
+    Represent a single section of a debian control file.
+
+    .. describe:: section[key]
+
+        Return the value of the field at *key*. If *key* is not available,
+        raise :exc:`KeyError`.
+
+    .. describe:: key in section
+
+        Return ``True`` if *section* has a key *key*, else ``False``.
+
+      .. versionadded:: 0.8.0
+
+    .. method:: bytes
+
+        The number of bytes in the section.
+
+    .. method:: find(key, default='')
+
+        Return the value of the field at the key *key* if available,
+        else return *default*.
+
+    .. method:: find_flag(key)
+
+        Find a yes/no value for the key *key*. An example for such a
+        field is 'Essential'.
+
+    .. method:: get(key, default='')
+
+        Return the value of the field at the key *key* if available, else
+        return *default*.
+
+    .. method:: keys()
+
+        Return a list of keys in the section.
+
+.. function:: rewrite_section(section: TagSection, order: list, rewrite_list: list) -> str
+
+    Rewrite the section given by *section* using *rewrite_list*, and order the
+    fields according to *order*.
+
+    The parameter *order* is a :class:`list` object containing the names of the
+    fields in the order they should appear in the rewritten section.
+    :data:`apt_pkg.REWRITE_PACKAGE_ORDER` and
+    :data:`apt_pkg.REWRITE_SOURCE_ORDER` are two predefined lists for rewriting
+    package and source sections, respectively.
+
+    The parameter *rewrite_list* is a list of tuples of the form
+    ``(tag, newvalue[, renamed_to])``, whereas *tag* describes the field which
+    should be changed, *newvalue* the value which should be inserted or
+    ``None`` to delete the field, and the optional *renamed_to* can be used
+    to rename the field.
+
+.. data:: REWRITE_PACKAGE_ORDER
+
+    The order in which the information for binary packages should be rewritten,
+    i.e. the order in which the fields should appear.
+
+.. data:: REWRITE_SOURCE_ORDER
+
+    The order in which the information for source packages should be rewritten,
+    i.e. the order in which the fields should appear.
+
+Dependencies
+------------
+.. function:: check_dep(pkgver, op, depver)
+
+    Check that the dependency requirements consisting of op and depver can be
+    satisfied by the version pkgver.
+
+    Example::
+
+        >>> bool(apt_pkg.check_dep("1.0", ">=", "1"))
+        True
+
+The following two functions provide the ability to parse dependencies. They
+use the same format as :attr:`Version.depends_list_str`.
+
+.. function:: parse_depends(depends)
+
+    Parse the string *depends* which contains dependency information as
+    specified in Debian Policy, Section 7.1.
+
+    Returns a list. The members of this list are lists themselves and contain
+    one or more tuples in the format ``(package,version,operation)`` for every
+    'or'-option given, e.g.::
+
+        >>> apt_pkg.parse_depends("PkgA (>= VerA) | PkgB (>= VerB)")
+        [[('PkgA', 'VerA', '>='), ('PkgB', 'VerB', '>=')]]
+
+
+    .. note::
+
+        The behavior of this function is different than the behavior of the
+        old function :func:`ParseDepends()`, because the third field
+        ``operation`` uses `>` instead of `>>` and `<` instead of `<<` which
+        is specified in control files.
+
+
+.. function:: parse_src_depends(depends)
+
+    Parse the string *depends* which contains dependency information as
+    specified in Debian Policy, Section 7.1.
+
+    Returns a list. The members of this list are lists themselves and contain
+    one or more tuples in the format ``(package,version,operation)`` for every
+    'or'-option given, e.g.::
+
+        >>> apt_pkg.parse_depends("PkgA (>= VerA) | PkgB (>= VerB)")
+        [[('PkgA', 'VerA', '>='), ('PkgB', 'VerB', '>=')]]
+
+
+    Furthemore, this function also supports to limit the architectures, as
+    used in e.g. Build-Depends::
+
+        >>> apt_pkg.parse_src_depends("a (>= 01) [i386 amd64]")
+        [[('a', '01', '>=')]]
+
+    .. note::
+
+        The behavior of this function is different than the behavior of the
+        old function :func:`ParseDepends()`, because the third field
+        ``operation`` uses `>` instead of `>>` and `<` instead of `<<` which
+        is specified in control files.
+
+
+Configuration
+-------------
+
+.. class:: Configuration()
+
+    Configuration() objects store the configuration of apt, mostly created
+    from the contents of :file:`/etc/apt.conf` and the files in
+    :file:`/etc/apt.conf.d`.
+
+    .. describe:: key in conf
+
+      Return ``True`` if *conf* has a key *key*, else ``False``.
+
+    .. describe:: conf[key]
+
+        Return the value of the option given key *key*. If it does not
+        exist, raise :exc:`KeyError`.
+
+    .. describe:: conf[key] = value
+
+        Set the option at *key* to *value*.
+
+    .. method:: find(key[, default=''])
+
+        Return the value for the given key *key*. This is the same as
+        :meth:`Configuration.get`.
+
+        If *key* does not exist, return *default*.
+
+    .. method:: find_file(key[, default=''])
+
+        Return the filename hold by the configuration at *key*. This formats the
+        filename correctly and supports the Dir:: stuff in the configuration.
+
+        If *key* does not exist, return *default*.
+
+    .. method:: find_dir(key[, default='/'])
+
+        Return the absolute path to the directory specified in *key*. A
+        trailing slash is appended.
+
+        If *key* does not exist, return *default*.
+
+    .. method:: find_i(key[, default=0])
+
+        Return the integer value stored at *key*.
+
+        If *key* does not exist, return *default*.
+
+    .. method:: find_b(key[, default=0])
+
+        Return the boolean value stored at *key*. This returns an integer, but
+        it should be treated like True/False.
+
+        If *key* does not exist, return *default*.
+
+    .. method:: set(key, value)
+
+        Set the value of *key* to *value*.
+
+    .. method:: exists(key)
+
+        Check whether the key *key* exists in the configuration.
+
+    .. method:: subtree(key)
+
+        Return a sub tree starting at *key*. The resulting object can be used
+        like this one.
+
+    .. method:: list([key])
+
+        List all items at *key*. Normally, return the keys at the top level,
+        eg. APT, Dir, etc.
+
+        Use *key* to specify a key of which the childs will be returned.
+
+    .. method:: value_list([key])
+
+        Same as :meth:`Configuration.list`, but this time for the values.
+
+    .. method:: my_tag()
+
+        Return the tag name of the current tree. Normally this is an empty
+        string, but for subtrees it is the key of the subtree.
+
+    .. method:: clear(key)
+
+        Clear the configuration. Remove all values and keys at *key*.
+
+    .. method:: keys([key])
+
+        Return all the keys, recursive. If *key* is specified, ... (FIXME)
+
+    .. method:: get(key[, default=''])
+
+        This behaves just like :meth:`dict.get` and :meth:`Configuration.find`,
+        it returns the value of key or if it does not exist, *default*.
+
+.. data:: config
+
+    A :class:`Configuration()` object with the default configuration. This
+    object is initialized by calling :func:`init_config`.
+
+
+.. function:: read_config_file(configuration, filename)
+
+    Read the configuration file specified by the parameter *filename* and add
+    the settings therein to the :class:`Configuration()` object specified by
+    the parameter *configuration*
+
+.. function:: read_config_dir(configuration, dirname)
+
+    Read configuration files in the directory specified by the parameter
+    *dirname* and add the settings therein to the :class:`Configuration()`
+    object specified by the parameter *configuration*.
+
+.. function:: read_config_file_isc(configuration, filename)
+
+    Read the configuration file specified by the parameter *filename* and add
+    the settings therein to the :class:`Configuration()` object specified by
+    the parameter *configuration*
+
+.. function:: parse_commandline(configuration, options, argv)
+
+    This function is like getopt except it manipulates a configuration space.
+    output is a list of non-option arguments (filenames, etc). *options* is a
+    list of tuples of the form ``('c',"long-opt or None",
+    "Configuration::Variable","optional type")``.
+
+    Where ``type`` may be one of HasArg, IntLevel, Boolean, InvBoolean,
+    ConfigFile, or ArbItem. The default is Boolean.
+
+Locking
+--------
+When working on the global cache, it is important to lock the cache so other
+programs do not modify it. This module provides two context managers for
+locking the package system or file-based locking.
+
+.. class:: SystemLock
+
+    Context manager for locking the package system. The lock is established
+    as soon as the method __enter__() is called. It is released when
+    __exit__() is called. If the lock can not be acquired or can not be
+    released an exception is raised.
+
+    This should be used via the 'with' statement, e.g.::
+
+        with apt_pkg.SystemLock():
+            ... # Do your stuff here.
+        ... # Now it's unlocked again
+
+    Once the block is left, the lock is released automatically. The object
+    can be used multiple times::
+
+        lock = apt_pkg.SystemLock()
+        with lock:
+            ...
+        with lock:
+            ...
+
+.. class:: FileLock(filename: str)
+
+    Context manager for locking using a file. The lock is established
+    as soon as the method __enter__() is called. It is released when
+    __exit__() is called. If the lock can not be acquired or can not be
+    released, an exception is raised.
+
+    This should be used via the 'with' statement, e.g.::
+
+        with apt_pkg.FileLock(filename):
+            ...
+
+    Once the block is left, the lock is released automatically. The object
+    can be used multiple times::
+
+        lock = apt_pkg.FileLock(filename)
+        with lock:
+            ...
+        with lock:
+            ...
+
+For Python versions prior to 2.5, similar functionality is provided by the
+following three functions:
+
+.. function:: get_lock(filename, errors=False) -> int
+
+    Create an empty file at the path specified by the parameter *filename* and
+    lock it. If this fails and *errors* is **True**, the function raises an
+    error. If *errors* is **False**, the function returns -1.
+
+    The lock can be acquired multiple times within the same process, and can be
+    released by calling :func:`os.close` on the return value which is the file
+    descriptor of the created file.
+
+.. function:: pkgsystem_lock()
+
+    Lock the global pkgsystem. The lock should be released by calling
+    :func:`pkgsystem_unlock` again. If this function is called n-times, the
+    :func:`pkgsystem_unlock` function must be called n-times as well to release
+    all acquired locks.
+
+.. function:: pkgsystem_unlock()
+
+    Unlock the global pkgsystem. This reverts the effect of
+    :func:`pkgsystem_unlock`.
+
+
+Other classes
+--------------
+.. class:: Cdrom()
+
+    Return a Cdrom object with the following methods:
+
+    .. method:: ident(progress)
+
+        Identify the cdrom. The parameter *progress* refers to an
+        :class:`apt.progress.CdromProgress()` object.
+
+    .. method:: add(progress)
+
+        Add the cdrom to the sources.list file. The parameter *progress*
+        refers to an :class:`apt.progress.CdromProgress()` object.
+
+.. class:: SourceList
+
+    This is for :file:`/etc/apt/sources.list`.
+
+    .. method:: find_index(pkgfile)
+
+        Return a :class:`IndexFile` object for the :class:`PackageFile`
+        *pkgfile*.
+
+    .. method:: read_main_list
+
+        Read the main list.
+
+    .. method:: get_indexes(acq[, all])
+
+        Add the index files to the :class:`Acquire()` object *acq*. If *all* is
+        given and ``True``, all files are fetched.
+
+    .. attribute:: list
+
+        A list of :class:`MetaIndex` objects.
+
+String functions
+----------------
+.. function:: base64_encode(string)
+
+    Encode the given string using base64, e.g::
+
+        >>> apt_pkg.base64_encode(u"A")
+        'QQ=='
+
+.. function:: check_domain_list(host, list)
+
+    See if Host is in a ',' separated list, e.g.::
+
+        apt_pkg.check_domain_list("alioth.debian.org","debian.net,debian.org")
+
+.. function:: dequote_string(string)
+
+    Dequote the string specified by the parameter *string*, e.g.::
+
+        >>> apt_pkg.dequote_string("%61%70%74%20is%20cool")
+        'apt is cool'
+
+.. function:: quote_string(string, repl)
+
+    For every character listed in the string *repl*, replace all occurences in
+    the string *string* with the correct HTTP encoded value:
+
+        >>> apt_pkg.quote_string("apt is cool","apt")
+        '%61%70%74%20is%20cool'
+
+.. function:: size_to_str(size)
+
+    Return a string presenting the human-readable version of the integer
+    *size*. When calculating the units (k,M,G,etc.) the size is divided by the
+    factor 1000.
+
+    Example::
+
+        >>> apt_pkg.size_to_str(10000)
+        '10.0k'
+
+.. function:: string_to_bool(input)
+
+    Parse the string *input* and return one of **-1**, **0**, **1**.
+
+    .. table:: Return values
+
+        ===== =============================================
+        Value      Meaning
+        ===== =============================================
+         -1   The string *input* is not recognized.
+          0   The string *input* evaluates to **False**.
+         +1   The string *input* evaluates to **True**.
+        ===== =============================================
+
+    Example::
+
+        >>> apt_pkg.string_to_bool("yes")
+        1
+        >>> apt_pkg.string_to_bool("no")
+        0
+        >>> apt_pkg.string_to_bool("not-recognized")
+        -1
+
+.. function:: str_to_time(rfc_time)
+
+    Convert the :rfc:`1123` conforming string *rfc_time* to the unix time, and
+    return the integer. This is the opposite of :func:`TimeRFC1123`.
+
+    Example::
+
+        >> apt_pkg.str_to_time('Thu, 01 Jan 1970 00:00:00 GMT')
+        0
+
+.. function:: time_rfc1123(seconds)
+
+    Format the unix time specified by the integer *seconds*, according to the
+    requirements of :rfc:`1123`.
+
+    Example::
+
+        >>> apt_pkg.time_rfc1123(0)
+        'Thu, 01 Jan 1970 00:00:00 GMT'
+
+
+.. function:: time_to_str(seconds)
+
+    Format a given duration in a human-readable manner. The parameter *seconds*
+    refers to a number of seconds, given as an integer. The return value is a
+    string with a unit like 's' for seconds.
+
+    Example::
+
+        >>> apt_pkg.time_to_str(3601)
+        '1h0min1s'
+
+.. function:: upstream_version(version)
+
+    Return the string *version*, eliminating everything following the last
+    '-'. Thus, this should be equivalent to ``version.rsplit('-', 1)[0]``.
+
+.. function:: uri_to_filename(uri)
+
+    Take a string *uri* as parameter and return a filename which can be used to
+    store the file, based on the URI.
+
+    Example::
+
+        >>> apt_pkg.uri_to_filename('http://debian.org/index.html')
+        'debian.org_index.html'
+
+
+.. function:: version_compare(a, b)
+
+    Compare two versions, *a* and *b*, and return an integer value which has
+    the same characteristic as the built-in :func:`cmp` function.
+
+    .. table:: Return values
+
+        ===== =============================================
+        Value      Meaning
+        ===== =============================================
+        > 0   The version *a* is greater than version *b*.
+        = 0   Both versions are equal.
+        < 0   The version *a* is less than version *b*.
+        ===== =============================================
+
+
+
+
+Module Constants
+----------------
+.. _CurStates:
+
+Package States
+^^^^^^^^^^^^^^^
+.. data:: CURSTATE_CONFIG_FILES
+.. data:: CURSTATE_HALF_CONFIGURED
+.. data:: CURSTATE_HALF_INSTALLED
+.. data:: CURSTATE_INSTALLED
+.. data:: CURSTATE_NOT_INSTALLED
+.. data:: CURSTATE_UNPACKED
+
+.. _InstStates:
+
+Installed states
+^^^^^^^^^^^^^^^^
+.. data:: INSTSTATE_HOLD
+.. data:: INSTSTATE_HOLD_REINSTREQ
+.. data:: INSTSTATE_OK
+.. data:: INSTSTATE_REINSTREQ
+
+.. _Priorities:
+
+Priorities
+^^^^^^^^^^^
+.. data:: PRI_EXTRA
+.. data:: PRI_IMPORTANT
+.. data:: PRI_OPTIONAL
+.. data:: PRI_REQUIRED
+.. data:: PRI_STANDARD
+
+
+.. _SelStates:
+
+Select states
+^^^^^^^^^^^^^
+.. data:: SELSTATE_DEINSTALL
+.. data:: SELSTATE_HOLD
+.. data:: SELSTATE_INSTALL
+.. data:: SELSTATE_PURGE
+.. data:: SELSTATE_UNKNOWN
+
+
+Build information
+^^^^^^^^^^^^^^^^^
+.. data:: DATE
+
+    The date on which this extension has been compiled.
+
+.. data:: LIB_VERSION
+
+    The version of the apt_pkg library. This is **not** the version of apt,
+    nor the version of python-apt.
+
+.. data:: TIME
+
+    The time this extension has been built.
+
+.. data:: VERSION
+
+    The version of apt (not of python-apt).
diff --git a/doc/source/aptsources/distinfo.rst b/doc/source/library/aptsources.distinfo.rst
index 96f9445d..033ef483 100644
--- a/doc/source/aptsources/distinfo.rst
+++ b/doc/source/library/aptsources.distinfo.rst
@@ -1,10 +1,11 @@
 :mod:`aptsources.distinfo` --- provide meta information for distro repositories
 ===============================================================================
+.. note::
+
+    This part of the documentation is created automatically.
+
 
 .. automodule:: aptsources.distinfo
     :members:
     :undoc-members:
 
-    .. note::
-
-        This part of the documentation is created automatically.
diff --git a/doc/source/aptsources/distro.rst b/doc/source/library/aptsources.distro.rst
index 06ca0fda..6ebe438c 100644
--- a/doc/source/aptsources/distro.rst
+++ b/doc/source/library/aptsources.distro.rst
@@ -1,10 +1,11 @@
 :mod:`aptsources.distro` --- Distribution abstraction of the sources.list
 ===============================================================================
+.. note::
+
+    This part of the documentation is created automatically.
+
 
 .. automodule:: aptsources.distro
     :members:
     :undoc-members:
 
-    .. note::
-
-        This part of the documentation is created automatically.
diff --git a/doc/source/aptsources/sourceslist.rst b/doc/source/library/aptsources.sourceslist.rst
index 509db3ce..79b8dd01 100644
--- a/doc/source/aptsources/sourceslist.rst
+++ b/doc/source/library/aptsources.sourceslist.rst
@@ -1,10 +1,11 @@
 :mod:`aptsources.sourceslist` --- Provide an abstraction of the sources.list
 ============================================================================
+.. note::
+
+    This part of the documentation is created automatically.
+
 
 .. automodule:: aptsources.sourceslist
     :members:
     :undoc-members:
 
-    .. note::
-
-        This part of the documentation is created automatically.
diff --git a/doc/source/library/index.rst b/doc/source/library/index.rst
new file mode 100644
index 00000000..f049efb8
--- /dev/null
+++ b/doc/source/library/index.rst
@@ -0,0 +1,37 @@
+Python APT Library
+==================
+Python APT's library provides access to almost every functionality supported
+by the underlying apt-pkg and apt-inst libraries. This means that it is
+possible to rewrite frontend programs like apt-cdrom in Python, and this is
+relatively easy, as can be seen in e.g. :doc:`../tutorials/apt-cdrom`.
+
+When going through the library, the first two modules are :mod:`apt_pkg` and
+:mod:`apt_inst`. These modules are more or less straight bindings to the
+apt-pkg and apt-inst libraries and the base for the rest of python-apt.
+
+Going forward, the :mod:`apt` package appears. This package is using
+:mod:`apt_pkg` and :mod`apt_inst` to provide easy to use ways to manipulate
+the cache, fetch packages, or install new packages. It also provides useful
+progress classes, for text and GTK+ interfaces. The last package is
+:mod:`aptsources`. The aptsources package provides classes and functions to
+read files like :file:`/etc/apt/sources.list` and to modify them.
+
+.. toctree::
+    :maxdepth: 1
+
+    apt_pkg
+    apt_inst
+
+    apt.cache
+    apt.cdrom
+    apt.debfile
+    apt.package
+    apt.progress.base
+    apt.progress.text
+    apt.progress.gtk2
+    apt.progress.qt4
+
+    aptsources.distinfo
+    aptsources.distro
+    aptsources.sourceslist
+
diff --git a/doc/source/templates/indexcontent.html b/doc/source/templates/indexcontent.html
new file mode 100644
index 00000000..394b46d5
--- /dev/null
+++ b/doc/source/templates/indexcontent.html
@@ -0,0 +1,50 @@
+{% extends "defindex.html" %}
+{% block body %}
+  <h1>{{ docstitle|e }}</h1>
+  <p>
+    Welcome! This is
+    {% block description %}the documentation for {{ project|e }}
+    {{ release|e }}{% if last_updated %}, last updated {{ last_updated|e }}{% endif %}{% endblock %}.
+  </p>
+
+  <p>
+   This documentation has been created using Sphinx and reStructuredText files
+   written by Julian Andres Klode &lt;jak@debian.org&gt;.
+  </p>
+
+
+
+
+  <p><strong>Parts of the documentation:</strong></p>
+  <table class="contentstable" align="center"><tr>
+    <td width="50%">
+      <p class="biglink"><a class="biglink" href="{{ pathto("whatsnew/" + version) }}">What's new in Python APT {{ version }}?</a><br/>
+         <span class="linkdescr">or <a href="{{ pathto("whatsnew/index") }}">all "What's new" documents</a></span></span></p>
+      <p class="biglink"><a class="biglink" href="{{ pathto("library/index") }}">Library Reference</a><br/>
+         <span class="linkdescr">keep this under your pillow</span></p>
+      <p class="biglink"><a class="biglink" href="{{ pathto("tutorials/index") }}">Tutorials</a><br/>
+         <span class="linkdescr">examples and more...</span></p>
+    </td><td width="50%">
+      <p class="biglink"><a class="biglink" href="{{ pathto("c++/embedding") }}">Embedding</a><br/>
+         <span class="linkdescr">tutorial for C++ programmers</span></p>
+      <p class="biglink"><a class="biglink" href="{{ pathto("c++/api") }}">C++ API</a><br/>
+         <span class="linkdescr">reference for C++ programmers</span></p>
+    </td></tr>
+  </table>
+
+  <p><strong>Indices and tables:</strong></p>
+  <table class="contentstable" align="center"><tr>
+    <td width="50%">
+      <p class="biglink"><a class="biglink" href="{{ pathto("modindex") }}">Global Module Index</a><br/>
+         <span class="linkdescr">quick access to all modules</span></p>
+      <p class="biglink"><a class="biglink" href="{{ pathto("genindex") }}">General Index</a><br/>
+         <span class="linkdescr">all functions, classes, terms</span></p>
+    </td><td width="50%">
+      <p class="biglink"><a class="biglink" href="{{ pathto("search") }}">Search page</a><br/>
+         <span class="linkdescr">search this documentation</span></p>
+      <p class="biglink"><a class="biglink" href="{{ pathto("contents") }}">Complete Table of Contents</a><br/>
+         <span class="linkdescr">lists all sections and subsections</span></p>
+    </td></tr>
+  </table>
+
+{% endblock %}
diff --git a/doc/source/templates/layout.html b/doc/source/templates/layout.html
new file mode 100644
index 00000000..60298719
--- /dev/null
+++ b/doc/source/templates/layout.html
@@ -0,0 +1,10 @@
+{% extends "!layout.html" %}
+{% block rootrellink %}
+        <li><img src="{{ pathto('_static/py.png', 1) }}" alt=""
+                 style="vertical-align: middle; margin-top: -1px"/></li>
+        <li><a href="{{ pathto('index') }}">{{ shorttitle }}</a>{{ reldelim1 }}</li>
+{% endblock %}
+{% block extrahead %}
+    <link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" />
+{{ super() }}
+{% endblock %}
diff --git a/doc/source/tutorials/apt-cdrom.rst b/doc/source/tutorials/apt-cdrom.rst
new file mode 100644
index 00000000..0561e082
--- /dev/null
+++ b/doc/source/tutorials/apt-cdrom.rst
@@ -0,0 +1,156 @@
+Writing your own apt-cdrom
+==========================
+:Author: Julian Andres Klode <jak@debian.org>
+:Release: |release|
+:Date: |today|
+
+This article explains how to utilise python-apt to build your own clone of the
+:command:`apt-cdrom` command. To do this, we will take a look at the
+:mod:`apt.cdrom` and :mod:`apt.progress.text` modules, and we will learn how
+to use apt_pkg.parse_commandline to parse commandline arguments. The code shown
+here works on Python 2 and Python 3.
+
+Basics
+------
+The first step in building your own :command:`apt-cdrom` clone is to import the
+:mod:`apt` package, which will import :mod:`apt.cdrom` and
+:mod:`apt.progress.text`::
+
+    import apt
+
+Now we have to create a new :class:`apt.cdrom.Cdrom` object and pass to it an
+:class:`apt.progress.text.CdromProgress` object, which is responsible for
+displaying the progress and asking questions::
+
+    cdrom = apt.Cdrom(apt.progress.text.CdromProgress())
+
+Now we have to choose the action, depending on the given options on the
+command line. For now, we simply use the value of ``sys.argv[1]``::
+
+    import sys
+    if sys.argv[1] == 'add':
+        cdrom.add()
+    elif sys.argv[1] == 'ident':
+        cdrom.ident()
+
+Now we have a basic :command:`apt-cdrom` clone which can add and identify
+CD-ROMs::
+
+    import sys
+
+    import apt
+
+    cdrom = apt.Cdrom(apt.progress.text.CdromProgress())
+    if sys.argv[1] == 'add':
+        cdrom.add()
+    elif sys.argv[1] == 'ident':
+        cdrom.ident()
+
+Advanced example with command-line parsing
+-------------------------------------------
+Our example clearly misses a way to parse the commandline in a correct
+manner. Luckily, :mod:`apt_pkg` provides us with a function to do this:
+:func:`apt_pkg.parse_commandline`. To use it, we add ``import apt_pkg`` right
+after import apt::
+
+    import sys
+
+    import apt_pkg
+    import apt
+
+
+:func:`apt_pkg.parse_commandline` is similar to :mod:`getopt` functions, it
+takes a list of recognized options and the arguments and returns all unknown
+arguments. If it encounters an unknown argument which starts with a leading
+'-', the function raises an error indicating that the option is unknown. The
+major difference is that this function manipulates the apt configuration space.
+
+The function takes 3 arguments. The first argument is an
+:class:`apt_pkg.Configuration` object. The second argument is a list of tuples
+of the form ``(shortopt, longopt, config, type)``, whereas *shortopt* is a
+character indicating the short option name, *longopt* a string indicating the
+corresponding long option (e.g. ``"--help"``), *config* the name of the
+configuration item which should be set and *type* the type of the argument.
+
+For apt-cdrom, we can use the following statement::
+
+    arguments = apt_pkg.parse_commandline(apt_pkg.config,
+                    [('h', "help", "help"),
+                     ('v', "version", "version"),
+                     ('d', "cdrom", "Acquire::cdrom::mount", "HasArg"),
+                     ('r', "rename", "APT::CDROM::Rename"),
+                     ('m', "no-mount", "APT::CDROM::NoMount"),
+                     ('f', "fast", "APT::CDROM::Fast"),
+                     ('n', "just-print", "APT::CDROM::NoAct"),
+                     ('n', "recon", "APT::CDROM::NoAct"),
+                     ('n', "no-act", "APT::CDROM::NoAct"),
+                     ('a', "thorough", "APT::CDROM::Thorough"),
+                     ('c', "config-file", "", "ConfigFile"),
+                     ('o', "option", "", "ArbItem")], args)
+
+
+This allows us to support all options supported by apt-cdrom. The first option
+is --help. As you can see, it omits the fourth field of the tuple; which means
+it is a boolean argument. Afterwards you could use
+``apt_pkg.config.find_b("help")`` to see whether ``--help`` was specified. In
+``('d',"cdrom","Acquire::cdrom::mount","HasArg")`` the fourth field is
+``"HasArg"``. This means that the option has an argument, in this case the
+location of the mount pint. ``('c',"config-file","","ConfigFile")`` shows how
+to include configuration files. This option takes a parameter which points to
+a configuration file which will be added to the configuration space.
+('o',"option","","ArbItem") is yet another type of option, which allows users
+to set configuration options on the commandline.
+
+Now we have to check whether help or version is specified, and print a message
+and exit afterwards. To do this, we use :meth:`apt_pkg.Configuration.find_b`
+which returns ``True`` if the configuration option exists and evaluates to
+``True``::
+
+    if apt_pkg.config.find_b("help"):
+        print("This should be a help message")
+        sys.exit(0)
+    elif apt_pkg.config.find_b("version"):
+        print("Version blah.")
+        sys.exit(0)
+
+
+Now we are ready to create our progress object and our cdrom object. Instead
+of using :class:`apt.Cdrom` like in the first example, we will use
+:class:`apt_pkg.Cdrom` which provides a very similar interface. We could also
+use :class:`apt.Cdrom`, but `apt.Cdrom` provides options like *nomount* which
+conflict with our commandline parsing::
+
+    progress = apt.progress.text.CdromProgress()
+    cdrom = apt_pkg.Cdrom()
+
+
+Now we have to do the action requested by the user on the commandline. To see
+which option was requested, we check the list ``arguments`` which was returned
+by ``apt_pkg.parse_commandline`` above, and afterwards call ``cdrom.add`` or
+``cdrom.ident``::
+
+    if apt_pkg.config.find_b("help"):
+        print("This should be a help message")
+        sys.exit(0)
+    elif apt_pkg.config.find_b("version"):
+        print("Version blah.")
+        sys.exit(0)
+
+    if not arguments:
+        sys.stderr.write('E: No operation specified\n')
+        sys.exit(1)
+    elif arguments[0] == 'add':
+        cdrom.add(progress)
+    elif arguments[0] == 'ident':
+        cdrom.ident(progress)
+    else:
+        sys.stderr.write('E: Invalid operation %s\n' % arguments[0])
+        sys.exit(1)
+
+
+After putting all our actions into a main() function, we get a completely
+working apt-cdrom clone, which just misses useful ``--help`` and ``--version``
+options. If we add a function show_help(), we get an even more complete
+apt-cdrom clone:
+
+.. literalinclude:: ../examples/apt-cdrom.py
diff --git a/doc/source/tutorials/apt-get.rst b/doc/source/tutorials/apt-get.rst
new file mode 100644
index 00000000..575f0c46
--- /dev/null
+++ b/doc/source/tutorials/apt-get.rst
@@ -0,0 +1,45 @@
+Doing stuff :command:`apt-get` does
+===================================
+:Author: Julian Andres Klode <jak@debian.org>
+:Release: |release|
+:Date: |today|
+
+The following article will show how you can use python-apt to do actions done
+by the :command:`apt-get` command.
+
+
+Printing the URIs of all index files
+------------------------------------
+We all now that we can print the URIs of all our index files by running a
+simple ``apt-get -s --print-uris update``. We can do the same. Responsible for
+the source entries is the class :class:`apt_pkg.SourceList`, which can be
+combined with an :class:`apt_pkg.Acquire` object using :meth:`get_indexes`.
+
+First of all, we have to create the objects::
+
+    acquire = apt_pkg.Acquire()
+    slist = apt_pkg.SourceList()
+
+Now we have to parse /etc/apt/sources.list and its friends, by using
+:meth:`apt_pkg.SourceList.read_main_list`::
+    slist.read_main_list()
+
+Now the **slist** object knows about the location of the indexes. We now have
+to load those indexes into the *acquire* object by calling
+:meth:`apt_pkg.SourceList.get_indexes`::
+
+    slist.get_indexes(acquire, True)
+
+The first argument is the acquire object into which we will load these indexes,
+and the second argument means that we want to fetch all indexes. Now the only
+thing left to do is iterating over the list of items and printing out their
+URIs. Luckily, there is :attr:`apt_pkg.Acquire.items` which allows us to
+iterate over the items::
+
+    for item in acquire.items:
+        print item.desc_uri
+
+In the end a program could look like this:
+
+.. literalinclude:: ../examples/update-print-uris.py
+
diff --git a/doc/source/tutorials/contributing.rst b/doc/source/tutorials/contributing.rst
new file mode 100644
index 00000000..f68d626e
--- /dev/null
+++ b/doc/source/tutorials/contributing.rst
@@ -0,0 +1,312 @@
+Contributing to python-apt
+==========================
+:Author: Julian Andres Klode <jak@debian.org>
+:Release: |release|
+:Date: |today|
+
+Let's say you need a new feature, you can develop it, and you want to get it
+included in python-apt. Then be sure to follow the following guidelines.
+
+Available branches
+-------------------
+First of all, let's talk a bit about the bzr branches of python-apt. In the
+following parts, we will assume that you use bzr to create your changes and
+submit them.
+
+**mvo:** http://people.ubuntu.com/~mvo/bzr/python-apt/mvo
+    This is Michael Vogt's branch. Most of the development of apt happens here,
+    as he is the lead maintainer of python-apt.
+
+    This branch is also available from Launchpads super mirror, via
+    ``lp:python-apt``. Checkouts from Launchpad are generally faster and can
+    use the bzr protocoll.
+
+    VCS-Browser: https://code.launchpad.net/~mvo/python-apt/python-apt--mvo
+
+**debian-sid:** http://bzr.debian.org/apt/python-apt/debian-sid
+    This is the official Debian branch of python-apt. All code which will be
+    uploaded to Debian is here. It is not as up-to-date as the mvo branch,
+    because this branch often gets updated just right before the release
+    happens.
+
+    VCS-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes
+
+**debian-experimental:** http://bzr.debian.org/apt/python-apt/debian-experimental
+
+    This is another official Debian branch of python-apt, for releases
+    targetted at Debian experimental. This branch may contain unstable code
+    and may thus not work correctly.
+
+    VCS-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-experimental/changes
+
+**jak:** http://bzr.debian.org/users/jak/python-apt/jak
+    This is Julian Andres Klode's (the documentation author's) branch. This
+    is the place where cleanup and documentation updates happen. It is based
+    off debian-sid or mvo.
+
+    VCS-Browser: http://bzr.debian.org/loggerhead/users/jak/python-apt/jak/changes
+
+**ubuntu:** ``lp:~ubuntu-core-dev/python-apt/ubuntu``
+    This is the official Ubuntu development branch. The same notes apply as
+    for the debian-sid branch above.
+
+    VCS-Browser: https://code.launchpad.net/~ubuntu-core-dev/python-apt/ubuntu
+
+
+.. highlightlang:: c
+
+C++ Coding style
+----------------
+This document gives coding conventions for the C++ code comprising
+the C++ extensions of Python APT.  Please see the companion
+informational PEP describing style guidelines for Python code (:PEP:`8`).
+
+Note, rules are there to be broken.  Two good reasons to break a
+particular rule:
+
+    (1) When applying the rule would make the code less readable, even
+        for someone who is used to reading code that follows the rules.
+
+    (2) To be consistent with surrounding code that also breaks it
+        (maybe for historic reasons) -- although this is also an
+        opportunity to clean up someone else's mess (in true XP style).
+
+This part of the document is derived from :PEP:`7` which was written by
+Guido van Rossum.
+
+
+C++ dialect
+^^^^^^^^^^^
+
+- Use ISO standard C++ (the 1998 version of the standard).
+
+- All function declarations and definitions must use full
+  prototypes (i.e. specify the types of all arguments).
+
+- Use C++ style // one-line comments where useful.
+
+- No compiler warnings with ``gcc -std=c++98 -Wall -Wno-write-strings``. There
+  should also be no errors with ``-pedantic`` added.
+
+
+Code lay-out
+^^^^^^^^^^^^
+
+- Use 3-space indents, in files that already use them. In new source files,
+  that were created after this rule was introduced, use 4-space indents.
+
+  At some point, the whole codebase may be converted to use only
+  4-space indents.
+
+- No line should be longer than 79 characters.  If this and the
+  previous rule together don't give you enough room to code, your
+  code is too complicated -- consider using subroutines.
+
+- No line should end in whitespace.  If you think you need
+  significant trailing whitespace, think again -- somebody's
+  editor might delete it as a matter of routine.
+
+- Function definition style: function name in column 2, outermost
+  curly braces in column 1, blank line after local variable
+  declarations::
+
+    static int extra_ivars(PyTypeObject *type, PyTypeObject *base)
+    {
+        int t_size = PyType_BASICSIZE(type);
+        int b_size = PyType_BASICSIZE(base);
+
+        assert(t_size >= b_size); /* type smaller than base! */
+        ...
+        return 1;
+    }
+
+- Code structure: one space between keywords like 'if', 'for' and
+  the following left paren; no spaces inside the paren; braces as
+  shown::
+
+    if (mro != NULL) {
+        ...
+    }
+    else {
+        ...
+    }
+
+- The return statement should *not* get redundant parentheses::
+
+    return Py_None; /* correct */
+    return(Py_None); /* incorrect */
+
+- Function and macro call style: ``foo(a, b, c)`` -- no space before
+  the open paren, no spaces inside the parens, no spaces before
+  commas, one space after each comma.
+
+- Always put spaces around assignment, Boolean and comparison
+  operators.  In expressions using a lot of operators, add spaces
+  around the outermost (lowest-priority) operators.
+
+- Breaking long lines: if you can, break after commas in the
+  outermost argument list.  Always indent continuation lines
+  appropriately, e.g.::
+
+    PyErr_Format(PyExc_TypeError,
+            "cannot create '%.100s' instances",
+            type->tp_name);
+
+- When you break a long expression at a binary operator, the
+  operator goes at the end of the previous line, e.g.::
+
+    if (type->tp_dictoffset != 0 && base->tp_dictoffset == 0 &&
+        type->tp_dictoffset == b_size &&
+        (size_t)t_size == b_size + sizeof(PyObject *))
+        return 0; /* "Forgive" adding a __dict__ only */
+
+- Put blank lines around functions, structure definitions, and
+  major sections inside functions.
+
+- Comments go before the code they describe.
+
+- All functions and global variables should be declared static
+  unless they are to be part of a published interface
+
+
+Naming conventions
+^^^^^^^^^^^^^^^^^^
+
+- Use a ``Py`` prefix for public functions; never for static
+  functions.  The ``Py_`` prefix is reserved for global service
+  routines like ``Py_FatalError``; specific groups of routines
+  (e.g. specific object type APIs) use a longer prefix,
+  e.g. ``PyString_`` for string functions.
+
+- Public functions and variables use MixedCase with underscores,
+  like this: ``PyObject_GetAttr``, ``Py_BuildValue``, ``PyExc_TypeError``.
+
+- Internal functions and variables use lowercase with underscores, like
+  this: ``hashes_get_sha1.``
+
+- Occasionally an "internal" function has to be visible to the
+  loader; we use the _Py prefix for this, e.g.: ``_PyObject_Dump``.
+
+- Macros should have a MixedCase prefix and then use upper case,
+  for example: ``PyString_AS_STRING``, ``Py_PRINT_RAW``.
+
+
+Documentation Strings
+^^^^^^^^^^^^^^^^^^^^^
+- The first line of each function docstring should be a "signature
+  line" that gives a brief synopsis of the arguments and return
+  value.  For example::
+
+    PyDoc_STRVAR(myfunction__doc__,
+    "myfunction(name: str, value) -> bool\n\n"
+    "Determine whether name and value make a valid pair.");
+
+  The signature line should be formatted using the format for function
+  annotations described in :PEP:`3107`, whereas the annotations shall reflect
+  the name of the type (e.g. ``str``). The leading ``def`` and the trailing
+  ``:`` as used for function definitions must not be included.
+
+  Always include a blank line between the signature line and the
+  text of the description.
+
+  If the return value for the function is always ``None`` (because
+  there is no meaningful return value), do not include the
+  indication of the return type.
+
+- When writing multi-line docstrings, be sure to always use
+  string literal concatenation::
+
+    PyDoc_STRVAR(myfunction__doc__,
+    "myfunction(name, value) -> bool\n\n"
+    "Determine whether name and value make a valid pair.");
+
+
+Python Coding Style
+-------------------
+The coding style for all code written in python is :PEP:`8`. Exceptions from
+this rule are the documentation, where code is sometimes formatted differently
+to explain aspects, and functions provided for 0.7 compatibility purposes.
+
+When writing code, use tools like pylint, pyflakes, pychecker and pep8.py from
+http://svn.browsershots.org/trunk/devtools/pep8/ to verify that your code is
+OK. Fix all the problems which seem reasonable, and mention the unfixed issues
+when asking for merge.
+
+In order to make the automatic generation of Python 3 code using 2to possible,
+code written in Python may not utilize any functionality unsupported by 2to3 or
+deprecated as of Python 2.6.
+
+Submitting your patch
+---------------------
+First of all, the patch you create should be based against the most current
+branch of python-apt (debian-sid or debian-experimental). If it is a bugfix,
+you should probably use debian-sid. If you choose the wrong branch, we will
+ask you to rebase your patches against the correct one.
+
+Once you have made your change, check that it:
+
+    * conforms to :PEP:`8` (checked with pep8.py). It should, at least not
+      introduce new errors. (and never have whitespace at end of line)
+    * produces no new errors in pychecker, pyflakes and pylint (unless you
+      can't fix them, but please tell so when requesting the merge, so it can
+      be fixed before hitting one of the main branches).
+    * does not change the behaviour of existing code in a non-compatible way.
+
+If your change follows all points of the checklist, you can commit it to your
+repository. (You could commit it first, and check later, and then commit the
+fixes, but commits should be logical and it makes no sense to have to commits
+for one logical unit).
+
+Once you have made all your changes,  you can run ``bzr send -o patch-name``
+to create a so called *merge-directive*, which contains your changes and
+allows us to preserve the history of your changes. (But please replace patch-name
+with something useful).
+
+Now report a bug against the python-apt package, attach the merge directive
+you created in the previous step, and tag it with 'patch'. It might also be
+a good idea to prefix the bug report with '[PATCH]'.
+
+If your patch introduces new functions, parameters, etc. , but does not update
+the content of this documentation, please CC. jak@debian.org, and add a short
+notice to the bug report. Also see `Documentation updates`
+
+Once your patch got merged, you can *pull* the branch into which it has been
+merged into your local one. If you have made changes since you submitted your
+patch, you may need to *merge* the branch instead.
+
+.. note::
+
+    If you plan to work on python-apt for a longer time, it may be a good
+    idea to publish your branch somewhere. Alioth (http://alioth.debian.org)
+    and Launchpad (https://launchpad.net) provide bzr hosting. You can also
+    use any webspace with ftp or sftp connection (for the upload). Then you do
+    not need to send *merge directives*, but you can point to your branch
+    instead.
+
+
+Documentation updates
+---------------------
+If you want to update the documentation, please follow the procedure as written
+above. You can send your content in plain text, but reStructuredText is the
+preferred format. I (Julian Andres Klode) will review your patch and include
+it.
+
+.. highlightlang:: sh
+
+Example patch session
+----------------------
+In the following example, we edit a file, create a merge directive (an enhanced
+patch), and report a wishlist bug with this patch against the python-apt
+package::
+
+    user@pc:~$ bzr clone http://bzr.debian.org/apt/python-apt/debian-sid/
+    user@pc:~$ cd debian-sid
+    user@pc:~/debian-sid$ editor FILES
+    user@pc:~/debian-sid$ pep8.py FILES # PEP 8 check, see above.
+    user@pc:~/debian-sid$ pylint -e FILES # Check with pylint
+    user@pc:~/debian-sid$ pyflakes FILES  # Check with pyflakes
+    user@pc:~/debian-sid$ pychecker FILES # Check with pychecker
+    user@pc:~/debian-sid$ bzr commit
+    user@pc:~/debian-sid$ bzr send -o my-patch
+    user@pc:~/debian-sid$ reportbug --severity=wishlist --tag=patch --attach=my-patch python-apt
+    user@pc:~/debian-sid$ # Add --list-cc=jak@debian.org if you change docs.
diff --git a/doc/source/tutorials/index.rst b/doc/source/tutorials/index.rst
new file mode 100644
index 00000000..06d31c6b
--- /dev/null
+++ b/doc/source/tutorials/index.rst
@@ -0,0 +1,8 @@
+Tutorials
+=========
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    *
diff --git a/doc/source/whatsnew/0.7.100.rst b/doc/source/whatsnew/0.7.100.rst
new file mode 100644
index 00000000..a3888b3a
--- /dev/null
+++ b/doc/source/whatsnew/0.7.100.rst
@@ -0,0 +1,199 @@
+What's New In python-apt 0.7.100
+================================
+Python-apt 0.7.100 is a new major release of the python bindings for the APT
+package management libraries. It provides support for Python 3, new language
+features and an API conforming to :PEP:`8`.
+
+Despite the many changes made in python-apt 0.7.100, the release still provides
+backwards compatibility to the 0.7 series. This makes it possible to run your
+old applications.
+
+.. note::
+
+    Applications using the old API should be updated to the new API because
+    the old ones will be dropped in the 0.8 release. To build a python-apt
+    variant without the deprecated API, build it without the -DCOMPAT_0_7
+    compiler flag.
+
+Support for Python 3
+--------------------
+Python-apt is the first Debian package to support the third major release of
+Python. The port is straight forward and integrates as nicely in Python 3 as
+the Python 2 builds integrate in Python 2.
+
+Please be aware that python-apt builds for Python 3 are built without the
+compatibility options enabled for Python 2 builds. They also do not provide
+methods like :meth:`has_key` on mapping objects, because it has been removed
+in Python 3.
+
+Python 3 support may be disabled by distributions.
+
+Real classes in :mod:`apt_pkg`
+------------------------------
+The 0.7.100 release introduces real classes in the :mod:`apt_pkg` extension. This
+is an important step forward and makes writing code much easier, because you
+can see the classes without having to create an object first. It also makes
+it easier to talk about those classes, because they have a real name now.
+
+The 0.7 series shipped many functions for creating new objects, because the
+classes were not exported. In 0.7.100, the classes themselves replace those
+functions, as you can see in the following table.
+
+.. table::
+
+    ===================================== =================================
+    Function                               Replacing class
+    ===================================== =================================
+    :func:`apt_pkg.GetAcquire`            :class:`apt_pkg.Acquire`
+    :func:`apt_pkg.GetCache()`            :class:`apt_pkg.Cache`
+    :func:`apt_pkg.GetCdrom()`            :class:`apt_pkg.Cdrom`
+    :func:`apt_pkg.GetDepCache()`         :class:`apt_pkg.DepCache`
+    :func:`apt_pkg.GetPackageManager`     :class:`apt_pkg.PackageManager`
+    :func:`apt_pkg.GetPkgAcqFile`         :class:`apt_pkg.AcquireFile`
+    :func:`apt_pkg.GetPkgActionGroup`     :class:`apt_pkg.ActionGroup`
+    :func:`apt_pkg.GetPkgProblemResolver` :class:`apt_pkg.ProblemResolver`
+    :func:`apt_pkg.GetPkgRecords`         :class:`apt_pkg.PackageRecords`
+    :func:`apt_pkg.GetPkgSourceList`      :class:`apt_pkg.SourceList`
+    :func:`apt_pkg.GetPkgSrcRecords`      :class:`apt_pkg.SourceRecords`
+    :func:`apt_pkg.ParseSection`          :class:`apt_pkg.TagSection`
+    :func:`apt_pkg.ParseTagFile`          :class:`apt_pkg.TagFile`
+    ===================================== =================================
+
+Complete rename of functions, methods and attributes
+-----------------------------------------------------
+In May 2008, Ben Finney reported bug 481061 against the python-apt package,
+asking for PEP8 conformant names. With the release of python-apt 0.7.100, this
+is finally happening.
+
+Context managers for the :keyword:`with` statement
+--------------------------------------------------
+This is not a real big change, but it's good to have it:
+:class:`apt_pkg.ActionGroup` can now be used as a context manager for the
+:keyword:`with` statement. This makes it more obvious that you are using an
+action group, and is just cooler::
+
+    with apt_pkg.ActionGroup(depcache):
+        for package in my_selected_packages:
+            depcache.mark_install(package)
+
+This also works for :class:`apt.Cache`::
+
+    with cache.actiongroup(): # cache is an Instance of apt.Cache
+        for package in my_selected_packages:
+            package.mark_install() # Instance of apt.Package
+
+Yet another context manager is available for locking the package system::
+
+    with apt_pkg.SystemLock():
+        # do your stuff here
+        pass
+
+There is also one for file based locking::
+
+    with apt_pkg.FileLock(filename):
+        # do your stuff here
+        pass
+
+
+Unification of dependency handling
+----------------------------------
+In apt 0.7.XX, there were three different return types of functions parsing
+dependencies.
+
+First of all, there were :func:`apt_pkg.ParseDepends()` and
+:func:`apt_pkg.ParseSrcDepends()` which returned a list of or groups (which
+are lists themselves) which contain tuples in the format ``(package,ver,op)``,
+whereas op is one of "<=",">=","<<",">>","=","!=".
+
+Secondly, there was Package.DependsListStr which returned a dictionary mapping
+the type of the dependency (e.g. 'Depends', 'Recommends') to a list similar to
+those of :func:`apt_pkg.ParseDepends()`. The only difference was that the
+values ">>", "<<" of op are ">", "<" instead.
+
+Thirdly, there was SourceRecords.BuildDepends, which returned a simple list
+of tuples in the format ``(package, version, op, type)``, whereas ``op`` was
+the integer representation of those ">>", "<<" actions and ``type`` an integer
+representing the type of the dependency (e.g. 'Build-Depends'). The whole
+format was almost useless from the Python perspective because the string
+representations or constants for checking the values were not exported.
+
+python-apt 0.7.100 puts an end to this confusion and uses one basic format, which
+is the format known from Package.DependsListStr. The format change only applies
+to the new functions and attributes, i.e. :attr:`SourceRecords.build_depends`
+will now return a dict, whereas :attr:`SourceRecords.BuildDepends` will still
+return the classic format. The functions :func:`apt_pkg.parse_depends` and
+:func:`apt_pkg.parse_src_depends` now use the same values for ``op`` as
+:attr:`Package.DependsListStr` does.
+
+Example::
+
+    >>> s = apt_pkg.SourceRecords()
+    >>> s.lookup("apt")
+    1
+    >>> s.build_depends
+    {'Build-Depends': [[('debhelper', '5.0', '>=')],
+                       [('libdb-dev', '', '')],
+                       [('gettext', '0.12', '>=')],
+                       [('libcurl4-gnutls-dev', '', ''),
+                        ('libcurl3-gnutls-dev', '7.15.5', '>=')],
+                       [('debiandoc-sgml', '', '')],
+                       [('docbook-utils', '0.6.12', '>=')],
+                       [('xsltproc', '', '')],
+                       [('docbook-xsl', '', '')],
+                       [('xmlto', '', '')]]}
+    >>> s.BuildDepends
+    [('debhelper', '5.0', 2, 0),
+    ('libdb-dev', '', 0, 0),
+    ('gettext', '0.12', 2, 0),
+    ('libcurl4-gnutls-dev', '', 16, 0),
+    ('libcurl3-gnutls-dev', '7.15.5', 2, 0),
+    ('debiandoc-sgml', '', 0, 0),
+    ('docbook-utils', '0.6.12', 2, 0),
+    ('xsltproc', '', 0, 0),
+    ('docbook-xsl', '', 0, 0),
+    ('xmlto', '', 0, 0)]
+
+C++ headers
+------------
+The 0.7.100 release introduces python-apt-dev which provides headers for
+developers to provide Python support in the libapt-pkg-using application.
+
+.. warning::
+
+    As of 0.7.93, those headers are still considered experimental and their
+    API may change without prior notice.
+
+Other changes
+-------------
+This release of python-apt also features several other, smaller changes:
+
+    * Reduced memory usage by making :class:`apt.Cache` create
+      :class:`apt.Package()` object dynamically, instead of creating all of
+      them during the cache initialization.
+    * Support to set the candidate version in :class:`apt.package.Package`
+
+Porting your applications to python-apt 0.8 API
+------------------------------------------------
+Porting your application to the new python-apt 0.8 API may be trivial. You
+should download the source tarball of python-apt and run the tool
+utils/migrate-0.8 using Python 2.6 over your code::
+
+    python2.6 utils/migrate-0.8.py -c myapp.py mypackage/
+
+This will search your code for places where possibly deprecated names are
+used. Using the argument ``-c``, you can turn colorized output on.
+
+Now that you know which parts of your code have to be changed, you have to know
+how to do this. For classes, please look at the table. For all attributes,
+methods, functions, and their parameters the following rules apply:
+
+    1. Replace leading [A-Z] with [a-z] (e.g DescURI => descURI)
+    2. Replace multiple [A-Z] with [A-Z][a-z] (e.g. descURI => descUri)
+    3. Replace every [A-Z] with the corresponding [a-z] (descUri => desc_uri)
+
+As an exception, refixes such as 'de' (e.g. 'dequote') or 'un' (e.g. 'unlock')
+are normally not separated by underscores from the next word. There are also
+some other exceptions which are listed here, and apply to any name containing
+this word: **filename**, **filesize**, **destdir**, **destfile**, **dequote**,
+**unlock**, **reinstall**, **pinfile**, **REINSTREQ**, **UNPACKED**,
+**parse_commandline**.
diff --git a/doc/source/whatsnew/index.rst b/doc/source/whatsnew/index.rst
new file mode 100644
index 00000000..cc270a16
--- /dev/null
+++ b/doc/source/whatsnew/index.rst
@@ -0,0 +1,9 @@
+What's new in python-apt
+========================
+
+.. toctree::
+   :maxdepth: 2
+   :glob:
+
+   *
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 767fa3ca..a3c54e3c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,3 +5,5 @@ aptsources/distro.py
 apt/progress/gtk2.py
 apt/package.py
 apt/debfile.py
+apt/progress/text.py
+apt/cache.py
diff --git a/po/am.po b/po/am.po
index 2427611b..37ad7aed 100644
--- a/po/am.po
+++ b/po/am.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,51 +276,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 6.0 'Squeeze' "
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -303,52 +338,158 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "በየቀኑ"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Every two days"
-#~ msgstr "በየሁለት ቀን"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Weekly"
-#~ msgstr "በየሳምንቱ"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+#, fuzzy
+msgid "Details"
+msgstr "በየቀኑ"
 
-#~ msgid "Every two weeks"
-#~ msgstr "በየሁለት ሳምንት"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "After one week"
-#~ msgstr "ከአንድ ሳምንት በሓላ"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "After two weeks"
-#~ msgstr "ከሁለት ሳምንት በሓላ"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "After one month"
-#~ msgstr "ከአንድ ወር በሓላ"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Import key"
-#~ 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 ""
 
-#, fuzzy
-#~ msgid "Error importing selected file"
-#~ msgstr "ሰህተት የመረጡትን ፋይል ለማምጣት"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Error removing the key"
-#~ msgstr "ቁለፉን የማጥፋት ሰህተት"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "የመረጡትን ቁለፍ ማጥፋት አይቻልም፣ እባክዎን ይህንን ሰህተት ያመለከቱ"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "    "
-#~ 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 cbd177e3..6e00b3c9 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -24,224 +24,249 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "ملاحظات الإصدار"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "تحديثات الإنترنت"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "مدعوم بشكل رسمي"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "حقوق نقل محدودة"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -253,52 +278,62 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 6.0 'Squeeze' "
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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:42
+#: ../data/templates/Debian.info.in:94
 msgid "Proposed updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "تحديثات الإنترنت"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -306,420 +341,159 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "يوميا"
-
-#~ msgid "Every two days"
-#~ msgstr "كل يومين"
-
-#~ msgid "Weekly"
-#~ msgstr "اسبوعي"
-
-#~ msgid "Every two weeks"
-#~ msgstr "كل اسبوعين"
-
-#~ msgid "Every %s days"
-#~ msgstr "كل %s يوم"
-
-#~ msgid "After one week"
-#~ msgstr "بعد اسبوع"
-
-#~ msgid "After two weeks"
-#~ msgstr "بعد اسبوعين"
-
-#~ msgid "After one month"
-#~ msgstr "بعد شهر"
-
-#~ msgid "After %s days"
-#~ msgstr "بعد %s يوم"
-
-#~ msgid "Import key"
-#~ msgstr "استيراد المفتاح"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "خطاء في استيراد الملف"
-
-#~ msgid "Error removing the key"
-#~ msgstr "خطاء في ازالة المفتاح"
-
-#, fuzzy
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "إلمفتاح الذي إخترتة لا يمكن إزالتة, الرجاء التبليغ عن هذا كخطأ برمجي."
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "الرجاء ادخال اسم القرص"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "الرجاء ادخال القرص في الجهاز:"
-
-#~ msgid "Broken packages"
-#~ msgstr "الرزم المكسورة"
-
-#, fuzzy
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "هذا النظام يحتوي على رزم مكسورة لا يمكن إصلاحها من هذا البرنامج, الرجاء "
-#~ "العمل على إصلاحها أولا بواسطة apt-get أو synaptic قبل الإستمرار"
-
-#, fuzzy
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "لا يمكن تحديث الرزم العليا المطلوبة"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "سيكون من الضروري إزالة رزم مهمة"
-
-#, fuzzy
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "لم يكن ممكنا إحتساب التحديث"
-
-#, fuzzy
-#~ msgid "Error authenticating some packages"
-#~ msgstr "خطأ في التحقق من هوية بعض الرزم"
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "تعذّر تثبيت '%s'"
-
-#, fuzzy
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "لم يكن بالإمكان تثبيت إحدى الرزم المطلوبة. الرجاء التبليغ عن هذا كخطأ "
-#~ "برمجي. "
-
-#~ msgid "Reading cache"
-#~ msgstr "جاري القراءة من الكاش"
-
-#, fuzzy
-#~ msgid "No valid mirror found"
-#~ msgstr "لم يتم العثور على مرآه صالحة"
-
-#~ msgid "Repository information invalid"
-#~ msgstr "معلومات المستودع غير صالحة"
-
-#, fuzzy
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "تحديث معلومات المستودعادت أدت إلى إنتاج ملف غير صالح, الرجاء التبليغ عن "
-#~ "هذا كخطأ برمجي."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "مصادر الطرف الثالث غير مفعلة"
-
-#~ msgid "Error during update"
-#~ msgstr "خطأ خلال التحديث"
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "لا يوجد مساحة كافية على القرص الصلب"
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "هل تريد البدء في عملية التحديث الان؟"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "لم يكن ممكنا تثبيت التحديثات"
-
-#, fuzzy
-#~ msgid "Could not download the upgrades"
-#~ msgstr "لم يكن ممكنا تنزيل التحديثات"
-
-#, fuzzy
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "سيتم إلغاء التحديث الآن, الرجاء التأكد من إتصالك للإنترنت أو وسيط التثبيت "
-#~ "والمحاولة ثانيا. "
-
-#, fuzzy
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "هل تود إزالة الرزم الملغية?"
-
-#, fuzzy
-#~ msgid "_Skip This Step"
-#~ msgstr "_تجاهل هذه الخطوة"
-
-#~ msgid "_Remove"
-#~ msgstr "_إزالة"
-
-#, fuzzy
-#~ msgid "Error during commit"
-#~ msgstr "خطأ أثناء التفعيل"
-
-#~ msgid "Checking package manager"
-#~ msgstr "جاري التأكد من مدير الحزم"
-
-#~ msgid "Updating repository information"
-#~ msgstr "حاليا في عملية تحديث معلومات المستودع"
-
-#~ msgid "Invalid package information"
-#~ msgstr "معلومات الرزمة غير صالحة"
-
-#, fuzzy
-#~ msgid "Asking for confirmation"
-#~ msgstr "حاليا في عملية طلب التأكيد"
-
-#~ msgid "Upgrading"
-#~ msgstr "جاري عملية التحديث"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "جاري عملية البحث عن البرامج الملغية"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "إنتهت عملية تحديث النظام."
-
-#, fuzzy
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "الرجاء ادراج '%s' في السوّاقة '%s'"
-
-#~ msgid "Applying changes"
-#~ msgstr "جاري تطبيق التغييرات"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "لم يمكن تثبيت  '%s'"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "لم يمكن العثور على أمر 'diff'"
-
-#, fuzzy
-#~ msgid "A fatal error occured"
-#~ msgstr "وقع خطأ شديد"
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr "لمنع فقدان المعلومات الرجاء إغلاق جميع البرامج و الوثائق المفتوحة."
-
-#, fuzzy
-#~ msgid "Your system is up-to-date"
-#~ msgstr "إن نظامك الآن محدث"
-
-#, fuzzy
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>إزالة %s </b>"
-
-#~ msgid "Install %s"
-#~ msgstr "تثبيت %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "تحديث %s"
-
-#~ msgid "Reboot required"
-#~ msgstr "مطلوب إعادة تشغيل النظام"
-
-#, fuzzy
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "لقد تم إنهاء التحديث, من المطلوب إعادة تشغيل النظام, هل تود القيام بذلك "
-#~ "الآن?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>إعادة تشغيل النظام من أجل إنهاء التحديث</big><b>"
-
-#, fuzzy
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>إبدأ التحديث?</big></b>"
-
-#, fuzzy
-#~ msgid "Cleaning up"
-#~ msgstr "جاري عملية التنظيف"
-
-#~ msgid "Details"
-#~ msgstr "التّفاصيل"
-
-#~ msgid "Difference between the files"
-#~ msgstr "الفرق بين الملفات"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "جاري تعديل قنوات البرامج"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "جاري تحضير التحديث"
-
-#~ msgid "Restarting the system"
-#~ msgstr "جاري إعادة تشغيل النظام"
-
-#~ msgid "Terminal"
-#~ msgstr "شاشة طرفية"
-
-#~ msgid "_Keep"
-#~ msgstr "_اترك"
-
-#~ msgid "_Replace"
-#~ msgstr "_استبدل"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_بلغ عن خطأ برمجي"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_أعد التَشغيل اﻵن"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_تابع التحديث"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "لم يمكن العثور على ملاحظات الإصدار"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "قد يكون الخادم مضغوطا فوق طاقته. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "لم يمكن تنزيل ملاحظات الإصدار"
-
-#, fuzzy
-#~ msgid "Please check your internet connection."
-#~ msgstr "الرجاء التأكد من إتصالك بالإنترنت"
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "لم يكن ممكنا تشغيل أداة التحديث"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr "هذا على الأغلب خطأ برمجي في أداة التحديث, الرجاء التبليغ عنه"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "جاري تنزيل أداة التحديث"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "سوف تدلك أداة التحديث أثناء عملية التحديث"
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "توقيع أداة تحديث"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "أداة تحديث"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Failed to fetch"
-#~ msgstr "فشل في الإحضار"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "لقد فشل إحضار التحديث, قد تكون هناك مشكلة في الشبكة. "
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "التّفاصيل"
 
-#~ msgid "Failed to extract"
-#~ msgstr "فشل في الإستخلاص"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr "لقد فشل إستخلاص التحديث, قد تكون هناك مشكلة في الشبكة أو الخادم. "
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Verfication failed"
-#~ msgstr "فشل في التأكد"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Authentication failed"
-#~ msgstr "خطأ في إثبات الهوية"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "Version %s: \n"
-#~ msgstr "الإصدار %s: \n"
+#: ../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 "Download size: %s"
-#~ msgstr "حجم التنزيل: %s"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "الرجاء الإنتظار, قد يستغرق هذا وقتا"
-
-#~ msgid "Update is complete"
-#~ msgstr "لقد انتهت عملية التحديث"
-
-#~ msgid "Software index is broken"
-#~ msgstr "فهرس البرامج تالف"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr "الرجاء التأكد من إتصالك بالإنترنت"
 
-#, fuzzy
-#~ msgid "Changes"
-#~ msgstr "تغييرات"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Description"
-#~ msgstr "الوصف"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Show progress of single files"
-#~ msgstr "إظهار تقدّم الملفات المفردة"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Software Updates"
-#~ msgstr "تحديثات البرامج"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "U_pgrade"
-#~ msgstr "ت_حديث"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "_Check"
-#~ msgstr "_تحقق"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_أخفي هذة المعلومات في المستقبل"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "_Install Updates"
-#~ msgstr "_ثبت التحديثات"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "تعذّر تثبيت '%s'"
 
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "ت_حديث"
+#: ../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 "<b>Internet updates</b>"
-#~ msgstr "<b>تحديثات الإنترنت</b>"
-
-#~ msgid "Authentication"
-#~ msgstr "إثبات الهوية"
+msgid "An essential package would be removed"
+msgstr "سيكون من الضروري إزالة رزم مهمة"
 
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_تحقق من وجود التحديثات تلقائيا"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_إستورد ملف المفاتيح"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>تعليق</b>"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>العنوان العالمي URI:"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "المصدر\n"
-#~ "الثنائي"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "جاري مسح القرص المدمج"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "_Reload"
-#~ msgstr "_إعادة التحميل"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Show and install available updates"
-#~ 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 ""
 
-#~ msgid "Update Manager"
-#~ msgstr "مدير التحديث"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Show details of an update"
-#~ msgstr "أظهر تفاصيل تحديث"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "The window size"
-#~ msgstr "مساحة النافذة"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/be.po b/po/be.po
index b4e92d2c..f950f327 100644
--- a/po/be.po
+++ b/po/be.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
 "Language-Team: Belarusian <be@li.org>\n"
@@ -25,222 +25,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -252,51 +277,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 6.0 'Squeeze' "
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -304,320 +339,160 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Штодзённа"
-
-#~ msgid "Every two days"
-#~ msgstr "Кожныя два дні"
-
-#~ msgid "Weekly"
-#~ msgstr "Штотыдзень"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Кожныя два тыдні"
-
-#~ msgid "Every %s days"
-#~ msgstr "Кожныя %s дні"
-
-#~ msgid "After one week"
-#~ msgstr "Пасьля тыдня"
-
-#~ msgid "After two weeks"
-#~ msgstr "Пасьля двух тыдняў"
-
-#~ msgid "After one month"
-#~ msgstr "Пасьля аднаго месяца"
-
-#~ msgid "After %s days"
-#~ msgstr "Пасьля %s дзён"
-
-#~ msgid "Import key"
-#~ msgstr "Імпартаваць ключ"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Памылка імпартаваньня выбранага файла"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Выбраны файл можа быць пашкоджаны, альбо не зьяўляецца ключом PGP."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Памылка выдаленьня ключа"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Выбраны ключ ня можа быць выдалены. Калі ласка, дашліце баг-рэпорт аб "
-#~ "гэтым."
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Калі ласка, задайце назву для дыска"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Калі ласка, устаўце дыск у дыскавод:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Пакеты з памылкай"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Вашая сыстэма ўтрымлівае пакеты з зламанымі залежнасьцямі, якія немагчыма "
-#~ "выправіць у гэтай праграме. Калі ласка, спачатку выпраўце іх з дапамогай "
-#~ "synaptic ці apt-get перш чым працягваць."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Немагчыма абнавіць неабходныя мэтапакеты"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Трэба было-б выдаліць абавязковы пакет"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Немагчыма падлічыць абнаўленьне"
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Памылка аўтэнтыфікацыі некаторых пакетаў"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Немагчыма аўтэнтыфікаваць некаторыя пакеты. Гэта можа быць з-за часовай "
-#~ "праблемы зь сеткай. Вы можаце паспрабаваць паўтарыць дзеяньне пазьней. "
-#~ "Глядзіце ніжэй сьпіс неаўтэнтыфікаваных пакетаў."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Немагчыма ўсталяваць \"%s\""
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Немагчыма ўсталяваць патрэбны пакет. Калі ласка, паведаміце аб гэтай "
-#~ "памылцы. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Немагчыма вызначыць мэта-пакет"
-
-#~ msgid "Reading cache"
-#~ msgstr "Чытаньне кэша"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Ня знойдзены правільны люстраны сэрвэр"
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Стварыць прадвызначаны сьпіс крыніц?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Пасьля агляду вашага файла \"sources.list\" не былі знойдзены запісы для "
-#~ "\"%s\".\n"
-#~ "\n"
-#~ "Ці мусяць быць дададзены прадвызначаныя запісы для \"%s\"? Калі вы "
-#~ "вылучыце \"Не\", абнаўленьне будзе скасавана."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Нерэчаісныя зьвесткі аб сховішчы"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Вынік абнаўленьня зьвестак аб сховішчаў меў вынікам нерэчаісны файл. Калі "
-#~ "ласка, паведаміце аб гэтым, як аб памылцы."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Зыходнікі ад трэціх бакоў - адключаныя"
-
-#~ msgid "Error during update"
-#~ msgstr "Памылка ў час абналеньня"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Узьнікла памылка ў час абнаўленьня. Звычайна гэта праблемы зь сеткай, "
-#~ "калі ласка, праверце вашае сеткавае далуэньне й паўтарыце спробу."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Бракуе дыскавае прасторы"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Абнаўленьне спынена. Калі ласка, вызваліце ня менш за %s дыскавае "
-#~ "прасторы на %s. Спусташыце Сьметніцу й выдаліце часовыя пакеты былых "
-#~ "усталёвак з дапамогай загаду \"sudo apt-get clean\"."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Ці жадаеце пачаць абнаўленьне?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Немагчыма ўсталяваць абнаўленьні"
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Немагчыма зпампаваць абнаўленьні"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Абнаўленьне спынена. Калі ласка, праверце вашае сеткавае далучэньне альбо "
-#~ "носьбіты ўсталёўкі  й паўтарыце спробу. "
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Выдаліць састарэлыя пакеты?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "Аб_мінуць гэты крок"
-
-#~ msgid "_Remove"
-#~ msgstr "В_ыдаліць"
-
-#~ msgid "Error during commit"
-#~ msgstr "Памылка ў час зацьвярджэньня"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Узьніклі нейкія памылкі ў час ачысткі. Калі ласка, паглядзіце зьмешчанае "
-#~ "ніжэй паведамленьне. "
-
-#~ msgid "Checking package manager"
-#~ msgstr "Праверка кіраўніка пакетаў"
-
-#~ msgid "Updating repository information"
-#~ msgstr "Абнаўленьне зьвестак сховішча"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Недзеяздольныя зьвесткі пра пакет"
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Запыт пацьвярджэньня"
-
-#~ msgid "Upgrading"
-#~ msgstr "Абнаўленьне"
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Калі ласка, устаўце \"%s\" у прыладу \"%s\""
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Applying changes"
-#~ msgstr "Зьдзяйсьненьне зьменаў"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Could not install '%s'"
-#~ msgstr "Немагчыма ўсталяваць \"%s\""
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+#, fuzzy
+msgid "Details"
+msgstr "Штодзённа"
 
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Ня знойдзена праграма \"diff\""
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "A fatal error occured"
-#~ msgstr "Узьнікла невыправімая памылка"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Install %s"
-#~ msgstr "Усталёўка %s"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Upgrade %s"
-#~ msgstr "Абнаўленьне %s"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "Reboot required"
-#~ 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 ""
 
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Абнаўленьне скончана й патрабуецца перагрузка сыстэмы. Ці жадаеце зрабіць "
-#~ "яе зараз?"
+#: ../apt/package.py:1053
+#, fuzzy
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr "Калі ласка, праверце вашае далучэньне да інтэрнэту."
 
-#~ msgid "    "
-#~ msgstr "    "
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Скасаваць працэс абнаўленьня?</big></b>\n"
-#~ "\n"
-#~ "Сыстэма можа патрапіць у нестабільны стан, калі вы скасуеце абнаўленьне. "
-#~ "Вельмі пажадана дачакацца канца абнаўленьня."
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Перагрузіце сыстэму для завяршэньня абнаўленьня</big></b>"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Пачаць абнаўленьне?</big></b>"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Cleaning up"
-#~ msgstr "Ачышчэньне"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "_Report Bug"
-#~ msgstr "Па_ведаміць пра памылку"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "_Restart Now"
-#~ msgstr "Пера_грузіць"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "_Resume Upgrade"
-#~ msgstr "Пра_цягваць абнаўленьне"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Немагчыма ўсталяваць \"%s\""
 
-#~ msgid "Could not find the release notes"
-#~ msgstr "Немагчыма адшукаць нататкі выпуску"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Паслужнік можа быць звыш нагружаны. "
+#: ../apt/debfile.py:494
+#, fuzzy
+msgid "An essential package would be removed"
+msgstr "Трэба было-б выдаліць абавязковы пакет"
 
-#~ msgid "Could not download the release notes"
-#~ msgstr "Немагчыма зпампаваць нататкі рэдакцыі"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Please check your internet connection."
-#~ msgstr "Калі ласка, праверце вашае далучэньне да інтэрнэту."
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Немагчыма запусьціць сродак абнаўленьня"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Верагодна, гэта выклікана памылкай у сродку абнаўленьня. Калі ласка, "
-#~ "паведаміце пра гэта як пра памылку."
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Пампаваньне сродка абнаўленьня"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Version %s: \n"
-#~ msgstr "Вэрсія %s: \n"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Update is complete"
-#~ 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 ""
 
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Ваш дыстрыбутыў больш не падтрымліваецца"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Маецца ў наяўнасьці новая рэдакцыя \"%s\" дыстрыбутыву</b>"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Software index is broken"
-#~ msgstr "Пашкоджаны індэкс праграм"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "Абнаўленьне %s"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
index f9b8f205..0fc3ed71 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -24,252 +24,283 @@ 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:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:135
+#, fuzzy
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:153
+#, fuzzy
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:197
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 5.10 актуализации"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Поддържани от обществото (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "Допринесен софтуер"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Поддържани от обществото (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Поддържани от обществото (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Поддържани от обществото (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Несвободни (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Несвободни (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "_Инсталиране на актуализациите"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "_Инсталиране на актуализациите"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 #, fuzzy
 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:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 актуализации"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Състарени версии"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Официално поддържани"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 актуализации"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Състарени версии"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Поддържани от обществото (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Несвободни (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD с Ubuntu 4.10 „Warty Warthog“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Официално поддържан"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Ограничени авторски права"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 обновления по сигурността"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 обновления"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Състарени версии"
@@ -283,57 +314,69 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 #. Description
 #: ../data/templates/Debian.info.in:8
 #, fuzzy
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../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:42
+#: ../data/templates/Debian.info.in:94
 #, fuzzy
 msgid "Proposed updates"
 msgstr "_Инсталиране на актуализациите"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 #, fuzzy
 msgid "Debian current stable release"
 msgstr "Debian Unstable „Sid“"
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (тестване)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (нестабилен)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-съвместим софтуер с несвободни зависимости"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Софтуер несъвместим с DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -341,1344 +384,163 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Ежедневно"
-
-#~ msgid "Every two days"
-#~ msgstr "Всеки два дни"
-
-#~ msgid "Weekly"
-#~ msgstr "Ежеседмично"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Всеки две седмици"
-
-#~ msgid "Every %s days"
-#~ msgstr "Всеки %s дни"
-
-#~ msgid "After one week"
-#~ msgstr "След една седмица"
-
-#~ msgid "After two weeks"
-#~ msgstr "След две седмици"
-
-#~ msgid "After one month"
-#~ msgstr "След един месец"
-
-#~ msgid "After %s days"
-#~ msgstr "След %s дни"
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "Обновления на софтуера"
-
-#, fuzzy
-#~ msgid "(Source Code)"
-#~ msgstr "Изходен код"
-
-#, fuzzy
-#~ msgid "Source Code"
-#~ msgstr "Изходен код"
-
-#~ msgid "Import key"
-#~ msgstr "Внасяне на ключ"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Грешка при внасяне на избрания файл"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Избраният файл може да не е GPG файл ключ или може да е повреден."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Грешка при премахване на ключа"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Ключът, който избрахте не може да бъде премахнат. Докладвайте това като "
-#~ "грешка."
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Грешка при сканиране на CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Моля, въведете име за диска"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Моля, поставете диск в устройството:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Повредени пакети"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Системата Ви съдържа повредени пакети, които не могат да бъдат поправени "
-#~ "с този софтуер. Моля, поправете ги със synaptic или apt-get преди да "
-#~ "продължите!"
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Не може да бъдат надградени изисквани мета-пакети"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Ще трябва да бъде премахнат важен пакет"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Не може да бъде планирано надграждането"
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Възникна непреодолим проблем при планиране на надграждането. Докладвайте "
-#~ "това като грешка."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Грешка при удостоверяването автентичността на някои пакети"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Не беше възможно да се удостовери автентичността на някои пакети. Това "
-#~ "може да е временен проблем с мрежата. Може би бихте искали да опитате "
-#~ "отново по-късно. Вижте по-долу списъка на неудоствоерените пакети."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Не може да се инсталира '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Не можеше да бъде инсталиран нужен пакет. Моля, докладвайте това като "
-#~ "грешка! "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Не могат да бъдат предположени мета-пакети"
-
-#, fuzzy
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Системата Ви не съдържа ubuntu-desktop, kubuntu-desktop или edubuntu-"
-#~ "desktop пакет и не бе възможно засичането на версията на Ubuntu, която "
-#~ "ползвате.\n"
-#~ " Моля, преди да продължите, инсталирайте един от тези пакети, като "
-#~ "използвате synaptic или apt-get!"
-
-#, fuzzy
-#~ msgid "Failed to add the CD"
-#~ msgstr "Грешка при доставянето"
-
-#~ msgid "Reading cache"
-#~ msgstr "Четене на кеша"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Не е открит валиден огледален сървър"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Докато бе преглеждана информацията от хранилището, не бе открит запис за "
-#~ "огледален сървър за надграждането. Това може да се случи, ако използвате "
-#~ "вътрешен огледален сървър или информацията за сървъра е остаряла.\n"
-#~ "\n"
-#~ "Желаете ли въпреки това да бъде презаписан файлът \"sources.list\"? Ако "
-#~ "тук изберете \"Да\", всички записи \"%s \" ще бъдат актуализирани на \"%s"
-#~ "\".\n"
-#~ "Ако изберете \"Не\", актуализирането ще бъде отменено."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Генериране на източници по подразбиране?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "След преглеждане на Вашия \"sources.list\" не бе открит валиден запис за "
-#~ "\"%s\".\n"
-#~ "\n"
-#~ "Да бъдат ли добавени записи по подразбиране за \"%s\"? Ако изберете \"Не"
-#~ "\", актуализацията ще бъде отменена."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Информацията от хранилището е невалидна"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Надграждане на информацията от хранилището доведе до невалиден файл. "
-#~ "Моля, съобщете това като грешка!"
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Забранени са източници от трети страни"
-
-#, fuzzy
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Някои записи от трети страни във Вашия \"souces.list\" бяха забранени. "
-#~ "Можете да ги разрешите отново след надграждането чрез инструмента "
-#~ "software-properties или чрез synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Грешка по време на надграждане"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Възникна проблем при актуализацията. Това обикновено е накакъв проблем с "
-#~ "мрежата. Моля, проверете мрежовата връзка и опитайте пак!"
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Недостатъчно свободно място на диска"
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Желаете ли да започне надграждането?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Не можеше да бъдат инсталирани надгражданията"
-
-#, fuzzy
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Надграждането сега ще бъде прекратено. Системата Ви може да е в "
-#~ "неизползваемо състояние. Бе изпълнено възстановяване (dpkg --configure -"
-#~ "a)."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Не можеше да бъдат свалени надгражданията"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Надграждането се прекратява. Моля, проверете Интернет връзката или "
-#~ "инсталационния носител и опитайте отново! "
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Премахване на остарелите пакети?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "П_рескачане на стъпката"
-
-#~ msgid "_Remove"
-#~ msgstr "_Премахване"
-
-#~ msgid "Error during commit"
-#~ msgstr "Грешка при прехвърляне"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Имаше проблем при почистването. Моля, вижте съобщението по-долу за повече "
-#~ "информация! "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Рестартиране на системата"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Проверка на диспечера на пакети"
+#: ../apt/progress/gtk2.py:259
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr "Сваляне на файл %li от %li при %s/сек"
 
-#, fuzzy
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Подготвяне на надграждането"
-
-#, fuzzy
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Възникна непреодолим проблем при планиране на надграждането. Докладвайте "
-#~ "това като грешка."
+#: ../apt/progress/gtk2.py:265
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Сваляне на файл %li от %li при %s/сек"
 
-#~ msgid "Updating repository information"
-#~ msgstr "Актуализиране информацията от хранилището"
-
-#, fuzzy
-#~ msgid "Invalid package information"
-#~ msgstr "Невалидна информация за пакет"
-
-#, fuzzy
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "След актуализиране не  информацията, важния пакет \"%s\" вече не може да "
-#~ "бъде открит.\n"
-#~ "Това показва сериозна грешка. Моля, съобщете за това!"
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Запитване за потвърждение"
-
-#~ msgid "Upgrading"
-#~ msgstr "Надграждане"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Търсене на остарял софтуер"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Надграждането на системата завърши."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Моля, поставете диск '%s' в устройство '%s'"
-
-#, fuzzy
-#~ msgid "Fetching is complete"
-#~ msgstr "Актуализацията е завършена"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Сваляне на файл %li от %li при %s/сек"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Изтегляне на файл %li от общо %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Прилагане на промените"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Не можеше да бъде инсталиран \"%s\""
-
-#, fuzzy
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Замяна на конфигурационния файл\n"
-#~ "\"%s\"?"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Командата \"diff\" не бе намерена"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Възникна фатална грешка"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Моля, съобщете това като грешка и включете файловете \"/var/log/dist-"
-#~ "upgrade.log\" и \"/var/log/dist-upgrade-apt.log\" във Вашия доклад. "
-#~ "Надграждането сега ще бъде прекратено.\n"
-#~ "Оригиналният \"sources.list\" was saved inбе съхранен в \"/etc/apt/"
-#~ "sources.list.distUpgrade\"."
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Детайли"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "Пакетът %s ще бъде премахнат."
-#~ msgstr[1] "Пакетите %s ще бъдат премахнати."
-
-#, fuzzy
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%s нов пакет ще бъде инсталиран."
-#~ msgstr[1] "%s нови пакети ще бъдат инталирани."
-
-#, fuzzy
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%s пакет ще бъде надграден."
-#~ msgstr[1] "%s нови пакети ще бъдат надградени."
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Трябва да изтеглите данни общо %s. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Надграждането може да отнеме няколко часа, като не може да бъде отменено "
-#~ "по-нататък."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "За да предодвратите загуба на данни, затворете всички отворени приложения "
-#~ "и документи."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Системата Ви е актуална"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Премахване на %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Инсталиране на %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Надграждане на %s"
-
-#~ msgid "Reboot required"
-#~ msgstr "Нужно е рестартиране"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Надграждането е завършено и има нужда от рестарт. Рестартиране сега?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Отмяна на протичащото надграждане?</big></b>\n"
-#~ "\n"
-#~ "Системата Ви може да се окаже в неузползваемо състояние, ако отмените "
-#~ "надграждането. Силно препоръчвано е да възобновите надграждането!"
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Рестратирайте системата, за да завършите надграждането</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Започване на надграждането?</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Почистване"
-
-#~ msgid "Details"
-#~ msgstr "Детайли"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Разлика между файловете"
-
-#, fuzzy
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Изтегляне и инсталиране на надграждането"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Промяна на софтуерните канали"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Подготвяне на надграждането"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Рестартиране на системата"
-
-#~ msgid "Terminal"
-#~ msgstr "Терминал"
-
-#, fuzzy
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Поднови надграждането"
-
-#~ msgid "_Keep"
-#~ msgstr "_Задържане"
-
-#~ msgid "_Replace"
-#~ msgstr "_Замяна"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Съобщи грешка"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Рестартирай сега"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Поднови надграждането"
-
-#, fuzzy
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Поднови надграждането"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Не бяха открити бележки към изданието"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Сървърът може да е претоварен. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Не можеше да бъдат свалени бележките към изданието"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Моля, проверете Интернет връзката си!"
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Не може да бъде стартирана помощната програма за надграждане."
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Това най-верроятно е грешка в помощната програма за надграждане. Моля, "
-#~ "съобщете това като грешка!"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Изтегляне на помощната програма за надграждане"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr ""
-#~ "Помощната програма за надграждане ще Ви води през процеса на надграждане."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Подпис на помощната програма за надграждане"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Помощна програма за надграждане"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Грешка при доставянето"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Доставянето на надграждането бе неуспешно. Възможно е да има проблем с "
-#~ "мрежата. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Грешка при извличането"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Извличането на надграждането бе неуспешно. Възможно е да има проблем с "
-#~ "мрежата или сървъра. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Грешка при удостоверяване"
-
-#, fuzzy
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Удостоверяването на надграждането не успя. Възможно е да има проблем с "
-#~ "мрежата или със сървъра. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Идентификацията неуспешна"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Идентификацията на надграждането е неуспешна. Възможно е да има проблем с "
-#~ "мрежата или сървъра. "
-
-#, fuzzy
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "Сваляне на файл %li от %li при %s/сек"
-
-#, fuzzy
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Сваляне на файл %li от %li при %s/сек"
-
-#, fuzzy
-#~ msgid "The list of changes is not available"
-#~ msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!"
-
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!"
-
-#, fuzzy
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Неуспех при изтегляне на списъка с промени. Моля, проверете Интернет "
-#~ "връзката си."
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "Ubuntu 5.10 Състарени версии"
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "_Поднови надграждането"
-
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "_Инсталиране на актуализациите"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Версия %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Сваляне на списъка с промени..."
-
-#, fuzzy
-#~ msgid "_Check All"
-#~ msgstr "_Проверка"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Размер за изтегляне: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Можете да инсталирате %s актуализация"
-#~ msgstr[1] "Можете да инсталирате %s актуализации"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Моля, изчакайте! Това може да отнеме известно време."
-
-#~ msgid "Update is complete"
-#~ msgstr "Актуализацията е завършена"
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "_Инсталиране на актуализациите"
-
-#, fuzzy
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Нова версия: %s (Размер: %s)"
-
-#, fuzzy
-#~ msgid "Version %s"
-#~ msgstr "Версия %s:"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Вашата дистрибуция вече не се поддържа"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Повече няма да получавате поправки за сигурността и критични "
-#~ "актуализации. Надградете до по-късна версия на Ubuntu Linux. Вижте http://"
-#~ "www.ubuntu.com за повече информация за надграждането!"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Индексът на софтуера е повреден"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Невъзможно е да бъде инсталиран или премахнат какъвто и да е софтуер. "
-#~ "Моля, ползвайте диспечера на пакети \"Synaptic\" или първо задействайте "
-#~ "\"sudo apt-get install -f\" в терминален прозорец, за да поправите този "
-#~ "проблем!"
-
-#, fuzzy
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Ще трябва ръчно да проверите за актуализации</big></b>\n"
-#~ "\n"
-#~ "Системата Ви не проверява автоматично за актуализации. Можете да "
-#~ "настроите това в „Система” -> „Администрация” -> „Свойства на софтуера”"
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Поддържане на системата в съвременно състояние</b></big>"
-
-#, fuzzy
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Грешка при сканиране на CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Започване на надграждането?</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "Промени"
-
-#~ msgid "Chec_k"
-#~ msgstr "Провер_ка"
+msgid "Starting..."
+msgstr "Настройки"
 
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Проверка на софтуерните канали за нови актуализации"
-
-#~ msgid "Description"
-#~ msgstr "Описание"
-
-#~ msgid "Release Notes"
-#~ msgstr "Бележки към изданието"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Показване напредъка на отделните файлове"
-
-#~ msgid "Software Updates"
-#~ msgstr "Обновления на програмите"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Софтуерните актуализации поправят грешки, премахват уаизвими места в "
-#~ "сигурността и предлагат нови възможности."
-
-#~ msgid "U_pgrade"
-#~ msgstr "_Надграждане"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Надграждане до последната версия на Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Проверка"
-
-#, fuzzy
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Поднови надграждането"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Скрий тази информация за в бъдеще"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Инсталиране на актуализациите"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "_Надграждане"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "Промени"
-
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Актуализации по Интернет</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Актуализации по Интернет</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Актуализации по Интернет</b>"
-
-#, fuzzy
-#~ msgid "Add Cdrom"
-#~ msgstr "Добавяне на Cdrom"
-
-#~ msgid "Authentication"
-#~ msgstr "Идентификация"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "_Изтриване на изтеглените софтуерни файлове:"
-
-#, fuzzy
-#~ msgid "Download from:"
-#~ msgstr "Свалянето е завършено"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Внасяне на публичния ключ от доверен доставчик на софтуер"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Актуализации по Интернет"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Само актуализации на сигурността от официалните сървъри на Ubuntu ще "
-#~ "бъдат инсталирани автоматично"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Връщане на _стандартните стойности"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Връщане на стандартните ключове на Вашата дистрибуция"
-
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "Настройки на софтуера"
-
-#, fuzzy
-#~ msgid "Source code"
-#~ msgstr "Изходен код"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Проверявай за актуализации автоматично:"
-
-#, fuzzy
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "И_зтегли актуализациите във фонов режим, но не ги инсталирай"
-
-#, fuzzy
-#~ msgid "_Import Key File"
-#~ msgstr "Внасяне на ключ"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Инсталирай актуализациите на сигурноста без потвърждение"
-
-#, fuzzy
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Информацията за канала е остаряла</big></b>\n"
-#~ "\n"
-#~ "Ще трябва да презаредите информацията за канала, за да инсталирате "
-#~ "софтуер и актуализации от новодобавени или променени канали. \n"
-#~ "\n"
-#~ "Нужна Ви е Интернет връзка, за да продължите."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Коментар:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Компоненти:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Дистрибуция:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Вид:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Добавете пълния APT ред за канала, който искате да добавите</b></"
-#~ "big>\n"
-#~ "\n"
-#~ "APT редът съдържа вида, местонахождението и компонентите за даден канал. "
-#~ "Например <i>„deb http://ftp.debian.org sarge main“</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "APT ред:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Двоичен\n"
-#~ "Изходен код"
-
-#, fuzzy
-#~ msgid "Edit Source"
-#~ msgstr "Изходен код"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Сканиране на CD-ROM"
-
-#, fuzzy
-#~ msgid "_Add Source"
-#~ msgstr "Изходен код"
-
-#~ msgid "_Reload"
-#~ msgstr "_Презареждане"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Показване и инсталация на наличните актуализации"
-
-#~ msgid "Update Manager"
-#~ msgstr "Управление на обновленията"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Автоматична проверка за наличието на нова версия на текущата дистрибуция "
-#~ "и предлагане да се надгради (ако е възможно)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Проверка за нови версии на дистрибуцията"
-
-#, fuzzy
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Ако е забланена автоматичната проверка за актуализации, ще трябва ръчно "
-#~ "да презареждате списъка с канали. Тази опция позволява в този случай да "
-#~ "се скрие напомнянето."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Припомни за презареждане на списъка с канали"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Покажи подробностите за актуализациите"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Съхранява размера на update-manager диалога"
-
-#, fuzzy
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Съхранява състоянието на разширения панел, който съдържа списъка с "
-#~ "промени и описанието"
-
-#~ msgid "The window size"
-#~ msgstr "Размерът на прозореца"
-
-#, fuzzy
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Настройка на софтуерните канали и актуализациите по Интернет"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" актуализации на сигурността"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#, fuzzy
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "Ограничен за изнасяне от САЩ софтуер"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Сваляне на файл %li от %li при неизвестна скорост"
-
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "_Инсталиране на актуализациите"
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Отмяна на _изтеглянето"
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Не можеше да бъдат намерени надграждания"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Системата Ви вече е надградена."
-
-#, fuzzy
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Надграждане до Ubuntu 6.06 LTS</"
-#~ "span>"
-
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 актуализации на сигурността"
-
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Надграждане до последната версия на Ubuntu"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Не могат да бъдат инсталирани всички актуализации"
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Преглеждане на системата Ви</b></big>\n"
-#~ "\n"
-#~ "Софтуерните актуализации поправят грешки, премахват уаизвими места в "
-#~ "сигурността и предлагат нови възможности."
-
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "Официално поддържан"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Някои актуализации изискват премахването на допълнителен софтуер. "
-#~ "Използвайте функцията „Маркиране на всички актуализации” на Диспечера на "
-#~ "пакети „Synaptic” или задействайте „sudo apt-get dist-upgrade” в "
-#~ "терминален прозорец, за да актуализирате напълно системата си."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Следните актуализации ще бъдат пропуснати:"
-
-#~ msgid "Download is complete"
-#~ msgstr "Свалянето е завършено"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Надграждането се преустановява. Моля, съобщете това като грешка!"
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Надграждане на Ubuntu"
-
-#~ msgid "Hide details"
-#~ msgstr "Скрий детайлите"
-
-#~ msgid "Show details"
-#~ msgstr "Покажи детайлите"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr ""
-#~ "Позволено е да оперира само един диспечер на софтуера в даден момент"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Моля, затворете всички други приложения, преди всичко \"aptitude\" или "
-#~ "\"Synaptic\"."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Канали</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Ключове</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Носител на инсталацията"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Настройки на софтуера"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Канал</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Компоненти</b>"
-
-#~ msgid "Add Channel"
-#~ msgstr "Добавяне на канал"
-
-#~ msgid "Edit Channel"
-#~ msgstr "Редакция на канал"
-
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Добави канал"
-#~ msgstr[1] "_Добави канали"
-
-#~ msgid "_Custom"
-#~ msgstr "_Лично"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS актуализации"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS актуализации на сигурността"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS актуализации"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS Състарени версии"
-
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Раздели</b>"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Раздели:</b>"
+#: ../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 "Reload the latest information about updates"
-#~ msgstr "Презареждане от сървъра на информацията за пакетите."
+msgid "The list of changes is not available"
+msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!"
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Сваляне на промените</span>\n"
-#~ "\n"
-#~ "Трябва да се свалят промените от централния сървър"
-
-#~ msgid "Show available updates and choose which to install"
-#~ 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
 #, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "Грешка при премахване на ключа"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Редактиране на източниците и настройките на софтуера"
-
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Източници</b>"
-
-#~ msgid "day(s)"
-#~ msgstr "ден/дни"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Хранилище</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Временни файлове</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Потребителски интерфейс</b>"
-
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Ключове за идентификация</b></big>\n"
-#~ "\n"
-#~ "Може да добавяте и премахвате ключове за идентификация през този "
-#~ "прозорец. Ключът прави възможна проверката на цялостта на софтуера, който "
-#~ "сваляте от интернет."
-
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Добавяне на нов ключов файл за доверените вериги от ключове. Уверете се, "
-#~ "че сте получили ключа по сигурен канал и че можете да се доверите на "
-#~ "собственика. "
-
-#~ msgid "Add repository..."
-#~ msgstr "Добавяне на хранилище..."
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Автоматична п_роверка за обновления"
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Автоматично изчистване н_а временните пакетни файлове"
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Интервал на почистване в дни: "
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Изтриване на _старите пакети от пакетната временна памет"
-
-#~ msgid "Edit Repository..."
-#~ msgstr "Редактиране на хранилище..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Максимална възраст в дни:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Максимален размер в Мб:"
-
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Възвръщане на стандартните ключове идващи с дистрибуцията. Това няма да "
-#~ "промени потребителските инсталирани ключове."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Настройване на _максималния размер за пакетната временна памет"
-
-#~ msgid "Settings"
-#~ msgstr "Настройки"
-
-#~ msgid "Show detailed package versions"
-#~ msgstr "Показване на подробни пакетни версии"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Неуспех при изтегляне на списъка с промени. Моля, проверете Интернет "
+"връзката си."
 
-#~ msgid "Show disabled software sources"
-#~ msgstr "Показване на изключените източници на софтуер"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Update interval in days: "
-#~ msgstr "Интервал на обновяването в дни: "
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "_Add Repository"
-#~ msgstr "_Добавяне на хранилище"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Сваляне на възможните за обновяване пакети"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>Статус:</b>"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Налични обновления</b></big>\n"
-#~ "\n"
-#~ "Следните пакети могат да бъдат обновени. Може да ги обновите като "
-#~ "натиснете бутона „Инсталиране“."
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "Отказ на свалянето на дневника на промените"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Debian sarge"
-#~ msgstr "Debian 3.1 „Sarge“"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Не може да се инсталира '%s'"
 
-#, fuzzy
-#~ msgid "Debian sid"
-#~ msgstr "Debian Testing"
+#: ../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 "Oficial Distribution"
-#~ msgstr "<b>Дистрибуция:</b>"
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Трябва да сте „root“, за да стартирате тази програма."
-
-#~ msgid "Binary"
-#~ msgstr "Двоични"
-
-#~ msgid "Non-free software"
-#~ msgstr "Несвободен софтуер"
-
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian 3.0 „Woody“"
-
-#~ msgid "Debian Stable"
-#~ msgstr "Debian Stable"
-
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Debian Non-US (Stable)"
-
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian Non-US (Testing)"
+msgid "An essential package would be removed"
+msgstr "Ще трябва да бъде премахнат важен пакет"
 
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr ""
-#~ "Автоматичен подписващ ключ за архива на Ubuntu <ftpmaster@ubuntu.com>"
-
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr ""
-#~ "Автоматичен подписващ ключ за дисковете на Ubuntu <cdimage@ubuntu.com>"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "Избор на ключов файл"
-
-#~ msgid "There is one package available for updating."
-#~ msgstr "Има един пакет наличен за обновяване."
-
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "Има %s пакета налични за обновяване."
-
-#~ msgid "There are no updated packages"
-#~ msgstr "Няма пакети за обновяване"
-
-#~ msgid "You did not select any of the %s updated package"
-#~ msgid_plural "You did not select any of the %s updated packages"
-#~ msgstr[0] "Не избрахте единствения пакет наличен за обновяване."
-#~ msgstr[1] "Не избрахте нито един от наличните за обновяване %s пакета."
-
-#~ msgid "You have selected %s updated package, size %s"
-#~ msgid_plural "You have selected all %s updated packages, total size %s"
-#~ msgstr[0] "Избрахте %s пакет за обновяване, с размер %s"
-#~ msgstr[1] "Избрахте всички %s пакета за обновяване, с общ размер %s"
-
-#~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
-#~ msgstr[0] "Избрахте %s от %s пакет за обновяване, с размер %s"
-#~ msgstr[1] "Избрахте %s от %s пакета за обновяване, с общ размер %s"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "The updates are being applied."
-#~ msgstr "Обновленията се прилагат."
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Може да стартирате само една програма за управление на пакетите. "
-#~ "Затворете другата програма първо."
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Updating package list..."
-#~ msgstr "Обновяване на списъка с пакетите..."
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "There are no updates available."
-#~ msgstr "Няма налични обновления."
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "New version:"
-#~ msgstr "Нова версия:"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Обновете до новата версия на Ubuntu Linux. За версията, която имате ще "
-#~ "бъдат спрени поправките по сигурността и други критични обновления. Вижте "
-#~ "http://www.ubuntulinux.org за повече информация."
+#: ../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 ""
 
-#~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "Има нова версия на Ubuntu!"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "Излезнала е нова версия с кодовото име „%s“. Вижте http://www.ubuntulinux."
-#~ "org за информация по обновяването."
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Never show this message again"
-#~ msgstr "Без да се показва това съобщение отново"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "Няма открити промени. Сървърът може би не е обновен."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/bn.po b/po/bn.po
index 1ad0054c..f090b822 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -24,246 +24,277 @@ 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:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:135
+#, fuzzy
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:153
+#, fuzzy
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:197
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "উবুন্টু ৫.১০ আপডেট"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "ফ্রি নয় (মাল্টিভার্স)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "ফ্রি নয় (মাল্টিভার্স)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "ফ্রি নয় (মাল্টিভার্স)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 #, fuzzy
 msgid "Important security updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "আপডেট ইন্সটল করো (_I)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "আপডেট ইন্সটল করো (_I)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "উবুন্টু ৫.১০ আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "অফিসিয়াল ভাবে সমর্থিত"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "উবুন্টু ৫.১০ আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "ফ্রি নয় (মাল্টিভার্স)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "উবুন্টু ৫.১০ আপডেট"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
@@ -276,56 +307,69 @@ 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 "ডেবিয়ান ৩.১ \"সার্জ\""
+
+#. Description
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "ডেবিয়ান ৩.১ \"সার্জ\""
+
+#. Description
+#: ../data/templates/Debian.info.in:58
+#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "ডেবিয়ান ৩.১ \"সার্জ\""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../data/templates/Debian.info.in:83
 #, fuzzy
 msgid "Debian 3.1 'Sarge'"
 msgstr "ডেবিয়ান ৩.১ \"সার্জ\""
 
 #. Description
-#: ../data/templates/Debian.info.in:42
+#: ../data/templates/Debian.info.in:94
 #, fuzzy
 msgid "Proposed updates"
 msgstr "আপডেট ইন্সটল করো (_I)"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "ডেবিয়ান \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "ডেবিয়ান \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -333,792 +377,161 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "দৈনিক"
-
-#~ msgid "Every two days"
-#~ msgstr "প্রত্যেক দুই দিনে"
-
-#~ msgid "Weekly"
-#~ msgstr "সাপ্তাহিক"
-
-#~ msgid "Every two weeks"
-#~ msgstr "প্রত্যেক দুই সপ্তাহে"
-
-#~ msgid "Every %s days"
-#~ msgstr "প্রত্যেক %s দিনে"
-
-#~ msgid "After one week"
-#~ msgstr "এক সপ্তাহ পর"
-
-#~ msgid "After two weeks"
-#~ msgstr "দুই সপ্তাহ পর"
-
-#~ msgid "After one month"
-#~ msgstr "এক মাস পর"
-
-#~ msgid "After %s days"
-#~ msgstr "%s দিন পর"
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "সফ্টওয়্যার আপডেট"
-
-#~ msgid "Import key"
-#~ msgstr "কী ইম্পোর্ট"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "নির্বাচিত ফাইলটি ইম্পোর্ট করতে সমস্যা হয়েছে"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "বেছে নেয়া ফাইলটি মনে হয় কোন GPG কী ফাইল নয় অথবা এটি নষ্ট।"
-
-#~ msgid "Error removing the key"
-#~ msgstr "কী সরাতে সমস্যা হয়েছে"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>সিডি স্ক্যানিং এ ত্রুটি</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "ডিস্কের জন্য একটি নাম দিন"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "অনুগ্রহ করে ড্রাইভে একটি ডিস্ক দিন:"
-
-#~ msgid "Broken packages"
-#~ msgstr "ভাঙা প্যাকেজসমূহ"
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "দরকারী meta-packages আপগ্রেড করতে পারে নি"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "একটি প্রয়োজনীয় প্যকেজ অপসারণ করা হতে পারে"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "আপগ্রেড গণনা করতে পারছে না"
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "'%s' ইন্সটল করা যাচ্ছে না"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "একটি প্রয়োজনীয় প্যাকেজ ইন্সটল করা অসম্ভব ছিল। অনুগ্রহ করে একে একটি বাগ হিসাবে "
-#~ "রিপোর্ট করুন। "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "meta-package অনুমান করা যাচ্ছ না"
-
-#, fuzzy
-#~ msgid "Failed to add the CD"
-#~ msgstr "আনতে ব্যর্থ"
-
-#~ msgid "Reading cache"
-#~ msgstr "ক্যাশ পড়া হচ্ছে"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "কোন সঠিক মিরর পাওয়া যায় নি"
-
-#~ msgid "Generate default sources?"
-#~ msgstr "ডিফল্ট sources তৈরি করে?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "আপনার 'sources.list' স্ক্যান করার পর '%s' এর জন্য কোন সঠিক এন্ট্রি খুজে পাওয়া "
-#~ "যায় নি।\n"
-#~ "\n"
-#~ "'%s' জন্য ডিফল্ট যুক্ত করার উচিত? আপনি যদি 'না' নির্বাচন করেন তাহলে আপডেট "
-#~ "বাতিল হবে।"
-
-#~ msgid "Repository information invalid"
-#~ msgstr "রিপোজিটরির তথ্য সঠিক নয়"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "রিপোজিটোরি তথ্য আপগ্রেড করার সময় একটি ভুল ফাইল তৈরী হয়েছে। অনুগ্রহ করে এটিকে "
-#~ "বাগ হিসাবে রিপোর্ট করুন।"
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "তৃতীয় পার্টির উত্স নিষ্ক্রিয়"
-
-#~ msgid "Error during update"
-#~ msgstr "আপগ্রেড করার সময় সমস্যা"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "আপগ্রেড করার সময় একটি সমস্যা হয়েছে। এটি সাধারনত নেটওয়ার্কের সমস্যা, অনুগ্রহ করে "
-#~ "আপনার নেটওয়ার্ক সংযোগ পরীক্ষা করুন এবং পুনরায় চেষ্টা করুন।"
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "ডিস্কে যথেস্ট ফাঁকা জায়গা নেই"
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "আপনি কি আপগ্রেড শুরু করতে চান?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "আপগ্রেড ইন্সটল করা যায় নি"
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "আপগ্রেড ডাউনলোড করা যায় নি"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "আপগ্রেড এখন বন্ধ হবে। দয়া করে আপনার ইন্টারনেট সংযুক্তি বা ইনস্টলেশন মিডিয়া "
-#~ "পরীক্ষা করুন এবং আবার চেষ্টা করুন। "
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "অপ্রচলিত প্যাকেজগুলো মুছে ফেলা হবে?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "এই ধাপটি এড়িয়ে যাও (_এ)"
-
-#~ msgid "_Remove"
-#~ msgstr "সরাও (_স)"
-
-#~ msgid "Error during commit"
-#~ msgstr "প্রেরণ করার সময় সমস্যা"
-
-#~ msgid "Restoring original system state"
-#~ msgstr "সিস্টেমটি রিস্টার্ট করছি"
-
-#~ msgid "Checking package manager"
-#~ msgstr "প্যাকেজ ম্যানেজার পরীক্ষা করা হচ্ছ"
-
-#, fuzzy
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "আপগ্রেড প্রস্তুত করা হচ্ছে"
-
-#~ msgid "Updating repository information"
-#~ msgstr "রিপজিটরির তথ্য আপডেট করা হচ্ছে"
-
-#~ msgid "Invalid package information"
-#~ msgstr "ভুল প্যাকেজ তথ্য"
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "তথ্যের জন্য জিজ্ঞাসা"
-
-#~ msgid "Upgrading"
-#~ msgstr "আপগ্রেড করা হচ্ছে"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "অপ্রচলিত সফ্টওয়্যার অনুসন্ধান করা হচ্ছে"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "সিস্টেম আপগ্রেড সম্পন্ন।"
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "দয়া করে '%s' ড্রাইভে '%s' প্রবেশ করান"
-
-#, fuzzy
-#~ msgid "Fetching is complete"
-#~ msgstr "আপডেট সম্পন্ন"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "%li of %li ফাইল ডাউনলোড করছে"
-
-#, fuzzy
-#~ msgid "About %s remaining"
-#~ msgstr "%li মিিনিট বাকি আছে"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "%li of %li ফাইল ডাউনলোড করছে"
-
-#~ msgid "Applying changes"
-#~ msgstr "পরিবর্তনগুলো প্রয়োগ করছি"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "'%s' ইন্সটল করা যায় নি"
-
-#, fuzzy
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "কনফিগারেশন ফাইল '%s'\n"
-#~ "কি সরানো হবে?"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "'diff' কমান্ডটি পাওয়া যায় নি"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "একটি মারাত্মক সমস্যা সংঘটিত হয়েছে"
-
-#, fuzzy
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%s টি প্যাকেজ মোছা হবে।"
-#~ msgstr[1] "%s টি প্যাকেজ মোছা হবে।"
-
-#, fuzzy
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।"
-#~ msgstr[1] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।"
-
-#, fuzzy
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।"
-#~ msgstr[1] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "আপনাকে সর্বমোট %s ডাউনলোড করতে হবে। "
-
-#, fuzzy
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr "আপগ্রেড করতে কয়েক ঘন্টা লেগে যেতে পারে এবং পরে এটি বাতিল করা যাবে না।"
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr "তথ্য হারাতে না চাইলে সকল অ্যাপলিকেশন এবং ডকুমেন্ট বন্ধ রাখুন।"
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "আপনার সিস্টেম আপ-টু-ডেট"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>%s মুছো</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "%s ইন্সটল"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "%s আপগ্রেড"
-
-#, fuzzy
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li দিন %li ঘন্টা %li মিিনিট বাকি আছে"
-
-#, fuzzy
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li ঘন্টা %li মিিনিট বাকি আছে"
-
-#~ msgid "Reboot required"
-#~ msgstr "রিবুট করা প্রয়োজন"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr "আপগ্রেডটি সম্পন্ন এবং রিবুট করা প্রয়োজন। আপনি কি এক্ষুনি তা করতে চান?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>আপগ্রেড সম্পন্ন করতে সিস্টেমটি রিস্টার্ট করুন</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>আপগ্রেড শুরু করবো?</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "পরিস্কার করছি"
-
-#~ msgid "Details"
-#~ msgstr "বিস্তারিত"
-
-#~ msgid "Difference between the files"
-#~ msgstr "ফাইলগুলোর মধ্যে পার্থক্য"
-
-#, fuzzy
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "আপগ্রেড ডাউনলোড এবং ইন্সটল করা হচ্ছে"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "সফ্টওয়্যার চ্যানেল পরিবর্তন করা হচ্ছ"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "আপগ্রেড প্রস্তুত করা হচ্ছে"
-
-#~ msgid "Restarting the system"
-#~ msgstr "সিস্টেমটি রিস্টার্ট করছি"
-
-#~ msgid "Terminal"
-#~ msgstr "টার্মিন্যাল"
-
-#, fuzzy
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "পুনরায় আপগ্রেড শুরু (_R)"
-
-#~ msgid "_Keep"
-#~ msgstr "রাখো (_K)"
-
-#~ msgid "_Replace"
-#~ msgstr "প্রতিস্হাপন (_R)"
-
-#~ msgid "_Report Bug"
-#~ msgstr "বাগ রিপোর্ট (_R)"
-
-#~ msgid "_Restart Now"
-#~ msgstr "এক্ষুনি রিস্টার্ট (_R)"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "পুনরায় আপগ্রেড শুরু (_R)"
-
-#, fuzzy
-#~ msgid "_Start Upgrade"
-#~ msgstr "পুনরায় আপগ্রেড শুরু (_R)"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "রিলিজ নোট পাওয়া যায় নি"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "সার্ভারটি মনে হয় ব্যস্ত। "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "রিলিজ নোট ডাউনলোড করা যায় নি"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।"
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "আপগ্রেড টুলটি চালানো যায় নি"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr "এটি মনে হচ্ছে আপগ্রেড টুলের একটি বাগ। অনুগ্রহ করে বাগটি রিপোর্ট করুন"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "আপগ্রেড টুল ডাউনলোড করছি"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "আপগ্রেড টুলটি আপনাকে আপগ্রেড প্রক্রিয়ায় সাহায্য করবে।"
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "আপগ্রেড টুল স্বাক্ষর"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "আপগ্রেড টুল"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "আনতে ব্যর্থ"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "আপগ্রেডটি আনতে ব্যর্থ। নেটওয়ার্কে কোন সমস্যা থাকতে পারে। "
-
-#~ msgid "Failed to extract"
-#~ msgstr "এক্সট্রাক্ট করতে ব্যর্থ"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "আপগ্রেডটি এক্সট্রাক্ট করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা থাকতে পারে। "
-
-#~ msgid "Verfication failed"
-#~ msgstr "যথার্থ্যতা পরীক্ষা করতে ব্যর্থ"
-
-#, fuzzy
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "আপগ্রেড যথার্থ্য হয়েছে কিনা তা পরীক্ষা করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা "
-#~ "থাকতে পারে। "
-
-#~ msgid "Authentication failed"
-#~ msgstr "অনমোদন প্রক্রিয়া ব্যর্থ"
-
-#, fuzzy
-#~ msgid "The list of changes is not available"
-#~ msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।"
-
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।"
-
-#, fuzzy
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা "
-#~ "করুন।"
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "পুনরায় আপগ্রেড শুরু (_R)"
-
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "আপডেট ইন্সটল করো (_I)"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "ভার্সন %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছ..."
-
-#, fuzzy
-#~ msgid "_Check All"
-#~ msgstr "পরীক্ষা করো (_C)"
-
-#~ msgid "Download size: %s"
-#~ msgstr "ডাউনলোড এর আকার: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "আপনি %s আপডেট ইনস্টল করতে পারেন"
-#~ msgstr[1] "আপনি %s আপডেট ইনস্টল করতে পারেন"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।"
-
-#~ msgid "Update is complete"
-#~ msgstr "আপডেট সম্পন্ন"
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "আপডেট ইন্সটল করো (_I)"
-
-#, fuzzy
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "নতুন ভার্সন: %s (আকার: %s)"
-
-#, fuzzy
-#~ msgid "Version %s"
-#~ msgstr "ভার্সন %s:"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "আপনার ডিস্ট্রিবিউশনটি আর সমর্থিত নয়"
-
-#~ msgid "Software index is broken"
-#~ msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট"
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>আপনার সিস্টেম আপ-টু-ডেট রাখুন</b></big>"
-
-#, fuzzy
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>সিডি স্ক্যানিং এ ত্রুটি</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>আপগ্রেড শুরু করবো?</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "পরিবর্তন"
-
-#~ msgid "Chec_k"
-#~ msgstr "পরীক্ষা করো (_k)"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "নতুন আপডেট এর জন্য সফ্টওয়্যার চ্যানেল পরীক্ষা করো"
-
-#~ msgid "Description"
-#~ msgstr "বর্ননা"
-
-#~ msgid "Release Notes"
-#~ msgstr "রিলিজ নোট"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "একটি ফাইলের অগ্রগতি দেখাও"
-
-#~ msgid "Software Updates"
-#~ msgstr "সফ্টওয়্যার আপডেট"
-
-#~ msgid "U_pgrade"
-#~ msgstr "আপগ্রেড (_p)"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো"
-
-#~ msgid "_Check"
-#~ msgstr "পরীক্ষা করো (_C)"
-
-#, fuzzy
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "পুনরায় আপগ্রেড শুরু (_R)"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "ভবিষ্যতে এই তথ্য আড়াল রাখো (_H)"
-
-#~ msgid "_Install Updates"
-#~ msgstr "আপডেট ইন্সটল করো (_I)"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "আপগ্রেড (_p)"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "পরিবর্তন"
-
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>ইন্টারনেট আপডেট</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>ইন্টারনেট আপডেট</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>ইন্টারনেট আপডেট</b>"
-
-#, fuzzy
-#~ msgid "Add Cdrom"
-#~ msgstr "সিডিরম যোগ (_C)"
-
-#~ msgid "Authentication"
-#~ msgstr "প্রমাণীকরন"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "ডাউনলোড করা সফ্টওয়্যার ফাইল মুছো (_e):"
-
-#, fuzzy
-#~ msgid "Download from:"
-#~ msgstr "ডাউনলোড সম্পন্ন"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "বিশ্বস্ত সফ্টওয়্যার প্রদানকারীর থেকে পাবলিক কী ইমপোর্ট করো"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Internet Updates"
-#~ msgstr "ইন্টারনেট আপডেট"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Restore _Defaults"
-#~ msgstr "ডিফল্ট পুনঃস্হাপন (_D)"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "বিস্তারিত"
 
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "আপনার ডিস্ট্রিবিউশনের ডিফল্ট কী পুনঃস্হাপন করুন"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "সফ্টওয়্যার বৈশিষ্ট্য"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "স্বয়ংক্রিয় ভাবে আপডেট পরীক্ষা করো (_C):"
+#: ../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 "_Download updates automatically, but do not install them"
-#~ msgstr "আড়ালে আপডেট ডাউনলোড করো, কিন্তু তাদেরকে ইন্সটল করো না (_D)"
-
-#~ msgid "_Import Key File"
-#~ msgstr "কী ফাইল ইম্পোর্ট(_ই)"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "নিরাপত্তা জনিত আপডেট গুলো অনুমদন ছাড়াই ইন্সটল করো (_I)"
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>মন্তব্য:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>উপাদান:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>ডিস্ট্রিবিউসন:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>ধরন:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>ইউ-আর-আই:</b>"
-
-#~ msgid "APT line:"
-#~ msgstr "APT লাইন:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "বাইনারী\n"
-#~ "উৎস"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "সিডিরম স্ক্যান করা হচ্ছে"
-
-#~ msgid "_Reload"
-#~ msgstr "পুনরায় পড়ো (_R)"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "উপস্হিত আপডেট গুলো প্রদর্শন এবং ইন্সটল করো"
-
-#~ msgid "Update Manager"
-#~ msgstr "আপডেট ম্যানেজার"
+msgid "The list of changes is not available"
+msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।"
 
-#~ msgid "Check for new distribution releases"
-#~ msgstr "নতুন ডিস্ট্রিবিউশন রিলিজের জন্য পরীক্ষা করো"
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "চ্যানেল তালিকা পুনরায় পড়ার কথা মনে করো"
-
-#~ msgid "Show details of an update"
-#~ msgstr "একটি আপডেটের বিস্তারিত প্রদর্শন করো"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "update-manager ডায়ালগের আকার সংরক্ষন"
-
-#~ msgid "The window size"
-#~ 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
 #, fuzzy
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "সফ্টওয়্যার চ্যানেল এবং ইন্টারনেট আপডেট কনফিগার"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "ডেবিয়ান ৩.১ \"Sarge\" নিরাপত্তামুলক আপডেট"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।"
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "আপডেট ইন্সটল করো (_I)"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Cancel _Download"
-#~ msgstr "ডাউনলোড বাতিল (_D)"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Could not find any upgrades"
-#~ msgstr "কোন আপগ্রেড পাওয়া যায় নি"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "আপনার সিস্টেম ইতিমধ্যেই আপগ্রেড করা হয়েছে।"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">উবুন্টু \"ড্যাপার\" ৬.০৬ এ আপগ্রেড "
-#~ "করছি</span>"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "'%s' ইন্সটল করা যাচ্ছে না"
 
-#~ msgid "Cannot install all available updates"
-#~ msgstr "সকল উপস্হিত আপডেট ইন্সটল করা যায় নি"
+#: ../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 "Oficially supported"
-#~ msgstr "অফিসিয়াল ভাবে সমর্থিত"
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "নিম্নের আপডেটগুলো বাদ দেয়া হবে:"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "%li সেকেন্ড বাকি আছে"
-
-#~ msgid "Download is complete"
-#~ msgstr "ডাউনলোড সম্পন্ন"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "আপগ্রেডটি নিস্ফল ভাবে বের হয়ে যাচ্ছ। অনুগ্রহ করে এই বাগটি রিপোর্ট করুন।"
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "উবুন্টু আপগ্রেড করছি"
-
-#~ msgid "Hide details"
-#~ msgstr "বিস্তারিত আড়াল"
-
-#~ msgid "Show details"
-#~ msgstr "বিস্তারিত প্রদর্শন"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "শুধুমাত্র একটি সফ্টওয়্যার ম্যানেজমেন্ট টুল একসময়ে চালানো যাবে"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "অনুগ্রহ করে অন্যান্য অ্যাপলিকেশন যেমন, 'aptitude' অথবা 'Synaptic' প্রথমে বন্ধ "
-#~ "করুন।"
+msgid "An essential package would be removed"
+msgstr "একটি প্রয়োজনীয় প্যকেজ অপসারণ করা হতে পারে"
 
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>চ্যানেল</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>কী</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "ইন্সটলেশন মাধ্যম"
-
-#~ msgid "Software Preferences"
-#~ msgstr "সফ্টওয়্যার অগ্রাধিকার"
-
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>চ্যানেল</b>"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>উপাদান</b>"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Add Channel"
-#~ msgstr "চ্যানেল যোগ"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "চ্যানেন সম্পাদন"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "চ্যানেল যোগ (_A)"
-#~ msgstr[1] "চ্যানেল যোগ (_A)"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "নিজ হাতে (_C)"
+#: ../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 ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "উবুন্টু ৬.০৬ LTS"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "উবুন্টু ৬.০৬ নিরাপত্তামুলক আপডেট"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "উবুন্টু ৬.০৬ আপডেট"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "উবুন্টু ৬.০৬ ব্যাকপোর্ট"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/br.po b/po/br.po
index 6ed0348b..a846d409 100644
--- a/po/br.po
+++ b/po/br.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,51 +276,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 6.0 'Squeeze' "
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -303,56 +338,157 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Every %s days"
-#~ msgstr "Bep %s devezh"
+#: ../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 ""
 
-#~ msgid "After %s days"
-#~ msgstr "War-lerc'h %s devezh"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Import key"
-#~ msgstr "Emborzhiañ an alc'hwezh"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Error importing selected file"
-#~ msgstr "Fazi en ur emborzhiañ ar restr dibabet"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Moarvat n'eo ket ur restr alc'hwezh GPG ar restr dibabet, pe neuze eo "
-#~ "gwastet."
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Error removing the key"
-#~ msgstr "Fazi en ur zilemel an alc'hwezh"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "N'eus ket tu da zilemel an alc'whezh ho peus dibabet. Kelaouit eo ur bug "
-#~ "marplij."
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Roit un anv evit ar bladenn marplij"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Lakait ur bladenn e-barzh ul lenner marplij:"
+#: ../apt/debfile.py:376
+#, python-format
+msgid "Cannot install '%s'"
+msgstr ""
 
-#~ msgid "Broken packages"
-#~ msgstr "Pakadoù torr"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "    "
-#~ msgstr "    "
+#: ../apt/debfile.py:494
+msgid "An essential package would be removed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Import Key File"
-#~ msgstr "Emborzhiañ an alc'hwezh"
+#: ../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 ""
 
-#~ msgid "     "
-#~ 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 cac1598c..ab55c5ee 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -23,251 +23,282 @@ 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:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:135
+#, fuzzy
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:153
+#, fuzzy
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:197
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Actualitzacions de seguretat d'Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Actualitzacions de seguretat d'Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Actualitzacions d'Ubuntu 5.10"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Paquets mantinguts per la comunitat (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "Programari de la comunitat"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Paquets mantinguts per la comunitat (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Paquets mantinguts per la comunitat (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Paquets mantinguts per la comunitat (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Paquets sense llicència lliure (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Paquets sense llicència lliure (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 #, fuzzy
 msgid "Important security updates"
 msgstr "Debian Stable Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "_Instal·la les actualitzacions"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "_Instal·la les actualitzacions"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualitzacions de seguretat d'Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualitzacions d'Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Paquets mantinguts oficialment (Main)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualitzacions de seguretat d'Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualitzacions d'Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Paquets mantinguts per la comunitat (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Paquets sense llicència lliure (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Algun programari ja no es mantindrà oficialment"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Paquets amb restriccions per copyright (Restricted)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Actualitzacions de seguretat d'Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualitzacions d'Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
@@ -280,57 +311,70 @@ 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
 #, fuzzy
 msgid "Proposed updates"
 msgstr "_Instal·la les actualitzacions"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Debian Stable Security Updates"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 #, fuzzy
 msgid "Debian current stable release"
 msgstr "Debian Unstable \"Sid\""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian Testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Programari compatible DFSG amb dependències no lliures"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Programari no compatible DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -338,1303 +382,164 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 #, fuzzy
 msgid "Custom servers"
 msgstr "Servidor més proper"
 
-#~ msgid "Daily"
-#~ msgstr "Diàriament"
-
-#~ msgid "Every two days"
-#~ msgstr "Cada dos dies"
-
-#~ msgid "Weekly"
-#~ msgstr "Setmanalment"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Cada dues setmanes"
-
-#~ msgid "Every %s days"
-#~ msgstr "Cada %s dies"
-
-#~ msgid "After one week"
-#~ msgstr "Després d'una setmana"
-
-#~ msgid "After two weeks"
-#~ msgstr "Després de dues setmanes"
-
-#~ msgid "After one month"
-#~ msgstr "Després d'un mes"
-
-#~ msgid "After %s days"
-#~ msgstr "Després de %s dies"
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "Actualitzacions de programari"
-
-#, fuzzy
-#~ msgid "(Source Code)"
-#~ msgstr "Font"
-
-#, fuzzy
-#~ msgid "Source Code"
-#~ msgstr "Font"
-
-#~ msgid "Import key"
-#~ msgstr "Importa un clau"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "S'ha produït un error en importar el fitxer seleccionat"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "El fitxer que heu seleccionat no correspon a una clau GPG o pot estar "
-#~ "corromput."
-
-#~ msgid "Error removing the key"
-#~ msgstr "S'ha produït un error en esborrar la clau"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "La clau que heu seleccionat no es pot esborrar. Notifiqueu-ho com a error "
-#~ "de programació."
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>S'ha produït un error en llegir el CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Introduïu un nom per al disc"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Inseriu un disc a la unitat:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Paquets trencats"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "El vostre sistema conté paquets trencats que no es poden arreglar amb "
-#~ "aquesta aplicació. Utilitzeu el Synaptic o apt-get abans de continuar."
-
-#, fuzzy
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "No s'han pogut actualitzar els metapaquets sol·licitats"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "S'haurà d'esborrar un paquet essencial"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "No s'ha pogut calcular l'actualització"
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "S'ha produït un problema greu alhora de calcular l'actualització. "
-#~ "Informeu de l'error."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "S'ha produït un error en autenticar alguns paquets"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "No s'han pogut autenticar alguns paquets. Potser hi ha un problema "
-#~ "temporal amb la xarxa. Podeu provar-ho després. A continuació es mostra "
-#~ "la llista amb els paquets no autenticats."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "No s'ha pogut instal·lar '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "No s'ha pogut instal·lar un dels paquets sol·licitats. Envieu un informe "
-#~ "amb els error. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Els paquets ubuntu-desktop, kubuntu-desktop o edubuntu-desktop no estan "
-#~ "instal·lats al vostre sistema i no s'ha pogut detectar la versió d'Ubuntu "
-#~ "que esteu utilitzant.\n"
-#~ " Instal·leu algun dels paquets anteriors des del Synaptic o amb l'apt-get "
-#~ "per poder continuar."
-
-#, fuzzy
-#~ msgid "Failed to add the CD"
-#~ msgstr "Ha fallat l'extracció"
-
-#~ msgid "Reading cache"
-#~ msgstr "S'està llegint la memòria cau"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "No s'ha trobat una rèplica vàlida"
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Voleu generar les fonts per defecte?"
-
-#~ msgid "Repository information invalid"
-#~ msgstr "La informació del dipòsit no és vàlida"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "En actualitzar la informació del dipòsit s'ha produït un error. Informeu "
-#~ "de l'error."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "S'han desactivat les fonts de tercers"
-
-#, fuzzy
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "S'han desactivat algunes entrades de tercers al fitxer sources.list. "
-#~ "Podeu reactivar-los, després de l'actualització de programari, des de "
-#~ "'propietats del programari' o des del Synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "S'ha produït un error en l'actualització"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "S'ha produït un error mentre s'actualizava el vostre sistema. Comproveu "
-#~ "la vostra connexió de xarxa i torneu a intentar-ho."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "No disposeu de suficient espai al disc"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "L'actualització s'ha cancel·lat. Allibereu almenys %s d'espai de disc a %"
-#~ "s.\r\n"
-#~ "Buideu la vostra paperera i esborreu els paquets temporals utilitzant "
-#~ "'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Voleu iniciar l'actualització?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "No s'han pogut instal·lar les actualitzacions"
-
-#, fuzzy
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "L'actualització s'ha cancel·lat. El vostre sistema ha pogut quedar "
-#~ "inservible.  S'ha executat una recuperació del sistema (dpkg --configure -"
-#~ "a)."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "No s'han pogut descarregar les actualitzacions"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "S'ha cancel·lat l'actualització. Comproveu la vostra connexió a Internet "
-#~ "o el mitjà d'instal·lació i torneu-ho a provar. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Aquests paquets instal·lats ja no es mantindran de manera oficial i només "
-#~ "els mantindrà la comunitat Ubuntu ('universe').\n"
-#~ "\n"
-#~ "Si no teniu activat 'universe' se us sugerirà que els desintal·leu."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Voleu esborrar els paquets obsolets?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Omet aquest pas"
-
-#~ msgid "_Remove"
-#~ msgstr "Esbo_rra"
-
-#~ msgid "Restoring original system state"
-#~ msgstr "S'està restaurant l'estat original del sistema"
-
-#~ msgid "Checking package manager"
-#~ msgstr "S'està comprovant el gestor de paquets"
-
-#, fuzzy
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "S'està preparant l'actualització"
-
-#, fuzzy
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "S'ha produït un problema greu alhora de calcular l'actualització. "
-#~ "Informeu de l'error."
-
-#~ msgid "Updating repository information"
-#~ msgstr "S'està actualitzant la informació del dipòsit"
-
-#~ msgid "Invalid package information"
-#~ msgstr "La informació del paquet no és valida"
-
-#~ msgid "Upgrading"
-#~ msgstr "Actualitzant"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "S'està cercant programari obsolet"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "S'ha completat l'actualització del sistema"
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Inseriu '%s' a la unitat '%s'"
-
-#, fuzzy
-#~ msgid "Fetching is complete"
-#~ msgstr "S'ha completat l'actualització"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "S'està descarregant el fitxer %li de %li a %s/s"
-
-#, fuzzy
-#~ msgid "About %s remaining"
-#~ msgstr "Queden uns %li minuts"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "S'està descarregant el fitxer %li de %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "S'estan aplicant els canvis"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "No s'ha pogut instal·lar '%s'"
-
-#, fuzzy
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Voleu reemplaçar el fitxer de\n"
-#~ "configuració '%s'?"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "No s'ha trobat l'ordre 'diff'"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "S'ha produït un error greu"
-
-#, fuzzy
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "S'esborrarà %s paquet"
-#~ msgstr[1] "S'esborraran %s paquets"
-
-#, fuzzy
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "S'instal·larà %s paquet"
-#~ msgstr[1] "S'instal·laran %s paquets"
-
-#, fuzzy
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "S'actualitzarà %s paquet"
-#~ msgstr[1] "S'actualitzaran %s paquets"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Heu de descarregar un total de %s. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "L'actualització pot durar algunes hores i no la podreu cancel·lar un cop "
-#~ "hagi començat."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Per a evitar una possible pèrdua de dades, tanqueu tos els documents i "
-#~ "aplicacions."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "El vostre sistema està actualitzat"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Esborra %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Instal·la %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Actualitza %s"
-
-#, fuzzy
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "Queden uns %li dies %li hores %li minuts"
-
-#, fuzzy
-#~ msgid "%li hours %li minutes"
-#~ msgstr "Queden unes %li hores %li minuts"
-
-#~ msgid "Reboot required"
-#~ msgstr "És necessari que reinicieu el sistema"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "L'actualització ha finalitzat i és necessari reiniciar el sistema. Ho "
-#~ "voleu fer ara?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Voleu cancel·lar l'actualització?</big></b>\n"
-#~ "\n"
-#~ "Si ho feu, el sistema pot quedar inservible. Se us recomana continuar amb "
-#~ "l'actualització."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Reinicieu el sistema per a completar l'actualització</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Voleu iniciar l'actualització?</big></b>"
-
-#~ msgid "Details"
-#~ msgstr "Detalls"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Diferències entre els fitxers"
-
-#, fuzzy
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "S'estan descarregant i instal·lant les actualitzacions"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "S'estan modificant els canals de programari"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "S'està preparant l'actualització"
-
-#~ msgid "Restarting the system"
-#~ msgstr "S'està reiniciant el sistema"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#, fuzzy
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Reprén l'actualització"
-
-#~ msgid "_Replace"
-#~ msgstr "_Reemplaça"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Informa de l'error"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Reinicia"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Reprén l'actualització"
-
-#, fuzzy
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Reprén l'actualització"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "No s'han pogut trobar les notes de la versió"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "El servidor potser està sobrecarregat. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "No s'han pogut descarregar les notes de la versió"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Comproveu la vostra connexió a Internet"
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "No es pot executar l'eina d'actualització"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Això sembla un error de l'eina d'actualització. Informeu d'aquest error"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "S'està descarregant l'eina d'actualització"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "L'eina d'actualització us guiarà durant el procés d'actualització."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Signatura de l'eina d'actualització"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Eina d'actualització"
-
-#~ msgid "Failed to extract"
-#~ msgstr "Ha fallat l'extracció"
-
-#~ msgid "Verfication failed"
-#~ msgstr "Ha fallat la verificació"
-
-#~ msgid "Authentication failed"
-#~ msgstr "Ha fallat l'autenticació"
-
-#, fuzzy
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "S'està descarregant el fitxer %li de %li amb %s/s"
-
-#, fuzzy
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "S'està descarregant el fitxer %li de %li amb %s/s"
-
-#, fuzzy
-#~ msgid "The list of changes is not available"
-#~ msgstr "La llista de canvis encara no està disponible. Proveu-ho després."
-
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "La llista de canvis encara no està disponible. Proveu-ho després."
-
-#, fuzzy
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "S'ha produït un error en descarregar els canvis. Comproveu si teniu "
-#~ "connexió a Internet."
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "_Reprén l'actualització"
-
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "_Instal·la les actualitzacions"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versió %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "S'està descarregant la llista de canvis..."
-
-#, fuzzy
-#~ msgid "_Check All"
-#~ msgstr "_Comprova"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Mida de la descàrrega: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Podeu instal·lar %s actualització"
-#~ msgstr[1] "Podeu instal·lar %s actualitzacions"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Espereu, això pot tardar una estona."
-
-#~ msgid "Update is complete"
-#~ msgstr "S'ha completat l'actualització"
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "S'estan comprovant les actualitzacions..."
-
-#, fuzzy
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Versió nova: %s (Mida: %s)"
-
-#, fuzzy
-#~ msgid "Version %s"
-#~ msgstr "Versió %s:"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "La vostra distribució ja no es mantindrà més"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Ja no rebreu actualitzacions de seguretat o crítiques. Actualitzeu el "
-#~ "vostre sistema a la darrera versió d'Ubuntu. Vegeu http://www.ubuntu.com "
-#~ "per a més informació."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Ja disposeu de la nova distribució '%s'</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "L'índex de programari s'ha trencat"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "No és possible instal·lar o desinstal·lar programari. Per arreglar-ho, "
-#~ "utilitzeu el gestor de paquets \"Synaptic\" o executeu \"sudo apt-get "
-#~ "install -f\" en un terminal."
-
-#, fuzzy
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Heu de comprovar les actualizacions manualment</big></b>\n"
-#~ "\n"
-#~ "El vostre sistema no comprova les actualitzacions automàticament. Si "
-#~ "voleu que ho faci, configureu-ho a \"Sistema\" -> \"Administració\" -> "
-#~ "\"Propietats del programari\""
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Manteniu el vostre sistema actualitzat</b></big>"
-
-#, fuzzy
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>S'ha produït un error en llegir el CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Voleu iniciar l'actualització?</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "Canvis"
-
-#~ msgid "Chec_k"
-#~ msgstr "Compro_va"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Comprova els canals de programari per a actualitzacions noves"
-
-#~ msgid "Description"
-#~ msgstr "Descripció"
-
-#~ msgid "Release Notes"
-#~ msgstr "Notes de la versió"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Mostra el progrés per als fitxers individuals"
-
-#~ msgid "Software Updates"
-#~ msgstr "Actualitzacions de programari"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Les actualitzacions de programari corregeixen errors, eliminen problemes "
-#~ "de seguretat i proporcionen prestacions noves."
-
-#~ msgid "U_pgrade"
-#~ msgstr "_Actualitza"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Actualitza a la darrera versió d'Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Comprova"
-
-#, fuzzy
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Reprén l'actualització"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_En el futur oculta aquesta informació"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Instal·la les actualitzacions"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "_Actualitza"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "Canvis"
-
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Actualitzacions d'Internet</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Actualitzacions d'Internet</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Actualitzacions d'Internet</b>"
-
-#, fuzzy
-#~ msgid "Add Cdrom"
-#~ msgstr "Afegeix un _CD-ROM"
-
-#~ msgid "Authentication"
-#~ msgstr "Autenticació"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "Esborra els fitxers de programari descarregats:"
-
-#, fuzzy
-#~ msgid "Download from:"
-#~ msgstr "S'ha completat la descàrrega"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Importa la clau pública d'un proveïdor de confiança"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Actualitzacions d'Internet"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Restaura els valors per _defecte"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Restaura les claus per defecte de la vostra distribució"
-
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "Propietats del programari"
-
-#, fuzzy
-#~ msgid "Source code"
-#~ msgstr "Font"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Comprova les actualitzacions automàticament"
-
-#, fuzzy
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr ""
-#~ "_Descarrega les actualitzacions en segon pla, però no les instal·lis"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Importa una clau"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Instal·la actualitzacions de seguretat sense confirmació"
-
-#, fuzzy
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>La informació del canal no està actualitzada</big></b>\n"
-#~ "\n"
-#~ "Heu de recarregar la informació dels canals per a instal·lar programari o "
-#~ "actualitzacions des dels nous canals.\n"
-#~ "\n"
-#~ "Necessiteu una connexió a Internet per poder continuar."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comentari:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Components:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribució:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipus:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Introduïu la línia APT del canal que voleu afegir</b></big>\n"
-#~ "\n"
-#~ "La línia APT inclou el tipus, la ubicació i els components del canal, per "
-#~ "exemple <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "Línia APT:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binari\n"
-#~ "Font"
-
-#, fuzzy
-#~ msgid "Edit Source"
-#~ msgstr "Font"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "S'està analitzant el CD-ROM"
-
-#, fuzzy
-#~ msgid "_Add Source"
-#~ msgstr "Font"
-
-#~ msgid "_Reload"
-#~ msgstr "Act_ualitza"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Mostra i instal·la les actualitzacions disponibles"
-
-#~ msgid "Update Manager"
-#~ msgstr "Gestor d'actualitzacions"
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Comprova si hi ha noves distribucions"
-
-#, fuzzy
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Si no activeu la comprovació automàtica d'actualitzacions, haureu de "
-#~ "recarregar manualment la llista de canals."
-
-#~ msgid "Show details of an update"
-#~ msgstr "Mostra els detalls d'una actualització"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Emmagatzema la mida del diàleg del gestor d'actualitzacions"
-
-#~ msgid "The window size"
-#~ msgstr "La mida de la finestra"
-
-#, fuzzy
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Configura els canals de programari i les actualitzacions d'Internet"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Actualitzacions de seguretat de Debian 3.1 \"Sarge\""
-
-#, fuzzy
-#~ msgid "Debian \"Etch\" (testing)"
-#~ msgstr "Debian \"Etch\" (testing)"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#, fuzzy
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "Programari amb restriccions d'exportació als EUA"
+#: ../apt/progress/gtk2.py:265
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "S'està descarregant el fitxer %li de %li amb %s/s"
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr ""
-#~ "S'està descarregant el fitxer %li de %li a una velocitat desconeguda"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detalls"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "_Instal·la les actualitzacions"
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Cancel·la la _descàrrega"
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Algun programari ja no es mantindrà oficialment"
+msgid "Starting..."
+msgstr "Paràmetres"
 
-#~ msgid "Could not find any upgrades"
-#~ msgstr "No s'han pogut trobar actualitzacions"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "El vostre sistema ja està actualitzat"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">S'està actualitzant a Ubuntu 6.06 "
-#~ "LTS</span>"
+#: ../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 "Important security updates of Ubuntu"
-#~ msgstr "Debian Stable Security Updates"
+msgid "The list of changes is not available"
+msgstr "La llista de canvis encara no està disponible. Proveu-ho després."
 
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Actualitza a la darrera versió d'Ubuntu"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "No es poden instal·lar les actualitzacions disponibles"
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>S'està comprovant el vostre sistema</b></big>\n"
-#~ "\n"
-#~ "L'actualització del programari corregeix errors, elimina problemes de "
-#~ "seguretat i afegeix prestacions noves."
+#: ../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 "Oficially supported"
-#~ msgstr "Paquets mantinguts oficialment (Main)"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Algunes actualitzacions requereixen la desinstal·lació de programari "
-#~ "adicional. Per actualitzar completament el vostre sistema utilitzeu la "
-#~ "funció \"Marca totes les actualitzacions\" del gestor de paquets "
-#~ "\"Synaptic\" o executeu \"sudo apt-get dist-upgrade\" en un terminal."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Les següents actualitzacions s'ometran:"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Queden uns %li segons"
-
-#~ msgid "Download is complete"
-#~ msgstr "S'ha completat la descàrrega"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "L'actualització s'ha cancel·lat. Informeu d'aquest error"
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "S'està actualitzant Ubuntu"
-
-#~ msgid "Hide details"
-#~ msgstr "Amaga els detalls"
-
-#~ msgid "Show details"
-#~ msgstr "Mostra els detalls"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "Només podeu utilitzar un gestor de programari alhora."
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Abans heu de tancar l'altre gestor de paquets, p. ex. l'Aptitude o el "
-#~ "Synaptic"
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Canals</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Claus</b>"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"S'ha produït un error en descarregar els canvis. Comproveu si teniu connexió "
+"a Internet."
 
-#~ msgid "Installation Media"
-#~ msgstr "Mitjà d'instal·lació"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Software Preferences"
-#~ msgstr "Preferències del programari"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Canal</b>"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Components</b>"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Add Channel"
-#~ msgstr "Afegeix un canal"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "Edita el canal"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Afegeix el canal"
-#~ msgstr[1] "_Afegeix els canals"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "No s'ha pogut instal·lar '%s'"
 
-#~ msgid "_Custom"
-#~ msgstr "_Personalitza"
+#: ../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 "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Actualitzacions de seguretat d'Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Edita les fonts i els paràmetres del programari"
-
-#~ msgid "<b>Internet Updates</b>"
-#~ msgstr "<b>Actualitzacions d'Internet</b>"
-
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Fonts</b>"
-
-#~ msgid "Check for updates every"
-#~ msgstr "Comprova les actualitzacions cada"
-
-#~ msgid "Restore Defaults"
-#~ msgstr "Restaura els valors per defecte"
-
-#~ msgid "day(s)"
-#~ msgstr "dies"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Dipòsit</b>"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Seccions:</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Fitxers temporals</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Interfície d'usuari</b>"
-
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Claus d'autenticació</b></big>\n"
-#~ "\n"
-#~ "Des d'aquest quadre de diàleg podeu afegir i esborrar claus "
-#~ "d'autenticació. Les claus permeten comprovar la integritat del programari "
-#~ "que descarregueu."
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Introduïu la línia APT del dipòsit que voleu afegir</b></big>\n"
-#~ "\n"
-#~ "La línia APT conté el tipus, la ubicació i el contingut del dipòsit; per "
-#~ "exemple, <i>\"deb http://ftp.debian.org sarge main\"</i>. Podeu trobar "
-#~ "una descripció més detallada de la sintaxi en la documentació."
-
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner."
-#~ msgstr ""
-#~ "Afegeix una clau nova a l'anell de confiança. Assegureu-vos que heu rebut "
-#~ "la clau per un canal segur i que confieu en el propietari."
-
-#~ msgid "Add repository..."
-#~ msgstr "Afegeix un dipòsit..."
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Comprovació automàtica de les act_ualitzacions del programari."
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Neteja automàtica dels paquets _temporals."
-
-#~ msgid "Clean interval in days:"
-#~ msgstr "Interval de neteja en dies:"
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Esb_orra els paquets antics de la memòria cau"
-
-#~ msgid "Edit Repository..."
-#~ msgstr "Edita el dipòsit..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Antiguitat màxima en dies:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Mida màxima en MB:"
-
-#~ msgid "Remove the selected key from the trusted keyring."
-#~ msgstr "Esborra la clau seleccionada de l'anell de confiança."
-
-#~ msgid "Restore default keys"
-#~ msgstr "Restaura les claus per defecte"
-
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Restaura les claus per defecte de la distribució. Això no afecta les "
-#~ "claus instal·lades per l'usuari."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Fixa la mida _màxima de memòria cau per als paquets descarregats"
-
-#~ msgid "Settings"
-#~ msgstr "Paràmetres"
-
-#~ msgid "Show detailed package versions"
-#~ msgstr "Mostra les versions dels paquets detallades"
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "Mostra les fonts del programari desactivades"
-
-#~ msgid "Update interval in days:"
-#~ msgstr "Interval d'actualització en dies:"
-
-#~ msgid "_Add Repository"
-#~ msgstr "_Afegeix el dipòsit"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Descarrega els fitxers actualitzables"
+msgid "An essential package would be removed"
+msgstr "S'haurà d'esborrar un paquet essencial"
 
-#~ msgid "<b>Details</b>"
-#~ msgstr "<b>Detalls</b>"
-
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>Estat:</b>"
-
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Actualitzacions disponibles</b></big>\n"
-#~ "\n"
-#~ "Els paquets següents es poden actualitzar. Per a fer-ho premeu el botó "
-#~ "Instal·la."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">S'estan descarregant els canvis</"
-#~ "span>\n"
-#~ "\n"
-#~ "Es necessita obtenir els canvis des del servidor central"
-
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "Cancel·la la descàrrega del registre de canvis"
-
-#~ msgid "Downloading Changes"
-#~ msgstr "S'estan descarregant els canvis"
-
-#~ msgid "Reload"
-#~ msgstr "Actualitza"
-
-#~ msgid "Reload the package information from the server."
-#~ msgstr "Actualitza la informació dels paquets des del servidor."
-
-#~ msgid "_Install"
-#~ msgstr "_Instal·la"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Mostra les actualitzacions disponibles i tria quina instal·lar"
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr ""
-#~ "Necessiteu privilegis d'administrador per a poder executar aquest programa"
-
-#~ msgid "Binary"
-#~ msgstr "Binari"
-
-#~ msgid "Non-free software"
-#~ msgstr "Programari sense llicència lliure"
-
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian 3.0 \"Woody\""
-
-#~ msgid "Debian Stable"
-#~ msgstr "Debian Stable"
-
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Debian Non-US (Stable)"
-
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian Non-US (Testing)"
-
-#~ msgid "Debian Non-US (Unstable)"
-#~ msgstr "Debian Non-US (Unstable)"
-
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "Seleccioneu un fitxer clau"
-
-#~ msgid "Your system is up-to-date!"
-#~ msgstr "El sistema està actualitzat."
-
-#~ msgid "There is one package available for updating."
-#~ msgstr "Hi ha un paquet disponible per a actualitzar."
-
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "Hi ha %s paquets disponibles per a actualitzar."
-
-#~ msgid "Downloading changes..."
-#~ msgstr "S'estan descarregant els canvis..."
-
-#~ msgid "There are no updated packages"
-#~ msgstr "No hi ha paquets per a actualitzar"
-
-#~ msgid "You did not select any of the %s updated package"
-#~ msgid_plural "You did not select any of the %s updated packages"
-#~ msgstr[0] "No heu seleccionat cap paquet actualitzat"
-#~ msgstr[1] "No heu seleccionat cap dels %s paquets actualitzats"
-
-#~ msgid "You have selected %s updated package, size %s"
-#~ msgid_plural "You have selected all %s updated packages, total size %s"
-#~ msgstr[0] "Heu seleccionat %s paquet actualitzat, la mida és de $s"
-#~ msgstr[1] ""
-#~ "Heu seleccionat els %s paquets actualitzats, la mida total és de %s"
-
-#~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
-#~ msgstr[0] "Heu seleccionat %s paquet actualitzat de %s, la mida és de $s"
-#~ msgstr[1] ""
-#~ "Heu seleccionat %s paquets actualitzats de %s, la mida total és de %s"
-
-#~ msgid "The updates are being applied."
-#~ msgstr "S'estan aplicant les actualitzacions."
-
-#~ msgid "Upgrade finished"
-#~ msgstr "S'ha finalitzat l'actualització"
-
-#~ msgid "Another package manager is running"
-#~ msgstr "S'està executant un altre gestor de paquets"
-
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Només podeu executar un gestor de paquets a la vegada. Tanqueu l'altra "
-#~ "aplicació."
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Updating package list..."
-#~ msgstr "S'està actualitzant la llista de paquets..."
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Installing updates..."
-#~ msgstr "S'estan instal·lant les actualitzacions..."
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "There are no updates available."
-#~ msgstr "No hi ha actualitzacions disponibles."
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "New version:"
-#~ msgstr "Versió nova:"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Your distribution is no longer supported"
-#~ msgstr "La vostra distribució ja no es manté"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Actualitzeu el sistema amb una versió més nova d'Ubuntu Linux. La vostra "
-#~ "versió ja no disposarà de més actualitzacions de seguretat ni d'altres "
-#~ "actualitzacions crítiques. Si voleu més informació, visiteu http://www."
-#~ "ubuntulinux.org/."
+#: ../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 ""
 
-#~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "Ja disposeu del nou llançament d'Ubuntu"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "Ja disposeu del nou llançament d'Ubuntu amb el nom en clau '%s'. Si "
-#~ "necessiteu instruccions per a actualitzar el sistema, visiteu http://www."
-#~ "ubuntulinux.org/."
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Never show this message again"
-#~ msgstr "No tornis a mostrar aquest missatge"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr ""
-#~ "No s'han trobat els canvis. Pot ser que el servidor encara no s'hagi "
-#~ "actualitzat."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/cs.po b/po/cs.po
index f92cc2bb..0eeec1d6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -25,235 +25,266 @@ 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: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 s 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 s 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 s 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdrom s Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Bezpečnostní aktualizace Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cdrom s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Bezpečnostní aktualizace Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cdrom s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Udržováno komunitou"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Patentované (proprietární) ovladače zařízení"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Nesvobodný software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cdrom s Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Svobodný software oficiálně podporovaný společností Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Udržováno komunitou (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained 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:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Nesvobodné ovladače"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Patentované (proprietární) ovladače pro zařízení "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Patentované (proprietární) ovladače zařízení"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Software s omezující licencí (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 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:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cdrom s Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Důležité bezpečnostní aktualizace"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Doporučené aktualizace"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Navržené aktualizace"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Aktualizace přenesené z vyšších verzí distribuce"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cdrom s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Bezpečnostní aktualizace Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Aktualizace Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Software přenesený z vyšší verze distribuce na Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdrom s Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Oficiálně podporováno"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Bezpečnostní aktualizace Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Aktualizace Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Aplikace přenesené z vyšších verzí distribuce na Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Udržováno komunitou (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Nesvobodný (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Již není oficiálně podporováno"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Omezený copyright"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Bezpečnostní aktualizace Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Aktualizace Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Aplikace přenesené z vyšších verzí distribuce na Ubuntu 4.10"
 
@@ -265,55 +296,68 @@ 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 "Navržené aktualizace"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Důležité bezpečnostní aktualizace"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 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:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Software nekompatibilní s DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Server pro zemi \"%s\""
@@ -321,1221 +365,160 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Hlavní server"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Uživatelem vybrané servery"
 
-#~ msgid "Daily"
-#~ msgstr "Denně"
-
-#~ msgid "Every two days"
-#~ msgstr "Obden"
-
-#~ msgid "Weekly"
-#~ msgstr "Týdně"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Každé dva týdny"
-
-#~ msgid "Every %s days"
-#~ msgstr "Každých %s dní"
-
-#~ msgid "After one week"
-#~ msgstr "Po týdnu"
-
-#~ msgid "After two weeks"
-#~ msgstr "Po dvou týdnech"
-
-#~ msgid "After one month"
-#~ msgstr "Po měsíci"
-
-#~ msgid "After %s days"
-#~ msgstr "Po %s dnech"
-
-#~ msgid "%s updates"
-#~ msgstr "Aktualizace %s"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Nejbližší server"
-
-#~ msgid "Software Channel"
-#~ msgstr "Softwarový kanál"
-
-#~ msgid "Active"
-#~ msgstr "Aktivní"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Zdrojový kód)"
-
-#~ msgid "Source Code"
-#~ msgstr "Zdrojový kód"
-
-#~ msgid "Import key"
-#~ msgstr "Importovat klíč"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Chyba při importu vybraného souboru"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Vybraný soubor asi není klíč GPG, anebo může být poškozen."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Chyba při odstraňování klíče"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "Vybraný klíč nemohl být odstraněn. Prosím oznamte to jako chybu."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Chyba při načítání CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Prosím zadejte jméno disku"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Prosím vložte disk do mechaniky:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Poškozené balíky"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Váš systém obsahuje poškozené balíky, které nemohou být tímto programem "
-#~ "opraveny. Před pokračováním je prosím opravte použitím programu synaptic "
-#~ "nebo apt-get."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Nemohu aktualizovat požadované meta-balíky"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Toto by vedlo k odstranění základního balíku"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Nemohu vypočítat aktualizaci"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Při výpočtu aktualizace nastal neřešitelný problém.\n"
-#~ "\n"
-#~ "Prosím nahlaste tuto chybu jako chybu balíčku 'update-manager' a přiložte "
-#~ "soubory z adresáře /var/log/dist-upgrade/ k hlášení o chybě."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Chyba při ověřování některých balíků"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Nebylo možné ověřit pravost některých balíků. To může být způsobeno "
-#~ "přechodným problémem v síti. Možná to budete chtít zkusit později. Níže "
-#~ "je uveden seznam postižených balíků."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Nemohu nainstalovat '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Nebylo možné nainstalovat požadovaný balík. Prosím oznamte to jako chybu. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Nemohu odhadnout meta-balík"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Váš systém neobsahuje žádný z balíků ubuntu-desktop, kubuntu-desktop nebo "
-#~ "edubuntu-desktop a nebylo možné zjistit, jakou verzi Ubuntu používáte.\n"
-#~ " Před pokračováním prosím nainstalujte jeden z výše uvedených balíků "
-#~ "pomocí synaptic nebo apt-get."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Chyba při přidávání CD"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Vyskytla se chyba při přidávání CD, přechod na vyšší verzi bude přerušen. "
-#~ "Prosím nahlaste tuto situaci jako chybu, pokud používáte správné CD s "
-#~ "Ubuntu.\n"
-#~ "\n"
-#~ "Chybová zpráva byla:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "Probíhá čtení vyrovnávací paměti"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Stáhnout ze sítě údaje nutné pro přechod na vyšší verzi?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "Při přechodu na vyšší verzi můžete použít síť pro získání nejnovějších "
-#~ "aktualizací a stažení balíčků, které nejsou na aktuálním CD.\n"
-#~ "Pokud máte levné připojení k síti, můžete zde odpovědět 'Ano'. Pokud je "
-#~ "vaše síťové připojené nákladné, zvolte 'Ne'."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Nebyl nalezen platný zrcadlový server"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Během prohledávání informací o zdrojích software Nebyl nalezen žádný "
-#~ "zrcadlový server obsahující aktualizace. To se může stát, pokud používáte "
-#~ "interní zrcadlový server nebo pokud jsou informace o zrcadlových "
-#~ "serverech zastaralé.\n"
-#~ "\n"
-#~ "Chcete i přesto přepsat váš soubor 'sources.list'? Zvolíte-li 'Ano', "
-#~ "budou všechny položky '%s' aktualizovány na '%s'.\n"
-#~ "Zvolíte-li 'Ne', aktualizace bude zrušena."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Vygenerovat výchozí zdroje?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Po prohledání souboru 'sources.list' nebyla pro '%s' nalezena žádná "
-#~ "odpovídající položka.\n"
-#~ "\n"
-#~ "Chcete přidat výchozí položky pro '%s'? Zvolíte-li 'Ne', aktualizace bude "
-#~ "zrušena."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Neplatná informace o zdroji"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Aktualizace informací o zdroji vyústila v neplatný soubor. Prosím oznamte "
-#~ "to jako chybu."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Zdroje třetích stran zakázány"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Některé zdroje třetích stran v souboru sources.list byly zakázány. Tyto "
-#~ "zdroje můžete opět povolit po přechodu na novou verzi pomocí jdnoho z "
-#~ "nástrojů 'Zdroje software' nebo 'Synaptic'."
-
-#~ msgid "Error during update"
-#~ msgstr "Chyba během aktualizace"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Nastala chyba během aktualizace. Toto je obvykle způsobeno chybou "
-#~ "síťového připojení. Prosím zkontrolujte své připojení k síti a zkuste to "
-#~ "znovu."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Nedostatek volného místa na disku"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Aktualizace bude nyní přerušena. Prosím, uvolněte nejméně %s místa na %s. "
-#~ "Vyprázdněte svůj koš a odstraňte dočasné balíčky z dřívějších instalací "
-#~ "pomocí 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Chcete spustit aktualizaci?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Nepodařilo se nainstalovat aktualizace"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Aktualizace byla předčasně ukončena. Váš systém může být v nepoužitelném "
-#~ "stavu. Pokus o nápravu (dpkg --configure -a) byl proveden. Zkuste prosím "
-#~ "napravit situaci pomocí 'sudo apt-get install -f' nebo pomocí Synaptic.\n"
-#~ "\n"
-#~ "Prosím nahlaste tuto chybu jako chybu balíčku 'update-manager' a přiložte "
-#~ "soubory z adresáře /var/log/dist-upgrade/ k hlášení o chybě."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Nepodařilo se stáhnout aktualizace"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Aktualizace byla předčasně ukončena. Prosím zkontrolujte připojení k "
-#~ "Internetu popř. instalační médium a zkuste to znovu. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Podpora pro některé aplikace byla ukončena"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Společnost Canonical Ltd. již neposkytuje podporu pro následující "
-#~ "softwarové balíky. Je však možné, že tyto balíky jsou nadále podporovány "
-#~ "komunitou.\n"
-#~ "\n"
-#~ "Pokud nemáte povolen software spravovaný komunitou (Universe), tyto "
-#~ "balíky budou v dalším kroku navrhnuty k odebrání."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Odebrat zastaralé balíky?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Přeskočit tento krok"
-
-#~ msgid "_Remove"
-#~ msgstr "_Odebrat"
-
-#~ msgid "Error during commit"
-#~ msgstr "Chyba při potvrzování"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Během úklidu nastal problém. Podrobnější informace jsou obsaženy v "
-#~ "následující zprávě: "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Obnovuji původní stav systému"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "Stahuji verzi '%s' přenesenou z vyšší verze distribuce"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Kontroluji správce balíků"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Příprava přechodu na vyšší verzi selhala"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Příprava systému na přechod na vyšší verzi selhala. Prosím nahlaste tuto "
-#~ "chybu jako chybu balíčku 'update-manager' a přiložte soubory z adresáře /"
-#~ "var/log/dist-upgrade/ k hlášení o chybě."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Aktualizují se informace o zdrojích"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Neplatná informace o balíku"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Po aktualizaci informací o balících nebyl nalezen nezbytný balík '%s'.\n"
-#~ "To ukazuje na závažný problém; prosím nahlaste chybu balíku 'update-"
-#~ "manager' a přiložte k hlášení o chybě soubory v adresáři /var/log/dist-"
-#~ "upgrade/."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Vyžaduji potvrzení"
-
-#~ msgid "Upgrading"
-#~ msgstr "Probíhá přechod na vyšší verzi"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Vyhledávám zastaralý software"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Přechod na vyšší verzi systému je dokončen."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Prosím vložte '%s' do mechaniky '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Stahování je dokončeno"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Stahuji soubor %li z %li  rychlostí %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Zbývá zhruba %s"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Stahuji soubor %li z %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Provádím změny"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Nelze nainstalovat '%s'"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "Přechod na vyšší verzi systému byl předčasně ukončen. Nahlaste prosím "
-#~ "chybu balíku 'update-manager' a přiložte k chybovému hlášení soubory z "
-#~ "adresáře /var/log/dist-upgrade/."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Nahradit upravený soubor s nastavením\n"
-#~ "\"%s\"?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Pokud zvolíte nahrazení novější verzí, ztratíte veškeré lokální změny "
-#~ "tohoto konfiguračního souboru."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Příkaz \"diff\" nebyl nalezen"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Nastala kritická chyba"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Prosím oznamte toto jako chybu a do zprávy připojte soubory /var/log/dist-"
-#~ "upgrade/main.log a /var/log/dist-upgrade/apt.log. Přechod na novou verzi "
-#~ "bude nyní předčasně ukončen. Váš původní soubor sources.list byl uložen "
-#~ "do /etc/apt/sources.list.distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d balík bude odstraněn."
-#~ msgstr[1] "%d balíky budou odstraněny."
-#~ msgstr[2] "%d balíků bude odstraněno."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d nový balík bude nainstalován."
-#~ msgstr[1] "%d nové balíky budou nainstalovány."
-#~ msgstr[2] "%d nových balíků bude nainstalováno."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d balík bude nahrazen vyšší verzí."
-#~ msgstr[1] "%d balíky budou nahrazeny vyšší verzí."
-#~ msgstr[2] "%d balíky bude nahrazeno vyšší verzí."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Bude staženo celkem %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Přechod na vyšší verzi může trvat několik hodin a nelze jej vzít zpět."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr "Pro zamezení ztrátě dat uzavřete všechny aplikace a dokumenty."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Váš systém je aktuální"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Pro váš systém nejsou k dispozici žádné aktualizace. Přechod na vyšší "
-#~ "verzi bude nyní zrušen."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Odebrat %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Nainstalovat %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Aktualizovat %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li days %li hodin %li minut"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li hodin %li minut"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minut"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li sekund"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Stahování bude trvat cca. %s linkou o rychlosti 1Mbit (DSL) a cca. %s "
-#~ "modemem o rychlosti 56kbit."
-
-#~ msgid "Reboot required"
-#~ msgstr "Je nutné restartovat počítač"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Přechod na vyšší verzi byl dokončen a je nutné restartovat počítač. "
-#~ "Chcete jej restartovat nyní?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Zrušit probíhající aktualizaci?</big></b>\n"
-#~ "\n"
-#~ "Zrušení aktualizace může systém zanechat v nepoužitelném stavu. "
-#~ "<i>Důrazně</i> doporučuji v aktualizaci pokračovat."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Pro dokončení přechodu na vyšší verzi systému restartujte "
-#~ "počítač</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Spustit přechod na vyšší verzi systému?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Přecházím na verzi systému Ubuntu v6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Probíhá úklid"
-
-#~ msgid "Details"
-#~ msgstr "Podrobnosti"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Rozdíl mezi soubory"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Stahuji a instaluji balíky potřebné pro přechod na vyšší verzi"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Upravuji softwarové kanály."
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Připravuji přechod na vyšší verzi systému"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Restartuji počítač"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminál"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Zrušit přechod na vyšší verzi systému"
-
-#~ msgid "_Continue"
-#~ msgstr "_Pokračovat"
-
-#~ msgid "_Keep"
-#~ msgstr "_Ponechat"
-
-#~ msgid "_Replace"
-#~ msgstr "_Nahradit"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Oznámit chybu"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Restartovat nyní"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Pokračovat v přechodu na vyšší verzi systému"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Začít přechod na vyšší verzi systému"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Nebyly nalezeny poznámky k vydání."
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Server může být přetížen. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Nemohu stáhnout poznámky k vydání."
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Prosím zkontrolujte své připojení k internetu."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Nemohu spustit nástroj pro aktualizaci na vyšší řadu"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Toto je s největší pravděpodobností chyba v aktualizačním nástroji. "
-#~ "Oznamte to jako chybu, prosím."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Stahuji aktualizační nástroj"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Aktualizační nástroj vás provede procesem aktualizace."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Podpis aktualizačního nástroje"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Aktualizační nástroj"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Stahování selhalo"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "Stažení aktualizace selhalo. Pravděpodobně je problém se sítí. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Rozbalení selhalo"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Rozbalení aktualizace selhalo. Může být problém se sítí nebo se serverem. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Ověření selhalo"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Ověření aktualizace selhalo. Může jít o problém se sítí nebo se serverem. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Selhalo ověření pravosti."
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Ověření pravosti aktualizace selhalo. Může jít o problém se sítí nebo se "
-#~ "serverem. "
-
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "Stahuji %(current)li. soubor z %(total)li rychlostí %(speed)s/s"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Stahuji %(current)li. soubor of %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "Seznam změn není dostupný."
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Seznam změn ještě není dostupný.\n"
-#~ "Prosím, zkuste to později znovu."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Stažení seznamu změn selhalo. \n"
-#~ "Prosím zkontrolujte své internetové připojení."
-
-#~ msgid "Backports"
-#~ msgstr "Aplikace přenesené z novějších verzí distribuce"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Aktualizace distribuce"
-
-#~ msgid "Other updates"
-#~ msgstr "Ostatní aktualizace"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Verze %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Stahuji seznam změn..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "_Odznačit vše"
-
-#~ msgid "_Check All"
-#~ msgstr "_Zkontrolovat vše"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Stahovaná velikost: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Můžete instalovat %s aktualizaci"
-#~ msgstr[1] "Můžete instalovat %s aktualizace"
-#~ msgstr[2] "Můžete instalovat %s aktualizací"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Prosím čekejte, může to nějakou dobu trvat."
-
-#~ msgid "Update is complete"
-#~ msgstr "Aktualizace je dokončena"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Kontroluji dostupné aktualizace"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Z verze %(old_version)s na verzi %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Verze %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Velikost: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Vaše distribude již není podporovaná"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Pro vaší verzi Ubuntu Linux již nejsou dostupné žádné další bezpečnostní "
-#~ "opravy ani velmi důležité aktualizace. Přejděte na vyšší verzi Ubuntu "
-#~ "Linux. Pro více informací o přechodu na vyšší verzi se podívejte na "
-#~ "http://www.ubuntu.com."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Nové vydání distribuce (%s) je k dispozici</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Seznam softwaru je poškozen"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Není možné instalovat ani odebírat programy. Prosím použijte správce "
-#~ "balíčků \"Synaptic\" nebo nejdříve spusťe v terminálu \"sudo apt-get "
-#~ "install -f\" pro nápravu tohoto problému."
-
-#~ msgid "None"
-#~ msgstr "Prázdný"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Je nutné zkontrolovat aktualizace ručně</big></b>\n"
-#~ "\n"
-#~ "Váš systém nezjišťuje nové aktualizace automaticky. Toto nastavení můžete "
-#~ "změnit v \"Systém\" -> \"Správa\" -> \"Vlastnosti Software\""
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Udržujte svůj systém aktuální</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>Není možné nainstalovat všechny aktualizace</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Spouštím správce aktualizací</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "Změny"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Změny a popis aktualizace"
-
-#~ msgid "Chec_k"
-#~ msgstr "Zaš_krtnout"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Zkontrolovat dostupnost nových aktualizací v kanálech softwaru"
-
-#~ msgid "Description"
-#~ msgstr "Popis"
-
-#~ msgid "Release Notes"
-#~ msgstr "Poznámky k vydáni"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Spusťte přechod na vyšší verzi distribuce - tím nainstalujete maximální "
-#~ "možný počet aktualizací. \n"
-#~ "\n"
-#~ "Toto může být způsobeno nedokončeným přechodem na vyšší verzi, "
-#~ "neoficiálními balíky se software anebo použitím vývojové verze."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Zobrazit průběh stahování jednotlivých souborů"
-
-#~ msgid "Software Updates"
-#~ msgstr "Aktualizace software"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Aktualizace softwaru opravují chyby, eliminuje bezpečnostní zranitelnosti "
-#~ "a poskytují nové vlastnosti."
-
-#~ msgid "U_pgrade"
-#~ msgstr "_Přejít na vyšší verzi"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Přejít na nejnovější verzi Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Zaškrtnout"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Přechod na vyšší verzi distribuce"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "Nadále tyto informace _nezobrazovat"
-
-#~ msgid "_Install Updates"
-#~ msgstr "Na_instalovat aktualizace"
-
-#~ msgid "_Upgrade"
-#~ msgstr "_Aktualizovat"
-
-#~ msgid "changes"
-#~ msgstr "změny"
-
-#~ msgid "updates"
-#~ msgstr "aktualizace"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Automatické aktualizace</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Aktualizace z internetu</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Zúčastněte se, prosím, ankety oblíbenosti, jejímž účelem je lépe "
-#~ "poznat zvyky uživatelů Ubuntu. Pokud tak učiníte, seznam nainstalovaného "
-#~ "software a četnost jeho použití bude každý týden <b>anonymně</b> "
-#~ "odesílána projektu Ubuntu.\n"
-#~ "\n"
-#~ "Výsledky jsou používány ke zlepšení podpory pro oblíbené aplikace a pro "
-#~ "určování pořadí aplikací ve výsledcích vyhledávání.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Přidat CD-ROM"
-
-#~ msgid "Authentication"
-#~ msgstr "Ověření"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "_Smazat stažené balíky:"
-
-#~ msgid "Download from:"
-#~ msgstr "Stáhnout z:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Importovat veřejný klíč od důvěryhodného poskytovate softwaru"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Aktualizace z Internetu"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Pouze bezpečností aktualizace z oficiálních serverů Ubuntu budou "
-#~ "instalovány automaticky"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Obnovit _výchozí"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Obnovit výchozí klíče vaší distribuce"
-
-#~ msgid "Software Sources"
-#~ msgstr "Zdroje softwaru"
-
-#~ msgid "Source code"
-#~ msgstr "Zdrojový kód"
-
-#~ msgid "Statistics"
-#~ msgstr "Statistiky"
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#~ msgid "Submit statistical information"
-#~ msgstr "Odeslat statistické informace"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Stahuji %(current)li. soubor of %(total)li"
 
-#~ msgid "Third Party"
-#~ msgstr "Třetí strana"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Kontrolovat aktualizace automaticky"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "Stá_hnout aktualizace automaticky, ale neinstalovat je"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Importovat soubor s klíči"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Instalovat bezpečnostní aktualizace bez potvrzení"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Informace o dostupném software jsou zastaralé</big></b>\n"
-#~ "\n"
-#~ "Pro instalaci software a aktualizací z nových nebo pozměněných zdrojů je "
-#~ "nutné obnovit informace o dostupném softwaru.\n"
-#~ "\n"
-#~ "K tomu je nutné funkční připojení k Internetu."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Komentář:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Součásti:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribuce:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Typ:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Zadejte úplnou specifikaci APT kanálu, který chcete přidat</b></"
-#~ "big>\n"
-#~ "\n"
-#~ "Řádek pro APT kanál obsahuje typ, umístění a součásti kanálu, např. <i>"
-#~ "\"deb http://ftp.debian.org sarge main\"</i>."
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Podrobnosti"
 
-#~ msgid "APT line:"
-#~ msgstr "Řádka APT:"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binární balíky\n"
-#~ "Balíky se zdrojovými kódy"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Edit Source"
-#~ msgstr "Upravit zdroj"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Prohledávám CD-ROM"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Seznam změn není dostupný."
 
-#~ msgid "_Add Source"
-#~ msgstr "Přid_at zdroj"
+#: ../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 ""
 
-#~ msgid "_Reload"
-#~ msgstr "_Obnovit"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Stažení seznamu změn selhalo. \n"
+"Prosím zkontrolujte své internetové připojení."
 
-#~ msgid "Show and install available updates"
-#~ msgstr "Zobrazit a nainstalovat dostupné aktualizace"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Update Manager"
-#~ msgstr "Správce aktualizací"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Automaticky kontrolovat, zda je dostupná nová verze současné distribuce a "
-#~ "nabídnout přechod na vyšší verzi, je-li to možné."
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Zkontrolovat nová vydání distribuce"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Tato volba umožňuje skrytí upomínky na nutnost ručního obnovení seznamu "
-#~ "zdrojů zobrazované v případě, že automatická kontrola aktualizací je "
-#~ "zakázána."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Připomenout obnovení seznamu zdrojů"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Zobrazit detaily aktualizace"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Uchovává velikost dialogu spřávce aktualizací"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr "Uchovává stav prvku obsahujícího seznam změn a popisů"
-
-#~ msgid "The window size"
-#~ msgstr "Velikost okna"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Konfigurovat zdroje pro instalovatelný software a aktualizace"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Bezpečnostní Aktualizace Debian 3.1 \"Sarge\""
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Nemohu nainstalovat '%s'"
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Stahuji %li. soubor z %li neznámou rychlostí"
+#: ../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 "Normal updates"
-#~ msgstr "Instaluji aktualizace"
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Přerušit _stahování"
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Žádné aktualizace na vyšší řadu nebyly nalezeny."
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Váš systém byl již aktualizován na vyšší řadu"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Přechází se na Ubuntu 6.10</span>"
-
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Důležité bezpečnostní aktualizace Ubuntu"
-
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Aktualizace Ubuntu"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Nelze nainstalovat všechny dostupné aktualizace na vyšší řadu"
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Prozkoumává se systém</b></big>\n"
-#~ "\n"
-#~ "Aktualizace softwaru opravují chyby, eliminují bezpečnostní zranitelnosti "
-#~ "a poskytují nové funkce."
-
-#~ msgid "Oficially supported"
-#~ msgstr "Oficiálně podporované"
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Budou přeskočeny následující aktualizace na vyšší řadu:"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Zbývá přibližně %li sekund"
-
-#~ msgid "Download is complete"
-#~ msgstr "Stahování je hotovo"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr ""
-#~ "Aktualizace na vyšší řadu byla předčasně ukončena. Prosím oznamte to jako "
-#~ "chybu"
+msgid "An essential package would be removed"
+msgstr "Toto by vedlo k odstranění základního balíku"
 
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Aktualizuje se Ubuntu na vyšší řadu"
-
-#~ msgid "Hide details"
-#~ msgstr "Skrýt detaily"
-
-#~ msgid "Show details"
-#~ msgstr "Zobrazit detaily"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "V jednu chvíli může běžet jen jeden nástroj pro správu softwaru"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Prosím, uzavřete nejdříve jiné aplikace jako např. \"aptitude\" nebo "
-#~ "\"Synaptic\"."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Kanály</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Klíče</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Instalační média"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Volby softwaru"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Kanál</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Součásti</b>"
-
-#~ msgid "Add Channel"
-#~ msgstr "Přidat kanál"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "Upravit kanál"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Přidat kanál"
-#~ msgstr[1] "_Přidat kanály"
-#~ msgstr[2] "_Přidat kanály"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "_Vlastní"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS bezpečnostní aktualizace"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS aktualizace"
+#: ../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 ""
 
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS backporty"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid ""
-#~ "While scaning your repository information no valid entry for the upgrade "
-#~ "was found.\n"
-#~ msgstr ""
-#~ "Během prozkoumávání vašich zdrojů nebyla nalezený žádná platná položka "
-#~ "pro upgrade.\n"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Sekce</b>"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sekce:</b>"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/csb.po b/po/csb.po
index 31ff3ab7..c38aafde 100644
--- a/po/csb.po
+++ b/po/csb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -25,223 +25,248 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "%s aktualizacëji"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -253,52 +278,62 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../data/templates/Debian.info.in:83
 msgid "Debian 3.1 'Sarge'"
 msgstr ""
 
 #. 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
 #, fuzzy
 msgid "Security updates"
 msgstr "%s aktualizacëji"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Serwera dlô kraju %s"
@@ -306,232 +341,158 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Przédny serwera"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Jine serwerë"
 
-#~ msgid "Daily"
-#~ msgstr "Codniowò"
-
-#~ msgid "Every two days"
-#~ msgstr "Co dwa dni"
-
-#~ msgid "Weekly"
-#~ msgstr "Co tidzeń"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Co dwa tidzenie"
-
-#~ msgid "Every %s days"
-#~ msgstr "Co %s dni"
-
-#~ msgid "After one week"
-#~ msgstr "Pò tidzeniu"
-
-#~ msgid "After two weeks"
-#~ msgstr "Pò dwóch tidzeniach"
-
-#~ msgid "After one month"
-#~ msgstr "Pò miesącu"
-
-#~ msgid "After %s days"
-#~ msgstr "P %s dniach"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Nôblëższi serwera"
-
-#~ msgid "Software Channel"
-#~ msgstr "Kanal òprogramòwania"
-
-#~ msgid "Active"
-#~ msgstr "Aktiwny"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(zdrojowi kòd)"
-
-#~ msgid "Source Code"
-#~ msgstr "Zdrojowi kòd"
-
-#~ msgid "Import key"
-#~ msgstr "Impòrtëjë klucz"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Fela òbczas impòrtowania wëbrónegò lopkù"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Wëbróny lopk może nie bëc kluczã abò mòże bëc pòpsëti."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Fela òbczas rëmaniô klucza"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "Nie mòżna bëło rëmnąc klucza. Proszã zgłoszëc to jakno felã."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Wëstśpiła fela òbczas skanowania platë CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Proszã dac miono dlô platë"
-
-#~ msgid "Broken packages"
-#~ msgstr "Paczétë są zmiłkòwé"
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Nie je mòżno zaktualizowac wëmôgónëch meta-paczétów"
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Fela òbczas ùdowierzaniô niechtërnëch paczétów"
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Nie je mòżno zainstalowac '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Nie bëło mòżna zainstalowac wëmôgónegò paczétu. Proszã zgłoszëc to jakno "
-#~ "felã. "
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Nie je mòżno dodac platë CD"
-
-#~ msgid "Error during update"
-#~ msgstr "Fela òbczas aktualizacëji"
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "CZë chcesz zrëszëc aktualizacëjã?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Instalacëja aktualizacëji nie darzëła sã."
-
-#~ msgid "_Remove"
-#~ msgstr "_Rëmôj"
-
-#~ msgid "Error during commit"
-#~ msgstr "Fela òbczas zacwierdzaniô"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Sprôwdzanié menadżera paczétów"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "About %s remaining"
-#~ msgstr "Òsta kòl %s"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Applying changes"
-#~ msgstr "Zacwierdzanié zmianów"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+#, fuzzy
+msgid "Details"
+msgstr "Codniowò"
 
-#~ msgid "Could not install '%s'"
-#~ msgstr "Nie bëło mòżno zainstalowac '%s'"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Zastãpic swójny lopk kònfigùracëji\n"
-#~ "'%s'?"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Pòlét 'diff' nie òsta nalazłé"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d paczét òstanié rëmniãty."
-#~ msgstr[1] "%d paczétë òstaną rëmniãte."
-#~ msgstr[2] "%d paczétów òstaną rëmniãtëch."
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d nowi paczétë òstaną zainstalowóne."
-#~ msgstr[1] "%d nowi paczét òstanie zainstalowóny."
-#~ msgstr[2] "%d nowëch paczétów òstanie zainstalowónëch."
+#: ../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 ""
 
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d paczét òstanié zaktualizowóny."
-#~ msgstr[1] "%d paczétë òstaną zaktualizowóne."
-#~ msgstr[2] "%d paczétów òstanie zaktualizowónëch."
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Twojô systema je fùl zaktualizowónô"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Felëjë przistãpnëch aktualizacëjów. Aktualizacëjô òstanié òprzestónô."
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Rëmôj %s</b>"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Install %s"
-#~ msgstr "Instalëjë %s"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Upgrade %s"
-#~ msgstr "Aktualizëjë %s"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li dni %li gòdzin %li minut"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li gòdzin %li minut"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "%li minutes"
-#~ msgstr "%li minut"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Nie je mòżno zainstalowac '%s'"
 
-#~ msgid "%li seconds"
-#~ msgstr "%li sekùnd"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "Reboot required"
-#~ msgstr "Wëmògóne je zrëszenié kòmpùtra znowa"
+#: ../apt/debfile.py:494
+msgid "An essential package would be removed"
+msgstr ""
 
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Aktualizacëjô òsta zakùńczonô ë nót je zrëszëc kòmpùtr znowa. Zrobic to "
-#~ "terô?"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "    "
-#~ msgstr "    "
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Zrëszë kòpmùtr znowa, żebë zakùńczëc aktualizacëjã</big></b>"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b></big>Aktualizacëjô Ubuntu do wersëji 6.10</big></b>"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Difference between the files"
-#~ msgstr "Zjinaczi midze lopkama"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Restarting the system"
-#~ msgstr "Zrëszanié znowa systemë"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
+#: ../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 ""
 
-#~ msgid "_Continue"
-#~ msgstr "Ò_przestanié aktualizacëji"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "_Replace"
-#~ msgstr "_Zastãpi"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "_Restart Now"
-#~ msgstr "_Zrëszë znowa"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Startëjë aktualizacëjã"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/da.po b/po/da.po
index d67f517b..8e361052 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,235 +24,266 @@ 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: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 "Cd-rom med 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 "Cd-rom med 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 "Cd-rom med 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 sikkerhedsopdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 sikkerhedsopdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Vedligeholdt af fællesskabet"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Proprietære drivere til enheder"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Ikke-frit software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cd-rom med Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Fri software understøttet af Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Vedligeholdt af fællesskabet (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Fri software vedligeholdt af fællesskabet"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Proprietære drivere"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Proprietære drivere til enheder "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Proprietære drivere til enheder"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Ikke-frit software (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr "Software begrænset af ophavsret eller legale problemer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 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:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Vigtige sikkerhedsopdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Anbefalede opdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Foreslåede opdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Tilbageporterede opdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 sikkerhedsopdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 opdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 tilbageporteringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Understøttet officielt"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 sikkerhedsopdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 opdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 tilbageporteringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Vedligeholdt af fællesskabet (universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Ikke-frit (multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Ikke længere officielt supporteret"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Begrænset ophavsret"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 sikkerhedsopdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 opdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 tilbageporteringer"
 
@@ -264,55 +295,68 @@ 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:31
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 3.1 \"Sarge\""
+
+#. Description
+#: ../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 "Foreslåede opdateringer"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Vigtige sikkerhedsopdateringer"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-kompatibel software med ikke-frie afhængigheder"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Ikke-DFSG-kompatibel software"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Server for %s"
@@ -320,1223 +364,160 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Hovedserver"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Brugerdefinerede servere"
 
-#~ msgid "Daily"
-#~ msgstr "Dagligt"
-
-#~ msgid "Every two days"
-#~ msgstr "Hver anden dag"
-
-#~ msgid "Weekly"
-#~ msgstr "Ugenligt"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Hver anden uge"
-
-#~ msgid "Every %s days"
-#~ msgstr "Hver %s. dag"
-
-#~ msgid "After one week"
-#~ msgstr "Efter en uge"
-
-#~ msgid "After two weeks"
-#~ msgstr "Efter to uger"
-
-#~ msgid "After one month"
-#~ msgstr "Efter en måned"
-
-#~ msgid "After %s days"
-#~ msgstr "Efter %s dage"
-
-#~ msgid "%s updates"
-#~ msgstr "%s opdateringer"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Nærmeste server"
-
-#~ msgid "Software Channel"
-#~ msgstr "Softwarekanal"
-
-#~ msgid "Active"
-#~ msgstr "Aktiv"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Kildetekst)"
-
-#~ msgid "Source Code"
-#~ msgstr "Kildetekst"
-
-#~ msgid "Import key"
-#~ msgstr "Importér nøgle"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Fejl ved importering af den valgte fil"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Den valgte fil er ikke en GPG-nøglefil eller den kan være ødelagt."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Fejl ved fjernelse af nøgle"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Den valgte nøgle kunne ikke fjernes. Rapportér venligst dette som en fejl."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Fejl ved gennemsøgning af cd</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Indtast venligst et navn for disken"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Indsæt venligst en disk i drevet:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Ødelagte pakker"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Dit system indeholder ødelagte pakker som ikke kunne repareres med dette "
-#~ "program. Reparér dem venligst med synaptic eller apt-get, før du "
-#~ "fortsætter."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Kan ikke opgradere de krævede metapakker"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Det ville være nødvendigt at fjerne en vital pakke"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Kunne ikke beregne opgraderingen"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Der opstod et uløseligt problem under beregningen af opgraderingen.\n"
-#~ "\n"
-#~ "Rapportér venligst denne fejl mod \"update-manager\"-pakken og inkludér "
-#~ "filerne i /var/log/dist-upgrade/ i fejlrapporten."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Fejl ved godkendelse af nogle pakker"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Nogle pakker kunne ikke godkendes. Det kan være et problem med netværket. "
-#~ "Du kan prøve igen senere. Se nedenfor en liste over pakker som ikke kunne "
-#~ "godkendes."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Kan ikke installere \"%s\""
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Det var umuligt at installere en påkrævet pakke. Rapportér venligst dette "
-#~ "som en fejl. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Kan ikke gætte metapakke"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Dit system indeholder ikke en ubuntu-desktop, kubuntu-desktop eller "
-#~ "edubuntu-desktop-pakke, og det var ikke muligt at genkende hvilken Ubuntu-"
-#~ "version du kører.\n"
-#~ "\n"
-#~ "Installér venligst en af pakkerne nævnt herover ved hjælp af synaptic "
-#~ "eller apt-get, før du fortsætter."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Kunne ikke tilføje cd"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Der opstod en fejl ved tilføjelse af cd'en, opgraderingen afbrydes. "
-#~ "Rapportér venligst dette som en fejl, hvis dette er en gyldig Ubuntu cd.\n"
-#~ "\n"
-#~ "Fejlmeddelelsen var:\n"
-#~ "\"%s\""
-
-#~ msgid "Reading cache"
-#~ msgstr "Læser mellemlager"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Hent data fra netværket til opgraderingen?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "Opgraderingen kan bruge netværket til at søge efter de seneste "
-#~ "opdateringer og hente pakker som ikke er på den nuværende cd.\n"
-#~ "\n"
-#~ "Hvis du har en hurtig eller billig netværksforbindelse, bør du svare \"Ja"
-#~ "\" her. Hvis forbindelsen er dyr i anvendelse, bør du svare \"Nej\"."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Intet gyldigt spejl fundet"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Intet spejl for opdateringen blev fundet under indlæsning af din "
-#~ "arkivinformation. Dette kan ske hvis du kører et internt spejl eller hvis "
-#~ "spejlinformationen er forældet.\n"
-#~ "\n"
-#~ "Vil du genskrive din \"sources.list\"-fil alligevel? Hvis du vælger \"Ja"
-#~ "\" her, vil alle linjer \"%s\" blive erstattet af \"%s\".\n"
-#~ "Hvis du vælger \"Nej\", vil opdateringen blive annulleret."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Generér standardkilder?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Efter indlæsning af din \"sources.list\", blev der ikke fundet en gyldig "
-#~ "linje for \"%s\".\n"
-#~ "\n"
-#~ "Skal standardlinjer for \"%s\" tilføjes? Hvis du vælger \"Nej\", vil "
-#~ "opdateringen blive annulleret."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Arkivinformation ugyldig"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Opgradering af arkivet resulterede i en ødelagt fil. Rapportér venligst "
-#~ "dette som en fejl."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Tredjepartskilder er deaktiveret"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Nogle tredjepartselementer i din sources.list blev deaktiveret. Du kan "
-#~ "genaktivere dem efter opgraderingen med \"software-properties\"-værktøjet "
-#~ "eller med synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Fejl under opdatering"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "En fejl opstod under opdateringen. Dette skyldes som regel et "
-#~ "netværksproblem, tjek venligst din netværksforbindelse og prøv igen."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Ikke tilstrækkeligt ledig diskplads"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Opgraderingen afbrydes nu. Frigør venligst %s diskplads på %s. Tøm din "
-#~ "papirkurv og fjern midlertidige pakker fra tidligere installationer ved "
-#~ "at køre 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Vil du starte opgraderingen?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Kunne ikke installere opgraderingerne"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Opgraderingen afbrydes nu. Dit system kan være i en ubrugelig tilstand. "
-#~ "En genskabelse blev kørt (dpkg --configura -a).\n"
-#~ "\n"
-#~ "Rapportér venligst denne fejl mod \"update-manager\"-pakken og inkludér "
-#~ "filerne i /var/log/dist-upgrade/ i fejlrapporten."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Kunne ikke hente opgraderingerne"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Opgraderingen afbrydes nu. Tjek venligst din internetforbindelse eller "
-#~ "dit installationsmedie og prøv igen. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Support stoppede for nogle programmer"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Canonical Ltd. yder ikke længere support på de følgende softwarepakker. "
-#~ "Du kan stadig få hjælp fra fællesskabet.\n"
-#~ "\n"
-#~ "Hvis du ikke har slået software vedligeholdt af fællesskabet (universe) "
-#~ "til, vil disse pakker blive foreslået fjernet i det næste trin."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Fjern forældede pakker?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Spring dette trin over"
-
-#~ msgid "_Remove"
-#~ msgstr "_Fjern"
-
-#~ msgid "Error during commit"
-#~ msgstr "Fejl under gennemførelse"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Et problem opstod under oprydningen. Se venligst længere nede for mere "
-#~ "information. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Genskaber oprindelig systemtilstand"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "Henter tilbageportering af \"%s\""
-
-#~ msgid "Checking package manager"
-#~ msgstr "Undersøger pakkehåndtering"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Klargøring af opgraderingen fejlede"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Klargøring af systemet til opgraderingen fejlede. Rapportér venligst "
-#~ "denne fejl mod \"update-manager\"-pakken og inkludér filerne i /var/log/"
-#~ "dist-upgrade/ i fejlrapporten."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Opdaterer arkivinformation"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Ugyldig pakkeinformation"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Efter din pakkeinformation blev opdateret, kan den vitale pakke \"%s\" "
-#~ "ikke længere findes.\n"
-#~ "Dette indikerer en kritisk fejl, rapportér venligst denne fejl mod "
-#~ "\"update-manager\"-pakken og inkludér filerne i /var/log/dist-upgrade/ i "
-#~ "fejlrapporten."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Anmoder om bekræftelse"
-
-#~ msgid "Upgrading"
-#~ msgstr "Opgraderer"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Søger efter forældet software"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Systemopgradering er fuldført"
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Indsæt venligst '%s' i drevet '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Hentning er gennemført"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Henter fil %li af %li med %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Omkring %s tilbage"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Henter fil %li af %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Anvender ændringer"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Kunne ikke installere \"%s\""
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "Opgraderingen afbrydes nu. Rapportér venligst denne fejl mod \"update-"
-#~ "manager\"-pakken og inkludér filerne i /var/log/dist-upgrade/ i "
-#~ "fejlrapporten."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Udskift den tilpassede konfigurationsfil\n"
-#~ "\"%s\"?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Du mister alle ændringer du har lavet til denne konfigurationsfil, hvis "
-#~ "du vælger at erstatte den med en nyere version."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Kommandoen \"diff\" blev ikke fundet"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Der opstod en alvorlig fejl"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Rapportér venligst dette som en fejl og inkludér filerne /var/log/dist-"
-#~ "upgrade/main.log og /var/log/dist-upgrade/apt.log in din rapport. "
-#~ "Opgraderingen afbrydes nu.\n"
-#~ "Din oprindelige sources.list blev gemt i /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d pakke vil blive fjernet."
-#~ msgstr[1] "%d pakker vil blive fjernet."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d ny pakke vil blive installeret."
-#~ msgstr[1] "%d nye pakker vil blive installeret."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d pakke vil blive opgraderet."
-#~ msgstr[1] "%d pakker vil blive opgraderet."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Du skal hente i alt %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Hentning og installation af opgraderingen kan tage flere timer og kan "
-#~ "ikke afbrydes senere."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr "Luk alle åbne programmer og dokumenter for at undgå tab af data."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Dit system er opdateret"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Der er ingen opgraderinger tilgængelige for dit system. Opgraderingen vil "
-#~ "nu blive afbrudt."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Fjern %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Installér %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Opgradér %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li dage %li timer %li minutter"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li timer %li minutter"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minutter"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li sekunder"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Denne hentning vil tage omkring %s med en 1 Mbit DSL-forbindelse og "
-#~ "omkring %s med et 56k modem"
-
-#~ msgid "Reboot required"
-#~ msgstr "Genstart af maskinen påkrævet"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Opgraderingen er afsluttet og en genstart af maskinen er påkrævet. Vil du "
-#~ "gøre dette nu?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Afbryd den igangværende opgradering?</big></b>\n"
-#~ "\n"
-#~ "Systemet kan være i en ubrugelig tilstand, hvis du afbryder "
-#~ "opgraderingen. Det anbefales kraftigt at du fortsætter opgraderingen."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Genstart systemet for at færdiggøre opgraderingen</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Start opgraderingen?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Opgraderer Ubuntu til version 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Rydder op"
-
-#~ msgid "Details"
-#~ msgstr "Detaljer"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Forskel mellem filerne"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Henter og installerer opgraderingerne"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Ændrer softwarekanalerne"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Klargører opgraderingen"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Genstarter systemet"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Afbryd opgradering"
-
-#~ msgid "_Continue"
-#~ msgstr "_Fortsæt"
-
-#~ msgid "_Keep"
-#~ msgstr "_Behold"
-
-#~ msgid "_Replace"
-#~ msgstr "_Erstat"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Rapportér fejl"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Genstart nu"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Genoptag opgradering"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Begynd opgradering"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Kunne ikke finde udgivelsesnoterne"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Serveren kan være overbelastet. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Kunne ikke hente udgivelsesnoterne"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Undersøg venligst din internetforbindelse"
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Kunne ikke køre opgraderingsværktøjet"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Dette er højst sandsynligt en fejl i opgraderingsværktøjet. Raporter "
-#~ "venligst dette som en fejl."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Henter opgraderingsværktøjet"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Opgraderingsværktøjet vil guide dig igennem opgraderingsprocessen."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Signatur på opgraderingsværktøj"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Opgraderingsværktøj"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Fejl ved hentning"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Hentning af opgraderingen fejlede. Det skyldes muligvis et problem med "
-#~ "netværket. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Fejl ved udpakning"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Udpakningen af opgraderingen fejlede. Det skyldes muligvis et problem med "
-#~ "netværket eller serveren. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Efterprøvning fejlede"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Efterprøvning af opgraderingen fejlede. Det skyldes muligvis et problem "
-#~ "med netværket eller serveren. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Godkendelse mislykkedes"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Godkendelse af opgraderingen fejlede. Det skyldes muligvis et problem med "
-#~ "netværket eller serveren. "
-
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "Henter fil %(current)li af %(total)li med %(speed)s/s"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Henter fil %(current)li af %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "Listen med ændringer er ikke tilgængelig"
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Listen med ændringer er ikke klar endnu.\n"
-#~ "Prøv venligst igen senere."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Fejl ved hentning af ændringslisten.\n"
-#~ "Undersøg venligst din internetforbindelse."
-
-#~ msgid "Backports"
-#~ msgstr "Tilbageporteringer"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Distributionsopdateringer"
-
-#~ msgid "Other updates"
-#~ msgstr "Andre opdateringer"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Version %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Henter listen med ændringer..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "_Fjern alle afkrydsninger"
-
-#~ msgid "_Check All"
-#~ msgstr "_Afkryds alle"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Overføringsstørrelse: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Du kan installere %s opdatering"
-#~ msgstr[1] "Du kan installere %s opdateringer"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Vent venligst, dette kan tage et stykke tid."
-
-#~ msgid "Update is complete"
-#~ msgstr "Opdatering er gennemført"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Leder efter opdateringer"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Fra version %(old_version)s til %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Version %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Størrelse: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Din distribution understøttes ikke længere"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Du vil ikke modtage yderligere sikkerhedrettelser eller kritiske "
-#~ "opdateringer. Opgradér til en senere version af Ubuntu Linux. Se http://"
-#~ "www.ubuntu.com (engelsk) for mere information om opgradering."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Ny distributionsudgivelse \"%s\" er tilgængelig</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Softwareindekset er ødelagt"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Det er ikke muligt at installere eller fjerne software. Brug venligst "
-#~ "pakkehåndteringsprogrammet \"Synaptic\" eller kør \"sudo apt-get install -"
-#~ "f\" i en terminal for at fikse dette problem først."
-
-#~ msgid "None"
-#~ msgstr "Intet"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Du må undersøge for opdateringer manuelt</big></b>\n"
-#~ "\n"
-#~ "Dit system søger ikke automatisk efter nye opdateringer. Du kan indstille "
-#~ "denne adfærd i <i>Softwarekilder</i> under <i>Internetopdateringer</i>-"
-#~ "fanebladet."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Hold dit system opdateret</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Ikke alle opdateringer kan installeres</b></big>\r\n"
-#~ "\r\n"
-#~ "%s"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<big><b>Starter opdateringshåndtering</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "Ændringer"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Ændringer og beskrivelse af opdateringen"
-
-#~ msgid "Chec_k"
-#~ msgstr "_Kontrollér"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Kontrollér softwarekanalerne for nye opdateringer"
-
-#~ msgid "Description"
-#~ msgstr "Beskrivelse"
-
-#~ msgid "Release Notes"
-#~ msgstr "Udgivelsesnoter"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Kør en distributionsopgradering, for at installere så mange opdateringer "
-#~ "som muligt.\n"
-#~ "\n"
-#~ "Dette kan skyldes en ufærdig opgradering, uofficielle softwarepakker "
-#~ "eller hvis der køres en udviklingsversion."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Vis fremgang for enkelte filer"
-
-#~ msgid "Software Updates"
-#~ msgstr "Softwareopdateringer"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Softwareopdateringer retter fejl, lukker sikkerhedshuller og gør nye "
-#~ "funktioner tilgængelige."
-
-#~ msgid "U_pgrade"
-#~ msgstr "O_pgradér"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Opgradér til seneste version af Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Tjek"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Distributionsopgradering"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Skjul denne information i fremtiden"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Installér opdateringer"
-
-#~ msgid "_Upgrade"
-#~ msgstr "_Opgradér"
-
-#~ msgid "changes"
-#~ msgstr "ændringer"
-
-#~ msgid "updates"
-#~ msgstr "opdateringer"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Automatiske opdateringer</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>Cd-rom/dvd</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Internetopdateringer</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Tag venligst del i populariteteskonkurrencen, for at forbedre "
-#~ "brugeroplevelsen af Ubuntu. Hvis du vælger at gøre dette, fremsendes der "
-#~ "på ugentlig basis en anonym liste over installeret software og hvor ofte "
-#~ "det anvendes.\n"
-#~ "\n"
-#~ "Resultaterne anvendes til at forbedre supporten for populære programmer "
-#~ "og prioriterer programmerne i søgeresultaterne.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Tilføj cd-rom"
-
-#~ msgid "Authentication"
-#~ msgstr "Godkendelse"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "Sl_et hentede softwarefiler:"
-
-#~ msgid "Download from:"
-#~ msgstr "Hent fra:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Importér den offentlige nøgle fra en betroet softwareleverandør"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Internetopdateringer"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Kun sikkerhedsopdateringer fra de officielle Ubuntu-servere vil blive "
-#~ "installeret automatisk"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Gendan stan_darder"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Gendan standardnøglerne for din distribution"
-
-#~ msgid "Software Sources"
-#~ msgstr "Softwarekilder"
-
-#~ msgid "Source code"
-#~ msgstr "Kildetekst"
-
-#~ msgid "Statistics"
-#~ msgstr "Statistikker"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Indsend statistisk information"
-
-#~ msgid "Third Party"
-#~ msgstr "Tredjepart"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Undersøg automatisk efter opdateringer"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Hent automatisk opdateringer, men installér dem ikke"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Importér nøglefil"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Installér sikkerhedsopdateringer automatisk uden bekræftelse"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Informationer omkring tilgængeligt software er forældede</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "For at installere software og opdateringer fra nyligt tilføjede eller "
-#~ "ændrede kilder, er du nødt til at genopfriske informationer omkring "
-#~ "tilgængeligt  software.\n"
-#~ "\n"
-#~ "Du skal bruge en fungerende internetforbindelse for at fortsætte."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Kommentar:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Komponenter:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribution:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Indtast en komplet APT-linje for det arkiv du ønsker at tilføje "
-#~ "som kilde</big></b>\n"
-#~ "\n"
-#~ "APT-linjen indeholder typen, placeringen og komponenter for arkivet, f."
-#~ "eks. <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "APT-linje:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binær\n"
-#~ "Kildetekst"
-
-#~ msgid "Edit Source"
-#~ msgstr "Redigér kilde"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Undersøger cd-rom"
-
-#~ msgid "_Add Source"
-#~ msgstr "_Tilføj kilde"
-
-#~ msgid "_Reload"
-#~ msgstr "_Genindlæs"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Vis og installér tilgængelige opdateringer"
-
-#~ msgid "Update Manager"
-#~ msgstr "Opdateringshåndtering"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Undersøg automatisk om en ny version den nuværende distribution er "
-#~ "tilgængelig, og tilbyd at opgradere (hvis det er muligt)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Undersøg om der er nye distributionsudgivelser"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Hvis automatisk undersøgelse for opdateringer er slået fra, er du nødt "
-#~ "til at genopfriske kanallisten manuelt. Denne indstilling tillader at "
-#~ "påmindelsen skjules i det tilfælde."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Påmind om at genopfriske kanallisten"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Vis detaljer for opdatering"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Størrelsen på opdateringshåndteringens vindue"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Tilstanden for udfolderen der indeholder listen med ændringer og "
-#~ "beskrivelser"
-
-#~ msgid "The window size"
-#~ msgstr "Vinduesstørrelsen"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Konfigurér kilderne for installérbar software og opdateringer"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" sikkerhedsopdateringer"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Henter fil %li af %li med ukendt hastighed"
-
-#~ msgid "Normal updates"
-#~ msgstr "Almindelige opdateringer"
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Afbryd _hentning"
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Noget software er ikke længere officielt understøttet"
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Kunne ikke finde nogen tilgængelige opgraderinger"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Henter fil %(current)li af %(total)li"
 
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Dit system er allerede opgraderet."
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detaljer"
 
-#, fuzzy
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Opgraderer til Ubuntu 6.06 LTS</"
-#~ "span>"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Opgrader til seneste version af Ubuntu"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Kan ikke installere alle tilgængelige opdateringer"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Listen med ændringer er ikke tilgængelig"
 
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "Officielt understøttet"
+#: ../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 ""
 
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Nogle opdateringer kræver yderligere software. Brug funktionen \"Vælg "
-#~ "alle opgraderinger\" i pakkehåndteringsprogrammet \"Synaptic\" eller kør "
-#~ "\"sudo apt-get dist-upgrade\" i en terminal for at opdatere dit system "
-#~ "fuldstændigt."
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Fejl ved hentning af ændringslisten.\n"
+"Undersøg venligst din internetforbindelse."
 
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Følgende opdateringer vil blive sprunget over:"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Tid tilbage(ca.): %li sekunder"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Download is complete"
-#~ msgstr "Overførsel fuldført"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Opgraderingen afbryder nu. Rapporter venligst denne fejl."
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Opgraderer Ubuntu"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Hide details"
-#~ msgstr "Skjul detaljer"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Show details"
-#~ msgstr "Vis detaljer"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr ""
-#~ "Det er kun tilladt at have et softwarestyringsværktøj kørende ad gangen."
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Kan ikke installere \"%s\""
 
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Luk venligst det andet program (f.eks. 'Aptitude eller 'Synaptic') først."
+#: ../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 "<b>Channels</b>"
-#~ msgstr "<b>Kanaler</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Nøgler</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Installationsmedie"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Indstillinger"
+msgid "An essential package would be removed"
+msgstr "Det ville være nødvendigt at fjerne en vital pakke"
 
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Kanal</b>"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponenter</b>"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#, fuzzy
-#~ msgid "Add Channel"
-#~ msgstr "Tilføj kanal"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "Redigér kanal"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Tilføj kanal"
-#~ msgstr[1] "_Tilføj kanaler"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "_Tilpasset"
+#: ../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 ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS Sikkerhedsopdateringer"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS Opdateringer"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS Backports"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/de.po b/po/de.po
index 6074a464..1a981522 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,5 +1,6 @@
-# German translation of update-manager.
+# German translation of python-apt.
 # Copyright (C) 2005 Michiel Sikkes  <michiel@eyesopened.nl>
+# Copyright (C) 2009 - 2010 Julian Andres Klode <jak@debian.org>
 # 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.
@@ -7,12 +8,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: update-manager\n"
+"Project-Id-Version: python-apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-21 15:34+0200\n"
-"PO-Revision-Date: 2009-06-15 17:03+0200\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"
-"Language-Team: German GNOME Translations <gnome-de@gnome.org>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,246 +27,256 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/templates/Ubuntu.info.in:13
+msgid "Ubuntu 10.04 'Lucid Lynx'"
+msgstr "Ubuntu 10.04 »Lucid Lynx«"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
+msgstr "CD mit Ubuntu 10.04 »Lucid Lynx«"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 9.10 »Karmic Koala«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:31
+#: ../data/templates/Ubuntu.info.in:92
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "CD-ROM mit Ubuntu 9.10 »Karmic Koala«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:74
+#: ../data/templates/Ubuntu.info.in:135
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 9.04 »Jaunty Jackalope«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:92
+#: ../data/templates/Ubuntu.info.in:153
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "CD-ROM mit Ubuntu 9.04 »Jaunty Jackalope«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:135
+#: ../data/templates/Ubuntu.info.in:196
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 8.10 »Intrepid Ibex«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:153
+#: ../data/templates/Ubuntu.info.in:214
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "CD mit Ubuntu 8.10 »Intrepid Ibex«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:197
+#: ../data/templates/Ubuntu.info.in:258
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 8.04 »Hardy Heron«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:215
+#: ../data/templates/Ubuntu.info.in:276
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD mit Ubuntu 8.04 »Hardy Heron«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:252
+#: ../data/templates/Ubuntu.info.in:313
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.10 »Gutsy Gibbon«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:270
+#: ../data/templates/Ubuntu.info.in:331
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD mit Ubuntu 7.10 »Gutsy Gibbon«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:305
+#: ../data/templates/Ubuntu.info.in:366
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04 »Feisty Fawn«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:323
+#: ../data/templates/Ubuntu.info.in:384
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD mit Ubuntu 7.04 »Feisty Fawn«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:357
+#: ../data/templates/Ubuntu.info.in:418
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 »Edgy Eft«"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:362
+#: ../data/templates/Ubuntu.info.in:423
 msgid "Community-maintained"
 msgstr "Von der Ubuntu-Gemeinde betreut"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:368
+#: ../data/templates/Ubuntu.info.in:429
 msgid "Restricted software"
 msgstr "Eingeschränkte Software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:375
+#: ../data/templates/Ubuntu.info.in:436
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD mit Ubuntu 6.10 »Edgy Eft«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:409
+#: ../data/templates/Ubuntu.info.in:470
 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:473
 msgid "Canonical-supported Open Source software"
 msgstr "Von Canonical unterstütze Open-Source-Software"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:414
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Community-maintained (universe)"
 msgstr "Von der Gemeinde betreut (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:415
+#: ../data/templates/Ubuntu.info.in:476
 msgid "Community-maintained Open Source software"
 msgstr "Von der Ubuntu-Gemeinde betreute Open-Source-Software"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:417
+#: ../data/templates/Ubuntu.info.in:478
 msgid "Non-free drivers"
 msgstr "Proprietäre Treiber"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:418
+#: ../data/templates/Ubuntu.info.in:479
 msgid "Proprietary drivers for devices"
 msgstr "Proprietäre Gerätetreiber"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:420
+#: ../data/templates/Ubuntu.info.in:481
 msgid "Restricted software (Multiverse)"
 msgstr "Eingeschränkte Software (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:421
+#: ../data/templates/Ubuntu.info.in:482
 msgid "Software restricted by copyright or legal issues"
 msgstr "Rechtlich eingeschränkte Software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:427
+#: ../data/templates/Ubuntu.info.in:488
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "CD mit Ubuntu 6.06 LTS »Dapper Drake«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:439
+#: ../data/templates/Ubuntu.info.in:500
 msgid "Important security updates"
 msgstr "Wichtige Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:444
+#: ../data/templates/Ubuntu.info.in:505
 msgid "Recommended updates"
 msgstr "Empfohlene Aktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:449
+#: ../data/templates/Ubuntu.info.in:510
 msgid "Pre-released updates"
 msgstr "Vorabveröffentlichte Aktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:454
+#: ../data/templates/Ubuntu.info.in:515
 msgid "Unsupported updates"
 msgstr "Nicht unterstütze Aktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:461
+#: ../data/templates/Ubuntu.info.in:522
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 »Breezy Badger«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:475
+#: ../data/templates/Ubuntu.info.in:536
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD mit Ubuntu 5.10 »Breezy Badger«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:487
+#: ../data/templates/Ubuntu.info.in:548
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:492
+#: ../data/templates/Ubuntu.info.in:553
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Aktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:497
+#: ../data/templates/Ubuntu.info.in:558
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:504
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 »Hoary Hedgehog«"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:518
+#: ../data/templates/Ubuntu.info.in:579
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD mit Ubuntu 5.04 »Hoary Hedgehog«"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
+#: ../data/templates/Ubuntu.info.in:582 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Offiziell unterstützt"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:530
+#: ../data/templates/Ubuntu.info.in:591
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:535
+#: ../data/templates/Ubuntu.info.in:596
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 Aktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:540
+#: ../data/templates/Ubuntu.info.in:601
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:546
+#: ../data/templates/Ubuntu.info.in:607
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 »Warty Warthog«"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:552
+#: ../data/templates/Ubuntu.info.in:613
 msgid "Community-maintained (Universe)"
 msgstr "Von der Ubuntu-Gemeinde betreut (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:554
+#: ../data/templates/Ubuntu.info.in:615
 msgid "Non-free (Multiverse)"
 msgstr "Unfrei (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:560
+#: ../data/templates/Ubuntu.info.in:621
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD-ROM mit Ubuntu 4.10 »Warty Warthog«"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:563
+#: ../data/templates/Ubuntu.info.in:624
 msgid "No longer officially supported"
 msgstr "Unterstützung ist ausgelaufen"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:565
+#: ../data/templates/Ubuntu.info.in:626
 msgid "Restricted copyright"
 msgstr "Eingeschränktes Copyright"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:633
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Sicherheitsaktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:577
+#: ../data/templates/Ubuntu.info.in:638
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Aktualisierungen"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:582
+#: ../data/templates/Ubuntu.info.in:643
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Backports"
 
@@ -348,39 +359,39 @@ msgstr "Haupt-Server"
 msgid "Custom servers"
 msgstr "Benutzerdefinierte Server"
 
-#: ../apt/progress/gtk2.py:246
+#: ../apt/progress/gtk2.py:259 ../apt/progress/gtk2.py:315
 #, 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"
 
-#: ../apt/progress/gtk2.py:252
+#: ../apt/progress/gtk2.py:265 ../apt/progress/gtk2.py:321
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Datei %(current)li von %(total)li wird heruntergeladen"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:272
+#: ../apt/progress/gtk2.py:341
 msgid "Details"
 msgstr "Details"
 
-#: ../apt/progress/gtk2.py:354
+#: ../apt/progress/gtk2.py:429
 msgid "Starting..."
 msgstr "Starte..."
 
-#: ../apt/progress/gtk2.py:360
+#: ../apt/progress/gtk2.py:435
 msgid "Complete"
 msgstr "Fertig"
 
-#: ../apt/package.py:315
+#: ../apt/package.py:333
 #, 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:878 ../apt/package.py:982
+#: ../apt/package.py:989 ../apt/package.py:1095
 msgid "The list of changes is not available"
 msgstr "Die Liste mit Änderungen ist momentan nicht verfügbar."
 
-#: ../apt/package.py:986
+#: ../apt/package.py:1099
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -393,7 +404,7 @@ msgstr ""
 "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:992
+#: ../apt/package.py:1105
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -401,51 +412,103 @@ msgstr ""
 "Die Liste mit Änderungen konnte nicht heruntergeladen werden. \n"
 "Bitte überprüfen Sie Ihre Internet-Verbindung."
 
-#: ../apt/debfile.py:56
-#, python-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dies ist kein gültiges DEB archive, es fehlt der Eintrag '%s'"
-
-#: ../apt/debfile.py:81
+#: ../apt/debfile.py:70
 #, python-format
 msgid "List of files for '%s' could not be read"
 msgstr "Die Liste der Dateien von ›%s‹ konnte nicht gelesen werden."
 
-#: ../apt/debfile.py:149
+#: ../apt/debfile.py:138
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr "Abhängigkeit nicht erfüllbar: %s\n"
 
-#: ../apt/debfile.py:173
+#: ../apt/debfile.py:162
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr "Steht in Konflikt zu dem installiertem Paket ›%s‹"
 
-#: ../apt/debfile.py:319
+#: ../apt/debfile.py:308
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr "Falsche Architektur ›%s‹"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:325
+#: ../apt/debfile.py:314
 msgid "A later version is already installed"
 msgstr "Eine spätere Version is bereits installiert."
 
-#: ../apt/debfile.py:345
+#: ../apt/debfile.py:334
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr "Es konnten nicht alle Abhängigkeiten erfüllt werden (Cache defekt)"
 
-#: ../apt/debfile.py:376
+#: ../apt/debfile.py:365
 #, python-format
 msgid "Cannot install '%s'"
 msgstr "›%s‹ kann nicht installiert werden"
 
-#: ../apt/debfile.py:484
+#: ../apt/debfile.py:473
 #, 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"
 
-#: ../apt/debfile.py:494
+#: ../apt/debfile.py:483
 msgid "An essential package would be removed"
 msgstr "Ein grundlegendes Paket müsste entfernt werden"
+
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr "%c%s... Fertig"
+
+#: ../apt/progress/text.py:120
+msgid "Hit "
+msgstr "OK   "
+
+#: ../apt/progress/text.py:129
+msgid "Ign "
+msgstr "Ign  "
+
+#: ../apt/progress/text.py:131
+msgid "Err "
+msgstr "Fehl "
+
+#: ../apt/progress/text.py:142
+msgid "Get:"
+msgstr "Hole:"
+
+#: ../apt/progress/text.py:202
+msgid " [Working]"
+msgstr " [Verarbeite]"
+
+#: ../apt/progress/text.py:213
+#, python-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Medienwechsel: Bitte legen Sie das Medium mit dem Namen\n"
+" »%s«\n"
+"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n"
+
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:222
+#, 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
+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«"
+
+#: ../apt/progress/text.py:254
+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"
+
+#: ../apt/cache.py:127
+msgid "Building data structures"
+msgstr "Datenstrukturen werden aufgebaut"
diff --git a/po/el.po b/po/el.po
index 3404a45c..835417bc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
 "Language-Team: Greek <team@gnome.gr>\n"
@@ -23,236 +23,267 @@ 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: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 με το 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 με το 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 με 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Community maintained"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Οδηγοί με κλειστό κώδικα για συσκευές"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Λογισμικό με περιορισμούς"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cdrom με το Ubuntu 6.10 'Edgy Eft"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 TLS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Λογισμικό ανοικτού κώδικα υποστηριζόμενο από την Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Υποστηριζόμενα από την κοινότητα (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../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:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Όχι-ελεύθεροι οδηγοί"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Οδηγοί με κλειστό κώδικα για συσκευές "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Οδηγοί με κλειστό κώδικα για συσκευές"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Όχι-ελεύθερο (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr "Λογισμικό με περιορισμούς από πνευματικά δικαιώματα και νόμους"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cdrom με Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Σημαντικές ενημερώσεις ασφαλείας"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Συνιστώμενες ενημερώσεις"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Προτεινόμενες ενημερώσεις"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Backported ενημερώσεις"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Αναβαθμίσεις  Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Officially supported"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ενημερώσεις Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Όχι-ελεύθερα (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Δεν υποστηρίζονται πια επίσημα"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Περιορισμένα πνευματικά δικαιώματα"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ενημερώσεις ασφαλείας Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ενημερώσεις Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Backports"
 
@@ -264,55 +295,68 @@ 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:31
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 3.1 \"Sarge\""
+
+#. Description
+#: ../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
 #, fuzzy
 msgid "Security updates"
 msgstr "Σημαντικές ενημερώσεις ασφαλείας"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες Εξαρτήσεις"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Λογισμικό μη συμβατό με DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Εξυπηρετητής για %s"
@@ -320,1326 +364,160 @@ 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:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Κύριος εξυπηρετητής"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Προσαρμοσμένοι εξυπηρετητές"
 
-#~ msgid "Daily"
-#~ msgstr "Ημερησίως"
-
-#~ msgid "Every two days"
-#~ msgstr "Κάθε δύο ημέρες"
-
-#~ msgid "Weekly"
-#~ msgstr "Εβδομαδιαίως"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Κάθε δύο εβδομάδες"
-
-#~ msgid "Every %s days"
-#~ msgstr "Κάθε %s ημέρες"
-
-#~ msgid "After one week"
-#~ msgstr "Μετά από μια εβδομάδα"
-
-#~ msgid "After two weeks"
-#~ msgstr "Μετά από δύο εβδομάδες"
-
-#~ msgid "After one month"
-#~ msgstr "Μετά από ένα μήνα"
-
-#~ msgid "After %s days"
-#~ msgstr "Μετά από %s ημέρες"
-
-#~ msgid "%s updates"
-#~ msgstr "%s ενημερώσεις"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Κοντινότερος εξυπηρετητής"
-
-#~ msgid "Software Channel"
-#~ msgstr "Κανάλι λογισμικού"
-
-#~ msgid "Active"
-#~ msgstr "Ενεργό"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Πηγαίος κώδικας)"
-
-#~ msgid "Source Code"
-#~ msgstr "Πηγαίος κώδικας"
-
-#~ msgid "Import key"
-#~ msgstr "Εισαγωγή κλειδιού"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Σφάλμα εισαγωγής επιλεγμένου αρχείου"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Το επιλεγμένο αρχείο μπορεί να μην είναι ένα αρχείο κλειδιού GPG ή μπορεί "
-#~ "να είναι κατεστραμμένο"
-
-#~ msgid "Error removing the key"
-#~ msgstr "Σφάλμα απομάκρυνσης κλειδιού"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Το κλειδί που επιλέξατε δεν μπορεί να απομακρυνθεί. Παρακαλώ αναφέρετε "
-#~ "αυτό ως σφάλμα."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Σφάλμα σάρωσης του CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκο"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Κατεστραμμένα πακέτα"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Το σύστημα σας περιέχει κατεστραμμένα πακέτα τα οποία δεν μπορούν να "
-#~ "διορθωθούν με αυτό το λογισμικό. Παρακαλώ διορθώστε τα μέσω synaptic ή "
-#~ "apt-get για να συνεχίσετε."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Αδυναμία αναβάθμισης απαιτούμενων μετα-πακέτων"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Αδυναμία υπολογισμού της αναβάθμισης"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Συνέβηκε ένα ανεπίλυτο πρόβλημα κατά τον υπολογισμό της αναβάθμισης.\n"
-#~ "\n"
-#~ "Παρακαλώ αναφέρετε το ως σφάλμα στο πακέτο 'update-manager' και "
-#~ "επισυνάψτε στην αναφορά σφάλματος τα αρχεία στο /var/log/dist-upgrade/."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Δεν ήταν δυνατή η πιστοποίηση κάποιων πακέτων. Αυτό μπορεί να οφείλεται "
-#~ "και σε ένα πρόβλημα δικτύου. Προσπαθήστε αργότερα. Δείτε παρακάτω τη "
-#~ "λίστα των μη πιστοποιημένων πακέτων."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Αδυναμία εγκατάστασης '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Δεν ήταν δυνατή η αναβάθμιση του απαιτούμενου πακέτου. Παρακαλώ αναφέρετε "
-#~ "το ως σφάλμα. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Αδυναμία εύρεσης μετα-πακέτου"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Το σύστημα σας δεν περιέχει κάποιο από τα πακέτα ubuntu-desktop, kubuntu-"
-#~ "desktop or edubuntu-desktop, και έτσι δεν είναι δυνατός ο εντοπισμός της "
-#~ "έκδοσης του Ubuntu σας.\n"
-#~ "\n"
-#~ " Εγκαταστήστε ένα από αυτά τα πακέτα πρώτα μέσω synaptic ή apt-get πριν "
-#~ "να συνεχίσετε."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Αποτυχία προσθήκης του CD"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Υπήρξε σφάλμα κατά την προσθήκη του CD και η αναβάθμιση θα τερματιστεί. "
-#~ "Παρακαλώ αναφέρετε το ως σφάλμα αν αυτό είναι ένα έγκυρο Ubuntu CD.\n"
-#~ "\n"
-#~ "Το μήνυμα σφάλματος ήταν:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "Ανάγνωση λανθάνουσας μνήμης"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Να γίνει λήψη δεδομένων από το δίκτυο για την αναβάθμιση;"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "Η αναβάθμιση μπορεί να χρησιμοποιεί το δίκτυο για να ελέγχει για τις πιο "
-#~ "πρόσφατες ενημερώσεις, και για να λαμβάνει πακέτα που δεν είναι στο CD.\n"
-#~ "Αν διαθέτετε μια γρήγορη ή φθηνή πρόσβαση στο δίκτυο  απαντήστε 'Ναι' "
-#~ "εδώ. Αν η πρόσβαση είναι ακριβή πατήστε 'Όχι'"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Δεν βρέθηκε έγκυρη εναλλακτική τοποθεσία αρχείων"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Κατά τον έλεγχο των πληροφοριών repository, δεν βρέθηκε καταχώριση "
-#~ "εναλλακτικής τοποθεσίας αρχείων για την αναβάθμιση. Αυτό μπορεί να "
-#~ "συμβαίνει αν εκτελείτε μια εσωτερική εναλλακτική τοποθεσία αρχείων ή αν η "
-#~ "πληροφορίες εναλλακτικής τοποθεσίας είναι παρωχημένες.\n"
-#~ "\n"
-#~ "Θέλετε να αντικατασταθεί το αρχείο 'sources.list' οπωσδήποτε; Αν "
-#~ "επιλέξετε εδώ 'Ναι' θα ενημερωθούν όλες οι '%s' καταχωρίσεις σε '%s'.\n"
-#~ " Αν επιλέξετε 'Όχι' η ενημέρωση θα ακυρωθεί."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Δημιουργία προεπιλεγμένων πηγών;"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Μετά τον έλεγχο του  'sources.list'  δεν βρέθηκε έγκυρη καταχώριση για το "
-#~ "'%s'.\n"
-#~ "\n"
-#~ "Να προστεθούν οι προεπιλεγμένες καταχωρίσεις για το '%s'; Αν απαντήσετε "
-#~ "'Όχι' η ενημέρωση θα ακυρωθεί."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Μη έγκυρες πληροφορίες repository"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Η αναβάθμιση των πληροφοριών repository είχε σαν αποτέλεσμα ένα άκυρο "
-#~ "αρχείο. Παρακαλώ αναφέρετε το ως σφάλμα."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Απενεργοποιήθηκαν πηγές τρίτων"
-
-#, fuzzy
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Μερικές καταχωρίσεις τρίτων έχουν απενεργοποιηθεί στο αρχείο souces.list. "
-#~ "Μπορείτε να τις ενεργοποιήσετε μετά την αναβάθμιση με το εργαλείο "
-#~ "'software-properties' ή με το synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Σφάλμα κατά την ενημέρωση"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Δημιουργήθηκε ένα πρόβλημα κατά την αναβάθμιση. Αυτό συνήθως σημαίνει "
-#~ "πρόβλημα δικτύου. Ελέγξτε τη σύνδεση δικτύου σας και προσπαθήστε ξανά."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Δεν υπάρχει αρκετός χώρος στο δίσκο"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ ελευθερώστε τουλάχιστον %s "
-#~ "χώρου στο %s. Αδειάστε τα απορρίμματα σας και απομακρύνετε τα προσωρινά "
-#~ "πακέτα προηγούμενων εγκαταστάσεων με  την εντολή 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Θέλετε να ξεκινήσετε την αναβάθμιση;"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Αδυναμία εγκατάστασης των αναβαθμίσεων"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Η αναβάθμιση τώρα θα τερματιστεί. Το σύστημα σας μπορεί να γίνει ασταθές. "
-#~ "Εκτελείται μια διεργασία ανάκτησης (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Παρακαλώ αναφέρετε το ως σφάλμα στο πακέτο 'update-manager' και "
-#~ "συμπεριλάβετε και τα αρχεία του /var/log/dist-upgrade/ στην αναφορά "
-#~ "σφάλματος."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Αδυναμία λήψης των αναβαθμίσεων"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ ελέγξτε τη σύνδεση σας στο "
-#~ "διαδίκτυο ή το μέσο εγκατάστασης και προσπαθήστε ξανά. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Η υποστήριξη για ορισμένες εφαρμογές τερματίστηκε"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Αυτά τα εγκατεστημένα πακέτα δεν υποστηρίζονται πια επίσημα από την "
-#~ "Canonical Ltd, αλλά μπορείτε να λάβετε υποστήριξη από τη κοινότητα.\n"
-#~ "\n"
-#~ "Αν δεν έχετε ενεργοποιημένο το 'universe' , θα γίνει πρόταση για "
-#~ "απομάκρυνση αυτών των πακέτων στο επόμενο βήμα."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Αφαίρεση παρωχημένων πακέτων;"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "Παράκα_μψη αυτου του βήματος"
-
-#~ msgid "_Remove"
-#~ msgstr "_Απομάκρυνση"
-
-#~ msgid "Error during commit"
-#~ msgstr "Σφάλμα κατά την υποβολή"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Δημιουργήθηκαν ορισμένα προβλήματα κατά την εκκαθάριση. Παρακαλώ δείτε το "
-#~ "παρακάτω μήνυμα για περισσότερες πληροφορίες. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Γίνεται επαναφορά αρχικής κατάστασης συστήματος"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "Λήψη backport του '%s'"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Έλεγχος διαχειριστή πακέτων"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Απέτυχε η προετοιμασία της αναβάθμισης"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Συνέβηκε ένα ανεπίλυτο πρόβλημα κατά τον υπολογισμό της αναβάθμισης. "
-#~ "Παρακαλώ αναφέρετε το ως σφάλμα στο πακέτο 'update-manager'  και "
-#~ "επισυνάψτε στην αναφορά τα αρχεία του /var/log/dist-upgrade/."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Ενημέρωση πληροφοριών repository"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Μη έγκυρες πληροφορίες πακέτου"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Μετά την ενημέρωση των πληροφοριών πακέτων, δεν μπορεί να βρεθεί το "
-#~ "απαραίτητο πακέτο '%s'.\n"
-#~ "Παρακαλώ αναφέρετε το ως σφάλμα στο πακέτο 'update-manager' και "
-#~ "συμπεριλάβετε και τα αρχεία του /var/log/dist-upgrade/ στην αναφορά "
-#~ "σφάλματος."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Ερώτηση για επιβεβαίωση"
-
-#~ msgid "Upgrading"
-#~ msgstr "Γίνεται αναβάθμιση"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Γίνεται αναζήτηση για παρωχημένο λογισμικό"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Παρακαλώ εισάγετε τον δίσκο '%s' στον οδηγό '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Η λήψη ολοκληρώθηκε"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Λήψη αρχείου %li από %li με %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Απομένουν περίπου %s"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Λήψη αρχείου %li από %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Γίνεται εφαρμογή αλλαγών"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Αδυναμία εγκατάστασης '%s'"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ αναφέρετε το ως σφάλμα στο "
-#~ "πακέτο 'update-manager' και συμπεριλάβετε και τα αρχεία του /var/log/dist-"
-#~ "upgrade/ στην αναφορά σφάλματος."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Αντικατάσταση προσαρμοσμένου αρχείου ρύθμισης\n"
-#~ "'%s';"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Οι αλλαγές που έχετε κάνει σε αυτό το αρχείο ρυθμίσεων θα χαθούν αν "
-#~ "επιλέξετε να το αντικαταστήσετε με μια νεότερη έκδοση."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Η εντολή 'diff' δεν βρέθηκε"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Προέκυψε μοιραίο σφάλμα"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Παρακαλώ αναφέρετε το ως σφάλμα και επισυνάψτε τα αρχεία /var/log/dist-"
-#~ "upgrade/main.log και /var/log/dist-upgrade/apt.log στην αναφορά σας. Η "
-#~ "αναβάθμιση τώρα θα τερματιστεί. \n"
-#~ "Το αρχικό αρχείο sources.list αποθηκεύτηκε στο /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d πακέτο πρόκειται να απομακρυνθεί."
-#~ msgstr[1] "%d πακέτα πρόκειται να απομακρυνθούν."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d νέο πακέτο πρόκειται να εγκατασταθεί."
-#~ msgstr[1] "%d νέα πακέτα πρόκειται να εγκατασταθούν."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d πακέτο πρόκειται να αναβαθμιστεί."
-#~ msgstr[1] "%d πακέτα πρόκειται να αναβαθμιστούν."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Θα πρέπει να κάνετε συνολική λήψη %s. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Η αναβάθμιση μπορεί να διαρκέσει αρκετές ώρες και δεν είναι δυνατή η "
-#~ "ακύρωση της αργότερα."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Για να αποφύγετε απώλεια δεδομένων, κλείστε όλες τις ανοικτές εφαρμογές "
-#~ "και έγγραφα."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Το σύστημα σας είναι ενημερωμένο"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Δεν υπάρχουν διαθέσιμες αναβαθμίσεις για το σύστημα σας. Η αναβάθμιση θα "
-#~ "ακυρωθεί."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Απομάκρυνση %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Εγκατάσταση %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Αναβάθμιση %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "Απομένουν περίπου %li μέρες %li ώρες και %li λεπτά"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li ώρες και %li λεπτά"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li λεπτά"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li δευτερόλεπτα"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Η λήψη θα διαρκέσει περίπου %s με σύνδεση 1Mbit DSL και περίπου %s με ένα "
-#~ "56K μόντεμ."
-
-#~ msgid "Reboot required"
-#~ msgstr "Απαιτείται επανεκκίνηση"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Η αναβάθμιση ολοκληρώθηκε και απαιτείται επανεκκίνηση. Θέλετε να γίνει "
-#~ "επανεκκίνηση τώρα;"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Ακύρωση της αναβάθμισης που εκτελείται;</big></b>\n"
-#~ "\n"
-#~ "Το σύστημα σας μπορεί να γίνει ασταθές αν ακυρώσετε την αναβάθμιση. Σας "
-#~ "συστήνουμε τα συνεχίσετε την αναβάθμιση."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Επανεκκινήστε το σύστημα για να ολοκληρωθεί η αναβάθμιση</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Έναρξη της αναβάθμισης;</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Γίνεται αναβάθμιση του Ubuntu στην έκδοση 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Εκκαθάριση"
-
-#~ msgid "Details"
-#~ msgstr "Λεπτομέρειες"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Διαφορά μεταξύ των αρχείων"
-
-#, fuzzy
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Λήψη και εγκατάσταση των αναβαθμίσεων"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Τροποποίηση των καναλιών λογισμικού"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Προετοιμασία της αναβάθμισης"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Γίνεται επανεκκίνηση του συστήματος"
-
-#~ msgid "Terminal"
-#~ msgstr "Τερματικό"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "Α_κύρωση αναβάθμισης"
-
-#~ msgid "_Continue"
-#~ msgstr "_Συνέχεια"
-
-#~ msgid "_Keep"
-#~ msgstr "_Διατήρηση"
-
-#~ msgid "_Replace"
-#~ msgstr "Αντικατά_σταση"
-
-#~ msgid "_Report Bug"
-#~ msgstr "Ανα_φορά σφάλματος"
-
-#~ msgid "_Restart Now"
-#~ msgstr "Επανε_κκίνηση τώρα"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Συνέχεια αναβάθμισης"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "Έναρ_ξη αναβάθμισης"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Αδυναμία εύρεσης σημειώσεων έκδοσης"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Ο εξυπηρετητής μπορεί να είναι υπερφορτωμέμος "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Αδυναμία λήψης των σημειώσεων έκδοσης"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Παρακαλώ ελέγξτε τη σύνδεση σας με το διαδίκτυο."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Αδυναμία εκτέλεσης του εργαλείου αναβαθμίσεων"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Αυτό πιθανόν να είναι σφάλμα του εργαλείου αναβάθμισης. Παρακαλώ "
-#~ "αναφέρετε το ως σφάλμα."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Λήψη του εργαλείου αναβάθμισης"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr ""
-#~ "Το εργαλείο αναβάθμισης θα σας καθοδηγήσει στην διαδικασία ενημέρωσης"
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Υπογραφή εργαλείου αναβάθμισης"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Εργαλείο αναβάθμισης"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Αποτυχία λήψης"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Η λήψη της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Αποτυχία αποσυμπίεσης"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Η αποσυμπίεση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα "
-#~ "δικτύου ή εξυπηρετητή. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Αποτυχία επαλήθευσης"
-
-#, fuzzy
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Η επαλήθευση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου "
-#~ "ή εξυπηρετητή. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Η πιστοποίηση απέτυχε"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Η πιστοποίηση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα "
-#~ "δικτύου ή εξυπηρετητή. "
-
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "Λήψη αρχείου %(current)li από %(total)li με %(speed)s/s"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Λήψη αρχείου %(current)li από %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη."
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη.\n"
-#~ "Προσπαθήστε ξανά αργότερα."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Αποτυχία λήψης της λίστας των αλλαγών.\n"
-#~ "Παρακαλώ ελέγξτε τη σύνδεση σας στο διαδίκτυο."
-
-#~ msgid "Backports"
-#~ msgstr "Backports"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Αναβαθμίσεις διανομής"
-
-#~ msgid "Other updates"
-#~ msgstr "Άλλες ενημερώσεις"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Έκδοση %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Λήψη της λίστας των αλλαγών..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "Α_ποεπιλογή όλων"
-
-#~ msgid "_Check All"
-#~ msgstr "Έλε_γχος όλων"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Μέγεθος λήψης: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Μπορείτε να εγκαταστήσετε %s ενημέρωση"
-#~ msgstr[1] "Μπορείτε να εγκαταστήσετε %s ενημερώσεις"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο."
-
-#~ msgid "Update is complete"
-#~ msgstr "Η ενημέρωση ολοκληρώθηκε"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Έλεγχος για ενημερώσεις"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Από έκδοση: %(old_version)s σε %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Έκδοση %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Μέγεθος: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Η διανομή σας δεν υποστηρίζεται πια"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Δεν θα μπορείτε να λαμβάνετε περίπτερο ενημερώσεις και σημαντικές "
-#~ "αναβαθμίσεις. Θα πρέπει να κάνετε αναβάθμιση σε μια νεότερη έκδοση του "
-#~ "Ubuntu Linux. Δείτε το http://www.ubuntu.com για περισσότερες πληροφορίες "
-#~ "για την αναβάθμιση."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Είναι διαθέσιμη νέα έκδοση διανομής '%s'</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Είναι αδύνατη η προσθήκη ή η απομάκρυνση λογισμικού. Παρακαλώ "
-#~ "χρησιμοποιήστε το διαχειριστή πακέτων \"Synaptic\" η εκτελέστε την εντολή "
-#~ "\"sudo apt-get install -f\" σε ένα τερματικό για να διορθώσετε το "
-#~ "πρόβλημα πρώτα."
-
-#~ msgid "None"
-#~ msgstr "Καμία"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Θα πρέπει να κάνετε έλεγχο για ενημερώσεις χειροκίνητα</big></b>\n"
-#~ "\n"
-#~ "Το σύστημα σας δεν υποστηρίζει αυτόματο έλεγχο ενημερώσεων. Μπορείτε να "
-#~ "ρυθμίσετε αυτή τη συμπεριφορά μέσω του μενού <i>Πηγές λογισμικού</i> και "
-#~ "στην καρτέλα <i>Ενημερώσεις διαδικτύου</i>."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Διατηρήστε το σύστημα σας ενημερωμένο</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Δεν είναι δυνατή η εγκατάσταση όλων των ενημερώσεων</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<big><b>Εκκίνηση του update manager</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "Αλλαγές"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr "Λήψη αρχείου %(current)li από %(total)li με %(speed)s/s"
 
-#~ msgid "Changes and description of the update"
-#~ msgstr "Αλλαγές και περιγραφή της ενημέρωσης"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Λήψη αρχείου %(current)li από %(total)li"
 
-#~ msgid "Chec_k"
-#~ msgstr "Ελε_γχος"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Λεπτομέρειες"
 
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Έλεγχος των καναλιών λογισμικού για ενημερώσεις"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Description"
-#~ msgstr "Περιγραφή"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Release Notes"
-#~ msgstr "Σημειώσεις έκδοσης"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Εκτελέστε μια αναβάθμιση διανομής για να εγκαταστήσετε όσες το δυνατόν "
-#~ "περισσότερες ενημερώσεις.\n"
-#~ "\n"
-#~ "Αυτό μπορεί οφείλεται σε μη ολοκληρωμένη αναβάθμιση, σε ανεπίσημα πακέτα "
-#~ "λογισμικού ή αν χρησιμοποιείτε μια έκδοση υπό ανάπτυξη."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Εμφάνιση προόδου μοναδικών αρχείων"
-
-#~ msgid "Software Updates"
-#~ msgstr "Αναβαθμίσεις λογισμικού"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας "
-#~ "και να παρέχουν νέες λειτουργίες."
-
-#~ msgid "U_pgrade"
-#~ msgstr "Ανα_βάθμιση"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη."
 
-#~ msgid "_Check"
-#~ 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 ""
 
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "Αναβάθμιση _διανομής"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Αποτυχία λήψης της λίστας των αλλαγών.\n"
+"Παρακαλώ ελέγξτε τη σύνδεση σας στο διαδίκτυο."
 
-#~ msgid "_Hide this information in the future"
-#~ msgstr "Απόκρυ_ψη αυτής της πληροφορίας στο μέλλον"
-
-#~ msgid "_Install Updates"
-#~ msgstr "Ε_γκατάσταση ενημερώσεων"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "Ανα_βάθμιση"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "changes"
-#~ msgstr "αλλαγές"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "updates"
-#~ msgstr "ενημερώσεις"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Αυτόματες ενημερώσεις</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Διαδίκτυο</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Για την βελτίωση της χρήσης του Ubuntu, σας παρακαλούμε να πάρετε "
-#~ "μέρος στο διαγωνισμό για τις πιο δημοφιλείς εφαρμογές. Αν θέλετε, μια "
-#~ "λίστα των εγκατεστημένων σας εφαρμογών θα στέλνεται ανώνυμα στο Ubuntu σε "
-#~ "εβδομαδιαία βάση.\n"
-#~ "\n"
-#~ "Τα αποτελέσματα θα χρησιμοποιούνται για την βελτίωση της υποστήριξης για "
-#~ "τις πιο δημοφιλείς εφαρμογές, και για την κατάταξη των εφαρμογών στα "
-#~ "αποτελέσματα αναζήτησης.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Προσθήκη Cdrom"
-
-#~ msgid "Authentication"
-#~ msgstr "Πιστοποίηση"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "Δια_γραφή αρχείων ληφθέντων πακέτων"
-
-#~ msgid "Download from:"
-#~ msgstr "Λήψη από:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Εισαγωγή του δημόσιου κλειδιού από έναν έμπιστο πάροχο λογισμικού"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Αναβαθμίσεις διαδικτύου"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Μόνο οι ενημερώσεις ασφαλείας που προέρχονται από τους επίσημους "
-#~ "εξυπηρετητές του Ubuntu  θα εγκαθίστανται αυτόματα."
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Επαναφορά π_ροεπιλογών"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Επαναφορά των προεπιλεγμένων κλειδιών της διανομής σας"
-
-#~ msgid "Software Sources"
-#~ msgstr "Πηγές λογισμικού"
-
-#~ msgid "Source code"
-#~ msgstr "Πηγαίος κώδικας"
-
-#~ msgid "Statistics"
-#~ msgstr "Στατιστικά"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Υποβολή στατιστικών πληροφοριών"
-
-#~ msgid "Third Party"
-#~ msgstr "Τρίτων"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "Αυτόματος έλεγ_χος για ενημερώσεις κάθε:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "Αυτόματη λή_ψη ενημερώσεων χωρίς να εγκατασταθούν"
-
-#~ msgid "_Import Key File"
-#~ msgstr "Ε_ισαγωγή αρχείου κλειδιού"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "Ε_γκατάσταση ενημερώσεων ασφαλείας χωρίς επιβεβαίωση"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Οι πληροφορίες για το διαθέσιμο λογισμικό δεν είναι  "
-#~ "ενημερωμένες</big></b>\n"
-#~ "\n"
-#~ "Θα πρέπει να ανανεώσετε τις πληροφορίες καναλιού για να εγκαταστήσετε "
-#~ "λογισμικό και ενημερώσεις από τα τα νέα κανάλια που προσθέσατε ή "
-#~ "τροποποιήσατε. \n"
-#~ "\n"
-#~ "Χρειάζεστε μια ενεργή σύνδεση στο διαδίκτυο για να συνεχίσετε."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Σχόλιο:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Στοιχεία:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Διανομή:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Τύπος:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Εισάγετε την πλήρη γραμμή  APT του repository που θέλετε να "
-#~ "προσθέσετε</b></big>\n"
-#~ "\n"
-#~ "Η γραμμή APT περιέχει τον τύπο, τοποθεσία και το περιεχόμενο ενός "
-#~ "καναλιού, για παράδειγμα <i>\"deb http://ftp.debian.org sarge main\"</i>."
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "APT line:"
-#~ msgstr "Γραμμή APT:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binary\n"
-#~ "Source"
-
-#~ msgid "Edit Source"
-#~ msgstr "Επεξεργασία πηγής"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Σάρωση CD-ROM"
-
-#~ msgid "_Add Source"
-#~ msgstr "Προσ_θήκη πηγής"
-
-#~ msgid "_Reload"
-#~ msgstr "Ανα_νέωση"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Προβολή και εγκατάσταση διαθέσιμων ενημερώσεων"
-
-#~ msgid "Update Manager"
-#~ msgstr "Διαχείριση ενημερώσεων"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Αυτόματος έλεγχος αν είναι διαθέσιμη μια νεότερη έκδοση της τρέχουσας "
-#~ "διανομής και προσφέρει αναβάθμιση."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Έλεγχος για νέες εκδόσεις της διανομής"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Αν έχει απενεργοποιηθεί ο αυτόματος έλεγχος για ενημερώσεις, θα πρέπει να "
-#~ "ανανεώσετε τη λίστα καναλιών χειροκίνητα."
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Υπενθύμιση για την ανανέωση της λίστας καναλιών"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Show details of an update"
-#~ msgstr "Εμφάνιση λεπτομερειών μιας ενημέρωσης"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Αδυναμία εγκατάστασης '%s'"
 
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Αποθηκεύει το μέγεθος του διαλόγου του update-manager"
+#: ../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 ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Αποθηκεύει τη κατάσταση του expander που περιέχει τη λίστα των αλλαγών "
-#~ "και τις περιγραφής τους"
-
-#~ msgid "The window size"
-#~ msgstr "Το μέγεθος του παραθύρου"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Ρύθμιση των πηγών για λογισμικό και ενημερώσεις"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Αναβαθμίσεις ασφαλείας Debian 3.1 \"Sarge\""
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα"
-
-#~ msgid "Normal updates"
-#~ msgstr "Κανονικές ενημερώσεις"
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Ακύρωση _λήψης αρχείων"
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα"
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Δεν βρέθηκαν αναβαθμίσεις"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Το σύστημα σας έχει ήδη αναβαθμιστεί."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Αναβάθμιση σε Ubuntu 6.10</span>"
-
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Σημαντικές αναβαθμίσεις ασφαλείας του Ubuntu"
-
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Ενημερώσεις του Ubuntu"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Αδυναμία εγκατάστασης όλων των διαθέσιμων ενημερώσεων"
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Γίνεται ανάλυση του συστήματος σας</b></big>\n"
-#~ "\n"
-#~ "Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας "
-#~ "και να παρέχουν νέες λειτουργίες."
-
-#~ msgid "Oficially supported"
-#~ msgstr "Oficially supported"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Μερικές ενημερώσεις απαιτούν την απομάκρυνση επιπρόσθετου λογισμικού. "
-#~ "Χρησιμοποιήστε την λειτουργία \"Σημείωση όλων των αναβαθμίσεων\" από το "
-#~ "διαχειριστή πακέτων ή την εντολή \"sudo apt-get dist-upgrade\" σε ένα "
-#~ "τερματικό για να αναβαθμίσετε πλήρως το σύστημα σας."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Οι παρακάτω ενημερώσεις θα παρακαμφθούν:"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Απομένουν περίπου %li δευτερόλεπτα"
-
-#~ msgid "Download is complete"
-#~ msgstr "Η λήψη ολοκληρώθηκε"
+msgid "An essential package would be removed"
+msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί"
 
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Η αναβάθμιση θα τερματιστεί τώρα. Παρακαλώ αναφέρετε το ως σφάλμα."
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Αναβάθμιση Ubuntu"
-
-#~ msgid "Hide details"
-#~ msgstr "Απόκρυψη λεπτομερειών"
-
-#~ msgid "Show details"
-#~ msgstr "Εμφάνιση λεπτομερειών"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "Μόνο ένα εργαλείο διαχείρισης λογισμικού μπορεί να εκτελείται."
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Παρακαλώ κλείστε την άλλη εφαρμογή πρώτα π.χ. το 'aptitude' ή το "
-#~ "'Synaptic'."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Κανάλια</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Κλειδιά</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Μέσα εγκατάστασης"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Software Preferences"
-#~ msgstr "Προτιμήσεις λογισμικού"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Κανάλι</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Συστατικά</b>"
-
-#~ msgid "Add Channel"
-#~ msgstr "Προσθήκη Καναλιού"
-
-#~ msgid "Edit Channel"
-#~ msgstr "Επεξεργασία καναλιού"
-
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "Προσ_θήκη καναλιού"
-#~ msgstr[1] "Προσ_θήκη καναλιών"
-
-#~ msgid "_Custom"
-#~ msgstr "_Προσαρμοσμένο"
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ενημερώσεις ασφαλείας Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ενημερώσεις Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS Backports"
-
-#~ msgid "Inavlid package information"
-#~ msgstr "Μη έγκυρες πληροφορίες πακέτου"
-
-#~ msgid ""
-#~ "Failed to download the listof changes. Please check your internet "
-#~ "connection."
-#~ msgstr ""
-#~ "Αποτυχία λήψης της λίστας των αλλαγών. Παρακαλώ ελέγξτε τη σύνδεση σας."
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid ""
-#~ "While scaning your repository information no valid entry for the upgrade "
-#~ "was found.\n"
-#~ msgstr ""
-#~ "Κατά τον έλεγχο των πληροφοριών του repository δεν βρέθηκαν έγκυρες "
-#~ "καταχωρίσεις αναβάθμισης.\n"
-
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Ενότητες</b>"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Ενότητες:</b>"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Add Software Channels"
-#~ msgstr "Προσθήκη καναλιών λογισμικού"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Add the following software channel?"
-#~ msgid_plural "Add the following software channels?"
-#~ msgstr[0] "Να προστεθεί το παρακάτω κανάλι λογισμικού;"
-#~ msgstr[1] ""
+#: ../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 ""
 
-#~ msgid "You can install software from a channel. Use trusted channels, only."
-#~ msgstr ""
-#~ "Μπορείτε να εγκαταστήσετε λογισμικό από ένα κανάλι. Χρησιμοποιήστε μόνο "
-#~ "έμπιστα κανάλια."
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Could not add any software channels"
-#~ msgstr "Αδυναμία προσθήκης καναλιών λογισμικού"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "The file '%s' does not contain any valid software channels."
-#~ msgstr "Το αρχείο '%s' δεν περιέχει έγκυρα κανάλια λογισμικού."
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid ""
-#~ "The upgrade is finished now. A reboot is required to now, do you want to "
-#~ "do this now?"
-#~ msgstr ""
-#~ "Η αναβάθμιση ολοκληρώθηκε. Απαιτείται επανεκκίνηση, θέλετε να γίνει τώρα;"
-
-#~ msgid ""
-#~ "<b><big>You need to manually reload the latest information about updates</"
-#~ "big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties"
-#~ "\"."
-#~ msgstr ""
-#~ "<b><big>Πρέπει να ανανεώσετε χειροκίνητα τις τελευταίες πληροφορίες για "
-#~ "τις ενημερώσεις</big></b>\n"
-#~ "\n"
-#~ "Το σύστημα σας δεν έχει ρυθμιστεί να κάνει αυτόματο έλεγχο για "
-#~ "ενημερώσεις. Μπορείτε να ρυθμίσετε αυτή τη συμπεριφορά μέσω του μενού "
-#~ "\"Σύστημα\" -> \"Διαχείριση συστήματος\" -> \"Ιδιότητες λογισμικού\"."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Λήψη αλλαγών</span>\n"
-#~ "\n"
-#~ "Χρειάζεται να κάνετε λήψη των αλλαγών από τον κεντρικό εξυπηρετητή"
-
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Ανανέωση των τελευταίων πληροφοριών πακέτων για ενημερώσεις"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr ""
-#~ "Εμφάνιση διαθέσιμων αναβαθμίσεων και επιλογή αυτών που θα εγκατασταθούν"
-
-#~ msgid "Ubuntu 6.04 \"Dapper Drake\""
-#~ msgstr "Ubuntu 6.04 \"Dapper Drake\""
-
-#~ msgid "Ubuntu 5.10 \"Breezy Badger\""
-#~ msgstr "Ubuntu 5.10 \"Breezy Badger\""
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/en_AU.po b/po/en_AU.po
index a4359516..3c7125e5 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -24,235 +24,266 @@ 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: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 "CD-ROM 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 "CD-ROM 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 "CD-ROM 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD-ROM with Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../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:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD-ROM with Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../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:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD-ROM with Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Community maintained"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Proprietary drivers for devices"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Restricted software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD-ROM with Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Community maintained Open Source software"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Community maintained (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../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:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Non-free drivers"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Proprietary drivers for devices"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Restricted software (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 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:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Important security updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Recommended updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Proposed updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Backported updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD-ROM with Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD-ROM with Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Officially supported"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Backports"
 
@@ -264,55 +295,68 @@ 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:31
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 3.1 \"Sarge\""
+
+#. Description
+#: ../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 "Proposed updates"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Important security updates"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../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:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Non-DFSG-compatible Software"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Server for %s"
@@ -320,1175 +364,161 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Main server"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Custom servers"
 
-#~ msgid "Daily"
-#~ msgstr "Daily"
-
-#~ msgid "Every two days"
-#~ msgstr "Every two days"
-
-#~ msgid "Weekly"
-#~ msgstr "Weekly"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Every two weeks"
-
-#~ msgid "Every %s days"
-#~ msgstr "Every %s days"
-
-#~ msgid "After one week"
-#~ msgstr "After one week"
-
-#~ msgid "After two weeks"
-#~ msgstr "After two weeks"
-
-#~ msgid "After one month"
-#~ msgstr "After one month"
-
-#~ msgid "After %s days"
-#~ msgstr "After %s days"
-
-#~ msgid "%s updates"
-#~ msgstr "%s updates"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Nearest server"
-
-#~ msgid "Software Channel"
-#~ msgstr "Software Channel"
-
-#~ msgid "Active"
-#~ msgstr "Active"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Source Code)"
-
-#~ msgid "Source Code"
-#~ msgstr "Source Code"
-
-#~ msgid "Import key"
-#~ msgstr "Import key"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Error importing selected file"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "The selected file may not be a GPG key file or it might be corrupt."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Error removing the key"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Please enter a name for the disc"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Please insert a disc in the drive:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Broken packages"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Can't upgrade required meta-packages"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "An essential package would have to be removed"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Could not calculate the upgrade"
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Error authenticating some packages"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Can't install '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Can't guess meta-packag"
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Failed to add the CD"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "There was an error adding the CD, the upgrade will abort. If you are "
-#~ "using a valid Ubuntu CD please report this as a bug.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "Reading cache"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Fetch data from the network for the upgrade?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "The upgrade can use the network to check for the latest updates and to "
-#~ "fetch packages that are not on the current CD.\n"
-#~ "If you have fast and inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "No valid mirror found"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This can happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Generate default sources?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Repository information invalid"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Third party sources disabled"
-
-#~ msgid "Error during update"
-#~ msgstr "Error during update"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Not enough free disk space"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your Garbage Bin and remove temporary packages of former "
-#~ "installations using 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Do you want to start the upgrade?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Could not install the upgrades"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "The upgrade will now abort. Your system could be in an unusable state. A "
-#~ "recovery was attempted (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bug report."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Could not download the upgrades"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Remove obsolete packages?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Skip This Step"
-
-#~ msgid "_Remove"
-#~ msgstr "_Remove"
-
-#~ msgid "Error during commit"
-#~ msgstr "Error during commit"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "A problem occured during the clean-up. Please see the below message for "
-#~ "more information. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Restoring original system state"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Checking package manager"
-
-#~ msgid "Updating repository information"
-#~ msgstr "Updating repository information"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Invalid package information"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "After your package information was updated the essential package '%s' "
-#~ "could no longer be found.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bug report."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Asking for confirmation"
-
-#~ msgid "Upgrading"
-#~ msgstr "Upgrading"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Searching for obsolete software"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "System upgrade is complete."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Please insert '%s' into the drive '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Fetching is complete"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Fetching file %li of %li at %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "About %s remaining"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Fetching file %li of %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Applying changes"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Could not install '%s'"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "The upgrade has aborted. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "The 'diff' command was not found"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "A fatal error occured"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "has aborted.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time during the process."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr "To prevent data loss close all open applications and documents."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Your system is up-to-date"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Remove %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Install %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Upgrade %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li days %li hours %li minutes"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li hours %li minutes"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minutes"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li seconds"
-
-#~ msgid "Reboot required"
-#~ msgstr "Reboot required"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "The upgrade is finished and a restart is required. Do you want to do this "
-#~ "now?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Cancel the upgrade in progress?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Restart the system to complete the upgrade</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Start the upgrade?</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Cleaning up"
-
-#~ msgid "Details"
-#~ msgstr "Details"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Difference between the files"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Fetching and installing the upgrades"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Modifying the software channels"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Preparing the upgrade"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Restarting the system"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#~ msgid "_Keep"
-#~ msgstr "_Keep"
-
-#~ msgid "_Replace"
-#~ msgstr "_Replace"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Report Bug"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Restart Now"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Resume Upgrade"
+#: ../apt/progress/gtk2.py:259
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr "Downloading file %li of %li with %s/s"
 
-#~ msgid "Could not find the release notes"
-#~ msgstr "Could not find the release notes"
+#: ../apt/progress/gtk2.py:265
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Downloading file %li of %li"
 
-#~ msgid "The server may be overloaded. "
-#~ msgstr "The server may be overloaded. "
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Details"
 
-#~ msgid "Could not download the release notes"
-#~ msgstr "Could not download the release notes"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Please check your internet connection."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Could not run the upgrade tool"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Downloading the upgrade tool"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "The upgrade tool will guide you through the upgrade process."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Upgrade tool signature"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Upgrade tool"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Failed to fetch"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "Fetching the upgrade failed. There may be a network problem. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Failed to extract"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Verfication failed"
-
-#~ msgid "Authentication failed"
-#~ msgstr "Authentication failed"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "The list of changes is not available"
-
-#~ msgid "Other updates"
-#~ msgstr "Other updates"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Version %s: \n"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Download size: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "You can install %s update"
-#~ msgstr[1] "You can install %s updates"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Please wait, this can take some time."
-
-#~ msgid "Update is complete"
-#~ msgstr "Update is complete"
-
-#~ msgid "Version %s"
-#~ msgstr "Version %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Size: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Your distribution is not supported anymore"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>New distribution release '%s' is available</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Software index is broken"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-
-#~ msgid "None"
-#~ msgstr "None"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Keep your system up-to-date</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "Changes"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Changes and description of the update"
-
-#~ msgid "Chec_k"
-#~ msgstr "Chec_k"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Check the software channels for new updates"
-
-#~ msgid "Description"
-#~ msgstr "Description"
-
-#~ msgid "Release Notes"
-#~ msgstr "Release Notes"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Show progress of single files"
-
-#~ msgid "Software Updates"
-#~ msgstr "Software Updates"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-
-#~ msgid "U_pgrade"
-#~ msgstr "U_pgrade"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Upgrade to the latest version of Ubuntu"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "_Check"
-#~ msgstr "_Check"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Hide this information in the future"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "The list of changes is not available"
 
-#~ msgid "_Install Updates"
-#~ msgstr "_Install Updates"
+#: ../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 "_Upgrade"
-#~ msgstr "U_pgrade"
-
-#~ msgid "changes"
-#~ msgstr "changes"
-
-#~ msgid "updates"
-#~ msgstr "updates"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Automatic updates</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CD-ROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Internet updates</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it is used will be collected and sent anonymously to the Ubuntu "
-#~ "project on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-
-#~ msgid "Authentication"
-#~ msgstr "Authentication"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "D_elete downloaded software files:"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Failed to download the list of changes. Please check your Internet "
+"connection."
 
-#~ msgid "Download from:"
-#~ msgstr "Download from:"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Import the public key from a trusted software provider"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Internet Updates"
-#~ msgstr "Internet Updates"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Restore _Defaults"
-#~ msgstr "Restore _Defaults"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Restore the default keys of your distribution"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Software Sources"
-#~ msgstr "Software Sources"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Source code"
-#~ msgstr "Source code"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Can't install '%s'"
 
-#~ msgid "Statistics"
-#~ msgstr "Statistics"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "Submit statistical information"
-#~ msgstr "Submit statistical information"
+#: ../apt/debfile.py:494
+#, fuzzy
+msgid "An essential package would be removed"
+msgstr "An essential package would have to be removed"
 
-#~ msgid "Third Party"
-#~ msgstr "Third Party"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Check for updates automatically:"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Download updates automatically, but do not install them"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "_Import Key File"
-#~ msgstr "_Import Key File"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Install security updates without confirmation"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comment:</b>"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Components:</b>"
+#: ../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 ""
 
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribution:</b>"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type:</b>"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "APT line:"
-#~ msgstr "APT line:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binary\n"
-#~ "Source"
-
-#~ msgid "Edit Source"
-#~ msgstr "Edit Source"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Scanning CD-ROM"
-
-#~ msgid "_Add Source"
-#~ msgstr "_Add Source"
-
-#~ msgid "_Reload"
-#~ msgstr "_Reload"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Show and install available updates"
-
-#~ msgid "Update Manager"
-#~ msgstr "Update Manager"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Check for new distribution releases"
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Remind to reload the channel list"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Show details of an update"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Stores the size of the update-manager dialogue"
-
-#~ msgid "The window size"
-#~ msgstr "The window size"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Configure the sources for installable software and updates"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" Security Updates"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid ""
-#~ "<big><b>Error scaning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Error scaning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "A unresolvable problem occured while calculating the upgrade. Please "
-#~ "report this as a bug. "
-#~ msgstr ""
-#~ "An unresolvable problem occured while calculating the upgrade. Please "
-#~ "report this as a bug. "
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are runing.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are runing.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-
-#~ msgid ""
-#~ "Some third party entries in your souces.list where disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Some third party entries in your souces.list where disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system can be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a)."
-#~ msgstr ""
-#~ "The upgrade aborts now. Your system can be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a)."
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Some software no longer officially supported"
-
-#~ msgid ""
-#~ "These installed packages are no longer officially supported, and are now "
-#~ "only community-supported ('universe').\n"
-#~ "\n"
-#~ "If you don't have 'universe' enabled these packages will be suggested for "
-#~ "removal in the next step. "
-#~ msgstr ""
-#~ "These installed packages are no longer officially supported, and are now "
-#~ "only community-supported ('universe').\n"
-#~ "\n"
-#~ "If you don't have 'universe' enabled these packages will be suggested for "
-#~ "removal in the next step. "
-
-#~ msgid "Restoring originale system state"
-#~ msgstr "Restoring original system state"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this as a bug."
-#~ msgstr ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this as a bug."
-
-#~ msgid "About %li days %li hours %li minutes remaining"
-#~ msgstr "About %li days %li hours %li minutes remaining"
-
-#~ msgid "About %li hours %li minutes remaining"
-#~ msgstr "About %li hours %li minutes remaining"
-
-#~ msgid "About %li minutes remaining"
-#~ msgstr "About %li minutes remaining"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "About %li seconds remaining"
-
-#~ msgid "Download is complete"
-#~ msgstr "Download is complete"
-
-#~ msgid "Downloading file %li of %li at %s/s"
-#~ msgstr "Downloading file %li of %li at %s/s"
-
-#~ msgid "Downloading file %li of %li"
-#~ msgstr "Downloading file %li of %li"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "The upgrade aborts now. Please report this bug."
-
-#~ msgid ""
-#~ "Replace configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Replace configuration file\n"
-#~ "\n"
-#~ "'%s'?"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade."
-#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts "
-#~ "now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade."
-#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts "
-#~ "now.\n"
-#~ "\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-
-#~ msgid "%s package is going to be removed."
-#~ msgid_plural "%s packages are going to be removed."
-#~ msgstr[0] "%s package is going to be removed."
-#~ msgstr[1] "%s packages are going to be removed."
-
-#~ msgid "%s new package is going to be installed."
-#~ msgid_plural "%s new packages are going to be installed."
-#~ msgstr[0] "%s new package is going to be installed."
-#~ msgstr[1] "%s new packages are going to be installed."
-
-#~ msgid "%s package is going to be upgraded."
-#~ msgid_plural "%s packages are going to be upgraded."
-#~ msgstr[0] "%s package is going to be upgraded."
-#~ msgstr[1] "%s packages are going to be upgraded."
-
-#~ msgid "You have to download a total of %s."
-#~ msgstr "You have to download a total of %s."
-
-#~ msgid ""
-#~ "The upgrade can take several hours and cannot be canceled at any time "
-#~ "later."
-#~ msgstr ""
-#~ "The upgrade can take several hours and cannot be canceled at any time "
-#~ "later."
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Could not find any upgrades"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Your system has already been upgraded."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>"
-
-#~ msgid "Downloading and installing the upgrades"
-#~ msgstr "Downloading and installing the upgrades"
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Upgrading Ubuntu"
-
-#~ msgid ""
-#~ "Verfing the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Verifying the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-
-#~ msgid "Downloading file %li of %li with %s/s"
-#~ msgstr "Downloading file %li of %li with %s/s"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Downloading file %li of %li with unknown speed"
-
-#~ msgid "The list of changes is not available yet. Please try again later."
-#~ msgstr "The list of changes is not available yet. Please try again later."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. Please check your Internet "
-#~ "connection."
-#~ msgstr ""
-#~ "Failed to download the list of changes. Please check your Internet "
-#~ "connection."
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Cannot install all available updates"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "The following updates will be skipped:"
-
-#~ msgid "Downloading the list of changes..."
-#~ msgstr "Downloading the list of changes..."
-
-#~ msgid "Hide details"
-#~ msgstr "Hide details"
-
-#~ msgid "Show details"
-#~ msgstr "Show details"
-
-#~ msgid "New version: %s   (Size: %s)"
-#~ msgstr "New version: %s (Size: %s)"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr ""
-#~ "Only one software management tool is allowed to run at the same time"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties"
-#~ "\"."
-#~ msgstr ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behaviour in \"System\" -> \"Administration\" -> \"Software "
-#~ "Properties\"."
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Cancel _Download"
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Channels</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Keys</b>"
-
-#~ msgid "Add _Cdrom"
-#~ msgstr "Add _Cdrom"
-
-#~ msgid "Installation Media"
-#~ msgstr "Installation Media"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Software Preferences"
-
-#~ msgid "_Download updates in the background, but do not install them"
-#~ msgstr "_Download updates in the background, but do not install them"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid ""
-#~ "<b><big>The channel information is out-of-date</big></b>\n"
-#~ "\n"
-#~ "You have to reload the channel information to install software and "
-#~ "updates from newly added or changed channels. \n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>The channel information is out-of-date</big></b>\n"
-#~ "\n"
-#~ "\n"
-#~ "You have to reload the channel information to install software and "
-#~ "updates from newly added or changed channels. \n"
-#~ "\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Channel</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Components</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a channel, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a channel, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "Add Channel"
-#~ msgstr "Add Channel"
-
-#~ msgid "Edit Channel"
-#~ msgstr "Edit Channel"
-
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Add Channel"
-#~ msgstr[1] "_Add Channels"
-
-#~ msgid "_Custom"
-#~ msgstr "_Custom"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabeld, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changs and the "
-#~ "description"
-#~ msgstr ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-
-#~ msgid "Configure software channels and internet updates"
-#~ msgstr "Configure software channels and internet updates"
-
-#~ msgid "Software Properties"
-#~ msgstr "Software Properties"
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS Security Updates"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS Updates"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS Backports"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/en_CA.po b/po/en_CA.po
index ab31fdb2..2586ed53 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -24,256 +24,287 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../data/templates/Ubuntu.info.in:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:135
+#, fuzzy
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:153
+#, fuzzy
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "Ubuntu 5.04 Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:197
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../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:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../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:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 5.04 Updates"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Community maintained (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "Contributed software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "_Install"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "_Install"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 #, fuzzy
 msgid "Officially supported"
 msgstr "Officially supported"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Officially supported"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.04 Updates"
@@ -286,54 +317,67 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
-msgstr ""
+#, fuzzy
+msgid "Debian 6.0 'Squeeze' "
+msgstr "Debian Stable Security Updates"
+
+#. Description
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian Stable Security Updates"
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../data/templates/Debian.info.in:58
+#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian Stable Security Updates"
+
+#. Description
+#: ../data/templates/Debian.info.in:83
 #, fuzzy
 msgid "Debian 3.1 'Sarge'"
 msgstr "Debian Stable Security Updates"
 
 #. Description
-#: ../data/templates/Debian.info.in:42
+#: ../data/templates/Debian.info.in:94
 #, fuzzy
 msgid "Proposed updates"
 msgstr "_Install"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -341,631 +385,163 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Daily"
-#~ msgstr "<b>Details</b>"
-
-#, fuzzy
-#~ msgid "%s updates"
-#~ msgstr "_Install"
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "Software Updates"
-
-#, fuzzy
-#~ msgid "(Source Code)"
-#~ msgstr "Source"
-
-#, fuzzy
-#~ msgid "Source Code"
-#~ msgstr "Source"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Error importing selected file"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "The selected file may not be a GPG key file or it might be corrupt."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Error removing the key"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-
-#, fuzzy
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "The key you selected could not be removed. Please report this as a bug. "
-
-#, fuzzy
-#~ msgid "Error during update"
-#~ msgstr "Error removing the key"
-
-#, fuzzy
-#~ msgid "Checking package manager"
-#~ msgstr "Another package manager is running"
-
-#, fuzzy
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-
-#, fuzzy
-#~ msgid "Upgrading"
-#~ msgstr "Upgrade finished"
-
-#, fuzzy
-#~ msgid "Applying changes"
-#~ msgstr "Downloading changes..."
-
-#, fuzzy
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Your system is up-to-date!"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#, fuzzy
-#~ msgid "Details"
-#~ msgstr "<b>Details</b>"
-
-#, fuzzy
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "Upgrade finished"
-
-#, fuzzy
-#~ msgid "_Replace"
-#~ msgstr "Reload"
-
-#, fuzzy
-#~ msgid "_Resume Upgrade"
-#~ msgstr "Upgrade finished"
-
-#, fuzzy
-#~ msgid "_Start Upgrade"
-#~ msgstr "Upgrade finished"
-
-#, fuzzy
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-
-#, fuzzy
-#~ msgid "Upgrade tool"
-#~ msgstr "Upgrade finished"
-
-#, fuzzy
-#~ msgid "Authentication failed"
-#~ msgstr "A_uthentication"
-
-#, fuzzy
-#~ msgid "The list of changes is not available"
-#~ msgstr "There is a new release of Ubuntu available!"
-
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "There is a new release of Ubuntu available!"
-
-#, fuzzy
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Failed to download changes. Please check if there is an active internet "
-#~ "connection."
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "Ubuntu 5.04 Updates"
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "Upgrade finished"
-
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "_Install"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Version %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Cancel downloading the ChangeLog"
-
-#, fuzzy
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Installing updates..."
-#~ msgstr[1] "Installing updates..."
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "_Install"
-
-#, fuzzy
-#~ msgid "Version %s"
-#~ msgstr "Version %s:"
-
-#, fuzzy
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Your distribution is no longer supported"
-
-#~ msgid "Changes"
-#~ msgstr "Changes"
-
-#~ msgid "Description"
-#~ msgstr "Description"
-
-#~ msgid "Software Updates"
-#~ msgstr "Software Updates"
-
-#, fuzzy
-#~ msgid "U_pgrade"
-#~ msgstr "Upgrade finished"
-
-#, fuzzy
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "Upgrade finished"
-
-#, fuzzy
-#~ msgid "_Install Updates"
-#~ msgstr "_Install"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "Upgrade finished"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "Changes"
-
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Internet Updates</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Internet Updates</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet Updates</b>"
-
-#, fuzzy
-#~ msgid "Add Cdrom"
-#~ msgstr "Add _CD"
-
-#, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "Authentication"
-
-#, fuzzy
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Remove the selected key from the trusted keyring."
-
-#, fuzzy
-#~ msgid "Internet Updates"
-#~ msgstr "<b>Internet Updates</b>"
-
-#, fuzzy
-#~ msgid "Restore _Defaults"
-#~ msgstr "Restore default keys"
-
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "Software Properties"
-
-#, fuzzy
-#~ msgid "Source code"
-#~ msgstr "Source"
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comment:</b>"
-
-#, fuzzy
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Components</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribution:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-
-#~ msgid "APT line:"
-#~ msgstr "APT line:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binary\n"
-#~ "Source"
-
-#, fuzzy
-#~ msgid "Edit Source"
-#~ msgstr "Source"
-
-#, fuzzy
-#~ msgid "_Add Source"
-#~ msgstr "Source"
-
-#, fuzzy
-#~ msgid "_Reload"
-#~ msgstr "Reload"
-
-#~ msgid "Update Manager"
-#~ msgstr "Update Manager"
-
-#, fuzzy
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "US export restricted software"
-
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "_Install"
-
-#, fuzzy
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Your system has broken packages!"
-
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.04 Security Updates"
-
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "Officially supported"
-
-#, fuzzy
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "The following packages are not upgraded:"
-
-#, fuzzy
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-
-#, fuzzy
-#~ msgid "Hide details"
-#~ msgstr "<b>Details</b>"
-
-#, fuzzy
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Details</b>"
-
-#, fuzzy
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Details</b>"
-
-#, fuzzy
-#~ msgid "Installation Media"
-#~ msgstr "Installing updates..."
-
-#~ msgid "Software Preferences"
-#~ msgstr "Software Preferences"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#, fuzzy
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Details</b>"
-
-#, fuzzy
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Components</b>"
-
-#~ msgid "_Custom"
-#~ msgstr "_Custom"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 5.04 Updates"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 5.04 Security Updates"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 5.04 Updates"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 5.04 Updates"
-
-#~ msgid "Repositories changed"
-#~ msgstr "Repositories changed"
-
-#, fuzzy
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
-#~ "\n"
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-
-#, fuzzy
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Sections:</b>"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sections:</b>"
-
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Reload the package information from the server."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Show available updates and choose which to install"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "Error removing the key"
+#: ../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 "<b>Sources</b>"
-#~ msgstr "<b>Software Sources</b>"
+msgid "Details"
+msgstr "<b>Details</b>"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "Automatically check for updates"
-#~ msgstr "Automatically check for software _updates."
-
-#~ msgid "Choose a key-file"
-#~ msgstr "Choose a key-file"
-
-#~ msgid "<b>Packages to install:</b>"
-#~ msgstr "<b>Packages to install:</b>"
-
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Repository</b>"
+msgid "Starting..."
+msgstr "Settings"
 
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Temporary files</b>"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>User Interface</b>"
+#: ../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 ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialogue. A key makes "
-#~ "it possible to check verify the integrity of the software you download."
+msgid "The list of changes is not available"
+msgstr "There is a new release of Ubuntu available!"
 
-#~ msgid "A_uthentication"
-#~ msgstr "A_uthentication"
+#: ../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 ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Add a new key file to the trusted keyring. Make sure that you got the key "
-#~ "over a secure channel and that you trust the owner. "
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Automatically clean _temporary packages files"
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Clean interval in days: "
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Delete _old packages in the package cache"
-
-#~ msgid "Edit Repository..."
-#~ msgstr "Edit Repository..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Maximum age in days:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Maximum size in MB:"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Failed to download changes. Please check if there is an active internet "
+"connection."
 
-#, fuzzy
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Restore the default keys shiped with the distribution. This will not "
-#~ "change user-installed keys."
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Set _maximum size for the package cache"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Settings"
-#~ msgstr "Settings"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Show disabled software sources"
-#~ msgstr "Show disabled software sources"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Update interval in days: "
-#~ msgstr "Update interval in days: "
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "_Add Repository"
-#~ msgstr "_Add Repository"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Download upgradable packages"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid ""
-#~ "This means that some dependencies of the installed packages are not "
-#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
-#~ msgstr ""
-#~ "This means that some dependencies of the installed packages are not "
-#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
+#: ../apt/debfile.py:376
+#, python-format
+msgid "Cannot install '%s'"
+msgstr ""
 
-#~ msgid "It is not possible to upgrade all packages."
-#~ msgstr "It is not possible to upgrade all packages."
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid ""
-#~ "This means that besides the actual upgrade of the packages some further "
-#~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
-#~ msgstr ""
-#~ "This means that besides the actual upgrade of the packages some further "
-#~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#: ../apt/debfile.py:494
+msgid "An essential package would be removed"
+msgstr ""
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "Changes not found, the server may not be updated yet."
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "The updates are being applied."
-#~ msgstr "The updates are being applied."
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Updating package list..."
-#~ msgstr "Updating package list..."
-
-#~ msgid "There are no updates available."
-#~ msgstr "There are no updates available."
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Never show this message again"
-#~ msgstr "Never show this message again"
+#: ../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 ""
 
-#, fuzzy
-#~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
-#~ msgstr ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Initializing and getting list of updates..."
-#~ msgstr "Initializing and getting list of updates..."
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "You need to be root to run this program"
-#~ msgstr "You need to be root to run this program"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Edit software sources and settings"
-
-#~ msgid "Ubuntu Update Manager"
-#~ msgstr "Ubuntu Update Manager"
-
-#~ msgid "Binary"
-#~ msgstr "Binary"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "CD"
-#~ msgstr "CD"
-
-#~ msgid "Non-free software"
-#~ msgstr "Non-free software"
-
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index b838b766..aa451a85 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -23,235 +23,266 @@ 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: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:25
+#: ../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:60
+#: ../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:77
+#: ../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:112
+#: ../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:129
+#: ../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:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Community maintained"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Proprietary drivers for devices"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Restricted software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../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:214
+#: ../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:217
+#: ../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:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Community maintained (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../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:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Non-free drivers"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Proprietary drivers for devices"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Restricted software (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../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:231
+#: ../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:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Important security updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Recommended updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Proposed updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Backported updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../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:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../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:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Officially supported"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Community maintained (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../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:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "No longer officially supported"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Backports"
 
@@ -264,56 +295,68 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 #. Description
 #: ../data/templates/Debian.info.in:8
 #, fuzzy
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../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 "Proposed updates"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Important security updates"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 #, fuzzy
 msgid "Debian current stable release"
 msgstr "Debian Unstable \"Sid\""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../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:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Non-DFSG-compatible Software"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Server for %s"
@@ -321,1432 +364,161 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Main server"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Custom servers"
 
-#~ msgid "Daily"
-#~ msgstr "Daily"
-
-#~ msgid "Every two days"
-#~ msgstr "Every two days"
-
-#~ msgid "Weekly"
-#~ msgstr "Weekly"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Every fortnight"
-
-#~ msgid "Every %s days"
-#~ msgstr "Every %s days"
-
-#~ msgid "After one week"
-#~ msgstr "After one week"
-
-#~ msgid "After two weeks"
-#~ msgstr "After a fortnight"
-
-#~ msgid "After one month"
-#~ msgstr "After one month"
-
-#~ msgid "After %s days"
-#~ msgstr "After %s days"
-
-#~ msgid "%s updates"
-#~ msgstr "%s updates"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Nearest server"
-
-#~ msgid "Software Channel"
-#~ msgstr "Software Channel"
-
-#~ msgid "Active"
-#~ msgstr "Active"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Source Code)"
-
-#~ msgid "Source Code"
-#~ msgstr "Source Code"
-
-#~ msgid "Import key"
-#~ msgstr "Import key"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Error importing selected file"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "The selected file may not be a GPG key file or it might be corrupt."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Error removing the key"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Please enter a name for the disc"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Please insert a disc in the drive:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Broken packages"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Can't upgrade required meta-packages"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "An essential package would have to be removed"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Could not calculate the upgrade"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "An unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Error authenticating some packages"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Can't install '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Can't guess meta-package"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Failed to add the CD"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "Reading cache"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Fetch data from the network for the upgrade?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "No valid mirror found"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "While scanning your repository information no mirror entry for the "
-#~ "upgrade was found.  This can happen if you run a internal mirror or if "
-#~ "the mirror information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Generate default sources?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Repository information invalid"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Third party sources disabled"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Error during update"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "A problem occurred during the update. This is usually some sort of "
-#~ "network problem, please check your network connection and retry."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Not enough free disk space"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your Deleted Items folder and remove temporary packages of former "
-#~ "installations using 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Do you want to start the upgrade?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Could not install the upgrades"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Could not download the upgrades"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Support for some applications ended"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Remove obsolete packages?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Skip This Step"
-
-#~ msgid "_Remove"
-#~ msgstr "_Remove"
-
-#~ msgid "Error during commit"
-#~ msgstr "Error during commit"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Some problem occurred during the clean-up. Please see the below message "
-#~ "for more information. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Restoring original system state"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "Fetching backport of '%s'"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Checking package manager"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Preparing the upgrade failed"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Updating repository information"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Invalid package information"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "After your package information was updated the essential package '%s' "
-#~ "cannot be found any more.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Asking for confirmation"
-
-#~ msgid "Upgrading"
-#~ msgstr "Upgrading"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Searching for obsolete software"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "System upgrade is complete."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Please insert '%s' into the drive '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Fetching is complete"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Fetching file %li of %li at %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "About %s remaining"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Fetching file %li of %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Applying changes"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Could not install '%s'"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Replace the customised configuration file\n"
-#~ "'%s'?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "The 'diff' command was not found"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "A fatal error occured"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d package is going to be removed."
-#~ msgstr[1] "%d packages are going to be removed."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d new package is going to be installed."
-#~ msgstr[1] "%d new packages are going to be installed."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d package is going to be upgraded."
-#~ msgstr[1] "%d packages are going to be upgraded."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "cancelled at any time later."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr "To prevent data loss close all open applications and documents."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Your system is up-to-date"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "cancelled."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Remove %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Install %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Upgrade %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li days %li hours %li minutes"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li hours %li minutes"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minutes"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li seconds"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-
-#~ msgid "Reboot required"
-#~ msgstr "Reboot required"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be left in an unusable state if you cancel the upgrade. "
-#~ "You are strongly adviced to resume the upgrade."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Restart the system to complete the upgrade</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Start the upgrade?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Cleaning up"
-
-#~ msgid "Details"
-#~ msgstr "Details"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Difference between the files"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Fetching and installing the upgrades"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Modifying the software channels"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Preparing the upgrade"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Restarting the system"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Cancel Upgrade"
-
-#~ msgid "_Continue"
-#~ msgstr "_Continue"
-
-#~ msgid "_Keep"
-#~ msgstr "_Keep"
-
-#~ msgid "_Replace"
-#~ msgstr "_Replace"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Report Bug"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Restart Now"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Resume Upgrade"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Start Upgrade"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Could not find the release notes"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "The server may be overloaded. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Could not download the release notes"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Please check your Internet connection."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Could not run the upgrade tool"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Downloading the upgrade tool"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "The upgrade tool will guide you through the upgrade process."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Upgrade tool signature"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Upgrade tool"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Failed to fetch"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "Fetching the upgrade failed. There may be a network problem. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Failed to extract"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Verfication failed"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Authentication failed"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "Downloading file %(current)li of %(total)li with %(speed)s/s"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Downloading file %(current)li of %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "The list of changes is not available"
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-
-#~ 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."
-
-#~ msgid "Backports"
-#~ msgstr "Backports"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Distribution updates"
-
-#~ msgid "Other updates"
-#~ msgstr "Other updates"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Version %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Downloading list of changes..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "_Untick All"
-
-#~ msgid "_Check All"
-#~ msgstr "_Tick All"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Download size: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "You can install %s update"
-#~ msgstr[1] "You can install %s updates"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Please wait, this can take some time."
-
-#~ msgid "Update is complete"
-#~ msgstr "Update is complete"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Checking for updates"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "From version %(old_version)s to %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Version %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Size: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Your distribution is not supported anymore"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>New distribution release '%s' is available</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Software index is broken"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-
-#~ msgid "None"
-#~ msgstr "None"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behaviour in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Keep your system up-to-date</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>Not all updates can be installed</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<big><b>Starting update manager</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "Changes"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Changes and description of the update"
-
-#~ msgid "Chec_k"
-#~ msgstr "Chec_k"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Check the software channels for new updates"
-
-#~ msgid "Description"
-#~ msgstr "Description"
-
-#~ msgid "Release Notes"
-#~ msgstr "Release Notes"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Show progress of single files"
-
-#~ msgid "Software Updates"
-#~ msgstr "Software Updates"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-
-#~ msgid "U_pgrade"
-#~ msgstr "U_pgrade"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Upgrade to the latest version of Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Check"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Distribution Upgrade"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Hide this information in the future"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Install Updates"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "U_pgrade"
-
-#~ msgid "changes"
-#~ msgstr "changes"
-
-#~ msgid "updates"
-#~ msgstr "updates"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Automatic updates</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Internet updates</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Add _CDROM"
-
-#~ msgid "Authentication"
-#~ msgstr "Authentication"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "D_elete downloaded software files:"
-
-#~ msgid "Download from:"
-#~ msgstr "Download from:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Import the public key from a trusted software provider"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Internet Updates"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Restore _Defaults"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Restore the default keys of your distribution"
-
-#~ msgid "Software Sources"
-#~ msgstr "Software Sources"
-
-#~ msgid "Source code"
-#~ msgstr "Source code"
-
-#~ msgid "Statistics"
-#~ msgstr "Statistics"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Submit statistical information"
-
-#~ msgid "Third Party"
-#~ msgstr "Third Party"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Check for updates automatically:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Download updates automatically, but do not install them"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Import Key File"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Install security updates without confirmation"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working Internet connection to continue."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comment:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Components:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribution:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "APT line:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binary\n"
-#~ "Source"
-
-#~ msgid "Edit Source"
-#~ msgstr "Edit Source"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Scanning CD-ROM"
-
-#~ msgid "_Add Source"
-#~ msgstr "_Add Source"
-
-#~ msgid "_Reload"
-#~ msgstr "_Reload"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Show and install available updates"
-
-#~ msgid "Update Manager"
-#~ msgstr "Update Manager"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Check for new distribution releases"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Remind to reload the channel list"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Show details of an update"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Stores the size of the update-manager dialogue"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-
-#~ msgid "The window size"
-#~ msgstr "The window size"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Configure the sources for installable software and updates"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" Security Updates"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "By copyright or legal issues restricted software"
-
-#~ msgid "Normal updates"
-#~ msgstr "Normal updates"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Your system has already been upgraded."
-
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Important security updates of Ubuntu"
-
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "Officially supported"
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "The following updates will be skipped:"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "The upgrade aborts now. Please report this bug."
-
-#~ msgid "Hide details"
-#~ msgstr "Hide details"
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Channels</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Keys</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Installation Media"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Software Preferences"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Channel</b>"
-
-#, fuzzy
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Components</b>"
-
-#~ msgid "_Custom"
-#~ msgstr "_Custom"
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS Security Updates"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS Updates"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS Backports"
-
-#~ msgid "Repositories changed"
-#~ msgstr "Repositories changed"
-
-#, fuzzy
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
-#~ "\n"
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-
-#, fuzzy
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Sections:</b>"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sections:</b>"
-
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Reload the package information from the server."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Show available updates and choose which to install"
-
-#, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "Error removing the key"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Edit software sources and settings"
-
-#, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Software Sources</b>"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Repository</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Temporary files</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>User Interface</b>"
+#: ../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"
 
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialogue. A key makes "
-#~ "it possible to check verify the integrity of the software you download."
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Downloading file %(current)li of %(total)li"
 
-#, fuzzy
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Add a new key file to the trusted keyring. Make sure that you got the key "
-#~ "over a secure channel and that you trust the owner. "
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Details"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "Add repository..."
-#~ msgstr "_Add Repository"
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Automatically check for software _updates."
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Automatically clean _temporary packages files"
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Clean interval in days: "
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Delete _old packages in the package cache"
+msgid "Starting..."
+msgstr "_Settings"
 
-#~ msgid "Edit Repository..."
-#~ msgstr "Edit Repository..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Maximum age in days:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Maximum size in MB:"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Restore the default keys shiped with the distribution. This will not "
-#~ "change user installed keys."
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Set _maximum size for the package cache"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "The list of changes is not available"
 
-#, fuzzy
-#~ msgid "Settings"
-#~ msgstr "_Settings"
+#: ../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 ""
 
-#~ msgid "Show detailed package versions"
-#~ msgstr "Show detailed package versions"
+#: ../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."
 
-#~ msgid "Show disabled software sources"
-#~ msgstr "Show disabled software sources"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Update interval in days: "
-#~ msgstr "Update interval in days: "
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "_Add Repository"
-#~ msgstr "_Add Repository"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Download upgradable packages"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>Status:</b>"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "Cancel downloading the changelog"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Debian sarge"
-#~ msgstr "Debian 3.1 \"Sarge\""
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Can't install '%s'"
 
-#, fuzzy
-#~ msgid "Debian sid"
-#~ msgstr "Debian Testing"
+#: ../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 "Oficial Distribution"
-#~ msgstr "<b>Distribution:</b>"
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "You need to be root to run this program"
+msgid "An essential package would be removed"
+msgstr "An essential package would have to be removed"
 
-#~ msgid "Binary"
-#~ msgstr "Binary"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Non-free software"
-#~ msgstr "Non-free software"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian 3.0 \"Woody\""
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Debian Stable"
-#~ msgstr "Debian Stable"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Debian Non-US (Stable)"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian Non-US (Testing)"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
+#: ../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 ""
 
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Choose a key-file"
-#~ msgstr "Choose a key-file"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "There is one package available for updating."
-#~ msgstr "There are no updates available."
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "There are no updates available."
-
-#~ msgid "There are no updated packages"
-#~ msgstr "There are no updated packages"
-
-#~ msgid "You did not select any of the %s updated package"
-#~ msgid_plural "You did not select any of the %s updated packages"
-#~ msgstr[0] "You did not select any of the %s updated package"
-#~ msgstr[1] "You did not select any of the %s updated packages"
-
-#~ msgid "You have selected %s updated package, size %s"
-#~ msgid_plural "You have selected all %s updated packages, total size %s"
-#~ msgstr[0] "You have selected %s updated package, size %s"
-#~ msgstr[1] "You have selected all %s updated packages, total size %s"
-
-#~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
-#~ msgstr[0] "You have selected %s out of %s updated package, size %s"
-#~ msgstr[1] "You have selected %s out of %s updated packages, total size %s"
-
-#~ msgid "The updates are being applied."
-#~ msgstr "The updates are being applied."
-
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-
-#~ msgid "Updating package list..."
-#~ msgstr "Updating package list..."
-
-#~ msgid "There are no updates available."
-#~ msgstr "There are no updates available."
-
-#~ msgid "New version:"
-#~ msgstr "New version:"
-
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-
-#~ msgid "Never show this message again"
-#~ msgstr "Never show this message again"
-
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "Changes not found, the server may not be updated yet."
-
-#~ msgid "A_uthentication"
-#~ msgstr "A_uthentication"
-
-#~ msgid "_Settings"
-#~ msgstr "_Settings"
-
-#~ msgid "Ubuntu Update Manager"
-#~ msgstr "Ubuntu Update Manager"
-
-#~ msgid ""
-#~ "This means that some dependencies of the installed packages are not "
-#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
-#~ msgstr ""
-#~ "This means that some dependencies of the installed packages are not "
-#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
-
-#~ msgid "It is not possible to upgrade all packages."
-#~ msgstr "It is not possible to upgrade all packages."
-
-#~ msgid ""
-#~ "This means that besides the actual upgrade of the packages some further "
-#~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
-#~ msgstr ""
-#~ "This means that besides the actual upgrade of the packages some further "
-#~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 3101810f..f411a28c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+0200\n"
 "PO-Revision-Date: 2006-10-16 04:05+0000\n"
 "Last-Translator: Ed Glez <herzo2@gmail.com>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Oficiale subtenata"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,52 +276,65 @@ 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:31
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 3.1 \"Sarge\""
+
+#. Description
+#: ../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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -304,270 +342,158 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "After one week"
-#~ msgstr "Post unu semajno"
-
-#~ msgid "After two weeks"
-#~ msgstr "Post du semajnoj"
-
-#~ msgid "After one month"
-#~ msgstr "Post unu monato"
-
-#~ msgid "After %s days"
-#~ msgstr "Post %s tagoj"
-
-#~ msgid "Import key"
-#~ msgstr "Importi sxlosilon"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Eraro dum importado de elektita dosiero"
-
-#~ msgid "Error removing the key"
-#~ msgstr "Eraro dum forigo de sxlosilo"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "La sxlosilo elektita ne povis esti forigata. Bonvolu raporti cxi tion "
-#~ "kiel cimon."
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Bonvolu entajpi nomon por la disko"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detaloj"
 
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Bonvolu enmeti diskon en la diskingo:"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Can't install '%s'"
-#~ msgstr "Ne eblis instalo de '%s'"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Estis neebla instalo de bezonata pakajxo. Bonvolu raporti cxi tion kiel "
-#~ "cimo. "
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Reading cache"
-#~ msgstr "Legado de kasxmemoro"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "Repository information invalid"
-#~ msgstr "Deponeja informo ne valida"
+#: ../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 ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Promociado de deponeja informo igis nevalidan dosieron. Bonvolu raporti "
-#~ "cxi tion kiel cimo."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Aliulaj fontoj malsxaltitaj"
-
-#~ msgid "Error during update"
-#~ msgstr "Eraro dum gxisdatigo"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Problemo okazis dum la gxisdatigo. Kutime tio okazas pro retaj problemoj, "
-#~ "bonvolu kontroli vian retan konekton kaj reprovi."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Ne estas suficxa libera loko en disko"
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Cxu vi volas komenci la promociadon?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Ne eblis instali la promociojn"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Kelkaj problemoj okazis dum la purigado. Bonvolu vidi suban mesagxon por "
-#~ "pliaj informoj. "
-
-#~ msgid "Checking package manager"
-#~ msgstr "Kontrolado de pakajxa direktisto"
-
-#~ msgid "Updating repository information"
-#~ msgstr "Gxisdatigo de deponeja informo"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Nevalida pakajxa informo"
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Petado de konfirmo"
-
-#~ msgid "Upgrading"
-#~ msgstr "Promociado"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Sercxado de ne plu uzata programaro"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Sistema promocio estas kompleta."
-
-#~ msgid "Applying changes"
-#~ msgstr "Aplikado de sxangxoj"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Ne eblis instali '%s'"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "La komando 'diff' ne estis trovata"
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Via sistemo estas gxisdatigita"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Cxu nuligi la rulantan promociadon?</big></b>\n"
-#~ "\n"
-#~ "La sistemo povas esti neuzebla se vi nuligas la promociadon. Ni forte "
-#~ "konsilas dauxrigi la promociadon."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Rekomenci la sistemon por kompletigi la promocion</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Cxu komenci la promociadon?</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Purigado"
-
-#~ msgid "Details"
-#~ msgstr "Detaloj"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Diferenco inter la dosieroj"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Rekomencado de la sistemo"
-
-#~ msgid "_Keep"
-#~ msgstr "Konservi"
-
-#~ msgid "_Replace"
-#~ msgstr "Anstatauxigi"
-
-#~ msgid "_Restart Now"
-#~ msgstr "Rekomenci Nun"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Bonvolu kontroli vian interretan konekton."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Ne eblis ruli la promocian ilon"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Tio cxi sxajnas esti cimo en la promocia ilo. Bonvolu raporti cxi tion "
-#~ "kiel cimo"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Elsxutado de la promocia ilo"
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Subskribo de promocia ilo"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Promocia ilo"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versio %s: \n"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Elsxuta grando: %s"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr "Bonvolu kontroli vian interretan konekton."
 
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Via distribuo ne estas plu subtenata"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Nova distribua eldono '%s' estas disponebla</b>"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Konservi vian sistemon gxisdatigita</b></big>"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Changes"
-#~ msgstr "Sxangxoj"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Chec_k"
-#~ msgstr "Kontroli"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Description"
-#~ msgstr "Priskribo"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "U_pgrade"
-#~ msgstr "Promocii"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Promocii al lasta versio de Ubuntu"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Ne eblis instalo de '%s'"
 
-#~ msgid "_Check"
-#~ msgstr "Kontroli"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "_Hide this information in the future"
-#~ msgstr "Kasxi cxi tiujn informojn estonte"
+#: ../apt/debfile.py:494
+msgid "An essential package would be removed"
+msgstr ""
 
-#~ msgid "_Install Updates"
-#~ msgstr "Instali Gxisdatigojn"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "Promocii"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Interretaj gxisdatigoj</b>"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Komento:</b>"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Elementoj:</b>"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Duuma\n"
-#~ "Fonto"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Skanado de KD"
+#: ../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 ""
 
-#~ msgid "_Reload"
-#~ msgstr "Resxargi"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Show and install available updates"
-#~ msgstr "Vidigas kaj instalas disponeblajn gxisdatigojn"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Update Manager"
-#~ msgstr "Gxisdatiga Direktisto"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Kontroli auxtomate se nova versio de la aktuala distribuo estas "
-#~ "disponebla kaj proponi promocion (se eblas)."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index 84606f96..1c60e319 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -26,235 +26,266 @@ 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: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 "CD-ROM con 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 "CD-ROM con 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 "CD-ROM con 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 «Edgy Eft»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Mantenido por la comunidad"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Controladores privativos para dispositivos"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Software restringido"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD-ROM con Ubuntu 6.10 «Edgy Eft»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Software libre soportado por Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Mantenido por la comunidad (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Software libre mantenido por la comunidad"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Controladores no libres"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Controladores privativos para dispositivos "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Controladores privativos para dispositivos"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Software restringido (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr "Software restringido por copyright o cuestiones legales"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 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:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Actualizaciones importantes de seguridad"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Actualizaciones recomendadas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Actualizaciones propuestas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Actualizaciones «backport»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualizaciones de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "«Backports» de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Soportado oficialmente"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualizaciones de Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "«Backports» de Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Mantenido por la comunidad (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Software no libre (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Sin más soporte oficial"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Copyright restringido"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Actualizaciones de seguridad"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualizaciones de Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "«Backports» de Ubuntu 4.10"
 
@@ -266,55 +297,68 @@ 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 "Actualizaciones propuestas"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Actualizaciones importantes de seguridad"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian «Etch» (pruebas)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian «Sid» (inestable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Software compatible con la DFSG con dependencias no libres"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Software no compatible con la DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor para %s"
@@ -322,1512 +366,161 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Servidores personalizados"
 
-#~ msgid "Daily"
-#~ msgstr "Una vez al día"
-
-#~ msgid "Every two days"
-#~ msgstr "Cada dos días"
-
-#~ msgid "Weekly"
-#~ msgstr "Una vez a la semana"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Cada dos semanas"
-
-#~ msgid "Every %s days"
-#~ msgstr "Cada %s días"
-
-#~ msgid "After one week"
-#~ msgstr "Después de una semana"
-
-#~ msgid "After two weeks"
-#~ msgstr "Después de dos semanas"
-
-#~ msgid "After one month"
-#~ msgstr "Después de un mes"
-
-#~ msgid "After %s days"
-#~ msgstr "Después de %s días"
-
-#~ msgid "%s updates"
-#~ msgstr "Actualizaciones de %s"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Servidor maś cercano"
-
-#~ msgid "Software Channel"
-#~ msgstr "Canal de software"
-
-#~ msgid "Active"
-#~ msgstr "Activo"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Código fuente)"
-
-#~ msgid "Source Code"
-#~ msgstr "Código fuente"
-
-#~ msgid "Import key"
-#~ msgstr "Importar clave"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Hubo un error al importar el fichero seleccionado"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Puede que el fichero seleccionado no sea un fichero de clave GPG o que "
-#~ "esté corrupto."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Hubo un error al quitar la clave"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "No se puede quitar la clave que ha seleccionado. Por favor, avise de esto "
-#~ "como un fallo."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Error examinando el CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Por favor, introduzca un nombre para el disco"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Por favor, inserte un disco en la unidad:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Paquetes rotos"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Su sistema contiene paquetes rotos que no pueden ser arreglados con este "
-#~ "software. Por favor, arréglelos primero usando Synaptic o apt-get antes "
-#~ "de continuar."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "No se han podido actualizar los meta-paquetes requeridos"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Se ha tenido que desinstalar un paquete esencial"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "No se ha podido calcular la actualización"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Ha ocurrido un problema imposible de corregir cuando se calculaba la "
-#~ "actualización. Por favor, informe de ésto como un fallo."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Error autenticando algunos paquetes"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "No ha sido posible autenticar algunos paquetes. Esto puede ser debido a "
-#~ "un problema transitorio en la red. Pruebe de nuevo más tarde. Vea abajo "
-#~ "una lista de los paquetes no autenticados."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "No se ha podido instalar «%s»"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "No ha sido posible instalar un paquete requerido. Por favor, informe de "
-#~ "ésto como un fallo. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "No se ha podido determinar el meta-paquete"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Su sistema no contiene el paquete ubuntu-desktop,  kubuntu-desktop o "
-#~ "edubuntu-desktop, y no ha sido posible detectar qué versión de Ubuntu "
-#~ "está ejecutando.\n"
-#~ " Por favor, instale uno de los paquetes anteriores usando Synaptic o apt-"
-#~ "get antes de proceder."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Error al añadir el CD"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Ha habido un error al añadir el CD; se ha interrumpido la actualización. "
-#~ "Por favor, informe de esto como un fallo si este es un CD válido de "
-#~ "Ubuntu.\n"
-#~ "\n"
-#~ "El mensaje de error fue:\n"
-#~ "«%s»"
-
-#~ msgid "Reading cache"
-#~ msgstr "Leyendo caché"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "¿Obtener datos desde la red para la actualización?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "La actualización puede usar la red para comprobar las últimas "
-#~ "actualizaciones y para obtener los paquetes que no se encuentren en el CD "
-#~ "actual.\n"
-#~ "Si dispone de una conexión rápida o barata, debería responder «Sí». Si la "
-#~ "conexión es cara para usted, seleccione «No»."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "No se ha encontrado un servidor espejo válido"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Al examinar la información de sus repositorios no se ha encontrado "
-#~ "ninguna entrada de servidor espejo para la actualización. Esto puede "
-#~ "ocurrir si está usando un servidor espejo interno, o si la información "
-#~ "del servidor espejo está desactualizada.\n"
-#~ "\n"
-#~ "¿Desea reescribir su archivo «sources.list» de todos modos? Si selecciona "
-#~ "«Sí», se actualizarán todas las entradas «%s» a «%s».\n"
-#~ "Si selecciona «No» se cancelará la actualización."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "¿Generar orígenes predeterminados?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Tras examinar su «sources.list», no se han encontrado entradas válidas "
-#~ "para «%s».\n"
-#~ "\n"
-#~ "¿Deben añadirse entradas predeterminadas para «%s»? Si selecciona «No» se "
-#~ "cancelará la actualización."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Información de repositorio no válida"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "La actualización de la información del repositorio generó un archivo "
-#~ "incorrecto. Por favor, informe de ésto como un error."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Orígenes de terceros desactivados"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Se han desactivado algunas entradas de terceros proveedores en su «sources."
-#~ "list». Puede volver a activarlas tras la actualización con la herramienta "
-#~ "«Propiedades del software», o con Synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Error durante la actualización"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Ocurrió un problema durante la actualización. Normalmente es debido a "
-#~ "algún tipo de problema en la red, por lo que le recomendamos que "
-#~ "compruebe su conexión de red y vuelva a intentarlo."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "No hay espacio suficiente en el disco"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "La actualización se interrumpirá ahora. Por favor, libere al menos %s de "
-#~ "espacio en disco en %s. Vacíe su papelera, y elimine los paquetes "
-#~ "temporales de instalaciones anteriores tecleando «sudo apt-get clean» en "
-#~ "una terminal."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "¿Desea comenzar la actualización?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "No se han podido instalar las actualizaciones"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "La actualización se interrumpirá ahora. Su sistema puede haber quedado en "
-#~ "un estado inutilizable. Se está llevando a cabo una recuperación (dpkg --"
-#~ "configure -a).\n"
-#~ "\n"
-#~ "Por favor, informe de ésto como un fallo en el paquete «update-manager» e "
-#~ "incluya en el informe de error los archivos contenidos en /var/log/dist-"
-#~ "upgrade/."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "No se han podido descargar las actualizaciones"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "La actualización se interrumpirá ahora. Por favor, compruebe su conexión "
-#~ "a Internet (o su soporte de instalación) y vuelva a intentarlo. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Algunas aplicaciones han dejado de tener soporte"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Canonical Ltd. ya no soporta oficialmente los siguientes paquetes de "
-#~ "software. Todavía podrá obtener soporte de la comunidad.\n"
-#~ "\n"
-#~ "Si no tiene habilitado el software mantenido por la comunidad "
-#~ "(«universe»), se le sugerirá que desinstale estos paquetes en el siguiente "
-#~ "paso."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "¿Desinstalar los paquetes obsoletos?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Saltar este paso"
-
-#~ msgid "_Remove"
-#~ msgstr "_Quitar"
-
-#~ msgid "Error during commit"
-#~ msgstr "Error durante la confirmación"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Ha ocurrido algún problema durante el limpiado. por favor, vea el mensaje "
-#~ "inferior para más información. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Restaurando el estado original del sistema"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "Descargando «backport» de '%s'"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Comprobando gestor de paquetes"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Falló la preparación de la actualización"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Ha ocurrido un problema imposible de resolver cuando se calculaba la "
-#~ "actualización. Por favor, informe de ésto como un fallo en el paquete "
-#~ "«update-manager», e incluya en el informe los archivos contenidos en el "
-#~ "directorio /var/log/dist-upgrade/."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Actualizando la información del repositorio"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Información de paquete no válida"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Después de haberse actualizado la información de sus paquetes, ya no es "
-#~ "posible encontrar el paquete esencial «%s».\n"
-#~ "Esto indica un problema serio. Por favor, informe de ésto como un fallo "
-#~ "en el paquete «update-manager» e incluya en el informe de error los "
-#~ "archivos contenidos en /var/log/dist-upgrade/."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Solicitando confirmación"
-
-#~ msgid "Upgrading"
-#~ msgstr "Actualizando"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Buscando paquetes obsoletos"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "La actualización del sistema se ha completado."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Por favor, inserte «%s» en la unidad «%s»"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "La descarga se ha completado"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Descargando archivo %li de %li a %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Faltan alrededor de %s"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Descargando archivo %li de %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Aplicando los cambios"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "No se ha podido instalar «%s»"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "La actualización se interrumpirá ahora. Por favor, informe de esto como "
-#~ "un fallo en el paquete «update-manager» e incluya en el informe de error "
-#~ "los archivos contenidos en /var/log/dist-upgrade/."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "¿Desea sustituir el archivo de configuración modificado\n"
-#~ "«%s»?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Perderá todos los cambios que haya realizado en este archivo de "
-#~ "configuración si decide sustituirlo por una nueva versión."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "No se ha encontrado el comando «diff»"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Ha ocurrido un error fatal"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Por favor, informe de esto como un fallo e incluya los archivos /var/log/"
-#~ "dist-upgrade.log y /var/log/dist-upgrade-apt.log en su informe. La "
-#~ "actualización se cancelará ahora.\n"
-#~ "Su archivo «sources.list» original se ha guardado en /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "Se va a desinstalar %d paquete."
-#~ msgstr[1] "Se van a desinstalar %d paquetes."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "Se va a instalar %d paquete nuevo."
-#~ msgstr[1] "Se van a instalar %d paquetes nuevos."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "Se va a actualizar %d paquete."
-#~ msgstr[1] "Se van a actualizar %d paquetes."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Debe descargar un total de %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Descargar e instalar la actualización puede llevar varias horas, y no se "
-#~ "podrá cancelar después en ningún momento."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Para prevenir la pérdida de datos, cierre todas las aplicaciones y "
-#~ "documentos."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Su sistema está actualizado"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "No hay actualizaciones disponibles para su sistema. Se ha cancelado la "
-#~ "actualización."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Desinstalar %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Instalar %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Actualizar %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li días %li horas %li minutos"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li horas %li minutos"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minutos"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li segundos"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Esta descarga llevará aprox. %s con una conexión DSL de 1Mbit, y aprox. %"
-#~ "s con un módem de 56k."
-
-#~ msgid "Reboot required"
-#~ msgstr "Se requiere reiniciar el equipo"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "La actualización ha finalizado, y se requiere reiniciar el equipo. ¿Desea "
-#~ "hacerlo ahora?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>¿Cancelar la actualización en curso?</big></b>\n"
-#~ "\n"
-#~ "El sistema podría quedar en un estado no usable si cancela la "
-#~ "actualización. Le recomendamos encarecidamente que continúe la "
-#~ "actualización."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Reinicie el sistema para completar la actualización</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>¿Comenzar la actualización?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Actualizando Ubuntu a la versión 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Limpiando"
-
-#~ msgid "Details"
-#~ msgstr "Detalles"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Diferencia entre los archivos"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Descargando e instalando las actualizaciones"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Modificando los canales de software"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Preparando la actualización"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Reiniciando el sistema"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Cancelar la actualización"
-
-#~ msgid "_Continue"
-#~ msgstr "_Continuar"
-
-#~ msgid "_Keep"
-#~ msgstr "_Conservar"
-
-#~ msgid "_Replace"
-#~ msgstr "_Sustituir"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Informar de un error"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Reiniciar ahora"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Continuar actualización"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Iniciar la actualización"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "No se han podido encontrar las notas de publicación"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Puede que el servidor esté sobrecargado. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "No se han podido descargar las notas de publicación"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Por favor, compruebe su conexión a Internet."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "No se ha podido ejecutar la herramienta de actualización"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Esto parece ser un fallo en la herramienta de actualización. Por favor, "
-#~ "informe de ésto como un error."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Descargando la herramienta de actualización"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr ""
-#~ "La herramienta de actualización le guiará a través del proceso de "
-#~ "actualización."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Firma de la herramienta de actualización"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Herramienta de actualización"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Error al descargar"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Ha fallado la descarga de la actualización. Puede haber un problema con "
-#~ "la red. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Error al extraer"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Ha fallado la extracción de la actualización. Puede haber un problema con "
-#~ "la red o el servidor. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Error de verificación"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Ha fallado la verificación de la actualización. Puede haber un problema "
-#~ "con la red o con el servidor. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Error de autenticación"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Ha fallado la autenticación de la actualización. Debe haber un problema "
-#~ "con la red o el servidor. "
-
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "Descargando archivo %(current)li de %(total)li a %(speed)s/s"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Descargando archivo %(current)li de %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "La lista de cambios no se encuentra disponible."
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "La lista de cambios no está disponible aún.\n"
-#~ "Por favor, inténtelo de nuevo más tarde."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Hubo un fallo al descargar la lista de cambios. \n"
-#~ "Por favor, compruebe su conexión a Internet."
-
-#~ msgid "Backports"
-#~ msgstr "«Backports»"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Actualizaciones de la distribución"
-
-#~ msgid "Other updates"
-#~ msgstr "Otras actualizaciones"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versión %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Descargando la lista de cambios..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "_Desmarcar todo"
-
-#~ msgid "_Check All"
-#~ msgstr "_Marcar todo"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Tamaño de descarga: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Puede instalar %s actualización"
-#~ msgstr[1] "Puede instalar %s actualizaciones"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Por favor, espere; esto puede tardar un poco."
-
-#~ msgid "Update is complete"
-#~ msgstr "La actualización se ha completado"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Comprobando actualizaciones"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "De la versión %(old_version)s a la %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Versión %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Tamaño: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Su distribución ya no está soportada"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "No podrá obtener nuevas correcciones de seguridad ni actualizaciones "
-#~ "críticas. Actualícese a una versión posterior de Ubuntu Linux. Visite "
-#~ "http://www.ubuntu.com para más información sobre la actualización."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Está disponible la nueva versión «%s» de la distribución</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "El índice de software está dañado"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Es imposible instalar o desinstalar ningún programa. Por favor, utilice "
-#~ "el gestor de paquetes «Synaptic», o ejecute «sudo apt-get install -f» en "
-#~ "una terminal, para corregir este problema primero."
-
-#~ msgid "None"
-#~ msgstr "Ninguno"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Debe comprobar las actualizaciones manualmente</big></b>\n"
-#~ "\n"
-#~ "Su sistema no comprueba las actualizaciones manualmente. Puede configurar "
-#~ "este comportamiento en <i>Orígenes del software</i>, en la solapa "
-#~ "<i>Actualizaciones por Internet</i>."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Mantenga su sistema actualizado</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>No se han podido instalar todas las actualizaciones</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Iniciando el gestor de actualizaciones</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "Cambios"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Cambios y descripción de la actualización"
-
-#~ msgid "Chec_k"
-#~ msgstr "_Comprobar"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Comprobar si hay nuevas actualizaciones en los canales de software"
-
-#~ msgid "Description"
-#~ msgstr "Descripción"
-
-#~ msgid "Release Notes"
-#~ msgstr "Notas de publicación"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Ejecute una actualización de la distribución, para instalar tantas "
-#~ "actualizaciones como sea posible. \n"
-#~ "\n"
-#~ "Esto pudo deberse a una actualización incompleta, a que instaló paquetes "
-#~ "de software no oficiales, o a que está ejecutando una versión de "
-#~ "desarrollo."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Mostrar el progreso de cada archivo individual"
-
-#~ msgid "Software Updates"
-#~ msgstr "Actualizaciones de software"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Las actualizaciones de software corrigen errores, eliminan fallos de "
-#~ "seguridad y proporcionan nuevas funcionalidades."
-
-#~ msgid "U_pgrade"
-#~ msgstr "A_ctualizar"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Actualizar a la última versión de Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Comprobar"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Actualizar la distribución"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Ocultar esta información en el futuro"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Instalar actualizaciones"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "A_ctualizar"
-
-#~ msgid "changes"
-#~ msgstr "cambios"
-
-#~ msgid "updates"
-#~ msgstr "actualizaciones"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Actualizaciones automáticas</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Actualizaciones por Internet</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Para mejorar la experiencia del usuario de Ubuntu, por favor, "
-#~ "participe en la encuesta de popularidad. Al hacerlo, se creará una lista "
-#~ "con las aplicaciones que tenga instaladas y con qué frecuencia las "
-#~ "utiliza, y se enviará de forma anónima al proyecto Ubuntu todas las "
-#~ "semanas.\n"
-#~ "\n"
-#~ "Los resultados se usarán para mejorar el soporte de las aplicaciones "
-#~ "populares y para ordenar las aplicaciones en los resultados de las "
-#~ "búsquedas.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Añadir CD-ROM"
-
-#~ msgid "Authentication"
-#~ msgstr "Autentificación"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "_Borrar archivos de software descargados:"
-
-#~ msgid "Download from:"
-#~ msgstr "Descargar desde:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Importar la clave pública desde un proveedor de confianza"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Actualizaciones por Internet"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Sólo se instalarán automáticamente las actualizaciones de seguridad que "
-#~ "provengan de los servidores oficiales de Ubuntu."
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Restaurar valores predeterminados"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Restaurar las claves predeterminadas de su distribución"
-
-#~ msgid "Software Sources"
-#~ msgstr "Orígenes del software"
-
-#~ msgid "Source code"
-#~ msgstr "Código fuente"
-
-#~ msgid "Statistics"
-#~ msgstr "Estadísticas"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Enviar información estadística"
-
-#~ msgid "Third Party"
-#~ msgstr "Otros proveedores"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Comprobar actualizaciones automáticamente:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Descargar actualizaciones automáticamente, pero sin instalarlas"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Importar clave"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Instalar actualizaciones de seguridad sin requerir confirmación"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>La información acerca del software disponible está obsoleta</"
-#~ "big></b>\n"
-#~ "\n"
-#~ "Para poder instalar software y actualizaciones a partir de los orígenes "
-#~ "que se hayan añadido o cambiado recientemente, es necesario recargar la "
-#~ "información acerca del software disponible.\n"
-#~ "\n"
-#~ "Necesita una conexión a Internet para continuar."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comentario:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Componentes:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribución:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipo:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Introduzca la línea de APT completa del repositorio que quiera "
-#~ "añadir como origen</b></big>\n"
-#~ "\n"
-#~ "La línea de APT contiene el tipo, la ubicación y los componentes de un "
-#~ "repositorio, por ejemplo «<i>deb http://ftp.debian.org sarge main</i>»."
-
-#~ msgid "APT line:"
-#~ msgstr "Línea de APT:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binario\n"
-#~ "Fuente"
-
-#~ msgid "Edit Source"
-#~ msgstr "Editar origen"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Analizando el CD-ROM"
-
-#~ msgid "_Add Source"
-#~ msgstr "_Añadir origen"
-
-#~ msgid "_Reload"
-#~ msgstr "_Recargar"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Muestra e instala las actualizaciones disponibles"
-
-#~ msgid "Update Manager"
-#~ msgstr "Gestor de actualizaciones"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Comprobar automáticamente si se encuentra disponible una nueva versión de "
-#~ "la distribución actual, y proponer su actualización (si es posible)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Comprobar si existen nuevas publicaciones de la distribución"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Si desactiva la comprobación automática de actualizaciones, deberá "
-#~ "recargar la lista de canales manualmente. Esta opción le permite ocultar "
-#~ "la notificación que se muestra en este caso."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Recordar la recarga de la lista de canales"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Mostrar detalles de una actualización"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Almacena el tamaño de la ventana del gestor de actualizaciones"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Almacena el estado del expansor que contiene la lista de cambios y sus "
-#~ "descripciones"
-
-#~ msgid "The window size"
-#~ msgstr "El tamaño de la ventana"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr ""
-#~ "Configura los orígenes para el software instalable y las actualizaciones"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Actualizaciones de seguridad de Debian 3.1 «Sarge»"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "Software restringido por copyright o cuestiones legales"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Descargando archivo %li de %li a velocidad desconocida"
-
-#~ msgid "Normal updates"
-#~ msgstr "Actualizaciones normales"
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Cancelar _descarga"
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Algunos programas ya no están soportados oficialmente"
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "No se ha podido encontrar ninguna actualización"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Su sistema ya ha sido actualizado."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Actualizando a Ubuntu 6.10</span>"
-
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Actualizaciones de seguridad importantes para Ubuntu"
-
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Actualizaciones de Ubuntu"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "No se han podido instalar todas las actualizaciones disponibles"
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Analizando su sistema</b></big>\n"
-#~ "\n"
-#~ "Las actualizaciones de software corrigen errores, eliminan fallos de "
-#~ "seguridad y proporcionan nuevas funcionalidades."
-
-#~ msgid "Oficially supported"
-#~ msgstr "Soportado oficialmente"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Algunas actualizaciones requieren la desinstalación de software. Utilice "
-#~ "la función «Marcar todas las actualizaciones» del gestor de paquetes "
-#~ "«Synaptic», o ejecute «sudo apt-get dist-upgrade» en una terminal, para "
-#~ "actualizar completamente su sistema."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Se pasarán por alto las siguientes actualizaciones:"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Faltan %li segundos"
-
-#~ msgid "Download is complete"
-#~ msgstr "La descarga se ha completado"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr ""
-#~ "La actualización se cancelará ahora. Por favor, informe de esto como un "
-#~ "fallo."
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Actualizando Ubuntu"
-
-#~ msgid "Hide details"
-#~ msgstr "Ocultar detalles"
-
-#~ msgid "Show details"
-#~ msgstr "Mostrar detalles"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr ""
-#~ "Sólo se permite la ejecución simultánea de una única herramienta de "
-#~ "gestión de software"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Por favor, cierre primero la otra aplicación (ej: «aptitude» o «Synaptic»)."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Canales</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Claves</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Soporte de la instalación"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Preferencias de software"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Canales</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Componentes</b>"
-
-#~ msgid "Add Channel"
-#~ msgstr "Añadir un canal"
-
-#~ msgid "Edit Channel"
-#~ msgstr "Cambiar un canal"
-
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Añadir un canal"
-#~ msgstr[1] "_Añadir canales"
-
-#~ msgid "_Custom"
-#~ msgstr "_Personalizado"
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Actualizaciones de seguridad de Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Actualizaciones de Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "«Backports» de Ubuntu 6.06 LTS"
-
-#~ msgid ""
-#~ "While scaning your repository information no valid entry for the upgrade "
-#~ "was found.\n"
-#~ msgstr ""
-#~ "Cuando se exploraba la información de su repositorio, se encontró una "
-#~ "entrada no válida para la actualización.\n"
-
-#~ msgid "Repositories changed"
-#~ msgstr "Hay cambios en los repositorios"
-
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "Necesita recargar la lista de paquetes desde los servidores para que sus "
-#~ "cambios tengan efecto. ¿Quiere hacer esto ahora?"
-
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Secciones</b>"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Secciones:</b>"
-
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Recargar la última información sobre actualizaciones"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Descargando informe de cambios</"
-#~ "span>\n"
-#~ "\n"
-#~ "Se necesita descargar los cambios del servidor central"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Mostrar actualizaciones disponibles y elegir cuáles instalar"
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "Hubo un error al quitar la clave"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Descargando archivo %(current)li de %(total)li"
 
-#, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Orígenes de software</b>"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detalles"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "Automatically check for updates"
-#~ msgstr "_Comprobar automáticamente las actualizaciones de software."
+msgid "Starting..."
+msgstr "Preferencias"
 
-#, fuzzy
-#~ msgid "Cancel downloading of the changelog"
-#~ msgstr "Cancelar la descarga del informe de cambios"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "Elija un fichero de clave"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "<b>Packages to install:</b>"
-#~ msgstr "<b>Paquetes a instalar:</b>"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Actualizaciones disponibles</b></big>\n"
-#~ "\n"
-#~ "El gestor de actualizaciones encontró los siguientes paquetes "
-#~ "actualizables. Puede actualizarlos usando el botón Instalar."
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "La lista de cambios no se encuentra disponible."
 
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Repositorio</b>"
+#: ../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 ""
 
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Ficheros temporales</b>"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Hubo un fallo al descargar la lista de cambios. \n"
+"Por favor, compruebe su conexión a Internet."
 
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Interfaz de usuario</b>"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Claves de autenticación</b></big>\n"
-#~ "\n"
-#~ "Puede añadir y quitar claves de autenticación desde este diálogo. Una "
-#~ "clave hace posible verificar la integridad del software que descarga."
-
-#~ msgid "A_uthentication"
-#~ msgstr "A_utenticación"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Añadir un nuevo archivo de clave al anillo de confianza. Asegúrese de que "
-#~ "obtuvo la clave a través de un canal seguro y que confía en el "
-#~ "propietario. "
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Limpiar _temporalmente los archivos de paquetes"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Clean interval in days: "
-#~ msgstr "Intervalo de limpieza en días: "
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "_Borrar paquetes viejos del caché de paquetes"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Edit Repository..."
-#~ msgstr "Editar repositorio..."
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Maximum age in days:"
-#~ msgstr "Edad máxima en días:"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "No se ha podido instalar «%s»"
 
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Tamaño máximo en MB:"
+#: ../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 ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Recupera las claves entregadas originalmente con la distribución. Esto no "
-#~ "cambia las claves instaladas por el usuario."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Establecer tamaño _máximo para el caché de paquetes"
-
-#~ msgid "Settings"
-#~ msgstr "Preferencias"
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "Mostrar orígenes de software desactivados"
-
-#~ msgid "Update interval in days: "
-#~ msgstr "Intervalo de actualización en días: "
-
-#~ msgid "_Add Repository"
-#~ msgstr "_Añadir repositorio"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Descargar paquetes actualizables"
-
-#~ msgid ""
-#~ "This means that some dependencies of the installed packages are not "
-#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
-#~ msgstr ""
-#~ "Ésto significa que no se satisfacen algunas dependencias de los paquetes "
-#~ "instalados. Utilice la \"Actualización inteligente\" de synaptic o \"apt-"
-#~ "get dist-upgrade\" para arreglar la situación."
-
-#~ msgid "It is not possible to upgrade all packages."
-#~ msgstr "No es posible actualizar todos los paquetes."
-
-#~ msgid ""
-#~ "This means that besides the actual upgrade of the packages some further "
-#~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
-#~ msgstr ""
-#~ "Ésto significa que además de la actualización de los paquetes será "
-#~ "necesaria alguna acción adicional (como instalar o quitar paquetes). "
-#~ "Utilice la \"Actualización inteligente\" de synaptic o \"apt-get dist-"
-#~ "upgrade\" para arreglar la situación."
-
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr ""
-#~ "No se ha encontrado el informe de cambios, puede que el servidor no este "
-#~ "actualizado aún."
-
-#~ msgid "The updates are being applied."
-#~ msgstr "Se están aplicando las actualizaciones."
-
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo "
-#~ "tiempo. Cierre la otra aplicación primero."
-
-#~ msgid "Updating package list..."
-#~ msgstr "Actualizando lista de paquetes..."
-
-#~ msgid "There are no updates available."
-#~ msgstr "No hay actualizaciones disponibles."
-
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Actualícese a una nueva versión de Ubuntu Linux. La versión que está "
-#~ "usando no obtendrá más actualizaciones de seguridad ni otras "
-#~ "actualizaciones críticas. Visite http://www.ubuntulinux.org para "
-#~ "información acerca de cómo actualizar."
-
-#~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "Hay una nueva versión de Ubuntu disponible"
-
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "Está disponible una nueva versión con el nombre '%s'. Visite http://www."
-#~ "ubuntulinux.org/ para recibir instrucciones acerca de cómo actualizar."
-
-#~ msgid "Never show this message again"
-#~ msgstr "No mostrar más este mensaje"
+msgid "An essential package would be removed"
+msgstr "Se ha tenido que desinstalar un paquete esencial"
 
-#, fuzzy
-#~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
-#~ msgstr ""
-#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo "
-#~ "tiempo. Cierre la otra aplicación primero."
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Initializing and getting list of updates..."
-#~ msgstr "Inicializando y obteniendo lista de actualizaciones..."
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Necesita ser root para ejecutar este programa"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Editar fuentes de software y preferencias"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Ubuntu Update Manager"
-#~ msgstr "Gestor de actualizaciones de Ubuntu"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Binary"
-#~ msgstr "Binario"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "CD"
-#~ msgstr "CD"
+#: ../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 ""
 
-#~ msgid "Non-free software"
-#~ msgstr "Software no libre"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr ""
-#~ "Clave de firmado automático del archivo de Ubuntu <ftpmaster@ubuntu.com>"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr ""
-#~ "Clave de firmado automático de las imágenes de CD de Ubuntu "
-#~ "<cdimage@ubuntu.com>"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Actualizaciones disponibles</b></big>\n"
-#~ "\n"
-#~ "El gestor de actualizaciones encontró los siguientes paquetes "
-#~ "actualizables. Puede actualizarlos usando el botón Instalar."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/et.po b/po/et.po
index cd599187..d57a083d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,51 +276,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -303,133 +338,159 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Iga päev"
-
-#~ msgid "Every two days"
-#~ msgstr "Iga kahe päeva tagant"
-
-#~ msgid "Weekly"
-#~ msgstr "Iga nädal"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Iga kahe nädala tagant"
-
-#~ msgid "Every %s days"
-#~ msgstr "Iga %s päeva tagant"
-
-#~ msgid "After one week"
-#~ msgstr "Peale ühte nädalat"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "After two weeks"
-#~ msgstr "Peale kahte nädalat"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "After one month"
-#~ msgstr "Peale ühte kuud"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+#, fuzzy
+msgid "Details"
+msgstr "Iga päev"
 
-#~ msgid "After %s days"
-#~ msgstr "Peale %s päeva"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Import key"
-#~ msgstr "Sissetoomisvõti"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Error importing selected file"
-#~ msgstr "Valitud faili sissetoomisel ilmes viga"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Valitud fail pole GPG võtmefail või see on rikutud."
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "Error removing the key"
-#~ msgstr "Võtme eemaldamisel tekkis viga"
+#: ../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 ""
 
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "Valitud võtit pole võimalik eemaldada"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Palun sisesta kettale nimi"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Palun sisesta ketas masinasse:"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Broken packages"
-#~ msgstr "Katkised paketid"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Sinu süsteem sisaldab katkiseid pakette mida pole võimalik antud "
-#~ "tarkvaraga parandada. Palun paranda need kasutades rakendust \"synaptic\" "
-#~ "või \"apt-get\" enne jätkamist."
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Ei suuda uuendada nõutud metapakette"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Hädavajalik pakett tuleks eemaldada"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Ei suuda uuendusi ette valmistada"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Mõnede pakettide tuvastamisel tekkis viga."
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Ei saa paigaldada '%s'"
 
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Mõndasid pakette polnud võimalik tuvastada. See võib olla mõõduv võrgu "
-#~ "viga. Sa võid hiljem uuesti proovida. Vaata järgnevalt mittetuvastatud "
-#~ "pakettide nimekirja."
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "Can't install '%s'"
-#~ msgstr "Ei saa paigaldada '%s'"
+#: ../apt/debfile.py:494
+#, fuzzy
+msgid "An essential package would be removed"
+msgstr "Hädavajalik pakett tuleks eemaldada"
 
-#~ msgid "Reading cache"
-#~ msgstr "Vahemälu lugemine"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "No valid mirror found"
-#~ msgstr "Ühtegi sobivat peeglit ei leitud"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Error during update"
-#~ msgstr "Uuendamise ajal ilmnes viga."
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Uuendamise ajal ilmnes viga. See on tavaliselt mingit sorti võrgu "
-#~ "probleem, palun kontrolli oma võrguühendust ning proovi hiljem uuesti."
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Not enough free disk space"
-#~ msgstr "Kõvakettal pole piisavalt vaba ruumi."
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Ei suuda uuendusi alla laadida"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Eemalda iganenud paketid?"
+#: ../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 ""
 
-#~ msgid "_Skip This Step"
-#~ msgstr "_Jäta see samm vahele"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "_Remove"
-#~ msgstr "_Eemalda"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Asking for confirmation"
-#~ msgstr "Kinnitamise küsimine"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "    "
-#~ msgstr "    "
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 3fbb309b..086cca4b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,51 +276,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 6.0 'Squeeze' "
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -303,104 +338,159 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Egunero"
+#: ../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 "Every two days"
-#~ msgstr "Bi egunetan behin"
+msgid "Details"
+msgstr "Egunero"
 
-#~ msgid "Weekly"
-#~ msgstr "Astero"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Every two weeks"
-#~ msgstr "Bi astetan behin"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Every %s days"
-#~ msgstr "%s egunetan behin"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "After one week"
-#~ msgstr "Aste bat eta gero"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "After two weeks"
-#~ msgstr "Bi aste eta gero"
+#: ../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 ""
 
-#~ msgid "After one month"
-#~ msgstr "HIlabete bat eta gero"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#~ msgid "After %s days"
-#~ msgstr "%s egun eta gero"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Import key"
-#~ msgstr "Inportatu giltza"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Error importing selected file"
-#~ msgstr "Errore bat suertatu da aukeratutako fitxategiak inportatzerakoan"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Aukeratutako fitxategia ez da GPG giltza bat edo egoera txarrean dago."
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Error removing the key"
-#~ msgstr "Errorea giltza ezabatzerakoan"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "Aukeratutako giltza ezin izan da ezabatu. Mesedez adierazi akatsa."
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Sartu diskarentzako izena"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Ezarri diskoa irakurgailuan:"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Ezin da %s instalatu"
 
-#, fuzzy
-#~ msgid "Broken packages"
-#~ msgstr "Hautistako paketeak"
+#: ../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 ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Zure sistemak hautsitako paketeak ditu eta ezin izan dira konpondu "
-#~ "aplikazio honekin. Konpon itzazu lehenbait lehen snaptic edo apt-get "
-#~ "erabiliz."
+msgid "An essential package would be removed"
+msgstr "Ezinbesteko pakete bat ezabatu beharko da"
 
-#, fuzzy
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Ezin izan dira berritu beharrezko meta-paketeak"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#, fuzzy
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Ezinbesteko pakete bat ezabatu beharko da"
+#: ../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 ""
 
-#~ msgid "Can't install '%s'"
-#~ msgstr "Ezin da %s instalatu"
+#: ../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 ""
 
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Ezin izan da beharrezko pakete bat instalatzea. Mesedez akats honen berri "
-#~ "eman. "
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "    "
-#~ 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
index 2e433e45..86a3fd9e 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -25,222 +25,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -252,51 +277,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -304,14 +339,157 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "    "
-#~ 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 6e37c50f..a1f68731 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+0200\n"
 "PO-Revision-Date: 2006-10-23 12:24+0000\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\n"
@@ -23,235 +23,266 @@ 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: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 "Ubuntu 4.10 \"Warty Warthog\" -CD-levy"
+
+#. 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 "Ubuntu 4.10 \"Warty Warthog\" -CD-levy"
+
+#. 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 "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy"
+
+#. 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Yhteisön ylläpitämät"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Suljetut laiteajurit"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Rajoitetut ohjelmistot"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 \"Edgy Eft\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Canonicalin tukemat avoimen lähdekoodin ohjelmistot"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Yhteisön ylläpitämät (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Yhteisön ylläpitämät avoimen lähdekoodin ohjelmistot"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Ei-vapaat ajurit"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Suljetut laiteajurit "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Suljetut laiteajurit"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Käyttörajoitetut ohjelmistot (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr "Tekijänoikeus- tai lakiasioilla rajoitetut ohjelmistot"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS \"Dapper Drake\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Tärkeät turvallisuuspäivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Suositellut päivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Ehdotetut päivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Takaisinsovitetut päivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 päivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 takaisinsovitukset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Virallisesti tuettu"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 päivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 takaisinsovitukset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Yhteisön ylläpitämät (universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Ei-vapaat ohjelmistot (multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Ei enää virallisesti tuettu"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Rajoitettu käyttöoikeus"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 turvallisuuspäivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 päivitykset"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 takaisinsovitukset"
 
@@ -263,56 +294,69 @@ 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:58
+#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 3.1 \"Sarge\""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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 "Ehdotetut päivitykset"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Tärkeät turvallisuuspäivitykset"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testattava)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (epävakaa)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 "DFSG-yhteensopivat ohjelmistot joilla riippuvuuksia epävapaisiin ohjelmiin"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-epäyhteensopivat ohjelmistot"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Palvelin maalle: %s"
@@ -320,1561 +364,161 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Pääpalvelin"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Määrittele palvelin"
 
-#~ msgid "Daily"
-#~ msgstr "Päivittäin"
-
-#~ msgid "Every two days"
-#~ msgstr "Joka toinen päivä"
-
-#~ msgid "Weekly"
-#~ msgstr "Viikoittain"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Joka toinen viikko"
-
-#~ msgid "Every %s days"
-#~ msgstr "%s päivän välein"
-
-#~ msgid "After one week"
-#~ msgstr "Viikon jälkeen"
-
-#~ msgid "After two weeks"
-#~ msgstr "Kahden viikon jälkeen"
-
-#~ msgid "After one month"
-#~ msgstr "Kuukauden jälkeen"
-
-#~ msgid "After %s days"
-#~ msgstr "%s päivän jälkeen"
-
-#~ msgid "%s updates"
-#~ msgstr "%s-päivitykset"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Lähin palvelin"
-
-#~ msgid "Software Channel"
-#~ msgstr "Ohjelmistokanava"
-
-#~ msgid "Active"
-#~ msgstr "Aktiivinen"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(lähdekoodi)"
-
-#~ msgid "Source Code"
-#~ msgstr "Lähdekoodi"
-
-#~ msgid "Import key"
-#~ msgstr "Tuo avain"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Virhe tuotaessa valittua avainta"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Valittu tiedosto ei ole kelvollinen GPG-avaintiedosto, tai se on "
-#~ "vahingoittunut."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Virhe poistettaessa avainta"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä "
-#~ "virheilmoitus."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Virhe luettaessa CD-levyä</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Syötä nimi levylle"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Aseta levy asemaan:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Rikkinäisiä paketteja"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Järjestelmä sisältää rikkinäisiä paketteja, joita ei voitu korjata tällä "
-#~ "ohjelmalla. Korjaa ne käyttämällä synapticia tai apt-get -komentoa ennen "
-#~ "jatkamista."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Tarvittavia metapaketteja ei voi päivittää"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Välttämätön paketti jouduttaisiin poistamaan"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Tarvittavia päivitykseen liittyviä tarkistuksia ei voitu tehdä"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Tehtäessä päivitykseen liittyviä tarkistuksia tapahtui virhe jota ei "
-#~ "voitu korjata.\n"
-#~ "\n"
-#~ "Ilmoita tästä ohjelmavirheestä paketille \"update-manager\" ja sisällytä "
-#~ "tiedostot hakemistosta /var/log/dist-upgrade raporttiin."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Joitain paketteja todennettaessa tapahtui virhe"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Joitain paketteja ei voitu todentaa. Tämä voi olla ohimenevä verkko-"
-#~ "ongelma. Voit yrittää myöhemmin uudelleen. Alla on luettelo "
-#~ "todentamattomista paketeista."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Ei voitu asentaa pakettia \"%s\""
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Vaadittua pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheraportti. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Metapakettia ei voitu arvata"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Järjestelmässä ei ole asennettuna ubuntu-desktop-, kubuntu-desktop- tai "
-#~ "edubuntu-desktop-pakettia, eikä käytössä olevaa Ubuntun versiota siten "
-#~ "onnistuttu tunnistamaan.\n"
-#~ " Asenna jokin luetelluista paketeista synapticilla tai apt-get-ohjelmalla "
-#~ "ennen jatkamista."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "CD-levyä ei voitu lisätä"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "CD-levyä lisättäessä tapahtui virhe, päivitys keskeytyy. Tee tästä "
-#~ "virheraportti, jos kyseessä on toimiva Ubuntu-CD.\n"
-#~ "\n"
-#~ "Virheilmoitus oli:\n"
-#~ "\"%s\""
-
-#~ msgid "Reading cache"
-#~ msgstr "Luetaan välimuistia"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Hae tiedot verkosta päivitystä varten?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "Päivitys voi käyttää verkkoyhteyttä uusimpien päivitysten "
-#~ "tarkistamiseksi, ja noutaa paketit, jotka eivät ole CD-levyllä.\n"
-#~ "Jos sinulla on nopea tai vähän kustannuksia aiheuttava verkkoyhteys, "
-#~ "valitse \"Kyllä\". Jos verkon käyttö on kallista, valitse \"Ei\"."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Sopivaa peilipalvelinta ei löytynyt"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Ohjelmavarastotietoja tarkistettaessa ei löydetty sopivaa "
-#~ "palvelinmerkintää päivitystä varten. Tämä voi tapahtua jos käytät "
-#~ "sisäistä peilipalvelinta tai palvelintiedot ovat vanhentuneita.\n"
-#~ "\n"
-#~ "Haluatko uudelleenkirjoittaa \"sources.list\"-tiedoston joka tapauksessa? "
-#~ "Jos valitset \"Kyllä\", kaikki \"%s\"-merkinnät muutetaan \"%s\"-"
-#~ "merkinnöiksi.\n"
-#~ "Jos valitset \"Ei\", päivitys keskeytyy."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Lisätäänkö oletusohjelmalähteet?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "\"sources.list\"-tiedostosta ei löytynyt sopivaa merkintää \"%s\":lle.\n"
-#~ "\n"
-#~ "Otetaanko käyttöön \"%s\":n oletuslähteet? Jos valitset \"Ei\", päivitys "
-#~ "keskeytyy."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Virhe ohjelmavarastotiedoissa"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Ohjelmavarastotietojen päivittäminen johti epäkelpoon tiedostoon. Tee "
-#~ "asiasta virheraportti."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Kolmannen osapuolen ohjelmalähteet poissa käytöstä"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Jotkin kolmannen osapuolen lähteet sources.list-tiedostossa ovat nyt "
-#~ "poissa käytöstä. Voit ottaa ne uudelleen käyttöön päivityksen jälkeen "
-#~ "\"Ohjelmalähteet\"-työkalulla tai Synaptic-ohjelmalla."
-
-#~ msgid "Error during update"
-#~ msgstr "Virhe päivitettäessä"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Päivitettäessä tapahtui virhe. Tämä on yleensä jonkinlainen verkko-"
-#~ "ongelma. Tarkista verkkoyhteytesi toiminta ja yritä uudelleen."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Levytilaa ei ole riittävästi"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Päivitys keskeytyy. Vapauta levytilaa vähintään %s levyllä %s. Tyhjennä "
-#~ "roskakori ja poista aiempien asennusten väliaikaiset pakettitiedostot "
-#~ "käyttämällä komentoa 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Haluatko aloittaa päivityksen?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Päivityksiä ei voitu asentaa"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Päivitys keskeytyy. Järjestelmäsi voi olla toimimattomassa tilassa. "
-#~ "Korjaustoimenpiteet suoritettiin (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Tee tästä virheraportti paketille \"update-manager\" ja sisällytä "
-#~ "tiedostot hakemistosta /var/log/dist-upgrade/ raporttiin."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Päivityksiä ei voitu noutaa"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Päivitys keskeytyy. Tarkista Internet-yhteytesi tai asennuslähteesi "
-#~ "(esim. CD) toiminta ja yritä uudelleen. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Tuki joillekin sovelluksille on loppunut"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Canonical Ltd. ei enää tue seuraavia ohjelmapaketteja. Niitä tuetaan "
-#~ "edelleen yhteisön puolesta.\n"
-#~ "\n"
-#~ "Jos sinulla ei ole käytössä yhteisön ylläpitämien sovelluksien "
-#~ "ohjelmalähdettä (\"universe\"), näitä paketteja suositellaan "
-#~ "poistettaviksi seuraavassa kohdassa."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Poistetaanko vanhentuneet paketit?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Ohita tämä kohta"
-
-#~ msgid "_Remove"
-#~ msgstr "_Poista"
-
-#~ msgid "Error during commit"
-#~ msgstr "Virhe suoritettaessa"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Siistimisvaiheessa ilmeni ongelma. Lisätietoja allaolevassa viestissä. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Palautetaan alkuperäistä järjestelmän tilaa"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "Noudetaan paketin \"%s\" takaisinsovitusta"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Tarkistetaan pakettienhallintaa"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Päivityksen valmistelu epäonnistui"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Järjestelmän valmistelu päivitystä varten epäonnistui. Ilmoita tästä "
-#~ "virheraportilla \"update-manager\"-paketille, sisällyttäen mukaan "
-#~ "tiedostot hakemistossa /var/log/dist-upgrade/."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Päivitetään ohjelmavarastotietoja"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Pakettitiedot viallisia"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Pakettitietojen päivitysten jälkeen pakollista ohjelmapakettia \"%s\" ei "
-#~ "enää löydetty.\n"
-#~ "Tämä merkitsee vakavaa virhetilannetta, tee tästä virheraportti paketille "
-#~ "\"update-manager\" ja sisällytä tiedostot hakemistosta /var/log/dist-"
-#~ "upgrade/ raporttiin."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Pyydetään vahvistusta"
-
-#~ msgid "Upgrading"
-#~ msgstr "Päivitetään"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Etsitään vanhentuneita ohjelmistoja"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Järjestelmän päivitys on valmis."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Aseta \"%s\" asemaan \"%s\""
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Nouto on valmis"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Noin %s jäljellä"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Noudetaan tiedostoa %li/%li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Muutoksia toteutetaan"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Pakettia \"%s\" ei voitu asentaa"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "Päivitys keskeytyy. Tee tästä virheraportti paketille \"update-manager\" "
-#~ "ja sisällytä raporttiin tiedostot hakemistosta /var/log/dist-upgrade/."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Korvataanko alkuperäisestä muutettu asetustiedosto\n"
-#~ "\"%s\"?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Tähän asetustiedostoon tehdyt muutokset menetetään, jos se korvataan "
-#~ "uudemmalla versiolla."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Komentoa 'diff' ei löytynyt"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Tapahtui vakava virhe"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Ilmoita tästä virheraportilla ja sisällytä siihen tiedostot /var/log/dist-"
-#~ "upgrade/main.log ja /var/log/dist-upgrade/apt.log. Päivitys keskeytyy "
-#~ "nyt.\n"
-#~ "Alkuperäinen sources.list tallennettiin nimellä /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d paketti poistetaan."
-#~ msgstr[1] "%d pakettia poistetaan."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d uusi paketti asennetaan."
-#~ msgstr[1] "%d uutta pakettia asennetaan."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d paketti päivitetään."
-#~ msgstr[1] "%d pakettia päivitetään."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Noudettavaa yhteensä %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Päivityksen noutaminen ja asennus voi kestää useita tunteja, eikä sitä "
-#~ "voi keskeyttää enää myöhemmin."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Jottei tietoja häviäisi, sulje kaikki avoinna olevat ohjelmat ja "
-#~ "asiakirjat."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Järjestelmäsi on ajan tasalla"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr "Päivityksiä ei ole saatavilla järjestelmälle. Päivitys keskeytyy."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Poista %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Asenna %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Päivitä %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li päivää %li tuntia %li minuuttia"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li tuntia %li minuuttia"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minuuttia"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li sekuntia"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Nouto kestää noin %s 1Mbit-DSL-yhteydellä ja noin %s 56kbit-modeemilla"
-
-#~ msgid "Reboot required"
-#~ msgstr "Uudelleenkäynnistys vaaditaan"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Päivitys on valmis ja uudelleenkäynnistys vaaditaan. Haluatko tehdä sen "
-#~ "nyt?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Peruuta käynnissä oleva päivitys?</big></b>\n"
-#~ "\n"
-#~ "Järjestelmä voi olla käyttökelvottomassa tilassa, jos peruutat "
-#~ "päivityksen. Päivityksen jatkaminen on erittäin suositeltavaa."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Käynnistä järjestelmä uudelleen saattaaksesi päivityksen loppuun</"
-#~ "big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Aloitetaanko päivitys?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Päivitetään Ubuntu versioon 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Siistitään"
-
-#~ msgid "Details"
-#~ msgstr "Yksityiskohdat"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Tiedostojen väliset erot"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Noudetaan ja asennetaan päivityksiä"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Muutetaan ohjelmakanavia"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Valmistellaan päivitystä"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Käynnistetään järjestelmä uudelleen"
-
-#~ msgid "Terminal"
-#~ msgstr "Pääte"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Peru päivitys"
-
-#~ msgid "_Continue"
-#~ msgstr "_Jatka"
-
-#~ msgid "_Keep"
-#~ msgstr "_Pidä"
-
-#~ msgid "_Replace"
-#~ msgstr "_Korvaa"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Tee virheraportti"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Uudelleenkäynnistä nyt"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Jatka päivitystä"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Aloita päivitys"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Julkaisutietoja ei löytynyt"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Palvelin voi olla ylikuormitettu. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Julkaisutietoja ei voitu noutaa"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Tarkista Internet-yhteytesi toimivuus."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Päivitystyökalua ei voitu suorittaa"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Tämä on luultavasti ohjelmavirhe päivitystyökalussa. Ilmoita tästä "
-#~ "virheraportilla."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Ladataan päivitystyökalua"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Päivitystyökalu ohjaa päivityksen suorittamisessa."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Päivitystyökalun allekirjoitus"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Päivitystyökalu"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Nouto epäonnistui"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Päivityksen noutaminen epäonnistui. Tämä voi johtua verkko-ongelmasta. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Purku epäonnistui"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Päivityksen purkaminen epäonnistui. Tämä voi johtua ongelmasta "
-#~ "verkkoyhteydessä tai palvelimessa. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Tarkistus epäonnistui"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Päivityksen tarkistaminen epäonnistui. Tämä voi johtua ongelmasta "
-#~ "verkkoyhteydessä tai palvelimessa. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Todennus epäonnistui"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Päivityksen todennus epäonnistui. Tämä voi johtua ongelmasta "
-#~ "verkkoyhteydessä tai palvelimessa. "
-
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "Noudetaan tiedostoa %(current)li/%(total)li nopeudella %(speed)s/s"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Noudetaan tiedostoa %(current)li/%(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "Muutosluettelo ei ole saatavilla."
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Muutosluettelo ei ole vielä saatavilla.\n"
-#~ "Yritä myöhemmin uudelleen."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Muutosluettelon nouto epäonnistui. \n"
-#~ "Tarkista Internet-yhteytesi toimivuus."
-
-#~ msgid "Backports"
-#~ msgstr "Takaisinsovitukset"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Jakelupäivitykset"
-
-#~ msgid "Other updates"
-#~ msgstr "Muut päivitykset"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versio %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Noudetaan muutosluetteloa..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "Poista _valinnat"
-
-#~ msgid "_Check All"
-#~ msgstr "_Tarkista kaikki"
-
-#~ msgid "Download size: %s"
-#~ msgstr "%s täytyy noutaa"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Voit asentaa %s päivityksen"
-#~ msgstr[1] "Voit asentaa %s päivitystä"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Odota, tämä voi kestää jonkun aikaa."
-
-#~ msgid "Update is complete"
-#~ msgstr "Päivitys on valmis"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Tarkistetaan päivityksiä"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Versiosta %(old_version)s versioon %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Versio %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Koko: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Jakeluasi ei enää tueta"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Turvallisuuspäivityksiä tai muita kriittisiä päivityksiä ei enää ole "
-#~ "saatavilla. Päivitä uudempaan versioon Ubuntusta. Katso lisätietoja "
-#~ "päivittämisestä osoitteesta http://www.ubuntu.com/"
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Uusi jakelujulkaisu \"%s\" on saatavilla</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Ohjelmaluettelo on rikkinäinen"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Mitään ohjelmia ei voida asentaa tai poistaa. Korjaa ongelma käyttämällä "
-#~ "Synaptic-pakettienhallintaa tai komentoa \"sudo apt-get install -f\" "
-#~ "päätteessä."
-
-#~ msgid "None"
-#~ msgstr "Ei mitään"
-
-#~ msgid "1 KB"
-#~ msgstr "1 kB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f kB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Päivitykset tulee tarkistaa käsin</big></b>\n"
-#~ "Järjestelmä ei tällä hetkellä seuraa päivityksiä automaattisesti. Voit "
-#~ "muuttaa näitä asetuksia <i>Ohjelmalähteet</i>-hallintatyökalun "
-#~ "<i>Internet-päivitykset</i>-välilehdellä."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Pidä järjestelmäsi ajan tasalla</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>Kaikkia päivityksiä ei voida asentaa</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<big><b>Käynnistetään päivitysten hallintaa</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "Muutokset"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Päivityksen muutokset ja kuvaus"
-
-#~ msgid "Chec_k"
-#~ msgstr "_Tarkista"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Tarkista onko ohjelmakanavissa uusia päivityksiä"
-
-#~ msgid "Description"
-#~ msgstr "Kuvaus"
-
-#~ msgid "Release Notes"
-#~ msgstr "Julkaisutiedot"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Suorita jakelupäivitys asentaaksesi mahdollisimman monta päivitystä. \n"
-#~ "\n"
-#~ "Tarve jakelupäivityksen käytölle voi johtua aiemmin keskeytyneestä "
-#~ "päivityksestä, asennetuista epävirallisista ohjelmapaketeista tai Ubuntun "
-#~ "kehitysversion käyttämisestä."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Näytä tiedostojen edistyminen"
-
-#~ msgid "Software Updates"
-#~ msgstr "Ohjelmapäivitykset"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Ohjelmapäivitykset korjaavat ohjelmavirheitä ja mahdollisia turva-aukkoja "
-#~ "sekä tarjoavat uusia ominaisuuksia."
-
-#~ msgid "U_pgrade"
-#~ msgstr "_Päivitä"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Päivitä Ubuntun viimeisimpään versioon"
-
-#~ msgid "_Check"
-#~ msgstr "_Tarkista"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Jakelupäivitys"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "P_iilota tämä tieto jatkossa"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Asenna päivitykset"
-
-#~ msgid "_Upgrade"
-#~ msgstr "_Päivitä"
-
-#~ msgid "changes"
-#~ msgstr "muutokset"
-
-#~ msgid "updates"
-#~ msgstr "päivitykset"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Automaattiset päivitykset</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Internet-päivitykset</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Parantaaksesi Ubuntun käytettävyyttä voit osallistua suosiokilpailuun. "
-#~ "Tällöin asennetuista ohjelmista ja ohjelmien käyttötiheydestä kerätään "
-#~ "luetteloa, ja tiedot lähetetään nimettömänä Ubuntu-projektille "
-#~ "viikoittain.\n"
-#~ "\n"
-#~ "Tuloksia käytetään suosittujen ohjelmien tuen parantamiseksi sekä "
-#~ "hakutulosten järjestämiseksi ohjelmia haettaessa.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Lisää CD"
-
-#~ msgid "Authentication"
-#~ msgstr "Varmennus"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "_Poista noudetut ohjelmatiedostot:"
-
-#~ msgid "Download from:"
-#~ msgstr "Hae lähteestä:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Asenna julkinen avain luotetulta ohjelmistotoimittajalta"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Internet-päivitykset"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Vain turvallisuuspäivitykset virallisilta Ubuntu-palvelimilta asennetaan "
-#~ "automaattisesti."
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Palauta _oletukset"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Palauta jakelusi oletusavaimet"
-
-#~ msgid "Software Sources"
-#~ msgstr "Ohjelmalähteet"
-
-#~ msgid "Source code"
-#~ msgstr "Lähdekoodi"
-
-#~ msgid "Statistics"
-#~ msgstr "Tilastot"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Lähetä tilastotietoja"
-
-#~ msgid "Third Party"
-#~ msgstr "Kolmas osapuoli"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Tarkista päivitykset automaattisesti:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Lataa päivitykset automaattisesti, mutta älä asenna niitä"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Tuo avaintiedosto"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Asenna turvallisuuspäivitykset kysymättä"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Tiedot saatavilla olevista ohjelmista ovat vanhentuneita</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "Tiedot saatavilla olevista ohjelmista täytyy ladata uudelleen ohjelmien "
-#~ "tai päivitysten asentamiseksi uusista tai muuttuneista ohjelmalähteistä.\n"
-#~ "\n"
-#~ "Tarvitset toiminnassa olevan Internet-yhteyden jatkaaksesi."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Kommentti:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Komponentit:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Jakelu:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tyyppi:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Kirjoita haluamasi ohjelmalähteen koko APT-rivi</b></big>\n"
-#~ "\n"
-#~ "APT-rivi sisältää kanavan tyypin, sijainnin ja sisällön, esimerkiksi <i>"
-#~ "\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "APT-rivi:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binääri\n"
-#~ "Lähdekoodi"
-
-#~ msgid "Edit Source"
-#~ msgstr "Muokkaa lähdettä"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Tutkitaan CD-levyä"
-
-#~ msgid "_Add Source"
-#~ msgstr "L_isää lähde"
-
-#~ msgid "_Reload"
-#~ msgstr "_Lataa uudestaan"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Näytä ja asenna saatavilla olevat päivitykset"
-
-#~ msgid "Update Manager"
-#~ msgstr "Päivitysten hallinta"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Tarkista automaattisesti, onko jakelusta saatavilla uudempaa versiota ja "
-#~ "tarjoa päivitystä (jos mahdollista)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Tarkista, onko jakelusta uusia julkaisuja"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Jos automaattinen päivitysten tarkistaminen on poissa käytöstä, täytyy "
-#~ "ohjelmaluettelot ladata käsin. Tämä valinta mahdollistaa tämän "
-#~ "muistutuksen piilottamisen."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Muistuta kanavaluettelon uudelleen lataamisesta"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Näytä päivityksen yksityiskohdat"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Tallentaa päivitystenhallintaikkunan koon"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Tallentaa muutosluettelon ja kuvauksen näyttämän ikkunalaajennoksen tilan."
-
-#~ msgid "The window size"
-#~ msgstr "Ikkunan koko"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Muokkaa asennettavien ohjelmien ja päivitysten lähteitä"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" turvallisuuspäivitykset"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "Tekijänoikeus- tai lakiasioilla käyttörajoitetut ohjelmistot"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella"
-
-#~ msgid "Normal updates"
-#~ msgstr "Normaalit päivitykset"
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Peruuta _nouto"
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja"
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Päivityksiä ei löytynyt"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Järjestelmäsi on jo päivitetty."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Päivitetään jakeluun Ubuntu 6.10</"
-#~ "span>"
-
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntun tärkeät turvallisuuspäivitykset"
-
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Ubuntun päivitykset"
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Ei voida asentaa kaikkia saatavilla olevia päivityksiä"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Noudetaan tiedostoa %(current)li/%(total)li"
 
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Tarkistetaan järjestelmää</b></big>\n"
-#~ "\n"
-#~ "Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat "
-#~ "uusia ominaisuuksia."
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Yksityiskohdat"
 
-#~ msgid "Oficially supported"
-#~ msgstr "Virallisesti tuettu"
+#: ../apt/progress/gtk2.py:367
+#, fuzzy
+msgid "Starting..."
+msgstr "Asetukset"
 
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Jotkut päivitykset vaativat muiden ohjelmien poistoa. Käytä \"Merkitse "
-#~ "kaikki päivitykset\"-toimintoa Synaptic-pakettienhallintaojhelmassa, tai "
-#~ "suorita päätteessä komento \"sudo apt-get dist-upgrade\"."
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Seuraavat päivitykset ohitetaan:"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Noin %li sekuntia jäljellä"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Muutosluettelo ei ole saatavilla."
 
-#~ msgid "Download is complete"
-#~ msgstr "Lataus on valmis"
+#: ../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 ""
 
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Päivitys keskeytyy. Ilmoita tästä virheraportilla."
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Muutosluettelon nouto epäonnistui. \n"
+"Tarkista Internet-yhteytesi toimivuus."
 
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Päivitetään Ubuntua"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Hide details"
-#~ msgstr "Piilota yksityiskohdat"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Show details"
-#~ msgstr "Näytä yksityiskohdat"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "Vain yksi pakettienhallintatyökalu voi olla kerralla käytössä"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr "Sulje ensin toinen ohjelma, kuten \"aptitude\" tai \"Synaptic\"."
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Kanavat</b>"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Avaimet</b>"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Installation Media"
-#~ msgstr "Asennuslähteet"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Ei voitu asentaa pakettia \"%s\""
 
-#~ msgid "Software Preferences"
-#~ msgstr "Asetukset"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "_Download updates in the background, but do not install them"
-#~ msgstr "_Nouda päivitykset taustalla, mutta älä asenna niitä"
+#: ../apt/debfile.py:494
+#, fuzzy
+msgid "An essential package would be removed"
+msgstr "Välttämätön paketti jouduttaisiin poistamaan"
 
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Kanava</b>"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponentit</b>"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Add Channel"
-#~ msgstr "Lisää kanava"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "Muokkaa kanavaa"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Lisää kanava"
-#~ msgstr[1] "_Lisää kanavia"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "_Muu"
+#: ../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 ""
 
-#~ msgid "Software Properties"
-#~ msgstr "Asetukset"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS turvallisuuspäivitykset"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS päivitykset"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS takaisinsovitukset"
-
-#~ msgid ""
-#~ "While scaning your repository information no valid entry for the upgrade "
-#~ "was found.\n"
-#~ msgstr ""
-#~ "Luettaessa varastotietoja ei löydetty kelvollisia ohjelmavarastoja "
-#~ "päivittämistä varten.\n"
-
-#~ msgid "Repositories changed"
-#~ msgstr "Varastot muuttuneet"
-
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "Ohjelmapakettien luettelo täytyy ladata uudelleen palvelimilta, jotta "
-#~ "muutoksesi tulevat voimaan. Haluatko tehdä tämän nyt?"
-
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Osastot</b>"
-
-#~ msgid "Remove obsolete Packages?"
-#~ msgstr "Poista vanhentuneet paketit?"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Osastot:</b>"
-
-#~ msgid "Add Software Channels"
-#~ msgstr "Lisää ohjelmistokanavia"
-
-#~ msgid "Add the following software channel?"
-#~ msgid_plural "Add the following software channels?"
-#~ msgstr[0] "Lisää seuraava ohjelmistokanava?"
-#~ msgstr[1] "Lisää seuraavat ohjelmistokanavat?"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "You can install software from a channel. Use trusted channels, only."
-#~ msgstr "Voit asentaa ohjelmia eri kanavilta. Käytä vain luotettuja kanavia."
-
-#~ msgid "Could not add any software channels"
-#~ msgstr "Ei voitu lisätä yhtään ohjelmistokanavaa"
-
-#~ msgid "The file '%s' does not contain any valid software channels."
-#~ msgstr "Tiedosto '%s' ei sisällä sopivia ohjelmistokanavia."
-
-#~ msgid ""
-#~ "<b><big>You need to manually reload the latest information about updates</"
-#~ "big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties"
-#~ "\"."
-#~ msgstr ""
-#~ "<b><big>Sinun pitää ladata päivitystiedot uudelleen käsin</big></b>\n"
-#~ "\n"
-#~ "Järjestelmäsi ei tarkista päivityksiä automaattisesti. Voit asettaa tätä "
-#~ "kohdassa \"Järjestelmä\" -> \"Hallinta\" -> \"Ohjelma-asetukset\"."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Ladataan muutoksia</span>\n"
-#~ "\n"
-#~ "Muutokset täytyy ladata keskuspalvelimelta"
-
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Lataa päivitystiedot uudelleen"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Näytä saatavilla olevat päivitykset ja valitse asennettavat"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Väliaikaistiedostot</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Käyttöliittymä</b>"
-
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Varmennusavaimet</b></big>\n"
-#~ "\n"
-#~ "Voit lisätä ja poistaa varmennusavaimia tässä valintaikkunassa. Avain "
-#~ "mahdollistaa lataamiesi ohjelmistojen eheyden tarkistamisen."
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Kirjoita haluamasi varaston koko APT-rivi</b></big>\n"
-#~ "\n"
-#~ "APT-rivi sisältää varaston tyypin, sijainnin ja sisällön, esimerkiksi <i>"
-#~ "\"deb http://ftp.debian.org sarge main\"</i>. Lisätietoja aiheesta löydät "
-#~ "dokumentaatiosta."
-
-#~ msgid "A_uthentication"
-#~ msgstr "Varmenn_us"
-
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Lisää uusi avaintiedosto luotettuihin avaimiin. Varmista, että "
-#~ "vastaanotit avaimen luotettavaa kanavaa pitkin, ja että luotat sen "
-#~ "omistajaan. "
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Tarkista ohjelma_päivitykset automaattisesti."
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Tyhjennä _väliaikaistiedostot automaattisesti"
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Tyhjennysväli päivissä: "
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "P_oista vanhat paketit pakettivälimuistista"
-
-#~ msgid "Edit Repository..."
-#~ msgstr "Muokkaa varastoa..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Maksimiaika päivissä:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Maksimikoko megatavuissa:"
-
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Palauta jakelun mukana toimitetut oletusavaimet. Tämä ei muuta tai poista "
-#~ "itse asennettuja avaimia."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Aseta _maksimikoko pakettivälimuistille"
-
-#~ msgid "Settings"
-#~ msgstr "Asetukset"
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "Näytä poissa käytöstä olevat ohjelmalähteet"
-
-#~ msgid "Update interval in days: "
-#~ msgstr "Päivitysten tarkistusväli päivissä: "
-
-#~ msgid "_Add Repository"
-#~ msgstr "_Lisää varasto"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Lataa päivitettävät paketit"
-
-#~ msgid "<b>Packages to install:</b>"
-#~ msgstr "<b>Asennettavat paketit:</b>"
-
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Saatavilla olevat päivitykset</b></big>\n"
-#~ "\n"
-#~ "Seuraavat paketit ovat päivitettävissä. Voit päivittää ne napsauttamalla "
-#~ "Asenna-painiketta."
-
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "Keskeytä muutosluettelon lataus"
-
-#~ msgid ""
-#~ "Reload the package information from the server. \n"
-#~ "\n"
-#~ "If you have a permanent internet connection this is done automatically. "
-#~ "If you are behind an internet connection that needs to be started by hand "
-#~ "(e.g. a modem) you should use this button so that update-manager knows "
-#~ "about new updates."
-#~ msgstr ""
-#~ "Lataa pakettitiedot palvelimelta uudelleen. \n"
-#~ "\n"
-#~ "Jos sinulla on kiinteä Internet-yhteys, tämä tehdään automaattisesti. Jos "
-#~ "olet käsin muodostettavan Internet-yhteyden (esim. modeemi) takana, sinun "
-#~ "täytyy käyttää tätä valintaa jotta päivitystenhallinta saisi tiedon "
-#~ "uusista päivityksistä."
-
-#~ msgid "Binary"
-#~ msgstr "Binääri"
-
-#~ msgid "CD"
-#~ msgstr "CD"
-
-#~ msgid "Non-free software"
-#~ msgstr "Ei-vapaat ohjelmat"
-
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr ""
-#~ "Ubuntu-arkiston automaattinen allekirjoitusavain <ftpmaster@ubuntu.com>"
-
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr ""
-#~ "Ubuntun CD-vedosten automaattinen allekirjoitusavain <cdimage@ubuntu.com>"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "Valitse avaintiedosto"
-
-#~ msgid ""
-#~ "This means that some dependencies of the installed packages are not "
-#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
-#~ msgstr ""
-#~ "Jotkut asennettujen pakettien riippuvuuksista ovat siis täyttämättä. "
-#~ "Käytä \"Synaptic\"- tai \"apt-get\"-ohjelmia korjataksesi ongelman."
-
-#~ msgid "It is not possible to upgrade all packages."
-#~ msgstr "Kaikkia paketteja ei voida päivittää."
-
-#~ msgid ""
-#~ "This means that besides the actual upgrade of the packages some further "
-#~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
-#~ msgstr ""
-#~ "Pakettien päivittämisen lisäksi tarvitaan siis joitain muita "
-#~ "toimenpiteitä (kuten pakettien asentamista tai poistamista). Käytä "
-#~ "Synaptic-ohjelman \"Smart Upgrade\"-toimintoa tai \"apt-get dist-upgrade"
-#~ "\"-komentoa korjataksesi ongelman."
-
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "Muutoksia ei löytynyt, palvelinta ei ole ehkä vielä päivitetty."
-
-#~ msgid "The updates are being applied."
-#~ msgstr "Päivityksiä asennetaan."
-
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Voit hallita paketteja vain yhdellä ohjelmalla kerrallaan. Sulje toinen "
-#~ "ohjelma ensin."
-
-#~ msgid "Updating package list..."
-#~ msgstr "Päivitetään pakettiluetteloa..."
-
-#~ msgid "There are no updates available."
-#~ msgstr "Päivityksiä ei saatavilla."
-
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Päivitä uudempaan versioon Ubuntu Linuxista. Käyttämällesi versiolle ei "
-#~ "enää ole tulossa turvallisuuspäivityksiä tai muita kriittisiä "
-#~ "päivityksiä. Tietoja päivittämisestä löydät sivulta http://www."
-#~ "ubuntulinux.org."
-
-#~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "Ubuntusta on uusi julkaisu saatavilla!"
-
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "Uusi julkaisu nimeltään '%s' on saatavilla. Päivitysohjeet löydät "
-#~ "osoitteesta http://www.ubuntulinux.org/."
-
-#~ msgid "Never show this message again"
-#~ msgstr "Älä näytä tätä viestiä uudestaan"
-
-#~ msgid "Unable to get exclusive lock"
-#~ msgstr "Ei saatu haluttua lukitusta"
-
-#~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
-#~ msgstr ""
-#~ "Tämä tarkoittaa yleensä, että toinen pakettienhallintaohjelma (kuten apt-"
-#~ "get tai aptitude) on jo käynnissä. Sulje tämä toinen ohjelma ensin."
-
-#~ msgid "Initializing and getting list of updates..."
-#~ msgstr "Alustetaan ja ladataan luetteloa päivityksistä..."
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Sinun täytyy olla pääkäyttäjä ajaaksesi tämän ohjelman"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Muokkaa ohjelmalähteitä ja asetuksia"
-
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to check verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Varmennusavaimet</b></big>\n"
-#~ "\n"
-#~ "Voit lisätä ja poistaa varmennusavaimia tässä valintaikkunassa. Avaimella "
-#~ "voidaan tarkistaa lataamiesi ohjelmien eheys."
-
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you got the key "
-#~ "over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Lisää uusi avaintiedosto luotettuihin avaimiin. Varmista, että "
-#~ "vastaanotit avaimen luotettua kanavaa pitkin ja että luotat avaimen "
-#~ "omistajaan. "
-
-#~ msgid ""
-#~ "Restore the default keys shiped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Palauta jakelun mukana toimitetut avaimet. Tämä ei tee muutoksia "
-#~ "käyttäjän asentamiin avaimiin."
-
-#~ msgid "Ubuntu Update Manager"
-#~ msgstr "Ubuntun päivitysten hallinta"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Saatavilla olevat päivitykset</b></big>\n"
-#~ "\n"
-#~ "Seuraavat paketit ovat päivitettävissä. Voit päivittää ne napsauttamalla "
-#~ "Asenna-painiketta."
-
-#~ msgid "0"
-#~ msgstr "0"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 37b7b62c..a12828ae 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  python-apt 0.7.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-21 15:34+0200\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"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -349,40 +349,40 @@ msgstr "Serveur principal"
 msgid "Custom servers"
 msgstr "Serveurs personnalisés"
 
-#: ../apt/progress/gtk2.py:246
+#: ../apt/progress/gtk2.py:259
 #, 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:252
+#: ../apt/progress/gtk2.py:265
 #, 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:272
+#: ../apt/progress/gtk2.py:285
 msgid "Details"
 msgstr "Détails"
 
-#: ../apt/progress/gtk2.py:354
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
 msgid "Starting..."
 msgstr "Paramètres"
 
-#: ../apt/progress/gtk2.py:360
+#: ../apt/progress/gtk2.py:373
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:315
+#: ../apt/package.py:301
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:878 ../apt/package.py:982
+#: ../apt/package.py:937 ../apt/package.py:1043
 msgid "The list of changes is not available"
 msgstr "La liste des modifications n'est pas disponible"
 
-#: ../apt/package.py:986
+#: ../apt/package.py:1047
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -391,7 +391,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:992
+#: ../apt/package.py:1053
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -406,7 +406,7 @@ msgstr ""
 
 #: ../apt/debfile.py:81
 #, python-format
-msgid "List of files for '%s' could not be read"
+msgid "List of files for '%s'could not be read"
 msgstr ""
 
 #: ../apt/debfile.py:149
@@ -447,3 +447,54 @@ msgstr ""
 #, fuzzy
 msgid "An essential package would be removed"
 msgstr "Un paquet essentiel devrait être enlevé"
+
+#: ../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/fur.po b/po/fur.po
index fc65c3f2..68966ebb 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,51 +276,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../data/templates/Debian.info.in:83
 msgid "Debian 3.1 'Sarge'"
 msgstr ""
 
 #. 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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -303,44 +338,158 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Ogni dì"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Every two days"
-#~ msgstr "Ogni dòi dîs"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Weekly"
-#~ msgstr "Ogni setemàne"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+#, fuzzy
+msgid "Details"
+msgstr "Ogni dì"
 
-#~ msgid "Every two weeks"
-#~ msgstr "Ogni dôs setemànis"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Every %s days"
-#~ msgstr "Ogni %s dîs"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "After one week"
-#~ msgstr "Dòpo une setemàne"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "After two weeks"
-#~ msgstr "Dòpo dôs setemànis"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "After one month"
-#~ msgstr "Dopo un mèis"
+#: ../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 ""
 
-#~ msgid "After %s days"
-#~ msgstr "Dopo %s dîs"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#~ msgid "Import key"
-#~ msgstr "Impuarte la clâf"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "    "
-#~ 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 5134732a..4a608218 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -26,235 +26,266 @@ 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: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 con 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 con 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 con 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdrom con Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Actualizacións de Seguranza para Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cdrom con Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Actualizacións de Seguranza para Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cdrom con Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Mantido pola Comunidade"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Controladores propietarios de dispositivos"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Aplicacións restrinxidas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cdrom con Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Software de Código Aberto soportado por Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Mantido pola Comunidade (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Software de Código Aberto mantido pola Comunidade"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Controladores non libres"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Controladores propietarios para dispositivos "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Controladores propietarios de dispositivos"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Software restrinxido (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr "Software restrinxido por razóns de copyright ou legais"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cdrom con Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Actualizacións de seguranza importantes"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Actualizacións recomendadas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Actualizacións aconselladas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Actualizacións de backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD con Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cdrom con Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualizacións de seguranza de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualizacións de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Actualizacións de Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdrom con Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Soportado oficialmente"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualizacións de Seguranza para Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualizacións para Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Backports para Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Mantido pola comunidade (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Software non libre (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Xa non se mantén oficialmente"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Copyright restrinxido"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Actualizacións de seguranza de Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualizacións de Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Backports para Ubuntu 4.10"
 
@@ -266,55 +297,68 @@ 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:31
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 3.1 \"Sarge\""
+
+#. Description
+#: ../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 "Actualizacións aconselladas"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Actualizacións de seguranza importantes"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (probas)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (inestable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Software compatible coa DFSG con dependencias non libres"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Software non compatible coa DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor desde %s"
@@ -322,1450 +366,160 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Servidores personalizados"
 
-#~ msgid "Daily"
-#~ msgstr "Unha vez ao día"
-
-#~ msgid "Every two days"
-#~ msgstr "Cada dous días"
-
-#~ msgid "Weekly"
-#~ msgstr "Unha vez á semana"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Cada dúas semanas"
-
-#~ msgid "Every %s days"
-#~ msgstr "Cada %s días"
-
-#~ msgid "After one week"
-#~ msgstr "Logo dunha semana"
-
-#~ msgid "After two weeks"
-#~ msgstr "Logo de dúas semanas"
-
-#~ msgid "After one month"
-#~ msgstr "Logo dun mes"
-
-#~ msgid "After %s days"
-#~ msgstr "Logo de %s días"
-
-#~ msgid "%s updates"
-#~ msgstr "actualizacións de %s"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Servidor máis próximo"
-
-#~ msgid "Software Channel"
-#~ msgstr "Canle de Software"
-
-#~ msgid "Active"
-#~ msgstr "Activo"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Código Fonte)"
-
-#~ msgid "Source Code"
-#~ msgstr "Código Fonte"
-
-#~ msgid "Import key"
-#~ msgstr "Importar clave"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Houbo un erro ao importar o ficheiro seleccionado"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Poida que o ficheiro seleccionado non sexa un ficheiro de clave GPG ou "
-#~ "que estea corrupto."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Houbo un erro ao borrar a clave"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Non se pode borrar a clave que seleccionou. Por favor, avise disto como "
-#~ "un fallo."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Erro ao examinar o CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Por favor, introduza un nome para o disco"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Por favor, inserte un disco na unidade:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Paquetes rotos"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "O seu sistema contén paquetes rotos que non poden ser arranxados con este "
-#~ "software. Por favor, arránxeos primeiro usando Synaptic ou apt-get antes "
-#~ "de continuar."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Non se puideron actualizar os meta-paquetes necesarios"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Tívose que desinstalar un paquete esencial"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Non se puido calcular a actualización"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Produciuse un erro imposible de resolver ao calcular a actualización.\n"
-#~ "\n"
-#~ "Informe deste erro do paquete \"update-manager\" e inclúa os ficheiros "
-#~ "que hai en /var/log/dist-upgrade/ no informe."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Erro autenticando algúns paquetes"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Non foi posible autenticar algúns paquetes. Isto pode ser debido a un "
-#~ "problema transitorio na rede. Probe de novo máis tarde. Vexa abaixo unha "
-#~ "lista dos paquetes non autenticados."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Non se puido instalar '%s»"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Non foi posible instalar un paquete necesario. Por favor, informe disto "
-#~ "como un fallo. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Non se puido determinar o meta-paquete"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "O seu sistema non contén os paquetes ubuntu-desktop, kubuntu-desktop ou "
-#~ "edubuntu-desktop e non foi posible detectar cal é a versión de ubuntu que "
-#~ "se está a executar.\n"
-#~ " Instale un dos paquetes mencionados usando synaptic ou apt-get antes de "
-#~ "continuar."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Non se puido engadir o CD"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Produciuse un erro ao engadir o CD, hai que cancelar a actualización. "
-#~ "Informe deste erro se se trata dun CD válido de Ubuntu.\n"
-#~ "\n"
-#~ "A mensaxe de erro foi:\n"
-#~ "\"%s\""
-
-#~ msgid "Reading cache"
-#~ msgstr "Lendo caché"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Procurar datos desde a rede para a actualización?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "A actualización pode empregar a rede para comprobar as actualizacións "
-#~ "máis recentes e descargar paquetes que non se atopan no CD.\n"
-#~ "Se dispón de acceso rápido ou barato á rede debería respostar \"Si\" "
-#~ "aquí. Se a súa conexión é cara, escolla \"Non\"."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Non se atopou un servidor espello válido"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Non se atopou ningunha entrada de servidor espello para a actualización "
-#~ "despois de examinar a información dos seus repositorios . Isto pode "
-#~ "ocorrer se está usando un servidor espello interno, ou se a información "
-#~ "do servidor espello está desactualizada.\n"
-#~ "\n"
-#~ "¿Desexa reescribir o seu ficheiro «sources.list» de todos os xeitos? Se "
-#~ "selecciona «Si», actualizaranse todas as entradas '%s' a '%s'.\n"
-#~ "Se selecciona «Non» cancelarase a actualización."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Xerar orixes predeterminadas?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Tras examinar o seu «sources.list», non se atoparon entradas válidas para "
-#~ "'%s'.\n"
-#~ "\n"
-#~ "Deben engadirse entradas predeterminadas para '%s'? Se selecciona «Non» "
-#~ "cancelarse a actualización."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Información de repositorio non válida"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "A actualización da información do repositorio xerou un ficheiro "
-#~ "incorrecto. Por favor, informe disto como un erro."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Orixes de terceiros desactivadas"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Desactiváronse algunhas entradas de terceiras partes no seu sources.list. "
-#~ "Pódeas volver a activar coa ferramenta \"software-properteis\" ou con "
-#~ "synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Erro durante a actualización"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Ocorreu un problema durante a actualización. Normalmente é debido a algún "
-#~ "tipo de problema na rede, por favor, comprobe a súa conexión de rede e "
-#~ "volvao a intentar."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Non hai espazo suficiente no disco"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "A actualización interromperase agora. Por favor, libere polo menos %s de "
-#~ "espazo en disco en %s. Vacíe a súa papelera, e elimine os paquetes "
-#~ "temporais de instalacións anteriores tecleando «sudo apt-get clean» nun "
-#~ "terminal."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Desexa comezar a actualización?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Non se puideron instalar as actualizacións"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Vaise cancelar a actualización agora. O seu sistema podería ficar nun "
-#~ "estado que non permita ser usado. Procedeuse a recuperalo (dpkg --"
-#~ "configure -a).\n"
-#~ "\n"
-#~ "Por favor, informe desde fallo do paquete \"update-manager\" e inclúa os "
-#~ "ficheiros en /var/log/dist-upgrade/ no informe."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Non se puideron descargar as actualizacións"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "A actualización interromperase agora. Por favor, comprobe a súa conexión "
-#~ "a Internet (ou o seu soporte de instalación) e volvao a intentar. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Rematou o soporte para algunhas aplicacións"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Canonical Ltd. non forece máis axuda para os paquetes de software "
-#~ "seguintes. Pode que ainda poda obter axuda da comunidade.\n"
-#~ "\n"
-#~ "Se non ten activado o software mantido pola comunidade (universe), "
-#~ "suxerirase que elimine estes paquetes no paso seguinte."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Desinstalar os paquetes obsoletos?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Saltar este paso"
-
-#~ msgid "_Remove"
-#~ msgstr "_Borrar"
-
-#~ msgid "Error during commit"
-#~ msgstr "Erro durante a confirmación"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Ocorreu algún problema durante o limpado. Por favor, vexa a mensaxe "
-#~ "inferior para máis información. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "A retornar ao estado orixinal do sistema"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "A procurar backports de \"%s\""
-
-#~ msgid "Checking package manager"
-#~ msgstr "Comprobando xestor de paquetes"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Fallou a preparación da actualización"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Fallou a preparación do sistema para a actualización. Informe deste erro "
-#~ "do paquete \"update-manager\" e inclúa os ficheiros de /var/log/dist-"
-#~ "upgrade/ no informe."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Actualizando a información do repositorio"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Información de paquete non válida"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Despois de actualizar a información sobre os paquetes, o paquete \"%s\", "
-#~ "que é esencial, xa non se dá atopado.\n"
-#~ "Isto indica un erro serio, por favor, informe deste fallo do paquete "
-#~ "\"update-manager\" e inclúa no informe os ficheiros que hai en /var/log/"
-#~ "dist-upgrade/"
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Solicitando confirmación"
-
-#~ msgid "Upgrading"
-#~ msgstr "Actualizando"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Buscando paquetes obsoletos"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Comletouse a actualización do sistema."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Por favor, inserte '%s' na unidade '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Rematou a descarga"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "A baixar o ficheiro %li de %li en %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Falta aproximadamente %s"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "A baixar o ficheiro %li de %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Aplicando os cambios"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Non se puido instalar '%s'"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "Vaise cancelar a actualización agora. Informe deste fallo do paquete "
-#~ "\"update-manager\" e inclúa no informe os ficheiros que hai en /var/log/"
-#~ "dist-upgrade/ ."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Substituir o ficheiro de configuración personalizado\n"
-#~ "\"%s\"?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Perderá as modificacións feitas neste ficheiro de configuración se "
-#~ "escolle substituílo por unha versión máis nova."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Non se atopou o comando 'diff'"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Ocorreu un erro fatal"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Informe deste fallo do paquete \"update-manager\" e inclúa os ficheiros "
-#~ "en /var/log/dist-upgrade/main.log e /var/log/dist-upgrade/apt.log no "
-#~ "informe. Agora vaise cancelar a actualización.\n"
-#~ "O seu ficheiro sources.list orixinal gardouse en /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "Vaise eliminar o paquete %d"
-#~ msgstr[1] "Vanse eliminar os paquetes %d"
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "Vaise instalar o paquete novo %d"
-#~ msgstr[1] "Vanse instalar os paquetes novos %d"
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "Vaise actualizar o paquete %d"
-#~ msgstr[1] "Vanse actualizar os paquetes %d"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Baixou un total de %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Descargar e instalar a actualización pode levar varias horas e non se "
-#~ "pode cancelar posteriormente."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Para previr a perda de datos peche todas as aplicacións e documentos."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "O seu sistema está actualizado"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Non hai actualizacións dispoñibles para o seu sistema. Vaise cancelar a "
-#~ "actualización."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Desinstalar %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Instalar %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Actualizar %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li días %li horas %li minutos"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li horas %li minutos"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minutos"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li segundos"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Esta descarga levará uns %s cunha conexión DSL de 1MB e uns %s cun módem "
-#~ "de 56k."
-
-#~ msgid "Reboot required"
-#~ msgstr "Cómpre reiniciar o equipo"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "A actualización finalizou e compre reiniciar o equipo. Desexao facer "
-#~ "agora?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Cancelar a actualización en curso?</big></b>\n"
-#~ "\n"
-#~ "O sistema podería quedar nun estado non usable se cancela a "
-#~ "actualización. Recomendámoslle encarecidamente que continúe a "
-#~ "actualización."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Reinicie o sistema para completar a actualización</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Comezar a actualización?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Actualizar Ubuntu para a versión 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Limpando"
-
-#~ msgid "Details"
-#~ msgstr "Detalles"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Diferenza entre os ficheiros"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "A descargar e instalar as actualizacións"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Modificando as canles de software"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Preparando a actualización"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Reiniciando o sistema"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Cancelar a Actualización"
-
-#~ msgid "_Continue"
-#~ msgstr "-Continuar"
-
-#~ msgid "_Keep"
-#~ msgstr "_Conservar"
-
-#~ msgid "_Replace"
-#~ msgstr "_Substituír"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Informar dun fallo"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Reiniciar agora"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Continuar actualización"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Iniciar a Actualización"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Non se puideron atopar as notas da versión"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Poida que o servidor estea sobrecargado. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Non se puideron descargar as notas da versión"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Por favor, comprobe a súa conexión a Internet."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Non se puido executar a ferramenta de actualización"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Isto parece ser un fallo na ferramenta de actualización. Por favor, "
-#~ "informe disto como un fallo"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Descargando a ferramenta de actualización"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr ""
-#~ "A ferramenta de actualización guiarao a través do proceso de "
-#~ "actualización."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Sinatura da ferramenta de actualización"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Ferramenta de actualización"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Erro ao descargar"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Fallou a descarga da actualización. Pode haber un problema coa rede. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Erro ao extraer"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Fallou a extracción da actualización. Pode haber un problema coa rede ou "
-#~ "o servidor. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Erro de verificación"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Fallou a verificación da actualización. Pode haber un problema coa rede "
-#~ "ou co servidor. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Erro de autenticación"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Fallou a autenticación da actualización. Pode haber un problema coa rede "
-#~ "ou o servidor. "
-
-#~ 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"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "A descargar o ficheiro %(current)li de %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "Non se dispón da lista de cambios"
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "A a lista de cambios aínda non está dispoñible.\n"
-#~ "Ténteo máis tarde."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Non se puido descargar a lista de cambios.\n"
-#~ "Comprobe a súa conexión á Internet."
-
-#~ msgid "Backports"
-#~ msgstr "Backports"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Actualizacións da distribución"
-
-#~ msgid "Other updates"
-#~ msgstr "Outras actualizacións"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versión %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "A descargar a lista de cambios..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "_Quitarlle a Selección a Todo"
-
-#~ msgid "_Check All"
-#~ msgstr "_Seleccionalo Todo"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Tamaño de descarga: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Pode instalar %s actualización"
-#~ msgstr[1] "Pode instalar %s actualizacións"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Por favor, espere; isto pode tardar un pouco."
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#~ msgid "Update is complete"
-#~ msgstr "Completouse a actualización"
-
-#~ msgid "Checking for updates"
-#~ msgstr "A examinar as actualizacións"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Desde a versión %(old_version)s á %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Versión %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Tamaño: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "A súa distribución xa non está soportada"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Non poderá obter novas correccións de seguridade nin actualizacións "
-#~ "críticas. Actualícese a unha versión posterior de Ubuntu Linux. Visite "
-#~ "http://www.ubuntu.com para máis información sobre a actualización."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Está dispoñible a nova versión '%s' da distribución</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "O índice de software está danado"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "A descargar o ficheiro %(current)li de %(total)li"
 
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "É imposible instalar ou desinstalar ningún programa. Por favor, utilice o "
-#~ "xestor de paquetes \"Synaptic\", ou execute \"sudo apt-get install -f\" "
-#~ "nun terminal, para corrixir este problema primeiro."
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detalles"
 
-#~ msgid "None"
-#~ msgstr "Ningún"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Non se dispón da lista de cambios"
 
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Ten que comprobar as actualizacións manualmente</big></b>\n"
-#~ "\n"
-#~ "O seu sistema non comproba as actualizacións automaticamente. Pode "
-#~ "configurar este comportamento en <i>Fontes de Software</i> na lingüeta "
-#~ "<i>Actualizacións desde a Internet</i>."
+#: ../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 ""
 
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Manteña o seu sistema actualizado</b></big>"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Non se puido descargar a lista de cambios.\n"
+"Comprobe a súa conexión á Internet."
 
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>Non se poden instalar todas as actualizacións</b></big>"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<big><b>A iniciar o xestor de actualizacións</b></big>"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Changes"
-#~ msgstr "Cambios"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Changes and description of the update"
-#~ msgstr "Cambios e descrición da actualización"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Chec_k"
-#~ msgstr "_Comprobar"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Comprobar se hai novas actualizacións nas canles de software"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Description"
-#~ msgstr "Descrición"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Release Notes"
-#~ msgstr "Notas da versión"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Non se puido instalar '%s»"
 
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Execute unha actualización da distribución para instalar tantas "
-#~ "actualizacións como sexa posible.\n"
-#~ "\n"
-#~ "Isto pode ser causado por unha actualización de distribución incompleta, "
-#~ "paquetes de software non oficiais ou por estar a executar unha versión en "
-#~ "desenvolvemento."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Mostrar o progreso de cada ficheiro individual"
-
-#~ msgid "Software Updates"
-#~ msgstr "Actualizacións de software"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "As actualizacións de software corrixen erros, eliminan fallos de "
-#~ "seguridade e proporcionan novas funcionalidades."
-
-#~ msgid "U_pgrade"
-#~ msgstr "A_ctualizar"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Actualizar á última versión de Ubuntu"
+#: ../apt/debfile.py:494
+#, fuzzy
+msgid "An essential package would be removed"
+msgstr "Tívose que desinstalar un paquete esencial"
 
-#~ msgid "_Check"
-#~ msgstr "_Comprobar"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "Actualización da _Distribución"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Ocultar esta información no futuro"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "_Install Updates"
-#~ msgstr "_Instalar actualizacións"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "_Upgrade"
-#~ msgstr "Act_ualizar"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "changes"
-#~ msgstr "cambios"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "updates"
-#~ msgstr "actualizacións"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Actualizacións automáticas</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Actualizacións por Internet</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Para mellorar a impresión dos usuarios sobre Ubuntu participe no "
-#~ "concurso de popularidade. Se o fai, cada semana mandarase de forma "
-#~ "anónima ao proxecto Ubuntu unha lista coas aplicacións que ten "
-#~ "instaladas  e a frecuencia coa que as usa.\n"
-#~ "\n"
-#~ "Os resultados empréganse para mellorar o soporte das aplicacións máis "
-#~ "populares e para ponderalas nos resultados das procuras.</li>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Engadir un Cdrom"
-
-#~ msgid "Authentication"
-#~ msgstr "Autenticación"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "_Borrar arquivos de software descargados:"
-
-#~ msgid "Download from:"
-#~ msgstr "Descargar desde:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Importar a clave pública dende un provedor de confianza"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Actualizacións por Internet"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Só se instalarán automaticamente as actualizacións de seguridade que "
-#~ "proveñan dos servidores oficiais de Ubuntu"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Restaurar valores predeterminados"
+#: ../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 ""
 
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Restaurar as claves predeterminadas da súa distribución"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Software Sources"
-#~ msgstr "Fontes de Software"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Source code"
-#~ msgstr "Código fonte"
-
-#~ msgid "Statistics"
-#~ msgstr "Estatísticas"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Enviar información estatística"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Third Party"
-#~ msgstr "Terceira Parte"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Comprobar actualizacións automaticamente:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Descargar as actualizacións automaticamente, pero non as instalar"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Importar clave"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Instalar actualizacións de seguridade sen requerir confirmación"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>A información sobre o software dispoñible está anticuada</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "Para instalar software e actualizacións de fontes engadidas hai pouco ou "
-#~ "modificadas terá que recargar a información sobre o software dispoñible.\n"
-#~ "\n"
-#~ "Precisará unha conexión á internet para continuar."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comentario:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Compoñentes:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribución:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipo:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Introduza a liña APT completa do depósito que quere engadir como "
-#~ "fonte</b></big>\n"
-#~ "\n"
-#~ "A liña APT inclúe o tipo, localización e compoñentes dun depósito, por "
-#~ "exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "Liña de APT:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binario\n"
-#~ "Fonte"
-
-#~ msgid "Edit Source"
-#~ msgstr "Modificar a Fonte"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Analizando o CD-ROM"
-
-#~ msgid "_Add Source"
-#~ msgstr "_Engadir Fonte"
-
-#~ msgid "_Reload"
-#~ msgstr "_Recargar"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Mostra e instala as actualizacións dispoñibles"
-
-#~ msgid "Update Manager"
-#~ msgstr "Xestor de actualizacións"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Comprobar automáticamente se se atopa dispoñible unha nova versión da "
-#~ "distribución actual, e propoñer a súa actualización (se é posible)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Comprobar se existen novas versións da distribución"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Se se desactiva a comprobación automática de actualizacións terá que "
-#~ "recargar a lista de canles manualmente. Esta opción permite agochar o "
-#~ "recordatorio que se mostra neste caso."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Recorde recargar a lista de canles"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Mostrar detalles dunha actualización"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Almacena o tamaño da ventá do xestor de actualizacións"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Almacena o estado do expandedor que contén a lista de cambios e a "
-#~ "descrición"
-
-#~ msgid "The window size"
-#~ msgstr "O tamaño da ventá"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Configurar as fontes para programas e actualizacións instalables"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Actualizacións de seguridade de Debian 3.1 \"Sarge\""
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid ""
-#~ "<big><b>Error scaning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Erro explorando o CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "A unresolvable problem occured while calculating the upgrade. Please "
-#~ "report this as a bug. "
-#~ msgstr ""
-#~ "Ocorreu un problema imposible de resolver cando se calculaba a "
-#~ "actualización. Por favor, informe disto como un fallo. "
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are runing.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "O seu sistema non contén o paquete ubuntu-desktop, ou kubuntu-desktop, ou "
-#~ "edubuntu-desktop, e non foi posible detectar que versión de Ubuntu está "
-#~ "aexecutar.\n"
-#~ " Por favor, instale un dos paquetes anteriores usando Synaptic ou apt-get "
-#~ "antes de proceder."
-
-#~ msgid ""
-#~ "Some third party entries in your souces.list where disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Desactiváronse algunhas entradas de terceiros no seu «sources.list». Pode "
-#~ "volver a activalas trala actualización coa ferramenta «Propiedades do "
-#~ "software», ou con Synaptic."
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system can be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a)."
-#~ msgstr ""
-#~ "A actualización interromperase agora. O seu sistema pode quedar nun "
-#~ "estado inutilizable. Estase levando a cabo unha recuperación (dpkg --"
-#~ "configure -a)."
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Algúns programas xa non están soportados oficialmente"
-
-#~ msgid ""
-#~ "These installed packages are no longer officially supported, and are now "
-#~ "only community-supported ('universe').\n"
-#~ "\n"
-#~ "If you don't have 'universe' enabled these packages will be suggested for "
-#~ "removal in the next step. "
-#~ msgstr ""
-#~ "Estes paquetes instalados xa non están soportados oficialmente, e desde "
-#~ "agora só están soportados pola comunidade («universe»).\n"
-#~ "\n"
-#~ "Se non ten activado o «universe», suxeriráselle que desinstale estes "
-#~ "paquetes no seguinte paso. "
-
-#~ msgid "Restoring originale system state"
-#~ msgstr "Restaurando o estado orixinal do sistema"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this as a bug."
-#~ msgstr ""
-#~ "Logo de actualizarse a información dos seus paquetes xa non é posible "
-#~ "atopar o paquete esencial '%s».\n"
-#~ "Isto indica un problema serio, por favor, informe disto como un fallo."
-
-#~ msgid "About %li days %li hours %li minutes remaining"
-#~ msgstr "Faltan %li dias %li horas %li minutos"
-
-#~ msgid "About %li hours %li minutes remaining"
-#~ msgstr "Faltan %li horas %li minutos"
-
-#~ msgid "About %li minutes remaining"
-#~ msgstr "Faltan %li minutos"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Faltan %li segundos"
-
-#~ msgid "Download is complete"
-#~ msgstr "Completouse a descarga"
-
-#~ msgid "Downloading file %li of %li at %s/s"
-#~ msgstr "Descargando ficheiro %li de %li a %s/s"
-
-#~ msgid "Downloading file %li of %li"
-#~ msgstr "Descargando ficheiro %li de %li"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr ""
-#~ "A actualización cancelarase agora. Por favor, informe disto como un fallo."
-
-#~ msgid ""
-#~ "Replace configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Desexa reemplazar o ficheiro de configuración\n"
-#~ "'%s'?"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade."
-#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts "
-#~ "now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Por favor, informe disto como un fallo e inclúa os arquivos /var/log/dist-"
-#~ "upgrade.log e /var/log/dist-upgrade-apt.log no seu informe. A "
-#~ "actualización cancelarase agora.\n"
-#~ "O seu arquivo «sources.list» orixinal gardouse en /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%s package is going to be removed."
-#~ msgid_plural "%s packages are going to be removed."
-#~ msgstr[0] "Vaise desinstalar %s paquete."
-#~ msgstr[1] "Vanse desinstalar %s paquetes."
-
-#~ msgid "%s new package is going to be installed."
-#~ msgid_plural "%s new packages are going to be installed."
-#~ msgstr[0] "Vaise instalar %s paquete novo."
-#~ msgstr[1] "Vanse instalar %s paquetes novos."
-
-#~ msgid "%s package is going to be upgraded."
-#~ msgid_plural "%s packages are going to be upgraded."
-#~ msgstr[0] "Vaise actualizar %s paquete."
-#~ msgstr[1] "Vanse actualizar %s paquetes."
-
-#~ msgid "You have to download a total of %s."
-#~ msgstr "Debe descargar un total de %s."
-
-#~ msgid ""
-#~ "The upgrade can take several hours and cannot be canceled at any time "
-#~ "later."
-#~ msgstr ""
-#~ "A actualización pode levar varias horas e non poderá ser cancelada "
-#~ "despois en ningún momento."
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Non se puido atopar ningunha actualización"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "O seu sistema xa foi actualizado."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Actualizando a Ubuntu 6.06 LTS</"
-#~ "span>"
-
-#~ msgid "Downloading and installing the upgrades"
-#~ msgstr "Descargando e instalando as actualizacións"
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Actualizando Ubuntu"
-
-#~ msgid ""
-#~ "Verfing the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Fallou a verificación da actualización. Pode haber un problema coa rede "
-#~ "ou o servidor. "
-
-#~ msgid "Downloading file %li of %li with %s/s"
-#~ msgstr "Descargando ficheiro %li de %li a %s/s"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Descargando ficheiro %li de %li a velocidade descoñecida"
-
-#~ msgid "The list of changes is not available yet. Please try again later."
-#~ msgstr ""
-#~ "A lista de cambios non está dispoñible aínda. Por favor, ténteo de novo "
-#~ "máis tarde."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. Please check your Internet "
-#~ "connection."
-#~ msgstr ""
-#~ "Fallou a descarga da lista de cambios. Por favor, comprobe a súa conexión "
-#~ "a Internet."
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Non se puideron instalar todas as actualizacións dispoñibles"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Algunhas actualizacións requiren a desinstalación de software. Utilice a "
-#~ "función «Marcar todas as actualizacións» do xestor de paquetes «Synaptic», "
-#~ "ou execute «sudo apt-get dist-upgrade» nun terminal, para actualizar "
-#~ "completamente o seu sistema."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Pasaranse por alto as seguintes actualizacións:"
-
-#~ msgid "Downloading the list of changes..."
-#~ msgstr "Descargando a lista de cambios..."
-
-#~ msgid "Hide details"
-#~ msgstr "Ocultar detalles"
-
-#~ msgid "Show details"
-#~ msgstr "Mostrar detalles"
-
-#~ msgid "New version: %s   (Size: %s)"
-#~ msgstr "Nova versión: %s   (Tamaño: %s)"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "Só se pode executar unha ferramenta de xestión de software ao tempo"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Por favor, peche primeiro a outra aplicación (ej: «aptitude» ou «Synaptic»)."
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties"
-#~ "\"."
-#~ msgstr ""
-#~ "<b><big>Debe comprobar as actualizacións manualmente</big></b>\n"
-#~ "\n"
-#~ "O seu sistema non comproba as actualizacións automatimente. Pode "
-#~ "configurar este comportamento en \"Sistema\" -> \"Administración\" -> "
-#~ "\"Propiedades do software\"."
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Analizando o seu sistema</b></big>\n"
-#~ "\n"
-#~ "As actualizacións de software corrixen erros, eliminan fallos de "
-#~ "seguridade e proporcionan novas funcionalidades."
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Cancelar _descarga"
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Canles</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Claves</b>"
-
-#~ msgid "Add _Cdrom"
-#~ msgstr "Engadir _CD-ROM"
-
-#~ msgid "Installation Media"
-#~ msgstr "Soporte da instalación"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Preferencias do software"
-
-#~ msgid "_Download updates in the background, but do not install them"
-#~ msgstr "_Descargar actualizacións en segundo plano, pero sen instalalas"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid ""
-#~ "<b><big>The channel information is out-of-date</big></b>\n"
-#~ "\n"
-#~ "You have to reload the channel information to install software and "
-#~ "updates from newly added or changed channels. \n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>A información das canles está obsoleta</big></b>\n"
-#~ "\n"
-#~ "Debe recargar a información das canles para poder instalar software e "
-#~ "actualizacións a partir das canles recientemente engadidas ou "
-#~ "cambiadas. \n"
-#~ "\n"
-#~ "Necesita unha conexión a internet para continuar."
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Canles</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Compoñentes</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a channel, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Introduza a liña de APT completa da canle que queira engadir</b></"
-#~ "big>\n"
-#~ "\n"
-#~ "A liña de APT contén o tipo, a ubicación e os compoñentes dunha canle, "
-#~ "por exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "Add Channel"
-#~ msgstr "Engadir unha canle"
-
-#~ msgid "Edit Channel"
-#~ msgstr "Cambiar unha canle"
-
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Engadir unha canle"
-#~ msgstr[1] "_Engadir canles"
-
-#~ msgid "_Custom"
-#~ msgstr "_Personalizado"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabeld, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Se se desactiva a comprobación automática de actualizacións, debe "
-#~ "recargar a lista de canles manualmente. Esta opción permítelle ocultar a "
-#~ "notificación que se mostra neste caso."
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changs and the "
-#~ "description"
-#~ msgstr ""
-#~ "Almacena o estado do expansor que contén a lista de cambios e as súas "
-#~ "descricións"
-
-#~ msgid "Configure software channels and internet updates"
-#~ msgstr "Configura canles de software e actualizacións por Internet"
-
-#~ msgid "Software Properties"
-#~ msgstr "Propiedades do software"
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Actualizacións de seguridade de Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Actualizacións de Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "«Backports» de Ubuntu 6.06 LTS"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/he.po b/po/he.po
index eb36a399..9df8ed16 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -27,237 +27,268 @@ 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:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "אובונטו 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "אובונטו 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:135
+#, fuzzy
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "אובונטו 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:153
+#, fuzzy
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "תקליטור אובונטו 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:197
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "אובונטו 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "תקליטור אובונטו 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "עדכוני אבטחה - אובונטו 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "תקליטור אובונטו 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "עדכוני אבטחה - אובונטו 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "תקליטור אובונטו 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "אובונטו 6.10 \"Edgy Eft\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "מתוחזק ע\"י הקהילה"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "דרייברים קניינים להתקנים"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "תוכנה בעלת הגבלות"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "תקליטור אובונטו 6.10 \"Edgy Eft\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "אובונטו 6.06 LTS \"DapperDrake\""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "תוכנות קוד פתוח הנתמכות ע\"י Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "מתוחזק ע\"י הקהילה (Universe("
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "תוכנות קוד פתוח המתוחזקות ע\"י הקהילה"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "דרייברים לא חופשיים"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr ""
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "דרייברים קניינים להתקנים"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "תוכנה בעלת הגבלות (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "תקליטור אובונטו 6.06 LTS \"Dapper Drake\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "עדכוני אבטחה חשובים"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "עדכונים מומלצים"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "עדכונים מוצעים"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "עדכונים מוצעים"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "אובונטו 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "תקליטור אובונטו 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "עדכוני אבטחה - אובונטו 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "אובונטו 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "תקליטור אובונטו 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "נתמך רשמית"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "עדכוני אבטחה - אובונטו 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "עדכונים - אובונטו 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "אובונטו 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "מתוחזק ע\"י קהילה (Universe("
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "לא-חופשי (Multiverse("
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "תקליטור אובונטו 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "אינה נתמכת רשמית יותר"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "זכויות יוצרים מגבילות"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "עדכוני אבטחה - אובונטו 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "עדכונים - אובונטו 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "עדכונים - אובונטו 5.10"
@@ -271,56 +302,68 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 #. Description
 #: ../data/templates/Debian.info.in:8
 #, fuzzy
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 6.0 'Squeeze' "
+msgstr "דביאן 3.1 \"סארג'\""
+
+#. Description
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
 msgstr "דביאן בדיקה"
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../data/templates/Debian.info.in:58
+#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "דביאן בדיקה"
+
+#. Description
+#: ../data/templates/Debian.info.in:83
 #, fuzzy
 msgid "Debian 3.1 'Sarge'"
 msgstr "דביאן 3.1 \"סארג'\""
 
 #. 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
 #, fuzzy
 msgid "Security updates"
 msgstr "עדכוני אבטחה חשובים"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 #, fuzzy
 msgid "Debian current stable release"
 msgstr "דביאן לא יציב \"סיד\""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "דביאן בדיקה"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "דביאן לא ארה\"ב (לא יציב)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "השרת ב%s"
@@ -328,1173 +371,161 @@ 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:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "שרת ראשי"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 #, fuzzy
 msgid "Custom servers"
 msgstr "השרת הקרוב ביותר"
 
-#~ msgid "Daily"
-#~ msgstr "מידי יום"
-
-#~ msgid "Every two days"
-#~ msgstr "כל יומיים"
+#: ../apt/progress/gtk2.py:259
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה"
 
-#~ msgid "Weekly"
-#~ msgstr "כל שבוע"
+#: ../apt/progress/gtk2.py:265
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה"
 
-#~ msgid "Every two weeks"
-#~ msgstr "כל שבועים"
-
-#~ msgid "Every %s days"
-#~ msgstr "כל %s ימים"
-
-#~ msgid "After one week"
-#~ msgstr "אחרי שבוע"
-
-#~ msgid "After two weeks"
-#~ msgstr "אחרי שבועים"
-
-#~ msgid "After one month"
-#~ msgstr "אחרי חודש"
-
-#~ msgid "After %s days"
-#~ msgstr "אחרי %s ימים"
-
-#, fuzzy
-#~ msgid "%s updates"
-#~ msgstr "מתקין עדכונים..."
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "עדכוני תוכנה"
-
-#~ msgid "Active"
-#~ msgstr "פעיל"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(קוד מקור)"
-
-#~ msgid "Source Code"
-#~ msgstr "קוד מקור"
-
-#~ msgid "Import key"
-#~ msgstr "יבוא מפתח"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "שגיאה בייבוא קובץ נבחר"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "הקובץ הנבחר הוא לא מפתח GPG או שהוא לא תקין."
-
-#~ msgid "Error removing the key"
-#~ msgstr "שגיאה בהסרת המפתח"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>שגיאה בסריקת התקליטור</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "אנא הזן שם לדיסק"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "אנא הכניסו תקליטור לכונן:"
-
-#~ msgid "Broken packages"
-#~ msgstr "חבילות פגומות"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "במערכת שלך נמצאות חבילות פגומות שתוכנה זו לא יכולה לתקן. אנא תקן אותן "
-#~ "באמצעות synaptic או apt-get לפני שתמשיך."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "לא ניתן לשדרג את חבילות העל הנדרשות"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "חבילה חיונית תוסר בלית ברירה"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "לא ניתן לחשב את השדרוג"
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "לאחר שהמידע על החבילות עודכן החבילה ההכרחית \"%s\" לא נמצא.\n"
-#~ "כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "שגיאה באימות חלק מן החבילות"
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "לא ניתן להתקין את \"%s\""
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr "לא ניתן להתקין חבילה הכרחית. אנא דווחו על זה כבאג. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "לא ניתן לקבוע חבילת על"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "אף אחת החבילות ubuntu-desktop, kubuntu-desktop או edubuntu-desktop אינה "
-#~ "מותקנת במערכת שלך, לכן לא ניתן לזהות באיזו גירסה של אובונטו נעשה שימוש.\n"
-#~ " אנא התקן אחת מהחבילות הנ\"ל בעזרת Synaptic או apt-get לפני שתמשיך."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "הוספת התקליטור נכשלה"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "אירעה שגיאה בהוספת התקליטור, לכן השדרוג בוטל. אנא דווחו על כך כבאג אם "
-#~ "מדובר בתקליטור אובונטו תקני.\n"
-#~ "\n"
-#~ "הודעת השגיאה הייתה:\n"
-#~ "\"%s\""
-
-#~ msgid "Reading cache"
-#~ msgstr "קורא מטמון"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "להוריד מידע מהאינטרנט לצורך השדרוג?"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "לא נמצא אתר מראה תקני"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "בעת סריקת מידע מאגרי התוכנה שלך לא נמצאה הפנייה לשרת מראה לצורך השדרוג. "
-#~ "שרת מראה מקומי או הפניה לשרת שפג תוקפה עשויים להיות הסיבה לכך.\n"
-#~ "\n"
-#~ "האם ברצונך לעדכון את רשימת המקורות (sources.list) בכל מקרה? אישור יגרום "
-#~ "לעדכון כל ההפניות \"%s\" ל-\"%s\".\n"
-#~ "\n"
-#~ "בחירה ב\"לא\" תבטל את העדכון."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "לייצר מקורות ברירת מחדל?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "לאחר סריקת רשימת המקורות שלך (sources.list) לא נמצא רישום מתאים ל\"%s\".\n"
-#~ "\n"
-#~ "האם לקבוע את ברירת המחדל כרישום ל\"%s\"? בחירה ב\"לא\" תבטל את העדכון."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "מידע מאגרים לא תקין"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr "עדכון מידע המאגרים יצר קובץ לא תקין. אנא דווחו על כך כבאג."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "מקורות של ספקי צד שלישי בוטלו"
-
-#~ msgid "Error during update"
-#~ msgstr "שגיאה במהלך העדכון"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "הייתה בעיה בתהליך העידכון. בדרך כלל זוהי בעיית רשת, אנא בדקו את חיבור "
-#~ "הרשת שלכם ונסו שנית."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "אין מספיק שטח בדיסק הקשיח"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "השדרגו יתבטל כעת. יש לפנות לפחות %s מהשטח ב-%s. רוקנו את הזבל והסירו "
-#~ "חבילות זמניות מהתקנות קודמות על ידי שימוש בפקודה \"sudo apt-get clean\"."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "האם ברצונך להתחיל את השדרוג?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "לא ניתן להתקין את השדרוג"
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "לא ניתן להוריד את השדרוג"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "השדרוג בוטל. אנא בדקו את החיבור לאינטרנט או את מדיית ההתקנה ונסו שנית. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "המיכה בכמה תוכנות הסתיימה"
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "להסיר חבילות שאינן בתוקף?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_דלג על השלב"
-
-#~ msgid "_Remove"
-#~ msgstr "_הסר"
-
-#~ msgid "Error during commit"
-#~ msgstr "שגיאה בעת ביצוע"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr "מספר בעיות נתגלו במהלך הניקוי. אנא הסתכל בהודעות מטה למידע נוסף. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "מחזיר את המערכת למצבה המקורי"
-
-#~ msgid "Checking package manager"
-#~ msgstr "בודק את מנהל החבילות"
-
-#~ msgid "Updating repository information"
-#~ msgstr "מעדכן מידע מאגרים"
-
-#~ msgid "Invalid package information"
-#~ msgstr "מידע חבילה לא תקין"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "פרטים"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "לאחר שהמידע על החבילות עודכן החבילה ההכרחית \"%s\" לא נמצא.\n"
-#~ "כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג."
-
-#~ msgid "Upgrading"
-#~ msgstr "משדרג"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "שדרוג המערכת הושלם."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "אנא הכניסו את \"%s\" לכונן \"%s\"."
-
-#~ msgid "Fetching is complete"
-#~ msgstr "ההורדה הושלמה"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה."
-
-#~ msgid "About %s remaining"
-#~ msgstr "נותרו כ-%s."
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "מוריד קובץ %li מתוך %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "מחיל שינויים"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "לא ניתן להתקין את \"%s\""
-
-#~ msgid "A fatal error occured"
-#~ msgstr "ארעה שגיאה חמורה"
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "חבילה %d תוסר."
-#~ msgstr[1] "%d חבילות יוסרו."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "חבילה חדשה %d תותקן."
-#~ msgstr[1] "%d חבילות חדשות יותקנו."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d חבילות חדשות ישודרגו."
-#~ msgstr[1] "%d חבילות ישודרגו."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "יש להוריד %s בסה\"כ. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "הורדת והתקנת השדרוג עשויה לארוך מספר שעות. לא ניתן לבטל את התהליך בשלב "
-#~ "מאוחר יותר."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr "כדי למנוע אובדן מידע אנא סגרו על תוכנית או מסמך פתוחים."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "המערכת שלך מעודכנת"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr "אין שדרוגים זמינים למערכת שלך. השדרוג יתבטל כעת."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>הסר %s </b>"
-
-#~ msgid "Install %s"
-#~ msgstr "התקן %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "שדרג %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li ימים, %li שעות ו-%li דקות"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li שעות ו-%li דקות"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li דקות"
-
-#~ msgid "%li seconds"
-#~ msgstr "%liשניות"
-
-#~ msgid "Reboot required"
-#~ msgstr "נדרשת הפעלה מחדש"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr "השדרוג הסתיים ונדרשת הפעלה מחדש. האם ברצונך לעשות זאת כעת?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>לבטל את השדרוג המתבצע?</big></b>\n"
-#~ "\n"
-#~ "המערכת עלולה להיות בלתי שמישה אם תבטלו את השדרוג. מומלץ ביותר להמשיך את "
-#~ "מהלך השדרוג."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>להפעיל מחדש את המערכת כדי להשלים את השדרוג?</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>להתחיל את השדרוג?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>משדרג את אובונטו לגרסה 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "מסדר ומנקה"
-
-#~ msgid "Details"
-#~ msgstr "פרטים"
-
-#~ msgid "Difference between the files"
-#~ msgstr "ההבדל בין הרבצים"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "מוריד ומתקין את השדרוג"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "מכין את השדרוג"
-
-#~ msgid "Restarting the system"
-#~ msgstr "מאתחל את המערכת"
-
-#~ msgid "Terminal"
-#~ msgstr "מסוף"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_בטל שידרוג"
-
-#~ msgid "_Continue"
-#~ msgstr "_המשך"
-
-#~ msgid "_Keep"
-#~ msgstr "_שמור"
-
-#~ msgid "_Replace"
-#~ msgstr "_החלף"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_דווח על באג"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_אתחל עכשיו"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_המשך בשידרוג"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_התחל שידרוג"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "לא ניתן למצוא הערות שיחרור גירסה"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "השרת עלול להיות עמוס מדי. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "לא ניתן להוריד הערות שחרור גירסה."
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "אנא בדקו את החיבור לאינטרנט."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "לא ניתן להריץ את כלי השדרוג"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr "זהו כנראה באג בכלי השדרוג. אנא דווחו על זה כבאג."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "מוריד את כלי השדרוג"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "כלי השדרוג ינחה אותך בתהליך השדרוג."
-
-#~ msgid "Upgrade tool"
-#~ msgstr "כלי שדרוג"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "ההורדה נכשלה"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "הורדת השדרוג נכשלה. עלולה להיות בעיית רשת. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "החילוץ נכשל"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr "חילוץ השדרוג נכשל. עלולה להיות בעיה עם הרשת או השרת. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "האימות נכשל"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr "אימות השדרוג נכשל. עלולה להיות בעיה עם הרשת או עם השרת. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "האימות נכשל"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr "אימות השדרוג נכשל. עלולה להיות בעיה עם הרשת או עם השרת. "
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "רשימת השינויים אינה זמינה"
-
-#~ msgid "Other updates"
-#~ msgstr "עדכונים אחרים"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "גרסה %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "מוריד רשימת שינויים..."
-
-#~ msgid "Download size: %s"
-#~ msgstr "גודל ההורדה: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "ניתן להתקין עדכון %s"
-#~ msgstr[1] "ניתן להתקין %s עדכונים"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "אנא חכו, התהליך עשוי לארוך זמן מה."
-
-#~ msgid "Update is complete"
-#~ msgstr "העדכון הושלם"
-
-#~ msgid "Checking for updates"
-#~ msgstr "מחפש עדכונים"
-
-#~ msgid "Version %s"
-#~ msgstr "גרסה %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(גודל: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "גרסת ההפצה שלך אינה נתמכת יותר"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "המערכת שלכם לא תקבל עדכוני אבטחה יותר. אנא שדרגו אותו לגירסה מאוחרת יותר "
-#~ "של אובונטו לינוקס. ראו http://www.ubuntu.com למידע נוסף על שידרוג המערכת."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>גירסה חדשה של ההפצה, \"%s\", זמינה</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "אינדקס התוכנות פגום"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "אי אפשר להתקין או להסיר אף תוכנה. יש להשתמש במנהל החבילות \"Synaptic\" או "
-#~ "להפעיל את הפקודה \"sudo apt-get install -f\" במסוף כדי לתקן בעיה זו."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>שמרו על המערכת מעודכנת</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>לא ניתן להתקין את כל העדכונים</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<big><b>פותח את מנהל העדכונים</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "שינויים"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "שינויים ותיאור העדכון"
-
-#~ msgid "Chec_k"
-#~ msgstr "_בדוק"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "בדיקת המצאות עדכונים במאגרי התוכנה"
-
-#~ msgid "Description"
-#~ msgstr "תיאור"
-
-#~ msgid "Release Notes"
-#~ msgstr "הערות שחרור גירסה"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "הראה התקדמות כל קובץ"
-
-#~ msgid "Software Updates"
-#~ msgstr "עדכוני תוכנה"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr "עדכוני תוכנה מתקנים שגיאות ופרצות אבטחה ומוסיפים תכונות חדשות."
-
-#~ msgid "U_pgrade"
-#~ msgstr "_שדרג"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "שדרוג המערכת לגירסה החדשה של אובונטו."
-
-#~ msgid "_Check"
-#~ msgstr "_בדוק"
+msgid "Starting..."
+msgstr "הגדרות"
 
-#, fuzzy
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_המשך בשידרוג"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_הסתר מידע זה בעתיד"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_התקן עדכונים"
-
-#~ msgid "changes"
-#~ msgstr "שינויים"
-
-#~ msgid "updates"
-#~ msgstr "עדכונים"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>עדכונים אוטומטיים</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>תקליטור/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>עדכוני אינטרנט</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>אינטרנט</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i> כדי לשפר את החוויה למשתמש באובונטו, אנא קחו חלק בתחרות הפופולריות. אם "
-#~ "תעשו כן רשימת התוכנות המותקנות ותכיפות השימוש בהן תשלח אנונימית לפרוייקט "
-#~ "אובונטו מיד שבוע.\n"
-#~ "\n"
-#~ "בתוצאות נעשה שימוש כדי לשפר את התמיכה בתוכנות פופולריות, ולדרג את "
-#~ "היישומים בתוצאות החיפוש.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "הוסף תקליטור"
-
-#~ msgid "Authentication"
-#~ msgstr "אימות"
-
-#~ msgid "Download from:"
-#~ msgstr "הורד מ:"
-
-#, fuzzy
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "הסר את המפתח הנבחר מרשימת המפתחות שאתה בוטח בהם."
-
-#~ msgid "Internet Updates"
-#~ msgstr "עדכוני אינטרנט"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr "רק עדכוני אבטחה משרתי אובונטו הרשמיים יותקנו באופן אוטומטי."
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "שחזר _ברירת מחדל"
-
-#, fuzzy
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "שחזר מפתחות ברירת מחדל"
-
-#~ msgid "Software Sources"
-#~ msgstr "מקורות תוכנה"
-
-#~ msgid "Source code"
-#~ msgstr "קוד מקור"
-
-#~ msgid "Statistics"
-#~ msgstr "סטטיסטיקה"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "שלח מידע סטטיסטי"
-
-#~ msgid "Third Party"
-#~ msgstr "צד שלישי"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_חפש עדכונים אוטומטית:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_הורד עדכונים באופן אוטומטי, אך אל תתקין אותם"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_התקן עדכוני אבטחה ללא הודעה"
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>הערות:</b>"
-
-#, fuzzy
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>רכיבים</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>הפצה:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>סוג:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>כתובת:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>הכנס את שורת APT השלמה של המאגר שברצונך להוסיף</b></big>\n"
-#~ "\n"
-#~ "שורת APT מכילה סוג, מיקום ותוכן של המאגר. לדוגמה: <i>\"deb http://ftp."
-#~ "debian.org sarge main\"</i>\n"
-#~ "אפשר למצוא הסבר מפורט על זה בתיעוד."
-
-#~ msgid "APT line:"
-#~ msgstr "APT שורת:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "מקור\n"
-#~ "בינארי"
-
-#, fuzzy
-#~ msgid "Edit Source"
-#~ msgstr "מקור"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "סורק תקליטור"
-
-#, fuzzy
-#~ msgid "_Add Source"
-#~ msgstr "מקור"
-
-#, fuzzy
-#~ msgid "_Reload"
-#~ msgstr "טען מחדש"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "הצג והתקן העדכונים הזמינים"
-
-#~ msgid "Update Manager"
-#~ msgstr "מנהל עדכונים"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr "בדוק אוטומטית אם גירסה חדשה של הפצה זו זמינה, והצע לשדרג (אם ניתן)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "חפש גירסאות חדשות להפצה"
-
-#~ msgid "Show details of an update"
-#~ msgstr "הצג פרטי עדכונים"
-
-#~ msgid "The window size"
-#~ msgstr "גודל החלון"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "הגדרת מקורות התוכנות להתקנה והעדכונים"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#, fuzzy
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "עדכוני אבטחה - דביאן יציב"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid ""
-#~ "This download will take about %s with a 56k modem and about %s with a "
-#~ "1Mbit DSL connection"
-#~ msgstr "ההורדה תיקח בערך %s עם מודם 56k ובערך %s עם חיבור DSL במהירות 1Mbit"
-
-#~ msgid "The list of changes is not available yet. Please try again later."
-#~ msgstr "רשימת השינויים לא זמינה עדיין. נסו שנית מאוחר יותר."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. Please check your Internet "
-#~ "connection."
-#~ msgstr "נכשל בהורדת רשימת השינויים. אנא בדוק אם החיבור לאינטרנט עובד."
-
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "תוכונות המוגבלות ע\"י זכויות יוצרים או בעיות משפטיות"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you havn't enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Canonical Ltd. לא תומכת יותר בחבילות התוכנה הבאות. עדיין ניתן לקבל תמיכה "
-#~ "מהקהילה.\n"
-#~ "\n"
-#~ "אם אל אפשרת התקנת תוכנות המתחוזקות ע\"י הקהילה (universe), החבילות האלה "
-#~ "יסומנו להסרה בצעד הבא."
-
-#~ msgid "Downloading file %li of %li with %s/s"
-#~ msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה"
-
-#~ msgid "Normal updates"
-#~ msgstr "עדכונים רגילים"
-
-#~ msgid "Downloading the list of changes..."
-#~ msgstr "מוריד את רשימת השינויים..."
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties"
-#~ "\"."
-#~ msgstr ""
-#~ "<b><big>יש לחפש עדכונים ידניתg></b>\n"
-#~ "\n"
-#~ "המערכת שלך לא מחפשת עדכונים באופן אוטומטי. ניתן לשנות הגדרות אלו ב\"מערכת"
-#~ "\"-> \"ניהול\" -> \"אפשרויות תוכנה\"."
-
-#~ msgid "Cancel _Download"
-#~ msgstr "בטל _הורדה"
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "לא ניתן למצוא שדרוג זמין"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "המערכת כבר שודרגה."
-
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "עדכוני אבטחה - אובונטו 5.10"
-
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "משדרג את אובונטו"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "לא ניתן להתקין את כל העדכונים הזמינים"
-
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "נתמך רשמית"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "נותרו %li שניות."
-
-#~ msgid "Download is complete"
-#~ msgstr "ההורדה הושלמה"
-
-#, fuzzy
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
-
-#, fuzzy
-#~ msgid "Hide details"
-#~ msgstr "<b>פרטים</b>"
-
-#, fuzzy
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>מפתחות</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>מפתחות</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "דיסק התקנה"
-
-#~ msgid "Software Preferences"
-#~ msgstr "העדפות תוכנה"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#, fuzzy
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>מפתחות</b>"
-
-#, fuzzy
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>רכיבים</b>"
-
-#~ msgid "_Custom"
-#~ msgstr "_התאם אישית"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "עדכונים - אובונטו 5.10"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "עדכוני אבטחה - אובונטו 5.04"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "עדכונים - אובונטו 5.10"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "עדכונים - אובונטו 5.10"
-
-#, fuzzy
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>מחלקה:</b>"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>מחלקה:</b>"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "טען מחדש את המידע על החבילה מהשרת"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">הורדת שינויים</span>\n"
-#~ "\n"
-#~ "צריך להוריד את השינויים מהשרת המרכזי"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "רשימת השינויים אינה זמינה"
 
-#~ msgid "Show available updates and choose which to install"
-#~ 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
 #, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "שגיאה בהסרת המפתח"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "ערוך מקורות תוכנה והגדרות"
-
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>מקורות</b>"
-
-#~ msgid "day(s)"
-#~ msgstr "ימים"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>מאגר</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>קבצים זמניים</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>ממשק משתמש</b>"
-
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>מפתחות אימות</b></big>\n"
-#~ "\n"
-#~ "ניתן להוסיף ולהסיר מפתחות אימות בעזרת תיבת דו-שיח זו. מפתח מאפשר לוודא את "
-#~ "תקינות התוכנה שאתה מוריד."
-
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "הוסף קובץ מפתח חדש לרשימת המפתחות שאתה בוטח בהם. אנא וודא שאתה שקיבלת את "
-#~ "המפתח בדרך מאובטחת ושאתה בוטח בבעלים. "
-
-#~ msgid "Add repository..."
-#~ msgstr "הוסף מאגר..."
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "_בדוק עדכוני תוכנה באופן אוטומטי."
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "_נקה קבצים זמניים של חבלות באופן אוטומטי."
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "משך זמן בימים בין הניקיונות: "
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "_מחק חבילות ישנות שנמצאות במטמון החבילות"
-
-#~ msgid "Edit Repository..."
-#~ msgstr "ערוך מאגר..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "גיל מקסימלי בימים:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "גודל מקסימלי במגה-בתים:"
-
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "שחזר את מפתחות ברירת המחדל שבאו עם ההפצה. זה לא ישנה את המפתחות המותקנים."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "_קבע גודל מקסימלי למטמון חבילות"
-
-#~ msgid "Settings"
-#~ msgstr "הגדרות"
-
-#~ msgid "Show detailed package versions"
-#~ msgstr "הראה פירוט גרסאות חבילה"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr "נכשל בהורדת רשימת השינויים. אנא בדוק אם החיבור לאינטרנט עובד."
 
-#~ msgid "Show disabled software sources"
-#~ msgstr "הראה פירוט מקורות תוכנה"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Update interval in days: "
-#~ msgstr "משך זמן בימים בין העדכונים: "
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "_Add Repository"
-#~ msgstr "_הוסף מאגר"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_הורד חבילות שניתנות לעדכון"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>מצב:</b>"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>עדכונים זמינים</b></big>\n"
-#~ "\n"
-#~ "נמצא שניתן לשדרג את החבילות הבאות. אפשר לשדרג אותן בעזרת בלחצן ההתקנה."
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "בטל הורדת דו\"ח השינויים"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Debian sarge"
-#~ msgstr "דביאן 3.1 \"סארג'\""
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "לא ניתן להתקין את \"%s\""
 
-#, fuzzy
-#~ msgid "Debian sid"
-#~ msgstr "דביאן בדיקה"
+#: ../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 "Oficial Distribution"
-#~ msgstr "<b>הפצה:</b>"
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "אתה צריך להיות root בשביל להריץ את תוכנה זו"
-
-#~ msgid "Binary"
-#~ msgstr "בינארי"
-
-#~ msgid "Non-free software"
-#~ msgstr "תוכנה לא-חופשית"
-
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "דביאן 3.0 \"וודי\""
-
-#~ msgid "Debian Stable"
-#~ msgstr "דביאן יציב"
-
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "דביאן לא ארה\"ב (יציב)"
-
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "דביאן לא ארה\"ב (בדיקה)"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "בחר בקובץ מפתח"
+msgid "An essential package would be removed"
+msgstr "חבילה חיונית תוסר בלית ברירה"
 
-#~ msgid "There is one package available for updating."
-#~ msgstr "אפשר לעדכן חבילה אחת."
-
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "אפשר לעדכן %s חבילות"
-
-#~ msgid "There are no updated packages"
-#~ msgstr "אין חבילות מעודכנות"
-
-#~ msgid "You did not select any of the %s updated package"
-#~ msgid_plural "You did not select any of the %s updated packages"
-#~ msgstr[0] "לא בחרת בחבילה המעודכנת"
-#~ msgstr[1] "לא בחרת אף אחת מ%s החבילות המעודכנות."
-
-#~ msgid "You have selected %s updated package, size %s"
-#~ msgid_plural "You have selected all %s updated packages, total size %s"
-#~ msgstr[0] "בחרת חבילה מעודכנת אחת, בגודל של %s"
-#~ msgstr[1] "בחרת את כל %s החבילות המעודכנות, בגודל כולל של %s"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
-#~ msgstr[0] "בחרת %s מתוך חבילה מעודכנת אחת, בגודל של %s"
-#~ msgstr[1] "בחרת %s מתוך %s חבילות מעודכנות, בגודל כולל של %s"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "The updates are being applied."
-#~ msgstr "העדכונים מתבצעים כרגע."
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "אפשר להריץ רק מנהל חבילות אחד באותו זמן. אנא סגור מנהלי חבילות אחרים קודם."
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Updating package list..."
-#~ msgstr "מעדכן רשימת חבילות..."
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "There are no updates available."
-#~ msgstr "אין עדכונים זמינים."
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "New version:"
-#~ 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 ""
 
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "אנא עדכן לגרסת אובונטו לינוקס חדשה. הגרסה שאתה משתמש בה כבר לא מקבלת "
-#~ "עדכוני אבטחה או עדכונים קריטיים אחרים. אנא ראה http://www.ubuntulinux.org "
-#~ "בשביל מידע אודות שדרוג."
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "הפצה חדשה עם שם קוד '%s' זמינה. אנא ראה http://www.ubuntulinux.org/ בשביל "
-#~ "הוראות שדרוג."
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Never show this message again"
-#~ msgstr "אל תראה את הודעה זו שוב."
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "שינויים לא נמצאו, השרת אולי לא מעודכן עדיין."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 2a8d99d3..24836e22 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,51 +276,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 6.0 'Squeeze' "
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -303,50 +338,158 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "प्रतिदिन"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Every two days"
-#~ msgstr "हर दो दिन"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Weekly"
-#~ msgstr "साप्ताहिक"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+#, fuzzy
+msgid "Details"
+msgstr "प्रतिदिन"
 
-#~ msgid "Every two weeks"
-#~ msgstr "हर दो हफ्तों में"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Every %s days"
-#~ msgstr "हर %s दिन में"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "After one week"
-#~ msgstr "एक हफ्ते बाद"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "After two weeks"
-#~ msgstr "दो हफ्ते बाद"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "After one month"
-#~ 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 ""
 
-#~ msgid "After %s days"
-#~ msgstr "%s दिन बाद"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#~ msgid "Import key"
-#~ msgstr "कुंजी आयात करें"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Error importing selected file"
-#~ 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 ""
 
-#~ msgid "    "
-#~ msgstr "    "
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
+
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "     "
-#~ 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 14e36bc1..4b268169 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -25,235 +25,266 @@ 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:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "Ubuntu 4.10 'Wart Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "Ubuntu 4.10 'Wart Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "Cdrom sa 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 sa 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdrom sa Ubuntu 5.04 ' Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CDROM s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CDROM s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Održavani od strane zajednice"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Neslobodni upogonitelji za uređaje"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Neslobodni softver"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CDROM sa Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Službeno podržani Open Source softver"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Održavani od strane zajednice (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Softver održavan od strane zajednice"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Neslobodni pogonski programi"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Neslobodni upogonitelji za uređaje "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Neslobodni upogonitelji za uređaje"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Ograničeni softver (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr "Softver ograničen autorskim pravom ili legalnim pitanjima"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "CDROM s Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Važne sigurnosne nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Preporučene nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Predložene nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Backport nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CDROM s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 osvježenja"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 backporti"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdrom sa Ubuntu 5.04 ' Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Službeno podržani"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 backporti"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Wart Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Održavani od strane zajednice (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Neslobodni (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Više nisu službeno podržani"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Ograničeno autorsko pravo"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 sigurnosne nadogradnje"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 osvježenja"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 backports"
 
@@ -265,55 +296,68 @@ 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 "Predložene nadogradnje"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Važne sigurnosne nadogradnje"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testni)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (nestabilni)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-kompatibilni programi sa neslobodnim ovisnostima"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-nekompatibilni programi"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Poslužitelj za %s"
@@ -321,1216 +365,160 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Glavni poslužitelj"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Osobni poslužitelji"
 
-#~ msgid "Daily"
-#~ msgstr "Dnevno"
-
-#~ msgid "Every two days"
-#~ msgstr "Svaki drugi dan"
-
-#~ msgid "Weekly"
-#~ msgstr "Tjedno"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Svaki drugi tjedan"
-
-#~ msgid "Every %s days"
-#~ msgstr "Svakih %s dana"
-
-#~ msgid "After one week"
-#~ msgstr "Nakon tjedan dana"
-
-#~ msgid "After two weeks"
-#~ msgstr "Nakon dva tjedna"
-
-#~ msgid "After one month"
-#~ msgstr "Nakon mjesec dana"
-
-#~ msgid "After %s days"
-#~ msgstr "Nakon %s dana"
-
-#~ msgid "%s updates"
-#~ msgstr "%s nadogradnje"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Najbliži poslužitelj"
-
-#~ msgid "Software Channel"
-#~ msgstr "Softverski repozitorij"
-
-#~ msgid "Active"
-#~ msgstr "Aktivno"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Izvorni kod)"
-
-#~ msgid "Source Code"
-#~ msgstr "Izvorni kod"
-
-#~ msgid "Import key"
-#~ msgstr "Uvoz ključa"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Greška prilikom uvoza odabrane datoteke"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Odabrana datoteka možda nije GPG ključ ili je možda oštećena."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Greška prilikom brisanja ključa"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Ključ koji ste odabrali se ne može obrisati. Molimo prijavite ovu grešku."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Greška prilikom očitavanja CD-a</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Upišite ime za disk"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Ubacite CD u uređaj:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Neispravni paketi"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Vaš sistem sadrži neispravne pakete koji nisu mogli biti popravljeni s "
-#~ "ovim programom. Popravite ih koristeći synaptic ili apt-get prije "
-#~ "nastavljanja."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Ne mogu nadograditi potrebne meta-pakete"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Bitan paket bi morao biti uklonjen"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Nisam mogao riješiti nadogradnju"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Nerješiv problem se pojavio prilikom rješavanja nadogradnje. \n"
-#~ "\n"
-#~ "Molimo prijavite ovo kao grešku u 'update-manager' paketu i uključite iz /"
-#~ "var/log/dist-upgrade/ u prijavu."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Greška prilikom identificiranja nekih paketa"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Nije bilo moguće identificirati neke pakete. Ovo bi mogao biti privremeni "
-#~ "problem s mrežom i trebali biste pokušati ponovo kasnije. Pogledajte "
-#~ "popis neidentificiranih paketa."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Ne mogu instalirati '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Nije bilo moguće instalirati potreban paket. Molimo prijavite ovo kao "
-#~ "grešku. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Nisam mogao odrediti meta-paket"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Vaš sustav ne sadrži ubuntu-desktop, kubuntu-desktop ili edubuntu-desktop "
-#~ "paket i nije bilo moguće odrediti koju verziju Ubuntua koristite.\n"
-#~ " Prije nastavka, molim instalirajte jedan od gore navedenih paketa "
-#~ "koristeći synaptic ili apt-get."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Dodavanje CDa nije uspjelo"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Došlo je do greške prilikom dodavanja CD-a zbog kojeg će nadogradnja biti "
-#~ "prekinuta. Molim prijavite ovo kao grešku, ako je ovo ispravan Ubuntu "
-#~ "CD.\n"
-#~ "\n"
-#~ "Poruka je bila:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "Čitam spremnik"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Preuzeti podatke za nadogradnju putem mreže?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "Nadogradnja može provjeriti dostupnost novih paketa i preuzeti pakete "
-#~ "putem Interneta, ukoliko nisu na CD-u.\n"
-#~ "Ako imate brz ili jeftin pristup mreži, trebali biste odgovoriti 'Da' "
-#~ "ovdje. Ukoliko ne želite preuzeti pakete putem mreže, odgovorite 'Ne'."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Nisam našao ispravan zrcalni poslužitelj"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Prilikom očitavanja vašeg repozitorija nisam našao unos za zrcalni "
-#~ "poslužitelj za nadogradnju. Ova greška se dogodila ako koristite "
-#~ "unutrašnji zrcalni poslužitelj ili je informacija o zrcalnom poslužitelju "
-#~ "zastarjela.\n"
-#~ "\n"
-#~ "Želite li, unatoč tome, nanovo zapisati vašu 'sources.list' datoteku ? "
-#~ "Ako odaberete 'Da' nadograditi će se svih '%s' do '%s' unosa.\n"
-#~ "Ako odaberete 'ne' nadogradnja će se prekinuti."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Kreirati uobičajene izvore?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Nakon očitavanja vaše 'sources.list' datoteke nisam našao ispravan unos "
-#~ "za '%s'.\n"
-#~ "Treba li dodati uobičajene unose za '%s' ? Ako odaberete 'Ne' nadogradnja "
-#~ "će prekinuti."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Podaci repozitorija neispravni"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Nadogradnja podataka repozitorija je rezultirala neispravnom datotekom. "
-#~ "Molim, prijavite ovo kao grešku."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Izvori trećih strana su isključeni"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Neki unosi trećih strana u vašoj sources.list datoteci su isključeni. "
-#~ "Možete ih uključiti nakon nadogradnje sa 'software-properties' alatom ili "
-#~ "sa synapticom."
-
-#~ msgid "Error during update"
-#~ msgstr "Greška prilikom nadogradnje"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Pojavio se problem prilikom nadogradnje. Obično se radi o mrežnom "
-#~ "problemu, pa vas molim da provjerite vašu mrežu i pokušate ponovo."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Nema dovoljno praznog mjesta na disku"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Nadogradnja se prekida. Molim oslobodite barem %s prostora na disku %s. "
-#~ "Ispraznite smeće i uklonite privremene pakete od prošlih instalacija "
-#~ "koristeći 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Želite li pokrenuti nadogradnju?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Nisam mogao instalirati nadogradnje"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Nadogradnja se prekida. Vaš sistem bi mogao biti u neupotrebljivom "
-#~ "stanju. Obnavljanje je pokrenuto (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Molim, prijavite ovu grešku u 'update-manager' paketu i uključite "
-#~ "datoteke u /var/log/dist-upgrade/ direktoriju u prijavu."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Nisam mogao preuzeti nadogradnje"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Nadogradnja se prekida. Molim provjerite vašu internet vezu ili "
-#~ "instalacijski medij i pokušajte ponovo. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Podrška za neke programe je gotova"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Ovi instalirani paketi više nisu službeno podržani od strane Canonicala i "
-#~ "sada se nalaze u repozitoriju kojeg održava zajednica ('Universe').\n"
-#~ "\n"
-#~ "Ako nemate omogućen 'universe' repozitorij, ovi paketi biti će predloženi "
-#~ "za uklanjanje."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Ukloniti zastarjele pakete?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Preskoči ovaj korak"
-
-#~ msgid "_Remove"
-#~ msgstr "_Ukloni"
-
-#~ msgid "Error during commit"
-#~ msgstr "Greška prilikom čina"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Neki problemi su se pojavili prilikom čišćenja. Molim pogledajte poruku "
-#~ "za više informacija. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Vraćam u početno stanje"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "Dohvaćanje backporta od '%s'"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Provjeravam upravitelja paketima"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Neuspjelo pripremanje nadogradnje"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Nerješiv problem se pojavio prilikom rješavanja nadogradnje. Molimo "
-#~ "prijavite ovo kao grešku u 'update-manager' paketu i uključite iz /var/"
-#~ "log/dist-upgrade/ u prijavu."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Nadograđujem podatke repozitorija"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Neispravni podaci paketa"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Nakon što su podaci paketa nadograđeni, bitan paket '%s' se ne može više "
-#~ "naći.\n"
-#~ "Ovo upućuje na ozbiljnu grešku, molim prijavite ovo kao grešku u 'update-"
-#~ "manager' paketu i uključite datoteke u /var/log/dist-upgrade/ direktoriju "
-#~ "u prijavu."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Pitam za potvrdu"
-
-#~ msgid "Upgrading"
-#~ msgstr "Nadograđujem"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Tražim zastarjele programe"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Nadogradnja sustava je završena."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Molim, ubacite '%s' u uređaj '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Preuzimanje je završeno"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Preuzimam datoteku %li od %li pri %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Otprilike je ostalo %s"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Preuzimam datoteku %li od %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Primjenjujem promjene"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Nisam mogao instalirati '%s'"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "Nadogradnja se prekida. Molim, prijavite ovu grešku za 'update-manager' "
-#~ "paket i uključite u prijavu datoteke iz /var/log/dist-upgrade direktorija."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Zamijeniti konfiguracijsku datoteku\n"
-#~ "'%s'?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Izgubit ćete sve promjene napravljene na ovoj konfiguracijskoj datoteci "
-#~ "ako odaberete izmjenu s novijom verzijom programa."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Nisam našao naredbu 'diff'"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Pojavila se ozbiljna greška"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Molim, prijavite ovo kao bug i uključite datoteke /var/log/dist-upgrade/"
-#~ "main.log i /var/log/dist-upgrade-apt.log u vaše izvješće. Nadogradnja se "
-#~ "sada prekida.\n"
-#~ "Vaša originalna sources.list datoteka je spremljena u /etc/apt/sources."
-#~ "list.distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d paket će biti uklonjen."
-#~ msgstr[1] "%d paketa će biti uklonjena."
-#~ msgstr[2] "%d paketa će biti uklonjeno."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d novi paket će biti instaliran."
-#~ msgstr[1] "%d nova paketa će biti instalirana."
-#~ msgstr[2] "%d novih paketa će biti instalirano."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d paket će biti nadograđen."
-#~ msgstr[1] "%d paketa će biti nadograđena."
-#~ msgstr[2] "%d paketa će biti nadograđeno."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Morate preuzeti ukupno %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Nadogradnja može potrajati nekoliko sati i ne može biti prekinuta niti u "
-#~ "jednom trenutku."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr "Da spriječite gubitak podataka zatvorite sve programe i datoteke."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Vaš sustav sadrži posljednje nadogradnje"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr "Nema nadogradnji za vaš sustav. Nadogradnja će biti otkazana."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Ukloni %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Instaliraj %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Nadogradi %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li dana %li sati i %li minuta"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li sati i %li minuta"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minuta"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li sekundi"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Preuzimanje će trajati %s sa 1Mbit DSL vezom i otprilike %s sa 56k modemom"
-
-#~ msgid "Reboot required"
-#~ msgstr "Potrebno je ponovno pokretanje računala"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Nadogradnja je završena i potrebno je ponovo pokrenuti računalo. Želite "
-#~ "li to učiniti sada?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Prekinuti nadogradnju u tijeku?</big></b>\n"
-#~ "\n"
-#~ "Sistem bi mogao biti u neupotrebljivom stanju ako prekinete nadogradnju. "
-#~ "Preporuka je da nastavite nadogradnju."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Ponovno pokretanje računala potrebno je za završetak nadogradnje</"
-#~ "big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Pokrenuti nadogradnju?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Nadogradnja Ubuntua na verziju 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Čišćenje"
-
-#~ msgid "Details"
-#~ msgstr "Detalji"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Razlike između datoteka"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Preuzimam i instaliram nadogradnje"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Mijenjam repozitorije"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Pripremam nadogradnju"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Ponovno pokrećem sustav"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Prekini nadogradnju"
-
-#~ msgid "_Continue"
-#~ msgstr "_Nastavi"
-
-#~ msgid "_Keep"
-#~ msgstr "_Zadrži"
-
-#~ msgid "_Replace"
-#~ msgstr "Za_mijeni"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Prijavi grešku"
-
-#~ msgid "_Restart Now"
-#~ msgstr "Ponovno pok_reni računalo"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Nastavi nadogradnju"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Pokreni nadogradnju"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Nisam mogao naći bilješke izdanja"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Poslužitelj bi mogao biti preopterećen. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Nisam mogao dohvatiti bilješke izdanja"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Molim, provjerite vašu internet vezu."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Nisam mogao pokrenuti alat za nadogradnju"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Ovo je najvjerovatnije greška u alatu za nadogradnju. Molim, prijavite "
-#~ "ovo kao grešku"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Dohvaćam alat za nadogradnju"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Alat za nadogradnju će vas voditi kroz proces nadogradnje."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Potpis alata za nadogradnju"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Alat za nadogradnju"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Preuzimanje nije uspjelo"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Preuzimanje nadogradnje nije uspjelo. Vjerojatno je problem u mreži. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Raspakiravanje nije uspjelo."
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Raspakiravanje nadogradnje nije uspjelo. Vjerojatno je problem u mreži "
-#~ "ili na poslužitelju. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Provjera nije uspjela"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Provjera nadogradnje nije uspjela. Vjerojatno je problem u mreži ili s "
-#~ "poslužiteljem. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Autorizacija nije uspjela"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Autorizacija nadogradnje nije uspjela. Vjerojatno je problem u mreži ili "
-#~ "s poslužiteljem. "
-
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "Preuzimanje datoteke %(current)li od %(total)li brzinom %(speed)s/s"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Preuzimam datoteku %(current)li od %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "Popis promjena nije dostupan."
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Popis promjena trenutno nije dostupan. \n"
-#~ "Molim, pokušajte ponovno kasnije."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Preuzimanje popisa promjena nije uspjelo. \n"
-#~ "Molim, provjerite svoju internet vezu."
-
-#~ msgid "Backports"
-#~ msgstr "Backporti"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Nadogranje distribucije"
-
-#~ msgid "Other updates"
-#~ msgstr "Druge nadogradnje"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Verzija %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Preuzimam popis promjena..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "_Odznači sve"
-
-#~ msgid "_Check All"
-#~ msgstr "Pro_vjeri sve"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Veličina preuzimanja: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Možete instalirati %s nadogradnju"
-#~ msgstr[1] "Možete instalirati %s nadogradnje"
-#~ msgstr[2] "Možete instalirati %s nadogradnji"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Molim pričekajte, ovo može potrajati."
-
-#~ msgid "Update is complete"
-#~ msgstr "Nadogradnja je gotova"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Tražim moguće nadogradnje"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Verzija %(old_version)s u %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Verzija %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Veličina: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Vaša distibucija više nije podržana"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Nećete više dobivati sigurnosne zakrpe ili kritične nadogradnje. "
-#~ "Nadogradite na noviju verziju Ubuntu Linuxa. Pogledajte na http://www."
-#~ "ubuntu.com za više detalja o nadogradnji."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Novo izdanje distribucije, '%s', je dostupno</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Popis programa je oštećen"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Nemoguće je instalirati ili ukloniti bilo koji program. Molim koristite "
-#~ "upravitelja paketima \"Synaptic\" ili upišite \"sudo apt-get install -f\" "
-#~ "u terminalu za ispravljanje ovog problema."
-
-#~ msgid "None"
-#~ msgstr "Ništa"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Morate ručno provjeriti postojanje nadogradnji</big></b>\n"
-#~ "\n"
-#~ "Vaš sustav ne provjerava automatski postojanje nadogradnji. Možete "
-#~ "podesiti ovo ponašanje u <i>Softver repozitoriji</i>, na <i>Internet "
-#~ "nadogradnje</i> kartici."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Održavajte vaš sustav nadograđenim</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>Greška prilikom očitavanja CD-a</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Pokreće se upravitelj nadogradnji</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "Promjene"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Promjene i opis nadogradnje"
-
-#~ msgid "Chec_k"
-#~ msgstr "P_rovjeri"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Provjeri repozitorije za nove nadogradnje"
-
-#~ msgid "Description"
-#~ msgstr "Opis"
-
-#~ msgid "Release Notes"
-#~ msgstr "Bilješke izdanja"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Pokreni nadogradnju distribucije, za instalaciju što više nadogradnji.\n"
-#~ "\n"
-#~ "Ovo može biti izazvano nedovršenom nadogradnjom, neslužbenim paketima ili "
-#~ "pokretanjem razvojne verzije."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Prikaži napredak pojedinih datoteka"
-
-#~ msgid "Software Updates"
-#~ msgstr "Nadogradnje programa"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i "
-#~ "donose nove mogućnosti."
-
-#~ msgid "U_pgrade"
-#~ msgstr "Na_dogradnja"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Nadogradi na zadnju verziju Ubuntua"
-
-#~ msgid "_Check"
-#~ msgstr "Pro_vjeri"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Nadogradnja distribucije"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "Ubuduće _sakrij ovu informaciju"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Instaliraj nadogradnje"
-
-#~ msgid "_Upgrade"
-#~ msgstr "Na_dogradnja"
-
-#~ msgid "changes"
-#~ msgstr "promjene"
-
-#~ msgid "updates"
-#~ msgstr "nadogradnje"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Automatske nadogradnje</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Internet nadogradnje</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Kako bismo poboljšali Ubuntu, molim odvojite trenutak i sudjelujte u "
-#~ "anketi. Ako to želite, popis instaliranog softvera i periodičnost njegove "
-#~ "uporabe biti će anonimno poslana Ubuntu projektu svaki tjedan.\n"
-#~ "\n"
-#~ "Rezultati će se iskoristiti kako bi se povećala podrška za popularne "
-#~ "programe i kako bi se programi rangirali više na ljestvici pretrage.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Dodaj CD-ROM"
-
-#~ msgid "Authentication"
-#~ msgstr "Autorizacija"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "_Obriši dobavljene datoteke programa:"
-
-#~ msgid "Download from:"
-#~ msgstr "Preuzimanje sa:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Uvezi javni ključ od pouzdanog davatelja programa"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Internet nadogradnje"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Samo sigrnosne nadogradnje sa službenih Ubuntu poslužitelja će biti "
-#~ "instalirane automatski"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Vrati _uobičajene postavke"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Vrati uobičajene ključeve vaše distribucije"
-
-#~ msgid "Software Sources"
-#~ msgstr "Softver repozitoriji"
-
-#~ msgid "Source code"
-#~ msgstr "Izvorni kod"
-
-#~ msgid "Statistics"
-#~ msgstr "Statistike"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Pošalji statističke informacije"
-
-#~ msgid "Third Party"
-#~ msgstr "Treća strana"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Provjeri postojanje nadogradnji automatski:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "P_reuzmi nadogradnje automatski, ali ih ne instaliraj"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Unesi datoteku ključa"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Instaliraj sigurnosne nadogradnje bez potvrde"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Informacije o repozitoriju su prestare</big></b>\n"
-#~ "\n"
-#~ "Morate ponovno učitati repozitorij za instalaciju programa i nadogradnju "
-#~ "s novog ili promijenjenog repozitorija. \n"
-#~ "\n"
-#~ "Trebate funkcionalnu internet vezu za nastavak."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Komentar:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Komponente:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribucija:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Vrsta:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Unesite kompletnu APT liniju repozitorija koji želite dodati</b></"
-#~ "big>\n"
-#~ "\n"
-#~ "APT linija uključuje vrstu, lokaciju i komponente kanala, na primjer <i>"
-#~ "\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "APT linija:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binarni\n"
-#~ "Izvorni"
-
-#~ msgid "Edit Source"
-#~ msgstr "Uredi izvor"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Pretražujem CD-ROM"
-
-#~ msgid "_Add Source"
-#~ msgstr "_Dodaj izvor"
-
-#~ msgid "_Reload"
-#~ msgstr "_Osvježi"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Pokaži i instaliraj moguće nadogradnje"
-
-#~ msgid "Update Manager"
-#~ msgstr "Upravitelj nadogradnjama"
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Automatski provjeri je li nova verzija trenutne distribucije dostupna i "
-#~ "ponudi nadogradnju (ako je moguća)."
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Preuzimam datoteku %(current)li od %(total)li"
 
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Provjeri za nova izdanja distribucije"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detalji"
 
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Ako je automatsko provjeravanje nadogradnji isključeno, morate ručno "
-#~ "ponovno učitati popis repozitorija. Ova opcija omogućuje skrivanje "
-#~ "podsjetnika prikazanog u ovom slučaju."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Podsjeti na potrebno ponovno učitavanje kanal popisa"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Prikaži detalje nadogradnje"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Sprema veličinu prozora upravitelja nadogradnji"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr "Sprema status programa koji sadrži popis promjena i opise"
-
-#~ msgid "The window size"
-#~ msgstr "Veličina prozora"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Podesi repozitorije i nadogradnje"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" sigurnosne nadogradnje"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Popis promjena nije dostupan."
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Preuzimam datoteku %li od %li nepoznatom brzinom"
+#: ../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 ""
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "_Instaliraj nadogradnje"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Preuzimanje popisa promjena nije uspjelo. \n"
+"Molim, provjerite svoju internet vezu."
 
-#~ msgid "Cancel _Download"
-#~ msgstr "Prekini _preuzimanje"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Neki paketi više nisu službeno podržani"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Nisam mogao naći niti jednu nadogradnju"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Vaš sustav je već nadograđen."
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Nadograđujem na Ubuntu 6.10</span>"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Uvezi sigurnosne nadogradnje za Ubuntu"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Ubuntu nadogradnje"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Ne mogu instalirati sve dostupne nadogradnje"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Ne mogu instalirati '%s'"
 
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Ispitujem vaš sustav</b></big>\n"
-#~ "\n"
-#~ "Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i "
-#~ "donose nove mogućnosti."
+#: ../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 "Oficially supported"
-#~ msgstr "Službeno podržani"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Neke nadogradnje zahtijevaju uklanjanje pojedinih programa. Upotrijebite "
-#~ "opciju \"Označi sve nadogradnje\" upravitelja paketima \"Synaptic\" ili "
-#~ "upišite \"sudo apt-get dist-upgrade\" u terminalu za potpunu nadogradnju "
-#~ "vašeg sistema."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Slijedeći paketi će biti preskočeni:"
+msgid "An essential package would be removed"
+msgstr "Bitan paket bi morao biti uklonjen"
 
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Otprilike je ostalo %li sekundi"
-
-#~ msgid "Download is complete"
-#~ msgstr "Preuzimanje je završeno"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Nadogradnja se prekida. Molim, prijavite ovaj bug."
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Nadograđujem Ubuntu"
-
-#~ msgid "Hide details"
-#~ msgstr "Sakrij detalje"
-
-#~ msgid "Show details"
-#~ msgstr "Prikaži detalje"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "Dozvoljno je pokretanje samo jednog paketnog alata u istom trenutku"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr "Molim, prvo zatvorite drugi program npr. 'aptitude' ili 'Synaptic'."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Repozitoriji</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Kjučevi</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Instalacijski medij"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Postavke nadogradnje"
-
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Repozitorij</b>"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponente</b>"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Add Channel"
-#~ msgstr "Dodaj repozitorij"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "Uredi repozitorij"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Dodaj repozitorij"
-#~ msgstr[1] "_Dodaj repoztorije"
-#~ msgstr[2] "_Dodaj repozotrije"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "_Prilagođeno"
+#: ../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 ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS sigurnosne nadogradnje"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS osvježenja"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS backporti"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 47434413..cdfd526f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -24,235 +24,266 @@ 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: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 "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM"
+
+#. 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 "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM"
+
+#. 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 "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM"
+
+#. 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 biztonsági frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 biztonsági frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Közösségi karbantartású"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Szabadalmazott eszközmeghajtók"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Nem-szabad"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Az Ubuntu 6.10 \"Edgy Eft\" CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "A Canonical által támogatott nyílt forrású szoftverek"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Közösségi karbantartású (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../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"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Nem-szabad meghajtók"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Szabadalmazott eszközmeghajtók "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Szabadalmazott eszközmeghajtók"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Nem-szabad szoftverek (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 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:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Az Ubuntu 6.06 LTS \"Dapper Drake\"-et tartalmazó CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Fontos biztonsági frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Ajánlott frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Javasolt frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Visszaportolt frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 biztonsági frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 visszaportolt csomagok"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Hivatalosan támogatott"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 biztonsági frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 visszaportolt csomagok"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Közösségi karbantartású (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Nem-szabad (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Hivatalosan már nem támogatott"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Szerzői jogi korlátozás alatt"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 biztonsági frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 frissítések"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 visszaportolt csomagok"
 
@@ -264,55 +295,68 @@ 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:31
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 3.1 \"Sarge\""
+
+#. Description
+#: ../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 "Javasolt frissítések"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Fontos biztonsági frissítések"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (tesztelés alatt)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (instabil)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Nem DFSG-kompatibilis szoftver"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Kiszolgáló a következőhöz: %s"
@@ -320,1234 +364,161 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Fő kiszolgáló"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Egyéni kiszolgálók"
 
-#~ msgid "Daily"
-#~ msgstr "Naponta"
-
-#~ msgid "Every two days"
-#~ msgstr "Kétnaponta"
-
-#~ msgid "Weekly"
-#~ msgstr "Hetente"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Minden két hétben"
-
-#~ msgid "Every %s days"
-#~ msgstr "%s naponta"
-
-#~ msgid "After one week"
-#~ msgstr "Egy hét után"
-
-#~ msgid "After two weeks"
-#~ msgstr "Két hét után"
-
-#~ msgid "After one month"
-#~ msgstr "Egy hónap után"
-
-#~ msgid "After %s days"
-#~ msgstr "%s nap után"
-
-#~ msgid "%s updates"
-#~ msgstr "%s frissítés"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Legközelebbi kiszolgáló"
-
-#~ msgid "Software Channel"
-#~ msgstr "Szoftvercsatorna"
-
-#~ msgid "Active"
-#~ msgstr "Aktív"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Forráskód)"
-
-#~ msgid "Source Code"
-#~ msgstr "Forráskód"
-
-#~ msgid "Import key"
-#~ msgstr "Kulcs importálása"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Hiba a kiválasztott fájl importálása közben"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "A kiválasztott fájl vagy nem GPG kulcsfájl, vagy sérült."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Hiba a kulcs eltávolítása közben"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt "
-#~ "hibaként."
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Hiba történt a CD beolvasása közben</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Kérem, adja meg a lemez nevét"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Kérem, helyezzen be egy lemezt a meghajtóba:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Törött csomagok"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Az Ön rendszere törött csomagokat tartalmaz, amelyek ezzel a szoftverrel "
-#~ "nem javíthatóak. Kérem, először javítsa ki őket a synaptic vagy az apt-"
-#~ "get segítségével."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "A szükséges meta-csomagok nem frissíthetőek"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Egy alapvető csomag eltávolításra kerülne"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Nem tudom megtervezni a frissítés menetét"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "A frissítés megtervezése közben feloldhatatlan probléma lépett fel.\n"
-#~ "\n"
-#~ "Jelentse ezt a hibát az \"update-manager\" csomaghoz és vegye be a /var/"
-#~ "log/dist-upgrade/ könyvtárban található fájlokat a hibajelentésbe."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Hiba történt néhány csomag hitelesítése közben"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Néhány csomagot nem sikerült hitelesíteni. Lehetséges, hogy ezt átmeneti "
-#~ "hálózati probléma okozza, ezért érdemes később újra megpróbálni. Az "
-#~ "alábbi lista a hitelesíthetetlen csomagokat tartalmazza."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "'%s' nem telepíthető"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Egy szükséges csomag nem telepíthető. Kérem, jelentse ezt hibaként. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Nem tudom megállapítani a meta-csomagot"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Az Ön rendszere nem tartalmazza az ubuntu-desktop, kubuntu-desktop vagy "
-#~ "edubuntu-desktop csomagok egyikét sem, és nem lehetett megállapítani, "
-#~ "hogy az Ubuntu mely változatát használja.\n"
-#~ " A folytatás előtt telepítse a fenti csomagok egyikét a synaptic vagy az "
-#~ "apt-get használatával."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "A CD hozzáadsa meghiúsult"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Hiba történt a CD hozzáadása során, a frissítés félbeszakad. Jelentse ezt "
-#~ "hibaként, ha ez egy érvényes Ubuntu CD.\n"
-#~ "\n"
-#~ "A hibaüzenet:\n"
-#~ "\"%s\""
-
-#~ msgid "Reading cache"
-#~ msgstr "Gyorsítótár beolvasása"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Letölt adatokat a hálózatról a frissítéshez?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "A frissítés használhatja a hálózatot a legújabb frissítések ellenőrzésére "
-#~ "és letöltheti a jelenlegi CD-n el nem érhető csomagokat.\n"
-#~ "Ha gyors vagy olcsó hálózati kapcsolattal rendelkezik, válaszoljon "
-#~ "igennel. Ha a hálózat elérése drásga, válaszoljon nemmel."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "nem található érvényes tükör"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "A lerakatinformációk elemzése során a program nem talált tükörbejegyzést "
-#~ "a frissítéshez. Ez akkor fordulhat elő, ha belső tükröt használ, vagy a "
-#~ "tükörinformációk elavultak.\n"
-#~ "\n"
-#~ "Mindenképpen újra kívánja írni a sources.list fájlt? Ha az \"Igen\" "
-#~ "gombot választja, akkor az összes \"%s\" bejegyzés \"%s\" bejegyzéssé "
-#~ "lesz frissítve. \n"
-#~ "A \"Nem\" kiválasztása megszakítja a frissítést."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Alapértelmezett források ismételt előállítása?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "A sources.list fájl elemzése után nem található érvényes bejegyzés a "
-#~ "következőhöz: %s.\n"
-#~ "\n"
-#~ "Kíván alapértelmezett bejegyzéseket adni a következőhöz: %s? Ha a Nem "
-#~ "gombott választja, a frissítés félbeszakad."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Érvénytelen csomagtároló információ"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "A csomagtároló információ frissítése hibás fájlt eredményezett. Kérem, "
-#~ "jelentse ezt hibaként."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "A külső források letiltva"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "A sources.list néhány harmadik féltól származó forrása le lett tiltva. "
-#~ "Újraengedélyezheti őket a frissítés után a Szoftvertulajdonságok "
-#~ "eszközzel, vagy a Synaptic csomagkezelővel."
-
-#~ msgid "Error during update"
-#~ msgstr "Hiba történt a frissítés közben"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Hiba lépett fel a frissítés közben. Ez többnyire hálózati problémára "
-#~ "utal. Kérem, ellenőrizze a hálózati kapcsolatot és próbálja újra."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Nincs elég szabad hely a merevlemezen"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "A frissítés most meg fog szakadni. Szabadítson fel legalább %s helyet a"
-#~ "(z) %s lemezen. Ürítse a kukáját és törölje a korábbi telepítések "
-#~ "átmeneti fájljait a \"sudo apt-get clean\" parancs kiadásával."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Biztosan el szeretné kezdeni a frissítést?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "A frissítések nem telepíthetők"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "A frissítés most félbeszakad. Előfordulhat, hogy a rendszer "
-#~ "használhatatlan állapotban van. Egy helyreállítás került futtatásra (dpkg "
-#~ "--configure -a).\n"
-#~ "\n"
-#~ "Jelentse ezt a hibát az \"update-manager\" csomaghoz és vegye be a /var/"
-#~ "log/dist-upgrade/ könyvtárban található fájlokat a hibajelentésbe."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "A frissítések nem tölthetők le"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "A frissítés most félbeszakad. Kérem, ellenőrizze a hálózati kapcsolatot "
-#~ "vagy a telepítő médiát és próbálja újra. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Egyes alkalmazások támogatása megszűnt"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "A Canonical Ltd. már nem biztosít támogatást a következő "
-#~ "szoftvercsomagokhoz. A közösségtől továbbra is kaphat támogatást. \n"
-#~ "\n"
-#~ "Ha nincsenek engedélyezve a közösség által karbantarott szoftverek "
-#~ "(universe tároló), akkor ezek a csomagok a következő lépésben "
-#~ "eltávolításra lesznek javasolva."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Eltávolítja az elavult csomagokat?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "Ezen lé_pés kihagyása"
-
-#~ msgid "_Remove"
-#~ msgstr "_Eltávolítás"
-
-#~ msgid "Error during commit"
-#~ msgstr "Hiba a módosítások rögzítése közben"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "A frissítés befejező fázisa közben hiba lépett fel. Az alábbi üzenet "
-#~ "további információkat tartalmaz a hibára vonatkozóan. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "A rendszer eredeti állapotának helyreállítása"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "\"%s\" visszaportolt változatának letöltése"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Csomagkezelő ellenőrzése"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "A frissítés előkészítése meghiúsult"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "A rendszer frissítésre való előkészítése meghiúsult. Jelentse ezt a hibát "
-#~ "az \"update-manager\" csomaghoz és vegye be a /var/log/dist-upgrade/ "
-#~ "könyvtárban található fájlokat a hibajelentésbe."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Csomagtároló-információk frissítése"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Érvénytelen csomaginformációk"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "A csomaginformációk frissítése után a(z) \"%s\" alapvető csomag nem "
-#~ "található többé.\n"
-#~ "Ez egy komoly problémát jelez, jelentse ezt a hibát az \"update-manager\" "
-#~ "csomaghoz és vegye be a /var/log/dist-upgrade/ könyvtárban található "
-#~ "fájlokat a hibajelentésbe."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Megerősítés kérése"
-
-#~ msgid "Upgrading"
-#~ msgstr "Frissítés folyamatban"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Elavult szoftverek keresése"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "A rendszer frissítése befejeződött."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Helyezze be a következő médiát: '%s', ebbe a meghajtóba: '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "A letöltés befejeződött"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Fájl letöltése (%li., összesen: %li), sebesség: %s/mp"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Kb. %s van hátra"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Fájl letöltése: %li/%li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Módosítások alkalmazása..."
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "'%s' nem telepíthető"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "A frissítés most félbeszakad. Jelentse ezt a hibát az \"update-manager\" "
-#~ "csomaghoz és vegye be a /var/log/dist-upgrade/ könyvtárban található "
-#~ "fájlokat a hibajelentésbe."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Lecseréli a személyre szabott\n"
-#~ "\"%s\"\n"
-#~ "konfigurációs fájlt?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "A beállítófájl összes módosítása elvész, ha lecseréli az újabb verzióra."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "A 'diff' parancs nem található"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Végzetes hiba történt"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Jelentse ezt hibaként és a hibajelentéshez mellékelje a /var/log/dist-"
-#~ "upgrade/main.log és /var/log/dist-upgrade/apt.log fájlokat. A frissítés "
-#~ "most félbeszakad.\n"
-#~ "Az eredeti sources.list /etc/apt/sources.list.distUpgrade néven került "
-#~ "mentésre."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d csomag el lesz távolítva."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d új csomag kerül telepítésre."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d csomag frissítve lesz."
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Összes letöltendő adatmennyiség: %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "A frissítés letöltése és telepítése több órát is igénybe vehet és a "
-#~ "későbbiek során nem lehet bármikor megszakítani."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Az esetleges adatvesztés elkerülése érdekében zárjon be minden nyitott "
-#~ "alkalmazást és dokumentumot."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "A rendszere naprakész"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Nem állnak rendelkezésre frissítések a rendszeréhez. A frissítés most "
-#~ "megszakad."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>%s eltávolítása</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "%s telepítése"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "%s frissítése"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li nap, %li óra és %li perc van hátra"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "Kb. %li óra és %li perc"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li perc"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li másodperc"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "A letöltés körülbelül %s-ig tart 1 Mbit DSL kapcsolaton és %s-ig 56k "
-#~ "modem használatával"
-
-#~ msgid "Reboot required"
-#~ msgstr "Újraindítás szükséges"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "A frissítés elkészült, de a befejezéshez újra kell indítani a rendszert. "
-#~ "Újraindítja most?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Megszakítja a folyamatban lévő frissítést?</big></b>\n"
-#~ "\n"
-#~ "A rendszer használhatatlan állapotban maradhat, ha megszakítja a "
-#~ "frissítést. Erősen javasoljuk, hogy folytassa a frissítést."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Indítsa újra a rendszert a frissítés befejezéséhez</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Megkezdi a frissítést?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Az Ubuntu frissítése a 6.10-es változatra.</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Frissítés befejezése"
-
-#~ msgid "Details"
-#~ msgstr "<b>Részletek</b>"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Fájlok közti különbség"
-
-#, fuzzy
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Frissítések letöltése és telepítése"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Szoftvercsatornák módosítása"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Frissítés előkészítése"
-
-#~ msgid "Restarting the system"
-#~ msgstr "A rendszer újraindítása"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminál"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "Frissítés _megszakításaa"
-
-#~ msgid "_Continue"
-#~ msgstr "Folytatás"
-
-#~ msgid "_Keep"
-#~ msgstr "_Megtartás"
-
-#~ msgid "_Replace"
-#~ msgstr "_Csere"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Hibabejelentés"
-
-#~ msgid "_Restart Now"
-#~ msgstr "Újrain_dítás most"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "Frissítés _folytatása"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "Frissítés _indítása"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Nem érhetők el a kiadási megjegyzések"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "A kiszolgáló túl lehet terhelve. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "A kiadási megjegyzések nem tölthetők le"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Kérjük ellenőrizze az internetkapcsolatát."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Nem sikerült futtatni a frissítőeszközt"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Feltehetőleg ez egy hiba a frissítőeszközben. Kérem, jelentse ezt "
-#~ "hibaként."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Frissítőeszköz letöltése"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "A frissítőeszköz végigvezeti Önt a frissítési folyamaton."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Frissítőeszköz aláírása"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Frissítőeszköz"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "A letöltés meghiúsult"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "A frissítés letöltése meghiúsult. Lehetséges, hogy hálózati probléma áll "
-#~ "fenn. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "A kibontás meghiúsult"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "A frissítés kibontása meghiúsult. Probléma lehet a hálózattal vagy a "
-#~ "kiszolgálóval. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Az ellenőrzés meghiúsult"
-
-#, fuzzy
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "A frissítés ellenőrzése meghiúsult. Probléma lehet a hálózattal vagy a "
-#~ "kiszolgálóval. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Hitelesítés sikertelen"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "A frissítés hitelesítése meghiúsult. Probléma lehet a hálózattal vagy a "
-#~ "kiszolgálóval. "
-
-#~ 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"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "%(current)li. fájl letöltése, összesen: %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "A módosítások listája nem érhető el"
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "A módosítások listája még nem érhető el.\n"
-#~ "Próbálkozzon később."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "A módosítások listájának letöltése meghiúsult.\n"
-#~ "Ellenőrizze az internetkapcsolatát."
-
-#~ msgid "Backports"
-#~ msgstr "Visszaportolt csomagok"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Disztribúciófrissítések"
-
-#~ msgid "Other updates"
-#~ msgstr "Egyéb frissítések"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "%s verzió: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Változások listájának letöltése..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "_Kijelölések törlése"
-
-#~ msgid "_Check All"
-#~ msgstr "Összes _ellenőrzése"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Letöltés mérete: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "%s frissítést telepíthet"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Kis türelmet, ez eltarthat egy ideig."
-
-#~ msgid "Update is complete"
-#~ msgstr "A frissítés befejeződött"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Frissítések keresése"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Régi verzió: %(old_version)s, új verzió:  %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "%s verzió"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Méret: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "A terjesztés már nem támogatott"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Nem fog további biztonsági javításokat vagy kritikus frissítéseket kapni. "
-#~ "Frissítsen az Ubuntu Linux egy újabb változatára. A frissítéssel "
-#~ "kapcsolatos információkat az http://www.ubuntu.com weboldalon talál."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>A disztribúció új \"%s\" kiadása elérhető</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "A szoftverindex sérült"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Lehetetlen szoftvereket telepíteni vagy törölni. Használja a Synaptic "
-#~ "csomagkezelőt vagy futtassa a \"sudo apt-get install -f\" parancsot egy "
-#~ "terminálban a probléma megoldása érdekében."
-
-#~ msgid "None"
-#~ msgstr "Nincs"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Saját kezűleg kell megkeresnie a rendelkezésre álló "
-#~ "frissítéseket</big></b>\n"
-#~ "\n"
-#~ "A rendszere jelenleg nem keresi automatikusan a frissítéseket. Ezt a "
-#~ "viselkedést az <i>Internetes frissítések</i> lap <i>Szoftverforrások</i> "
-#~ "szakaszában változtathatja meg."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Tartsa naprakészen a rendszerét</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Nem minden frissítés telepíthető</b></big>\r\n"
-#~ "\r\n"
-#~ "%s"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Frissítéskezelő indítása</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "Módosítások"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "A frissítés módosításai és leírása"
-
-#~ msgid "Chec_k"
-#~ msgstr "_Ellenőrzés"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Frissítések keresése a szoftvercsatornákon"
-
-#~ msgid "Description"
-#~ msgstr "Leírás"
-
-#~ msgid "Release Notes"
-#~ msgstr "Kiadási megjegyzések"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Disztribúciófrissítés futtatása, a lehető legtöbb frissítés telepítése "
-#~ "érdekében. \n"
-#~ "\n"
-#~ "Ezt egy befejezetlen frissítés, nem hivatalos szoftverforrások vagy "
-#~ "fejlesztői verzió futtatása okozhatja."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Egyes fájlok állapotának mutatása"
-
-#~ msgid "Software Updates"
-#~ msgstr "Szoftverfrissítések"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "A szoftverfrissítések kijavítják a programhibákat, biztonsági "
-#~ "sebezhetőségeket és új szolgáltatásokat biztosítanak."
-
-#~ msgid "U_pgrade"
-#~ msgstr "_Frissítés"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Frissítés az Ubuntu legújabb változatára"
-
-#~ msgid "_Check"
-#~ msgstr "_Ellenőrzés"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Disztribúció frissítése"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_A jövőben ne mutassa ezt az információt"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Telepítés"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "_Frissítés"
-
-#~ msgid "changes"
-#~ msgstr "módosítás"
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#~ msgid "updates"
-#~ msgstr "frissítés"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Automatikus frissítések</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CD-ROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Hálózati frissítések</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Az Ubuntu által biztosított felhasználói élmény javítása érdekében "
-#~ "kérjük vegyen részt a népszerűségi versenyben. Ha így dönt, akkor a "
-#~ "telepített szoftverek listája és azok használatának gyakorisága hetente "
-#~ "összegyűjtésre és névtelenül elküldésre kerül az Ubuntu projektnek.\n"
-#~ "\n"
-#~ "Az eredmények a népszerű alkalmazások támogatásának javításához és a "
-#~ "keresési eredmények rangsorolásához kerülnek felhasználásra.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "_CD-ROM hozzáadása"
-
-#~ msgid "Authentication"
-#~ msgstr "Hitelesítés"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "L_etöltött csomagok törlése:"
-
-#~ msgid "Download from:"
-#~ msgstr "Letöltés innen:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Megbízható szoftverszolgáltató publikus kulcsának importálása"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Hálózati frissítések"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Csak az Ubuntu kiszolgálóiról származó biztonsági frissítések kerülnek "
-#~ "automatikusan telepítésre."
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "_Alapértelmezés visszaállítása"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "A disztribúcióra jellemző alapértelmezett kulcsok visszaállítása"
-
-#~ msgid "Software Sources"
-#~ msgstr "Szoftverforrások"
-
-#~ msgid "Source code"
-#~ msgstr "Forráskód"
-
-#~ msgid "Statistics"
-#~ msgstr "Statisztika"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Statisztikai információk beküldése"
-
-#~ msgid "Third Party"
-#~ msgstr "Harmadik fél"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Frissítések automatikus keresése:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "Frissítések automatikus _letöltése, a telepítésük nélkül"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Kulcsfájl importálása"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Biztonsági frissítések telepítése megerősítés nélkül"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Az elérhető szoftverekkel kapcsolatos információk elévültek</"
-#~ "big></b>\n"
-#~ "\n"
-#~ "Szoftverek és frissítések telepítéséhez újonnan felvett vagy módosított "
-#~ "forrásokból, újra le kell töltenie az elérhető szoftverekkel kapcsolatos "
-#~ "információkat.\n"
-#~ "\n"
-#~ "A folytatáshoz működő hálózati kapcsolatra van szükség."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Megjegyzés:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Összetevők:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Disztribúció:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Típus:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Adja meg a forrásként felvenni kívánt tároló teljes APT sorát</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "Az APT sor tartalmazza a tároló típusát, helyét és összetevőit, például "
-#~ "<i>\"deb http://ftp.debian.org sarge main\"</i>."
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "%(current)li. fájl letöltése, összesen: %(total)li"
 
-#~ msgid "APT line:"
-#~ msgstr "APT sor:"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "<b>Részletek</b>"
 
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Bináris\n"
-#~ "Forrás"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Edit Source"
-#~ msgstr "Forrás szerkesztése"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "CD-ROM átvizsgálása"
-
-#~ msgid "_Add Source"
-#~ msgstr "_Forrás hozzáadása"
-
-#~ msgid "_Reload"
-#~ msgstr "F_rissítés"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Rendelkezésre álló frissítések megjelenítése és telepítése"
-
-#~ msgid "Update Manager"
-#~ msgstr "Frissítéskezelő"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Az aktuális terjesztés új verziójának automatikus keresése és a frissítés "
-#~ "felajánlása (ha lehetséges)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Új disztribúciókiadások keresése"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Ha a frissítések automatikus keresése le van tiltva, akkor a "
-#~ "csatornalistát kézzel kell újratölteni. Ezzel a beállítással elrejtheti "
-#~ "az ilyen helyzetekben megjelenő emlékeztetőt."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Figyelmeztessen, ha újra kell tölteni a csatornalistát"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Frissítés részleteinek megjelenítése"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "A frissítéskezelő ablak méretének tárolása"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Eltárolja a módosítások listáját és a leírást tartalmazó kiterjesztő "
-#~ "állapotát"
-
-#~ msgid "The window size"
-#~ msgstr "Az ablak mérete"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Telepíthető szoftverek és frissítések forrásának beállítása"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "A módosítások listája nem érhető el"
 
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" biztonsági frissítések"
+#: ../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 ""
 
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"A módosítások listájának letöltése meghiúsult.\n"
+"Ellenőrizze az internetkapcsolatát."
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Normal updates"
-#~ msgstr "Normális frissítések"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Cancel _Download"
-#~ msgstr "Letöltés _megszakítása"
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Néhány szoftver már nincs hivatalosan támogatva"
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Nincs elérhető frissítés"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Az Ön rendszere már frissítve lett."
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Frissítés az Ubuntu 6.10 "
-#~ "változatra</span>"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Az Ubuntu fontos biztonsági frissítései"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Az Ubuntu frissítései"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Nem telepíthető minden rendelkezésre álló frissítés"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "'%s' nem telepíthető"
 
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>A rendszer elemzése</b></big>\n"
-#~ "\n"
-#~ "A szoftverfrissítések programhibákat javítanak, megszüntetik a biztonsági "
-#~ "sebezhetőségeket és új szolgáltatásokat biztosítanak."
+#: ../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 "Oficially supported"
-#~ msgstr "Hivatalosan támogatott"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Néhány frissítés további szoftverek eltávolítását igényli. Használja a "
-#~ "Synaptic csomagkezelő \"Minden frissítés kijelölése\" funkcióját, vagy "
-#~ "futtassa terminálból a \"sudo apt-get dist-upgrade\" parancsot a rendszer "
-#~ "teljes frissítéshez."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "A következő frissítések ki lesznek hagyva:"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Kb. %li másodperc van hátra"
-
-#~ msgid "Download is complete"
-#~ msgstr "A letöltés befejeződött"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "A frissítés félbeszakadt. Kérem, jelentse ezt hibaként."
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Az Ubuntu frissítése"
-
-#~ msgid "Hide details"
-#~ msgstr "Részletek elrejtése"
+msgid "An essential package would be removed"
+msgstr "Egy alapvető csomag eltávolításra kerülne"
 
-#~ msgid "Show details"
-#~ msgstr "Részletek megjelenítése"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "Csak egy szoftverkezelő eszköz futhat egyidejűleg"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Zárja be a másik alkalmazást, például az aptitude vagy Synaptic "
-#~ "programokat."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Csatornák</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Kulcsok</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Telepítő média"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Szoftver beállításai"
-
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Csatorna</b>"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Összetevők</b>"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Add Channel"
-#~ msgstr "Csatorna hozzáadása"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "Csatorna szerkesztése"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "Csatorna hozzá_adása"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "_Egyéni"
+#: ../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 ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS biztonsági frissítések"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS frissítések"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS visszaportolt csomagok"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/id.po b/po/id.po
index 81d0f8d8..d16e283f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -23,246 +23,274 @@ 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:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "Ubuntu 6.06 LTS Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "Ubuntu 6.06 LTS Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:135
+#, fuzzy
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "Ubuntu 6.06 LTS Security Updates"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:153
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr ""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:197
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 6.06 LTS Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 6.06 LTS Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 6.06 LTS Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Dikelola oleh komunitas (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "Tidak-bebas (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS Updates"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Dikelola oleh komunitas (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Dikelola oleh komunitas (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Dikelola oleh komunitas (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Tidak-bebas (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Tidak-bebas (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 #, fuzzy
 msgid "Important security updates"
 msgstr "Pemutakhiran lewat Internet"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "_Instal Update"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "_Instal Update"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 6.06 LTS Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 6.06 LTS Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 6.06 LTS Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Resmi disokong"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 6.06 LTS Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 6.06 LTS Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 6.06 LTS Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Dikelola oleh komunitas (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Tidak-bebas (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Beberapa perangkat lunak tidak lagi resmi disokong"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Hak cipta terlarang"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 6.06 LTS Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 6.06 LTS Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 6.06 LTS Backports"
@@ -275,58 +303,71 @@ 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:58
+#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 3.1 \"Sarge\""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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
 #, fuzzy
 msgid "Proposed updates"
 msgstr "_Instal Update"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Pemutakhiran lewat Internet"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 "Perangkat Lunak yang sesuai dengan DFSG tapi tergantung pada Perangkat Lunak "
 "Tidak-Bebas"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -334,1099 +375,162 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Harian"
-
-#~ msgid "Every two days"
-#~ msgstr "Setiap dua hari"
-
-#~ msgid "Weekly"
-#~ msgstr "Mingguan"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Setiap dua minggu"
-
-#~ msgid "Every %s days"
-#~ msgstr "Setiap %s hari"
-
-#~ msgid "After one week"
-#~ msgstr "Setelah satu minggu"
-
-#~ msgid "After two weeks"
-#~ msgstr "Setelah dua minggu"
-
-#~ msgid "After one month"
-#~ msgstr "Setelah satu bulan"
-
-#~ msgid "After %s days"
-#~ msgstr "Setelah %s hari"
-
-#, fuzzy
-#~ msgid "%s updates"
-#~ msgstr "_Instal Update"
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "Perangkat Lunak Mutakhir"
-
-#~ msgid "Import key"
-#~ msgstr "Impor kunci"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Kesalahan mengimpor berkas terpilih"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Berkas terpilih mungkin bukan berkas kunci GPG atau berkas mungkin korup."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Kesalahan menghapus kunci"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Berkas yang anda pilih tidak dapat dihapus. Silakan laporkan ini sebagai "
-#~ "bug."
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Kesalahan memindai CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Silakan masukkan nama untuk cakram"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Silakan masukan cakram ke dalam penggerak"
-
-#~ msgid "Broken packages"
-#~ msgstr "Paket rusak"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Sistem anda mengandung paket rusak yang tidak dapat diperbaiki dengan "
-#~ "perangkat lunak ini. Silakan perbaiki terlebih dahulu dengan menggunakan "
-#~ "synaptic atau apt-get sebelum melanjutkan hal ini."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Tidak dapat memutakhirkan meta-paket yang dibutuhkan"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Paket esensial akan dihapus"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Tidak dapat menghitung pemutakhiran"
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Terjadi masalah saat menghitung pemutakhiran. Silakan laporkan ini "
-#~ "sebagai bug."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Kesalahan membuktikan keabsahan beberapa paket"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Tidak memungkinkan untuk membuktikan keabsahan dari beberapa paket. Ini "
-#~ "mungkin karena masalah pada jaringan. Anda dapat mencobanya beberapa saat "
-#~ "lagi. Lihat senarai dari paket yang belum terbukti keabsahnya dibawah ini."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Tidak dapat menginstal '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Tidak memungkinkan untuk menginstal paket yang dibutuhkan. Silakan "
-#~ "laporkan ini sebagai bug. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Tidak dapat menebak meta-paket"
-
-#, fuzzy
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Sistem anda tidak memuat paket ubuntu-desktop, kubuntu-desktop dan "
-#~ "edubuntu-desktop dan tidak memungkinkan untuk mendeteksi versi ubuntu "
-#~ "yang anda jalankan.\n"
-#~ " Silakan instal dahulu salah satu paket di atas dengan menggunakan "
-#~ "synaptic atau apt-get sebelum melanjutkan."
-
-#, fuzzy
-#~ msgid "Failed to add the CD"
-#~ msgstr "Gagal untuk fetch"
-
-#~ msgid "Reading cache"
-#~ msgstr "Membaca cache"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Tidak menemukan mirror yang valid"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Ketika memindai informasi gudang anda, tidak ditemukan entri mirror untuk "
-#~ "upgrade. Ini dapat terjadi jika anda menjalankan mirror internal atau "
-#~ "jika informasi morror sudah out-of-date.\n"
-#~ "\n"
-#~ "Apakah anda ingin menulis ulang berkas 'sources.list' anda?\" Jika anda "
-#~ "pilih 'Yes' disini, berkas akan memutakhirkan semua entri '%s' ke '%s'.\n"
-#~ "Jika anda pilih 'no' pemutakhiran akan dibatalkan."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Membuat sumber baku?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Setelah memindai berkas 'sources.list' anda, tidak ditemukan entri yang "
-#~ "benar untuk '%s'\n"
-#~ "Haruskah entri baku untuk '%s' ditambahkan? Jika anda pilih 'No' "
-#~ "pemutakhiran akan dibatalkan."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Informasi gudang tidak valid"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Meng-upgrade informasi gudang berakhir di dalam berkas yang tidak benar. "
-#~ "Silakan laporkan ini sebagai bug."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Sumber dari pihak ketiga dilumpukan"
-
-#, fuzzy
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Entri pihak ketikga di dalam berkas sources.list akan dilumpuhkan. Anda "
-#~ "dapat mengaktifkan kembali setelah upgrade dengan alat 'software-"
-#~ "properties' atau dengan synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Kesalahan pada waktu pemutakhiran"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Terjadi masalah pada waktu pemutakhiran. Ini biasanya karena masalah "
-#~ "jaringan, silakan periksa koneksi jaringan anda dan ulangi."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Kapasitas cakram tidak mencukupi"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Upgrade dibatalkan sekarang. Silakan sediakan setidaknya %s dari ruang "
-#~ "cakram pada %s. Kosongkan sampah anda dan hapus paket sementara dari "
-#~ "instalasi terdahulu dengan menggunakan 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Apakah anda ingin memulai pemutakhiran?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Tidak dapat menginstal pemutakhiran"
-
-#, fuzzy
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Upgrade dibatalkan sekarang. Sistem anda dapat menjadi tidak dapat "
-#~ "digunakan. Perbaikan sedang berjalan (dpkg --configure -a)."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Tidak dapat mengunduh pemutakhiran"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Upgrade dibatalkan sekarang. Silakan periksa koneksi internet anda atau "
-#~ "media instalasi dan coba lagi nanti. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Paket terinstal ini tidak lagi mendapat sokongan resmi, dan sekarang "
-#~ "hanya disokong melalui komunitas ('universe').\n"
-#~ "\n"
-#~ "Jika anda tidak mengaktifkan komponen 'universe' paket ini akan diajurkan "
-#~ "untuk penghapusan dalam langkah selanjutnya."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Hapus paket usang?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Lewati Langkah Ini"
-
-#~ msgid "_Remove"
-#~ msgstr "_Hapus"
-
-#~ msgid "Error during commit"
-#~ msgstr "Kesalahan pada waktu commit"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Beberapa kesalahan terjadi pada waktu pembersihan. Silakan lihat pesan di "
-#~ "bawah untuk informasi lebih lanjut. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Sistem dikembalikan ke keadaan awal"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Memeriksa manajer paket"
-
-#, fuzzy
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Menyiapkan upgrade"
-
-#, fuzzy
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Terjadi masalah saat menghitung pemutakhiran. Silakan laporkan ini "
-#~ "sebagai bug."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Memutakhirkan informasi gudang"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Informasi paket tidak valid"
-
-#, fuzzy
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Setelah informasi paket anda dimutakhirkan paket penting '%s' tidak dapat "
-#~ "ditemukan lagi.\n"
-#~ "Ini mengindikasikan adanya kesalahan serius, silakan laporkan ini sebagai "
-#~ "bug."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Menanyakan konfigurasi"
-
-#~ msgid "Upgrading"
-#~ msgstr "Meng-upgrade"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Mencari perangkat lunak usang"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Upgrade sistem telah selesai."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Silakan masukkan '%s' ke dalam penggerak '%s'"
-
-#, fuzzy
-#~ msgid "Fetching is complete"
-#~ msgstr "Pemutakhiran selesai"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Mengunduh berkas %li dari %li pada %s/s"
-
-#, fuzzy
-#~ msgid "About %s remaining"
-#~ msgstr "Sekitar %li menit lagi"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Mengunduh berkas %li dari %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Sahkan perubahan"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Tidak dapat instal '%s'"
-
-#, fuzzy
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Mengganti berkas konfigurasi\n"
-#~ "'%s'?"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Perintah 'diff' tidak dapat ditemukan"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Terjadi kesalahan fatal"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Silakan laporkan ini sebagai bug dan sertakan berkas /var/log/dist-"
-#~ "upgrade.log dan /var/log/dist-upgrade-apt.log dalam laporan anda. Upgrade "
-#~ "akan dibatalkan sekarang. Berkas sources.list anda akan disimpan dalam /"
-#~ "etc/apt/sources.list.distUpgrade."
-
-#, fuzzy
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%s paket akan dihapus."
-
-#, fuzzy
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%s paket baru akan diinstal."
-
-#, fuzzy
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%s paket akan diupgrade."
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Anda harus mengunduh sebanyak %s. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Upgrade membutuhkan waktu beberapa jam dan tidak dapat dibatalkan setelah "
-#~ "itu."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Untuk mencegah kehilangan data silakan tutup seluruh aplikasi dan dokumen."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Sistem anda telah up-to-date"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Hapus %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Instal %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Upgrade %s"
-
-#, fuzzy
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "Sekitar %li hari %li jam %li menit lagi"
-
-#, fuzzy
-#~ msgid "%li hours %li minutes"
-#~ msgstr "Sekitar %li jam %li menit lagi"
-
-#~ msgid "Reboot required"
-#~ msgstr "Diperlukan reboot"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Upgrade telah selesai dan sistem harus direboot. Apakah anda ingin "
-#~ "melakukan ini sekarang"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Batalkan upgrade yang sedang berjalan?</big></b>\n"
-#~ "\n"
-#~ "Jika anda membatalkan upgrade sistem dapat menjadi tidak bisa digunakan. "
-#~ "Anda disarankan untuk melanjutkan upgrade."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Mulai ulang sistem untuk menyelesaikan upgrade</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Mulai upgrade?</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Membersihkan"
-
-#~ msgid "Details"
-#~ msgstr "Rincian"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Perbedaan diantara berkas"
-
-#, fuzzy
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Mengunduh dan menginstal upgrade"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Memodifikasi kanal perangkat lunak"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Menyiapkan upgrade"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Memulai ulang sistem"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#, fuzzy
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Lanjutkan Upgrade"
-
-#~ msgid "_Keep"
-#~ msgstr "_Simpan"
-
-#~ msgid "_Replace"
-#~ msgstr "_Ganti"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Laporkan Bug"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Mulai Ulang Sekarang"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Lanjutkan Upgrade"
-
-#, fuzzy
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Lanjutkan Upgrade"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Tidak dapat menemukan catatan luncuran"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Server mungkin kelebihan muatan "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Tidak dapat mengunduh catatan luncuran"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Silakan periksa koneksi internet anda."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Tidak dapat menjalankan alat upgrade"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Sepertinya ada bug dalam peralatan upgrade. Silakan laporkan ini sebagai "
-#~ "bug"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Mengunduh peralatan upgrade"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Peralatan upgrade akan memandu anda untuk melalui proses upgrade."
+#: ../apt/progress/gtk2.py:259
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr "Mengunduh berkas %li dari %li dengan %s/s"
 
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Tanda tangan peralatan upgrade"
+#: ../apt/progress/gtk2.py:265
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Mengunduh berkas %li dari %li dengan %s/s"
 
-#~ msgid "Upgrade tool"
-#~ msgstr "Peralatan upgrade"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Rincian"
 
-#~ msgid "Failed to fetch"
-#~ msgstr "Gagal untuk fetch"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "Gagal meng-fetch upgrade. Terjadi masalah pada jaringan. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Gagal mengekstrak"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Gagal mengekstrak upgrade. Mungkin terjadi masalah dengan jaringan atau "
-#~ "dengan server. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Verifikasi gagal"
-
-#, fuzzy
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Gagal memeriksa upgrade. Mungkin terjadi masalah dengan jaringan atau "
-#~ "dengan server. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Otentikasi gagal"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Otentikasi upgrade gagal. Mungkin terjadi masalah dengan jaringan atau "
-#~ "dengan server. "
-
-#, fuzzy
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "Mengunduh berkas %li dari %li dengan %s/s"
-
-#, fuzzy
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Mengunduh berkas %li dari %li dengan %s/s"
-
-#, fuzzy
-#~ msgid "The list of changes is not available"
-#~ msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti."
-
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti."
-
-#, fuzzy
-#~ 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."
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "Ubuntu 6.06 LTS Backports"
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "_Lanjutkan Upgrade"
-
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "_Instal Update"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versi %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Mengunduh senarai dari perubahan..."
-
-#, fuzzy
-#~ msgid "_Check All"
-#~ msgstr "_Periksa"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Ukuran unduh: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Anda dapat instal %s pemutakhiran"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Silakan tunggu, hal ini membutuhkan beberapa waktu."
-
-#~ msgid "Update is complete"
-#~ msgstr "Pemutakhiran selesai"
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "_Instal Update"
-
-#, fuzzy
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Versi baru: %s   (Ukuran: %s)"
-
-#, fuzzy
-#~ msgid "Version %s"
-#~ msgstr "Versi %s:"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Distribusi anda tidak disokong lagi"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Anda tidak akan mendapatkan perbaikan keamanan atau pemutakhiran penting "
-#~ "lebih lanjut. Upgrade ke versi berikut dari Ubuntu Linux. Lihat http://"
-#~ "www.ubuntu.com untuk informasi lebih lanjut."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Luncuran distribusi baru '%s' telah tersedia</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Indeks perangkat lunak telah rusak"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Tidak memungkinkan untuk menginstal atau menghapus perangkat lunak "
-#~ "apapun. Silakan gunakan manajer paket \"Synaptic\" atau jalankan \"sudo "
-#~ "apt-get install -f\" dalam terminal untuk memperbaiki persoalan ini."
-
-#, fuzzy
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Anda harus memeriksa pemutakhiran secara manual</big></b>\n"
-#~ "\n"
-#~ "Sistem anda tidak diatur untuk pemutakhiran secara otomatis. Anda dapat "
-#~ "mengatur ini di dalam \"System\" -> \"Administration\" -> \"Software "
-#~ "Properties\"."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Memelihara sistem anda up-to-date</b></big>"
-
-#, fuzzy
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Kesalahan memindai CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Mulai upgrade?</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "Perubahan"
-
-#~ msgid "Chec_k"
-#~ msgstr "Peri_ksa"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Periksa kanal perangkal lunak untuk pemutakhiran terbaru"
-
-#~ msgid "Description"
-#~ msgstr "Deskripsi"
-
-#~ msgid "Release Notes"
-#~ msgstr "Catatan Luncuran"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Tampilkan kemajuan dari berkas tunggal"
-
-#~ msgid "Software Updates"
-#~ msgstr "Perangkat Lunak Mutakhir"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Perangkat lunak nutakhir memperbaiki kesalahan, menyingkirkan kelemahan "
-#~ "keamanan dan menyediakan fitur baru."
-
-#~ msgid "U_pgrade"
-#~ msgstr "U_pgrade"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Upgrade ke versi Ubuntu terakhir"
-
-#~ msgid "_Check"
-#~ msgstr "_Periksa"
-
-#, fuzzy
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Lanjutkan Upgrade"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Sembunyikan informasi ini di masa depan"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Instal Update"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "U_pgrade"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "Perubahan"
-
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Internet update</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Internet update</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet update</b>"
-
-#, fuzzy
-#~ msgid "Add Cdrom"
-#~ msgstr "Tambah _Cdrom"
-
-#~ msgid "Authentication"
-#~ msgstr "Otentikasi"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "H_apus berkas perangkat lunak yang telah diunduh:"
-
-#, fuzzy
-#~ msgid "Download from:"
-#~ msgstr "Unduh telah selesai"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Impor kunci publik dari penyedia perangkal lunak terpercaya"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Pemutakhiran lewat Internet"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Hanya pemutakhiran keamanan dari server resmi Ubuntu yang akan diinstal "
-#~ "secara otomatis"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Kembali ke _Baku"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Kembalikan kunci baku dari distribusi anda"
-
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "Properti Perangkat Lunak"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Periksa pemutakhiran secara otomatis:"
-
-#, fuzzy
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Unduh pemutakhiran di latar belakang, tetapi jangan diinstal"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Impor Berkas Kunci"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Instal pemutakhiran keamanan tanpa perlu konfirmasi"
-
-#, fuzzy
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Informasi kanal sudah out-of-date</big></b>\n"
-#~ "\n"
-#~ "Anda harus memuat ulang informasi kanal untuk menginstal perangkat lunak "
-#~ "dan pemutakhiran dari kanal yang baru ditambah atau berubah. \n"
-#~ "\n"
-#~ "Anda butuh koneksi internet untuk melanjutkannya."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Komentar:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Komponen:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribusi:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipe:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Masukkan baris lengkap APT dari kanal yang ingin anda tambah </"
-#~ "b></big>\n"
-#~ "\n"
-#~ "Baris APT menyertakan tipe, lokasi dan komponen dari kanal, sebagai "
-#~ "contoh <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "Baris APT:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Biner\n"
-#~ "Sumber"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Memindai CD-ROM"
-
-#~ msgid "_Reload"
-#~ msgstr "_MuatUlang"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Tampilkan dan instal pemutakhiran yang tersedia"
-
-#~ msgid "Update Manager"
-#~ msgstr "Manajer Pemutakhiran"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Memeriksa otomatis jika versi baru dari distribusi sekarang telah "
-#~ "tersedia dan tawarkan untuk meng-upgrade (jika memungkinkan)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Periksa untuk luncuran distribusi baru"
-
-#, fuzzy
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Jika pemeriksaan pemutakhiran secara otomatis dilumpuhkan, anda harus "
-#~ "memuat ulang senarai kanal secara manual. Opsi ini mengizinkan untuk "
-#~ "menyembunyikan pengingat yang ada pada kasus ini."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Ingatkan untuk memuat ulang senarai kanal"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Show details of an update"
-#~ msgstr "Tampilkan perincian dari pemutakhiran"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Menyimpan ukuran dari dialog update-manager"
+#: ../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 ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Simpan keadaan expander yang memuat senarai dari perubahan dan deskripsi"
+msgid "The list of changes is not available"
+msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti."
 
-#~ msgid "The window size"
-#~ msgstr "Ukuran jendela"
+#: ../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 "Configure the sources for installable software and updates"
-#~ msgstr "Mengatur kanal perangkat lunak dan pemutakhiran lewat internet"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" Security Updates"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+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."
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Kecepatan mengunduh berkas %li dari %li tidak diketahui"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "_Instal Update"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Cancel _Download"
-#~ msgstr "Batalkan _Unduh"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Beberapa perangkat lunak tidak lagi resmi disokong"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Tidak dapat menemukan upgrade apapun"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Sistem anda telah diupgrade"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Mengupgrade ke Ubuntu 6.06 LTS</"
-#~ "span>"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Pemutakhiran lewat Internet"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Tidak dapat menginstal '%s'"
 
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Upgrade ke versi Ubuntu terakhir"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Tidak dapat menginstal semua pemutakhiran yang tersedia"
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Menguji sistem anda</b></big>\n"
-#~ "\n"
-#~ "Pemutakhiran perangkat lunak memperbaiki kesalahan, melenyapkan kelemahan "
-#~ "keamanan dan menyediakan fitur baru."
+#: ../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 "Oficially supported"
-#~ msgstr "Resmi disokong"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Beberapa pemutakhiran butuh penghapusan perangkat lunak yang ada. Gunakan "
-#~ "fungsi \"Mark All Upgrades\" dari paket manajer paket \"Synaptic\" atau "
-#~ "jalankan \"sudo apt-get dist-upgrade\"\" dalam terminal untuk "
-#~ "memutakhirkan sistem anda."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Pemutakhiran berikut akan dilewati:"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Sekitar %li detik lagi"
-
-#~ msgid "Download is complete"
-#~ msgstr "Unduh telah selesai"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Upgrade sekarang dibatalkan. Silakan laporkan bug ini."
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Mengupgrade Ubuntu"
-
-#~ msgid "Hide details"
-#~ msgstr "Sembunyikan perincian"
-
-#~ msgid "Show details"
-#~ msgstr "Tampilkan perincian"
+msgid "An essential package would be removed"
+msgstr "Paket esensial akan dihapus"
 
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr ""
-#~ "Hanya satu peralatan manajemen perangkat lunak yang dapat berjalan disaat "
-#~ "yang bersamaan"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Silakan tutup aplikasi lain terlebih dahulu seperti 'aptitude' atau "
-#~ "'Synaptic'."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Kanal</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Kunci</b>"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Installation Media"
-#~ msgstr "Media Instalasi"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Software Preferences"
-#~ msgstr "Preferensi Perangkat Lunak"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Kanal</b>"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponen</b>"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Add Channel"
-#~ msgstr "Tambah Kanal"
+#: ../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 ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "Edit Kanal"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Tambah Kanal"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "_Custom"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/it.po b/po/it.po
index 97221f24..5d1ac5a7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -25,235 +25,266 @@ 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: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 "CD-ROM con 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 "CD-ROM con 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 "CD-ROM con 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 - Aggiornamenti di sicurezza"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 - Aggiornamenti di sicurezza"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 «Edgy Eft»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Mantenuto dalla comunità"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Driver proprietari per i dispositivi"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Software con restrizioni"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD-ROM con Ubuntu 6.10 «Edgy Eft»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Software open source supportato da Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Mantenuto dalla comunità (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Software open source mantenuto dalla comunità"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Driver non liberi"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Driver proprietari per dispositivi "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Driver proprietari per i dispositivi"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Software con restrizioni (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr "Software con restrizioni per copyright o motivi legali"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 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:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Aggiornamenti di sicurezza importanti"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Aggiornamenti raccomandati"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Aggiornamenti proposti"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Aggiornamenti di backport"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 - Aggiornamenti di sicurezza"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 - Aggiornamenti"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Backport di Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Supportati ufficialmente"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 - Aggiornamenti di sicurezza"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 - Aggiornamenti"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Backport per Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Mantenuti dalla comunità (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Non libero (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Software non più supportato ufficialmente"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Copyright con restrizioni"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 - Aggiornamenti di sicurezza"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Aggiornamenti di Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Backport per Ubuntu 4.10"
 
@@ -265,56 +296,69 @@ 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:31
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 3.1 \"Sarge\""
+
+#. Description
+#: ../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 "Aggiornamenti proposti"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Aggiornamenti di sicurezza importanti"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 #, fuzzy
 msgid "Debian current stable release"
 msgstr "Debian Unstable"
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (Unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Software compatibile con le DFSG con dipendenze non libere"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Software non compatibile con le DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Server in %s"
@@ -322,1588 +366,161 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Server principale"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Server personalizzati"
 
-#~ msgid "Daily"
-#~ msgstr "Ogni giorno"
-
-#~ msgid "Every two days"
-#~ msgstr "Ogni due giorni"
-
-#~ msgid "Weekly"
-#~ msgstr "Ogni settimana"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Ogni due settimane"
-
-#~ msgid "Every %s days"
-#~ msgstr "Ogni %s giorni"
-
-#~ msgid "After one week"
-#~ msgstr "Dopo una settimana"
-
-#~ msgid "After two weeks"
-#~ msgstr "Dopo due settimane"
-
-#~ msgid "After one month"
-#~ msgstr "Dopo un mese"
-
-#~ msgid "After %s days"
-#~ msgstr "Dopo %s giorni"
-
-#~ msgid "%s updates"
-#~ msgstr "%s aggiornamenti"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Server più vicino"
-
-#~ msgid "Software Channel"
-#~ msgstr "Canale software"
-
-#~ msgid "Active"
-#~ msgstr "Attivo"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(codice sorgente)"
-
-#~ msgid "Source Code"
-#~ msgstr "Codice sorgente"
-
-#~ msgid "Import key"
-#~ msgstr "Importa chiave"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Errore nell'importare il file selezionato"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Il file selezionato potrebbe non essere un file di chiave GPG o potrebbe "
-#~ "essere corrotto."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Errore nel rimuovere la chiave"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "La chiave selezionata non può essere rimossa. Notificare questo evento "
-#~ "come bug."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Errore nella scansione del CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Inserire un nome per il disco"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Inserire un disco nell'unità:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Pacchetti non integri"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Il sistema contiene pacchetti non integri che non possono essere "
-#~ "aggiustati con questo software. Prima di procedere, utilizzare \"synaptic"
-#~ "\" o \"apt-get\" per risolvere il probelma."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Impossibile aggiornare i meta-pacchetti richiesti"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Un pacchetto essenziale dovrebbe essere rimosso"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Impossibile calcolare l'aggiornamento"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Si è verificato un problema irrisolvibile durante il calcolo "
-#~ "dell'aggiornamento.\n"
-#~ "\n"
-#~ "Notificare questo evento come bug riguardo il pacchetto «update-manager» e "
-#~ "includere nella notifica i file della cartella «/var/log/dist-upgrade»."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Errore nell'autenticare alcuni pacchetti"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Non è stato possibile autenticare alcuni pacchetti. Questo potrebbe "
-#~ "essere un problema di rete passeggero, riprovare più tardi. Segue una "
-#~ "lista di pacchetti non autenticati."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Impossibile installare \"%s\""
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Non è stato possibile installare un pacchetto richiesto. Notificare "
-#~ "questo evento come bug. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Impossibile indovinare il meta-pacchetto"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Il sistema non contiene un pacchetto ubuntu-desktop, kubuntu-desktop o "
-#~ "edubuntu-desktop e non è stato possibile riconoscere la versione di "
-#~ "Ubuntu in esecuzione.\n"
-#~ " Prima di procedere, usare \"synaptic\" o \"apt-get\" per installare uno "
-#~ "dei pacchetti sopra menzionati."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Aggiunta del CD fallita"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Si è verificato un errore nell'aggiungere il CD, l'aggiornamento verrà "
-#~ "interrotto. Segnalare il bug se si tratta di un CD Ubuntu valido.\n"
-#~ "\n"
-#~ "Il messaggio di errore era:\n"
-#~ "\"%s\""
-
-#~ msgid "Reading cache"
-#~ msgstr "Lettura della cache"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Recuperare dalla rete i dati per l'aggiornamento?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "Il processo di aggiornamento può usare la rete per controllare gli ultimi "
-#~ "aggiornamenti e per recuperare i pacchetti che non sono nel CD corrente.\n"
-#~ "Se si possiede un accesso alla rete veloce e economico rispondere \"Sì\". "
-#~ "Altrimenti scegliere \"No\"."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Non è stato trovato alcun mirror valido"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Durante la scansione delle informazioni sui repository in uso non è "
-#~ "strata trovata nessuna voce di mirror per l'aggiornamento. Questo può "
-#~ "verificarsi qualora si abbia in esecuzione un mirror interno o qualora le "
-#~ "informazioni sul mirror siano datate.\n"
-#~ "\n"
-#~ "Riscrivere lo stesso il proprio file «sources.list»? Scegliendo di sì, "
-#~ "tutte le voci «%s» verranno aggiornate a «%s»\n"
-#~ "Scegliendo di no, l'aggiornamento verrà annullato."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Generare le sorgenti predefinite?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Dopo la scansione del proprio file «sorces.list», non è stata trovata "
-#~ "alcuna voce valida per «%s».\n"
-#~ "\n"
-#~ "Aggiungere le voci predefinite per «%s»? Selezionando «No», l'aggiornamento "
-#~ "verrà annullato."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Informazioni sul repository non valide"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "L'aggiornamento delle informazioni sul repository ha generato un file non "
-#~ "valido. Notificare questo evento come bug."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Sorgenti di terze parti disabilitate"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Sono state disabilitate alcune voci di terze parti nel proprio file "
-#~ "«sources.list». È possibile abilitarle di nuovo dopo l'aggiornamento con "
-#~ "lo strumento «software-properties» o con synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Errore durante l'aggiornamento"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Si è verificato un problema durante l'aggiornamento. Solitamente si "
-#~ "tratta di problemi di rete, controllare la connessione di rete e "
-#~ "riprovare."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Spazio libero su disco insufficiente"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Aggiornamento interrotto. Liberare almeno %s di spazio disco su %s. "
-#~ "Svuotare il cestino e rimuovere i pacchetti temporanei di precedenti "
-#~ "installazione usando \"sudo apt-get clean\"."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Iniziare l'aggiornamento?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Impossibile installare gli aggiornamenti"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Interruzione immediata dell'aggiornamento. Il sistema potrebbe trovarsi "
-#~ "in uno stato inutilizzabile. È stato eseguito un ripristino (dpkg --"
-#~ "configure -a).\n"
-#~ "\n"
-#~ "Riportare questo bug per il pacchetto 'update-manager' includendo i file "
-#~ "in /var/log/dist-upgrade/ nel rapporto."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Impossibile scaricare gli aggiornamenti"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Interruzione immediata dell'aggiornamento. Controllare la connessione a "
-#~ "internet o il supporto di installazione e riprovare. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Supporto terminato per alcune applicazioni"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Canonical Ltd. non fornisce più supporto per i seguenti pacchetti "
-#~ "software. È comunque possibile avere supporto dalla comunità.\n"
-#~ "\n"
-#~ "Se non è abilitato il repository del software mantenuto dalla comunità "
-#~ "(«universe»), verrà suggerita la rimozione di questi pacchetti al prossimo "
-#~ "passo."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Rimuovere i pacchetti obsoleti?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Salta questo passo"
-
-#~ msgid "_Remove"
-#~ msgstr "_Rimuovi"
-
-#~ msgid "Error during commit"
-#~ msgstr "Errore durante il commit"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Si sono verificati alcuni problemi durante la pulizia. Leggere il "
-#~ "messaggio seguente per maggiori informazioni. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Ripristino dello stato originale del sistema"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "Recupero del backport di «%s»"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Controllo gestore dei pacchetti"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Preparazione dell'aggiornamento fallito"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "La preparazione del sistema per l'aggiornamento è fallito. Notificare "
-#~ "questo evento come bug per il pacchetto «update-manager» includendo i file "
-#~ "in «/var/log/dist-upgrade/» nel rapporto."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Aggiornamento delle informazioni sui repository"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Informazioni di pacchetto non valide"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Dopo l'aggiornamento delle informazioni di pacchetto non è più possibile "
-#~ "trovare il pacchetto essenziale «%s».\n"
-#~ "Ciò indica un errore grave, segnalare questo evento come un bug per il "
-#~ "pacchetto «update-manager» includendo i file in «/var/log/dist-upgrade/» "
-#~ "nel rapporto."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Richiesta di conferma"
-
-#~ msgid "Upgrading"
-#~ msgstr "Aggiornamento"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Ricerca di software obsoleto"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "L'aggiornamento del sistema è stato completato."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Inserire \"%s\" nell'unità \"%s\""
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Il recupero è stato completato"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Recupero del file %li di %li a %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Circa %s minuti rimanenti"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Recupero del file %li di %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Applicazione dei cambiamenti"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Impossibile installare \"%s\""
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "L'aggiornamento si interromperà ora. Segnalare questo evento come bug per "
-#~ "il pacchetto «update-manager» e di includere i file in «/var/log/dist-"
-#~ "upgrade/» nella segnalazione."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Sostituire il file di configurazione personalizzato\n"
-#~ "«%s»?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Se si decide di sostituire il file di configurazione con una versione più "
-#~ "recente, tutte le modifiche apportate andranno perse."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Il comando «diff» non è stato trovato"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Si è verificato un errore fatale"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Segnalare questo evento come un bug e includere nella notifica i file /"
-#~ "var/log/dist-upgrade/main.log e /var/log/dist-upgrade/apt.log. "
-#~ "L'aggiornamento viene interrotto.\n"
-#~ "Il file sources.list originale è stato salvato in /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d pacchetto sta per essere rimosso."
-#~ msgstr[1] "%d pacchetti stanno per essere rimossi."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d nuovo pacchetto sta per essere installato."
-#~ msgstr[1] "%d nuovi pacchetti stanno per essere installati."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d pacchetto sta per essere aggiornato."
-#~ msgstr[1] "%d pacchetti stanno per essere aggiornati."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "È necessario scaricare un totale di %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Il recupero e l'installazione degli aggiornamenti può richiedere diverse "
-#~ "ore e non può essere annullato in un momento successivo."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Chiudere tutte le applicazioni e i documenti aperti per prevenire la "
-#~ "perdita di dati."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Il sistema è aggiornato!"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Non ci sono aggiornamenti disponibili per questo sistema. L'aggiornamento "
-#~ "sarà annullato."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Rimuovere %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Installare %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Aggiornare %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li giorni %li ore %li minuti"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li ore %li minuti"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minuti"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li secondi"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Con una connessione DSL a 1 Mbit questo scaricamento richiede circa %s, "
-#~ "con una connessione via modem a 56k circa %s"
-
-#~ msgid "Reboot required"
-#~ msgstr "Riavvio richiesto"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr "L'aggiornamento è finito ed è richiesto un riavvio. Riavviare ora?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Annullare l'aggiornamento in corso?</big></b>\n"
-#~ "\n"
-#~ "Il sistema potrebbe essere inutilizzabile se l'aggiornamento viene "
-#~ "annullato. Si consiglia fortemente di riprendere l'aggiornamento."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Riavviare il sistema per completare l'aggiornamento</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Avviare l'aggiornamento?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Aggiornamento di Ubuntu alla versione 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Pulizia"
-
-#~ msgid "Details"
-#~ msgstr "Dettagli"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Differenze tra i file"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Recupero e installazione degli aggiornamenti"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Modifica dei canali software"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Preparazione dell'aggiornamento"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Riavvio del sistema"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminale"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "A_nnula aggiornamento"
-
-#~ msgid "_Continue"
-#~ msgstr "_Continua"
-
-#~ msgid "_Keep"
-#~ msgstr "_Mantieni"
-
-#~ msgid "_Replace"
-#~ msgstr "_Sostituisci"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Notifica bug"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Riavvia ora"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Riprendi aggiornamento"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Avvia aggiornamento"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Impossibile trovare le note di rilascio"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Il server potrebbe essere sovraccarico. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Impossibile scaricare le note di rilascio"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Controllare la propria connessione a internet."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Impossibile eseguire lo strumento di aggiornamento"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Questo potrebbe essere un bug nello strumento per l'aggiornamento. "
-#~ "Notificare questo evento come un bug."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Scaricamento dello strumento di aggiornamento"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr ""
-#~ "Lo strumento di aggiornamento vi guiderà durante il processo di "
-#~ "aggiornamento."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Firma dello strumento di aggiornamento"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Strumento di aggiornamento"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Prelievo fallito"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Fallito il prelievo dell'aggiornamento. Potrebbe dipendere da un problema "
-#~ "di rete. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Estrazione fallita"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Fallita l'estrazione dell'aggiornamento. Potrebbe dipendere da un "
-#~ "problema con la connesione di rete o con il server. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Verifica fallita"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Fallita la verifica dell'aggiornamento. Potrebbe dipendere da un problema "
-#~ "con la connessione di rete o con il server. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Autenticazione fallita"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Fallita l'autenticazione dell'aggiornamento. Potrebbe dipendere da un "
-#~ "problema con la connessione di rete o con il server. "
-
-#~ 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"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Scaricamento del file %(current)li di %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "L'elenco dei cambiamenti non è disponibile"
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "L'elenco dei cambiamenti non è ancora disponibile.\n"
-#~ "Riprovare più tardi."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Fallito lo scaricamento dell'elenco dei cambiamenti. \n"
-#~ "Verificare la connessione a Internet."
-
-#~ msgid "Backports"
-#~ msgstr "Backport"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Aggiornamenti della distribuzione"
-
-#~ msgid "Other updates"
-#~ msgstr "Altri aggiornamenti"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versione %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Scaricamento dell'elenco dei cambiamenti..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "_Seleziona tutti"
-
-#~ msgid "_Check All"
-#~ msgstr "_Deseleziona tutti"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Dati da scaricare: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "È possibile installare %s aggiornamento"
-#~ msgstr[1] "È possibile installare %s aggiornamenti"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Attendere, potrebbe richiedere del tempo."
-
-#~ msgid "Update is complete"
-#~ msgstr "Aggiornamento completato"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Verifica degli aggiornamenti..."
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Dalla versione %(old_version)s alla %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Versione %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Dimensione: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "La distribuzione in uso non è più supportata"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Non si riceveranno più aggiornamenti di sicurezza o critici. Passare a "
-#~ "una versione più aggiornata di Ubuntu Linux. Per maggiori informazioni "
-#~ "consultare http://www.ubuntu.com"
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>È disponibile il nuovo rilascio «%s» della distribuzione</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "L'indice dei programmi è rovinato"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Impossibile installare o rimuovere alcun programma. Utilizzare il gestore "
-#~ "dei pacchetti \"Synaptic\" o inserire il comando \"sudo apt-get install -f"
-#~ "\" in un terminale per risolvere il problema."
-
-#~ msgid "None"
-#~ msgstr "Niente"
-
-#~ msgid "1 KB"
-#~ msgstr "1 kB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f kB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>È necessario controllare gli aggiornamenti manualmente</big></b>\n"
-#~ "\n"
-#~ "Il controllo automatico della disponibilità di aggiornamenti non è "
-#~ "attivo. È possibile configurare questo comportamento in <i>Sorgenti "
-#~ "software</i> nella scheda <i>Aggiornamenti internet</i>."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Mantenere aggiornato il sistema</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Non tutti gli aggiornamenti possono essere installati</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Avvio del gestore di aggiornamenti</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "Cambiamenti"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Cambiamenti e descrizione dell'aggiornamento"
-
-#~ msgid "Chec_k"
-#~ msgstr "_Verifica"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Verifica la presenza  di nuovi aggiornamenti nei canali software"
-
-#~ msgid "Description"
-#~ msgstr "Descrizione"
-
-#~ msgid "Release Notes"
-#~ msgstr "Note di rilascio"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Eseguire un aggiornamento della distribuzione per installare quanti più "
-#~ "aggiornamenti possibili. \n"
-#~ "\n"
-#~ "Questo può essere causato da un aggiornamento incompleto, da pacchetti "
-#~ "software non ufficiali o dall'esecuzione di una versione di sviluppo."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Mostra l'avanzamento dei singoli file"
-
-#~ msgid "Software Updates"
-#~ msgstr "Aggiornamenti software"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Gli aggiornamenti software correggono errori, eliminano vulnerabilità di "
-#~ "sicurezza e aggiungono nuove funzionalità."
-
-#~ msgid "U_pgrade"
-#~ msgstr "A_ggiorna"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Aggiorna all'ultima versione di Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Verifica"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "Aggiorna _distribuzione"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Non mostrare più queste informazioni"
-
-#~ msgid "_Install Updates"
-#~ msgstr "I_nstalla aggiornamenti"
-
-#~ msgid "_Upgrade"
-#~ msgstr "A_ggiorna"
-
-#~ msgid "changes"
-#~ msgstr "cambiamenti"
-
-#~ msgid "updates"
-#~ msgstr "aggiornamenti"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Aggiornamenti automatici</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CD-ROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Aggiornamenti internet</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Partecipando al sondaggio di popolarità è possibile migliorare "
-#~ "l'esperienza utente di Ubuntu. Scegliendo di partecipare, ogni settimana "
-#~ "verranno inviati in via anonima al progetto Ubuntu l'elenco del software "
-#~ "installato e la frequenza di utilizzo.\n"
-#~ "\n"
-#~ "I risultati sono utilizzati per migliorare il supporto alle applicazioni "
-#~ "più popolari e per classificarle nei risultati di ricerca.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Aggiungi CD-ROM"
-
-#~ msgid "Authentication"
-#~ msgstr "Autenticazione"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "_Elimina i file di software scaricati:"
-
-#~ msgid "Download from:"
-#~ msgstr "Scaricare da:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Importa la chiave pubblica da un fornitore di software fidato"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Aggiornamenti internet"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Solo gli aggiornamenti di sicurezza dai servers ufficiali di Ubuntu "
-#~ "saranno installati automaticamente"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Ripristina pre_definite"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Ripristina le chiavi predefinite della distribuzione in uso"
-
-#~ msgid "Software Sources"
-#~ msgstr "Sorgenti software"
-
-#~ msgid "Source code"
-#~ msgstr "Codice sorgente"
-
-#~ msgid "Statistics"
-#~ msgstr "Statistiche"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Inviare informazioni statistiche"
-
-#~ msgid "Third Party"
-#~ msgstr "Terze parti"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Verificare aggiornamenti automaticamente:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Scaricare gli aggiornamenti automaticamente, ma non installarli"
-
-#~ msgid "_Import Key File"
-#~ msgstr "I_mporta file chiave"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr ""
-#~ "I_nstallare gli aggiornamenti di sicurezza senza richiedere conferma"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Le informazioni sul software disponibile sono scadute</big></b>\n"
-#~ "\n"
-#~ "È necessario ricaricare le informazioni sul software disponibile per "
-#~ "installare software e aggiornamenti provenienti dai canali aggiunti o "
-#~ "modificati di recente. \n"
-#~ "\n"
-#~ "Per continuare è necessaria una connessione a internet funzionante."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Commento:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Componenti:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribuzione:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipo:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Inserire la riga APT completa del repository che si vuole "
-#~ "aggiungere come sorgente</b></big>\n"
-#~ "\n"
-#~ "La riga APT include il tipo, la posizione ed i componenti di un "
-#~ "repository, per esempio <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "Riga APT:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binari\n"
-#~ "Sorgenti"
-
-#~ msgid "Edit Source"
-#~ msgstr "Modifica sorgente"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Scansione CD-ROM"
-
-#~ msgid "_Add Source"
-#~ msgstr "_Aggiungi sorgente"
-
-#~ msgid "_Reload"
-#~ msgstr "_Ricarica"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Mostra e installa gli aggiornamenti disponibili"
-
-#~ msgid "Update Manager"
-#~ msgstr "Gestione aggiornamenti"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Controllare automaticamente se è disponibile una nuova versione della "
-#~ "distribuzione corrente e offrire la possibilità di aggiornarlo (se "
-#~ "possibile)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Controlla nuovi rilasci della distribuzione"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Se il controllo automatico degli aggiornamenti è disabilitato, è "
-#~ "necessario ricaricare manualmente l'elenco dei canali. Questa opzione "
-#~ "consente di nascondere il promemoria mostrato in questo caso."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Ricorda di ricaricare la lista dei canali"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Mostra i dettagli di un aggiornamento"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Salva la dimensione della finestra dell'update-manager"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Memorizza lo stato dell'espansore che contiene l'elenco dei cambiamenti e "
-#~ "la descrizione"
-
-#~ msgid "The window size"
-#~ msgstr "Dimensione della finestra"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr ""
-#~ "Configura le sorgenti per gli aggiornamenti e per il software installabile"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Aggiornamenti di sicurezza per Debian 3.1 \"Sarge\""
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid ""
-#~ "You will loose all customizations, that have been made by yourself or by "
-#~ "a script, if you replace the file by its latest version."
-#~ msgstr ""
-#~ "Sostituendo il file con la sua versione più recente, andranno perse tutte "
-#~ "le personalizzazioni apportate dall'utente o da uno script."
-
-#~ msgid ""
-#~ "This download will take about %s with a 56k modem and about %s with a "
-#~ "1Mbit DSL connection"
-#~ msgstr ""
-#~ "Questo scaricamento richiederà circa %s con un modem 56k e circa %s con "
-#~ "una connessione DSL da 1Mbit"
-
-#~ msgid "The list of changes is not available yet. Please try again later."
-#~ msgstr ""
-#~ "L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. Please check your Internet "
-#~ "connection."
-#~ msgstr ""
-#~ "Fallito lo scaricamento dell'elenco dei cambiamenti. Verificare la "
-#~ "connessione ad Internet."
-
-#~ msgid "By Canonical supported Open Source software"
-#~ msgstr "Software open source supportato da Canonical"
-
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "Software con restrizioni per copyright o questioni legali"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Scaricamento del file %li di %li a velocità sconosciuta"
-
-#~ msgid "Normal updates"
-#~ msgstr "Aggiornamenti normali"
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Annulla _scaricamento"
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Software non più supportato ufficialmente"
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Impossibile trovare aggiornamenti"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Il sistema è già stato aggiornato."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Aggiornamento a Ubuntu 6.10</span>"
-
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Importanti aggiornamenti di sicurezza per Ubuntu"
-
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Aggiornamenti per Ubuntu"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Impossibile installare tutti gli aggiornamenti disponibili"
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Esame del sistema</b></big>\n"
-#~ "\n"
-#~ "Gli aggiornamenti software correggono errori, eliminano vulnerabilità di "
-#~ "sicurezza ed aggiungono nuove funzionalità."
-
-#~ msgid "Oficially supported"
-#~ msgstr "Supportato ufficialmente"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Alcuni aggiornamenti richiedono la rimozione di altri programmi. "
-#~ "Utilizzare la funzione \"Marca tutti gli aggiornamenti\" del gestore di "
-#~ "pacchetti \"Synaptic\" o inserire il comando \"sudo apt-get dist-upgrade"
-#~ "\" in un terminale per aggiornare completamente il sistema."
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "I seguenti aggiornamenti saranno tralasciati:"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Scaricamento del file %(current)li di %(total)li"
 
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Circa %li secondi rimanenti"
-
-#~ msgid "Download is complete"
-#~ msgstr "Scaricamento completato"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr ""
-#~ "Interruzione immediata dell'aggiornamento. Notificare questo evento come "
-#~ "bug."
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Aggiornamento di Ubuntu"
-
-#~ msgid "Hide details"
-#~ msgstr "Nascondi dettagli"
-
-#~ msgid "Show details"
-#~ msgstr "Mostra dettagli"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr ""
-#~ "È consentita l'esecuzione di un solo strumento di gestione software alla "
-#~ "volta"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Chiudere tutte le altre applicazioni come \"aptitude\" o \"Synaptic\" "
-#~ "prima di continuare."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Canali</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Chiavi</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Supporto di installazione"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Preferenze software"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Canale</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Componenti</b>"
-
-#~ msgid "Add Channel"
-#~ msgstr "Aggiungi canale"
-
-#~ msgid "Edit Channel"
-#~ msgstr "Modifica canale"
-
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Aggiungi canale"
-#~ msgstr[1] "_Aggiungi canali"
-
-#~ msgid "_Custom"
-#~ msgstr "_Personalizzato"
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS - Aggiornamenti di sicurezza"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS - Aggiornamenti"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS - Backport"
-
-#~ msgid "No valid entry found"
-#~ msgstr "Nessuna voce valida trovata"
-
-#~ msgid ""
-#~ "While scaning your repository information no valid entry for the upgrade "
-#~ "was found.\n"
-#~ msgstr ""
-#~ "Durante la scansione delle informazioni sui repository, non è stata "
-#~ "trovata alcuna voce valida per l'aggiornamento.\n"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system can be in an unusable state. A "
-#~ "recovery is now run (dpkg --configure -a)."
-#~ msgstr ""
-#~ "Interruzione immediata dell'aggiornamento. Il sistema potrebbe essere in "
-#~ "uno stato inutilizzabile. Verrà avviata una procedura di ripristino (dpkg "
-#~ "--configure -a)."
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files ~/dist-upgrade.log and "
-#~ "~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
-#~ msgstr ""
-#~ "Notificare questo evento come bug e includere nella notifica i file \"~/"
-#~ "dist-upgrade.log\" e \"~/dist-upgrade-apt.log\". L'aggiornamento viene "
-#~ "interrotto ora. "
-
-#~ msgid "You can install one update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "È possibile installare un aggiornamento"
-#~ msgstr[1] "È possibile installare %s aggiornamenti"
-
-#~ msgid "Repositories changed"
-#~ msgstr "Repository cambiati"
-
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "È necessario ricaricare l'elenco dei pacchetti dai server affinché i "
-#~ "cambiamenti apportati abbiano effetto. Ricaricarlo ora?"
-
-#~ msgid ""
-#~ "<big><b>Analysing your system</b></big>\n"
-#~ "\n"
-#~ "Software updates can correct errors, eliminate security vulnerabilities, "
-#~ "and provide new features to you."
-#~ msgstr ""
-#~ "<big><b>Analisi del sistema in uso</b></big>\n"
-#~ "\n"
-#~ "Gli aggiornamenti del software possono correggere errori, eliminare "
-#~ "vulnerabilità di sicurezza e fornire nuove funzionalità."
-
-#~ msgid ""
-#~ "Software updates can correct errors, eliminate security vulnerabilities, "
-#~ "and provide new features to you."
-#~ msgstr ""
-#~ "Gli aggiornamenti software possono correggere errori, eliminare "
-#~ "vulnerabilità di sicurezza e fornire nuove funzionalità."
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically. The software package \"unattended-upgrades\" needs to be "
-#~ "installed therefor"
-#~ msgstr ""
-#~ "L'installazione automatica è limitata ai soli aggiornamenti di sicurezza "
-#~ "provenienti dai server Ubuntu ufficiali. Il pacchetto software "
-#~ "\"unattended-upgrades\" deve perciò essere installato"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and sections of a channel, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Inserire la riga APT completa del canale che si vuole aggiungere</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "La riga APT contiene il tipo, la posizione e le sezioni di un canale, ad "
-#~ "esempio <i>\"deb http://ftp.debian.org sarge main\"</i>"
-
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Sezioni</b>"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sezioni:</b>"
-
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Ricarica le informazioni sugli aggiornamenti"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Scaricamento cambiamenti</span>\n"
-#~ "\n"
-#~ "È necessario scaricare i cambiamenti dal server centrale"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr ""
-#~ "Mostra gli aggiornamenti disponibili e seleziona quelli da installare"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Dettagli"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "Errore rimuovendo la chiave"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Modifica le sorgenti e le impostazioni del software"
-
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Sorgenti</b>"
-
-#~ msgid "day(s)"
-#~ msgstr "giorni"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Repository</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>File temporanei</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Interfaccia utente</b>"
-
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Chiavi di autenticazione</b></big>\n"
-#~ "\n"
-#~ "In questo dialogo è possibile aggiungere o eliminare le chiavi di "
-#~ "autenticazione. Una chiave permette di verificare l'integrità del "
-#~ "software scaricato."
+msgid "Starting..."
+msgstr "Impostazioni"
 
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Aggiunge un nuovo file di chiave nel portachiavi fidato. Assicurarsi di "
-#~ "aver ricevuto la chiave attraverso un canale sicuro e ci si possa fidare "
-#~ "del proprietario. "
-
-#~ msgid "Add repository..."
-#~ msgstr "Aggiungi repository"
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Controllare automaticamente gli aggiornamenti _software"
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "_Pulire automaticamente i file temporanei dei pacchetti"
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Intervallo di pulizia in giorni: "
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Eliminare i pacchetti _vecchi dalla cache dei pacchetti"
-
-#~ msgid "Edit Repository..."
-#~ msgstr "Modifica repository..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Età massima in giorni:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Dimensione massima in MB:"
-
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Ripristina le chiavi predefinite fornite con la distribuzione. Questo non "
-#~ "modificherà le chiavi installate dal'utente."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Imposta la dimensione _massima per la cache dei pacchetti"
-
-#~ msgid "Settings"
-#~ msgstr "Impostazioni"
-
-#~ msgid "Show detailed package versions"
-#~ msgstr "Mostra le versioni dettagliate dei pacchetti"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Show disabled software sources"
-#~ msgstr "Mostrare le sorgenti software diabilitate"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Update interval in days: "
-#~ msgstr "Intervallo di aggiornamenti in giorni: "
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "L'elenco dei cambiamenti non è disponibile"
 
-#~ msgid "_Add Repository"
-#~ msgstr "_Aggiungi repository"
+#: ../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 ""
 
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Scaricare i pacchetti aggiornabili"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Fallito lo scaricamento dell'elenco dei cambiamenti. \n"
+"Verificare la connessione a Internet."
 
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>Stato:</b>"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Aggiornamenti disponibili</b></big>\n"
-#~ "\n"
-#~ "I seguenti pacchetti possono essere aggiornati. È possibile effettuare "
-#~ "l'aggiornamento usando il pulsante Installa."
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "Annulla lo scaricamento del changelog"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "You need to be root to run this program"
-#~ msgstr "È necessario essere root per eseguire questo programma"
-
-#~ msgid "Binary"
-#~ msgstr "Binario"
-
-#~ msgid "Non-free software"
-#~ msgstr "Software non libero"
-
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian·3.0·\"Woody\""
-
-#~ msgid "Debian Stable"
-#~ msgstr "Debian Stable"
-
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Debian·Non-US·(Stable)"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian·Non-US·(Testing)"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr ""
-#~ "Chiave di firma automatica per l'archivio Ubuntu <ftpmaster@ubuntu.com>"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr ""
-#~ "Chiave di firma automatica per l'immagine CD di Ubuntu <cdimage@ubuntu."
-#~ "com>"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Choose a key-file"
-#~ msgstr "Scegliere un file di chiave"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Impossibile installare \"%s\""
 
-#~ msgid "There is one package available for updating."
-#~ msgstr "C'è un pacchetto disponibile per l'aggiornamento"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "Ci sono %s pacchetti disponibili per l'aggiornamento."
+#: ../apt/debfile.py:494
+#, fuzzy
+msgid "An essential package would be removed"
+msgstr "Un pacchetto essenziale dovrebbe essere rimosso"
 
-#~ msgid "There are no updated packages"
-#~ msgstr "Non ci sono apacchetti aggiornati"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "You did not select any of the %s updated package"
-#~ msgid_plural "You did not select any of the %s updated packages"
-#~ msgstr[0] "Non hai selezionato nessuno dei %s pacchetti aggiornati"
-#~ msgstr[1] ""
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "You have selected %s updated package, size %s"
-#~ msgid_plural "You have selected all %s updated packages, total size %s"
-#~ msgstr[0] "Hai selezionato %s pacchetti aggiornati, dimensione %s"
-#~ msgstr[1] ""
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
-#~ msgstr[0] "Hai selezionato %s pacchetti su %s, dimensione %s"
-#~ msgstr[1] ""
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "The updates are being applied."
-#~ msgstr "Gli aggiornamenti sono in fase di applicazione."
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "È possibile eseguire solo una applicazione di gestione dei pacchetti per "
-#~ "volta. Chiudere prima quest'altra applicazione."
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Updating package list..."
-#~ msgstr "Aggiornamento della lista dei pacchetti..."
+#: ../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 ""
 
-#~ msgid "There are no updates available."
-#~ msgstr "Non ci sono aggiornamenti disponibili."
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "New version:"
-#~ msgstr "Nuova versione:"
-
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Effettuare l'aggiornamento ad una nuova versione di Ubuntu Linux. La "
-#~ "versione in uso non riceverà più aggiornamenti di sicurezza o altri "
-#~ "aggiornamenti critici. Consultare http://www.ubuntulinux.org per "
-#~ "informazioni riguardo all'aggiornamento."
-
-#~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "È disponibile un nuovo rilascio di Ubuntu!"
-
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "È disponibile un nuovo rilascio, nome in codice «%s». Consultare http://"
-#~ "www.ubuntulinux.org/ per le istruzioni sull'aggiornamento."
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Never show this message again"
-#~ msgstr "Non mostrare più questo messaggio"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr ""
-#~ "Modifiche non trovate, il server potrebbe non essere stato ancora "
-#~ "aggiornato."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 49519776..26ec8567 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: python-apt 0.7.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-21 15:34+0200\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -362,39 +362,39 @@ msgstr "メインサーバ"
 msgid "Custom servers"
 msgstr "カスタムサーバ"
 
-#: ../apt/progress/gtk2.py:246
+#: ../apt/progress/gtk2.py:259
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:252
+#: ../apt/progress/gtk2.py:265
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:272
+#: ../apt/progress/gtk2.py:285
 msgid "Details"
 msgstr ""
 
-#: ../apt/progress/gtk2.py:354
+#: ../apt/progress/gtk2.py:367
 msgid "Starting..."
 msgstr ""
 
-#: ../apt/progress/gtk2.py:360
+#: ../apt/progress/gtk2.py:373
 msgid "Complete"
 msgstr ""
 
-#: ../apt/package.py:315
+#: ../apt/package.py:301
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr ""
 
-#: ../apt/package.py:878 ../apt/package.py:982
+#: ../apt/package.py:937 ../apt/package.py:1043
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../apt/package.py:986
+#: ../apt/package.py:1047
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -403,7 +403,7 @@ msgid ""
 "until the changes become available or try again later."
 msgstr ""
 
-#: ../apt/package.py:992
+#: ../apt/package.py:1053
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -416,7 +416,7 @@ msgstr ""
 
 #: ../apt/debfile.py:81
 #, python-format
-msgid "List of files for '%s' could not be read"
+msgid "List of files for '%s'could not be read"
 msgstr ""
 
 #: ../apt/debfile.py:149
@@ -457,5 +457,56 @@ msgstr ""
 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 ""
+
 #~ msgid "Proprietary drivers for devices "
 #~ msgstr "デバイス用のプロプライエタリなドライバ "
diff --git a/po/ka.po b/po/ka.po
index 91cbde06..49a1729a 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -26,235 +26,266 @@ 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: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 "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 "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 "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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'-ის ლაზერული დისკი"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 უსაფრთხოების განახლება"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 'Breezy Badger'-ის ლაზერული დისკი"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 უსაფრთხოების განახლება"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 'Breezy Badger'-ის ლაზერული დისკი"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "universe საზოგადოების მხრდაჭერით"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "მოწყობილობების საკუთარი დრაივერები"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "არათავისუფალი პროგრამები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 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:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "თავისუფალი პროგრამები (Open Source) Canonical-ის მხარდაჭერით"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "universe საზოგადოების მხრდაჭერით"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "თავისუფალი პროგრამები (Open Source) universe საზოგადოების მხარდაჭერით"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "არათავისუფალი დრაივერები"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "მოწყობილობების საკუთარი დრაივერები "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "მოწყობილობების საკუთარი დრაივერები"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "არათავისუფალი პროგრამები (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr "პატენტებითა და კანონებით შეზღუდული პროგრამები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 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:439
 msgid "Important security updates"
 msgstr "უსაფრთხოების მნიშვნელოვანი განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "რეკომენდებული განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "შემოთავაზებული განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Backport-განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 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:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 ბექპორტები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 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:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "ოფიციალური მხარდაჭერით"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 უსაფრთხოების განახლება"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 ბექპორტები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "საზოგადოების მხარდაჭერით (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "არათავისუფალი (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 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:563
 msgid "No longer officially supported"
 msgstr "მოხსნილი აქვს ოფიციალური მხარდაჭერა"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "შეზღუდული საავტორო უფლება"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 უსაფრთხოების განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 განახლებები"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 ბექპორტები"
 
@@ -266,55 +297,68 @@ 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
 #, fuzzy
 msgid "Security updates"
 msgstr "უსაფრთხოების მნიშვნელოვანი განახლებები"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "არათავისუფალ პროგრამებზე დამოკიდებული DFSG-თავსებადი პროგრამები"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-არათავსებადი პროგრამები"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "%s სერვერი"
@@ -322,1202 +366,160 @@ 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:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "მთავარი სერვერი"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "საკუთარი სერვერები"
 
-#~ msgid "Daily"
-#~ msgstr "ყოველდღიურად"
-
-#~ msgid "Every two days"
-#~ msgstr "ყოველ 2 დღეში"
-
-#~ msgid "Weekly"
-#~ msgstr "ყოველკვირეულად"
-
-#~ msgid "Every two weeks"
-#~ msgstr "ყოველ 2 კვირაში"
-
-#~ msgid "Every %s days"
-#~ msgstr "ყოველ %s დღეში"
-
-#~ msgid "After one week"
-#~ msgstr "ერთი კვირის შემდგომ"
-
-#~ msgid "After two weeks"
-#~ msgstr "ორი კვირის შემდგომ"
-
-#~ msgid "After one month"
-#~ msgstr "ერთი თვის შემდგომ"
-
-#~ msgid "After %s days"
-#~ msgstr "%s დღის შემდეგ"
-
-#~ msgid "%s updates"
-#~ msgstr "%s განახლება"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "უახლოესი სერვერი"
-
-#~ msgid "Software Channel"
-#~ msgstr "პროგრამების მიღება წყაროებიდან"
-
-#~ msgid "Active"
-#~ msgstr "აქტიური"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(საწყისი კოდი)"
-
-#~ msgid "Source Code"
-#~ msgstr "საწყისი კოდი"
-
-#~ msgid "Import key"
-#~ msgstr "გასაღების იმპორტი"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "ამორჩეული ფაილის იმპორტი ვერ მოხერხდა"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "ამორჩეული ფაილი შეიძლება არ იყოს GPG გასაღების ფაილი ან შეიძლება იყოს "
-#~ "დაზიანებული."
-
-#~ msgid "Error removing the key"
-#~ msgstr "გასღების წაშლა ვერ მოხერხდა"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "ამორჩეული გასაღების წაშლა ვერ მოხერხდა. გთხოვთ აცნობოთ ეს როგორც ხარვეზი."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>დაიშვა შეცდომა CD-ს წაკითხვისას</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "შეიყვანეთ დისკის სახელი"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "მოათავსეთ დისკი დისკამძრავში:"
-
-#~ msgid "Broken packages"
-#~ msgstr "დაზიანებული პაკეტები"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "თქვენს სისტემაში არის დაზიანებული პაკეტები, რომელთა გამართვა ვერ ხერხდება "
-#~ "ამ პროგრამით. ჯერ გამართეთ დაზიანებული პაკეტები synaptic ან apt-get "
-#~ "პროგრამით და შემდეგ გააგრძელეთ."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "საჭირო მეტა-პაკეტების განახლება ვერ მოხერხდა"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "ამით საჭირო პაკეტი წაიშლება"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "სისტემა ვერ მომზადდა განახლებისათვის"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "მოხდა დაუდგენელი შეცდომა განახლებისათვის მზადებისას.\n"
-#~ "\n"
-#~ "შეატყობინეთ ეს ხარვეზი 'update-manager' პაკეტის საშუალებით, შეტყობინებას "
-#~ "დაურთეთ ფაილები /var/log/dist-upgrade/-დან."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "ზოგიერთი პაკეტის ავთენთიფიკაციის შეცდომა"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "ვერ ხერხდება ზოგიერთი პაკეტის ავთენთიფიკაცია. ეს შეიძლება იყოს კავშირის "
-#~ "ბრაკი. სცადეთ მოგვიანებით. ქვევით იხილეთ არა-ავთენთიფიცერული პაკეტების "
-#~ "სია."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "'%s' ვერ დაყენდა"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "საჭირო პაკეტის დაყენება ვერ მოხერხდა. შეატყობინეთ ეს როგორც ხარვეზი. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "მეტა-პაკეტი ვერ შეირჩა"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "თქვენს სისტემაში არ არის ubuntu-desktop, kubuntu-desktop ან edubuntu-"
-#~ "desktop პაკეტებიდან არცერთი, რის გამოც უბუნტუს ვერსიის დადგენა ვერ "
-#~ "ხერხდება.\n"
-#~ "  სანამ გააგრძელებდეთ, დააყენეთ რომელიმე მათგანი synaptic ან apt-get-ის "
-#~ "გამოყენებით."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "ვერ განხორციელდა CD-ს დამატება"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "შეცდომა CD-ს დამატებისას; განახლების პროცესი შეწყვეტილია. თუ დარწმუნებული "
-#~ "ხართ, რიმ ეს უბუნტუს CD0ს ბრალი არ არის, შეატყობინეთ ამ ხარვეზის "
-#~ "შესახებ.\n"
-#~ "\n"
-#~ "ინფორმაცია შეცდომის შესახებ:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "ქეშის კითხვა"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "მივიღოთ ქსელიდან მონაცემები განახლების შესახებ?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "განახლების პროგრამას შეუძლია მიიღოს ქსელიდან განახლებები და პაკეტები, "
-#~ "რომლებიც არ არის ამ CD-ზე.\n"
-#~ "დაეთანხმეთ განახლების მიღებას, ან უარი თქვით, თუ თქვენი ქსელი ძალიან "
-#~ "ნელია ან ძვირი."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "არ მოინახა შესაბამისი სარკე"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "რეპოზიტორიის შესახებ ინფორმაციაში არ არის მითითებული სარკე სისტემის "
-#~ "განახლებისათვის. შესაძლოა თქვენ შიდა სარკეს იყენებთ, ან ინფორმაცია სარკის "
-#~ "შესახებ მოძველებულია.\n"
-#~ "\n"
-#~ "თუ თქვენ მაინც გინდათ 'sources.list' ფაილის განახლება, დასტურის "
-#~ "შემთხვევაში ყველა ჩანაწერი %s'-დან '%s'-მდე განახლდება.\n"
-#~ "უარის შემთხვევაში განახლება არ მოხდება."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "გავუშვათ ნაგულისხმევი წყაროების გენერაცია?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "თქვენს  'sources.list'-ში არ აღმოჩნდა არც ერთი სათანადო ჩანაწერი '%s'-"
-#~ "სთვის.\n"
-#~ "\n"
-#~ "დავამატოთ ნაგულისხმევი ჩანაწერები '%s'-სთვის? უარის შემთხვევაში განახლება "
-#~ "არ მოხდება."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "რეპოზიტორიების ინფორმაცია არასწორია"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "რეპოზიტორიების განახლების შედეგად დაზიანდა ფაილი. შეატყობინეთ ეს როგორხ "
-#~ "ხარვეზი."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "მესამე მხარის წყაროები გამორთულია"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "მესამე მხარის ზოგი წყარო sources.list-ში გამორთულია. განახლების შემდეგ "
-#~ "შეგეძლებათ მათი ჩართვა 'software-properties' ან synaptic-ის საშუალებით."
-
-#~ msgid "Error during update"
-#~ msgstr "განახლებისას მოხდა შეცდომა"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "განახლებისას მოხდა შეცდომა. როგორც წესი ეს არის კავშირის პრობლემა, "
-#~ "შეამოწმეთ თქვენი კავშირი და სცადეთ კიდევ ერთხელ."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "დისკზე არ არის საკმარისი თავისუფალი ადგილი"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "განახლება შეწყვეტილია. გაათავისუფლეთ არანაკლებ %s ზომის ადგილი %s დისკზე. "
-#~ "გამოიყენეთ 'sudo apt-get clean' ურნიდან ფაილებისა და წინა ინსტალაციის "
-#~ "დროებითი პაკეტების წასაშლელად."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "გნებავთ განახლების დაწყება?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "განახლებების დაყენება ვერ ხერხდება"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "განახლება შეწყვეტილია. სისტემამ, შესაძლოა, დაკარგა მუშაობის უნარი. "
-#~ "გაშვებულია აღდგენის პროცესი (dpkg --configure -a).\n"
-#~ "\n"
-#~ "შეატყობინეთ ხარვეზის შესახებ 'update-manager' პაკეტის საშუალებით, "
-#~ "შეტყობინებაში ჩართეთ ფაილები var/log/dist-upgrade/-დან."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "განახლებების ჩამოტვირთვა ვერ ხერხდება"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "განახლება შეწყვეტილია. შეამოწმეთ ხელახლა ქსელი და საინსტალაციო დისკი. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "ზოგ პროგრამას მხარდაჭერა აღარა აქვს"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "ამ პაკეტებს Canonical Ltd.-ს ნაცვლად საზოგადოება უჭერს მხარს.\n"
-#~ "\n"
-#~ "თუ თქვენ არა გაქვთ საზოგადოების რეპოზიტორია (universe), მაშინ შემდეგ "
-#~ "ეტაპზე შემოთავაზებული იქნება ამ პაკეტების წაშლა."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "წავშალოთ მოძველებული პაკეტები?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "ეტაპის გა_მოტოვება"
-
-#~ msgid "_Remove"
-#~ msgstr "_წაშლა"
-
-#~ msgid "Error during commit"
-#~ msgstr "შეცდომა გადაცემისას"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr "შეცდომა გასუფთავებისას. დაწვრილებით იხილეთ ქვემოთ. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "სისტემის საწყისი მდგომარეობის აღდგენა"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "%s'-ის მიღება backport-იდან"
-
-#~ msgid "Checking package manager"
-#~ msgstr "პროგრამულ მენეჯერის შემოწმება"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "შეცდომა განახლების მომზადებისას"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "მოხდა დაუდგენელი შეცდომა განახლების მომზადებისას. შეატყობინეთ 'update-"
-#~ "manager'-ის ეს ხარვეზი, ანგარიშს დაურთეთ ფაილები /var/log/dist-upgrade/-"
-#~ "დან."
-
-#~ msgid "Updating repository information"
-#~ msgstr "რეპოზიტორიის ინფორმაციის განახლება"
-
-#~ msgid "Invalid package information"
-#~ msgstr "ინფორმაცია პაკეტის შესახებ არასწორია"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "პაკეტის შესახებ ინფორმაციის განახლების შემდეგ ვერ მოიძებნა მნიშვნელოვანი "
-#~ "პაკეტი '%s'.\n"
-#~ "ეს სერიოზული შეცდომაა, შეატყობინეთ 'update-manager'-ის ეს ხარვეზი, "
-#~ "ანგარიშს დაურთეთ ფაილები /var/log/dist-upgrade/-დან."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "დასტურის მოთხოვნა"
-
-#~ msgid "Upgrading"
-#~ msgstr "მიმდინარეობს განახლება"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "მოძველებული პროდუქტების ძებნა"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "სისტემის განახლება დასრულებულია."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "ჩადევით '%s'  '%s'-ში"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "ჩატვირთვა დასრულებულია"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "იტვირთება %li ფაილი %li-დან, სიჩქარე - %s/წმ"
-
-#~ msgid "About %s remaining"
-#~ msgstr "დარჩა დაახლოებით %s"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "იტვირთება %li ფაილი %li-დან"
-
-#~ msgid "Applying changes"
-#~ msgstr "ცვლილებების დამტკიცება"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "ვერ დადგა '%s'"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "განახლება შეწყვეტილია. შეატყობინეთ 'update-manager'-ის ეს ხარვეზი, "
-#~ "ანგარიშს დაურთეთ ფაილები /var/log/dist-upgrade/-დან."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "გადავაწეროთ ადრინდელს კონფიგურაციის განახლებული ფაილი\n"
-#~ "'%s'?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "თუ დაეთანხმებით, კონფიგურაციის ფაილში თქვენს მიერ ადრე შეტანილი "
-#~ "ცვლილებები დაიკარგება."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "'diff' ბრძანება ვერ მოინახა"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "ფატალური შეცდომა"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "შეატყობინეთ ეს ხარვეზი, ანგარიშს დაურთეთ ფაილები /var/log/dist-upgrade/"
-#~ "main.log და var/log/dist-upgrade/apt.log-დან. განახლება შეწყვეტილია.\n"
-#~ "თქვენი პირვანდელი  sources.list შენახულია /etc/apt/sources.list."
-#~ "distUpgrade-ში."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "წაიშლება %d პაკეტი."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "დადგება %d ახალი პაკეტი."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "განახლდება %d პაკეტი."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "სულ გადმოიტვირთება %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "განახლების გადმოტვირთვასა და დაყენებას სჭირდება რამდენიმე საათი და მისი "
-#~ "შეწყვეტა არ არის სასურველი."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "დახურეთ გახსნილი პროგრამები და დოკუმენტები, მონაცემების დაკარგვის თავიდან "
-#~ "ასაცილებლად."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "თქვენი სისტემა განახლებულია"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr "თქვენი სისტემისათვის არ არის განახლებები. პროცედურა შეწყვეტილია."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b> ამოშლა %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "დაყენება %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "ჩასაყენებელი განახლება %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li დღე %li საათი %li წუთი"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li საათი %li წუთი"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li წუთი"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li წამი"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "ჩამოტვირთვის ხანგრძლივობა: %s - 1Mbit DSL-სათვის,  %s 56k-მოდემისათვის."
-
-#~ msgid "Reboot required"
-#~ msgstr "საჭიროა გადატვირთვა"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr "განახლება დასრულდა, საჭიროა გადატვირთვა. გადავიტვირთოთ ახლა?"
-
-#, fuzzy
-#~ msgid "    "
-#~ msgstr "ეს არ ვიცი როგორ ვთარგმნო, ვერცერთ ლექსიკონში ვერ ვნახე :)    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>შევწყვიტოთ განახლების პროცესი?</big></b>\n"
-#~ "\n"
-#~ "განახლების შეწყვეტამ შეიძლება სისტემას მუშაობის უნარი დაუკარგოს. "
-#~ "დაბეჯითებით გირჩევთ არ შეწყვიტოთ განახლების პროცესი."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>სისტემის გადატვირთვა განახლების დასასრულებლად</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>განახლების დაწყება</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Ubuntu-ს განახლება 6.10 ვერსიამდე</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "გასუფთავება"
-
-#~ msgid "Details"
-#~ msgstr "ცნობები"
-
-#~ msgid "Difference between the files"
-#~ msgstr "განსხვავება ფაილებს შორის"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "მიმდინარეობს განახლებების ჩამოქაჩვა და დაყენება"
-
-#, fuzzy
-#~ msgid "Modifying the software channels"
-#~ msgstr "პროგრამების მიღების არხების შეცვლა"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "განახლებისათვის მომზადება"
-
-#~ msgid "Restarting the system"
-#~ msgstr "სისტემის გადატვირთვა"
-
-#~ msgid "Terminal"
-#~ msgstr "ტერმინალი"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "განახლების _შეწყვეტა"
-
-#~ msgid "_Continue"
-#~ msgstr "_გაგრძელება"
-
-#~ msgid "_Keep"
-#~ msgstr "_დატოვება"
-
-#~ msgid "_Replace"
-#~ msgstr "_ჩანაცვლება"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_ხარვეზის ანგარიშის გაგზავნა"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_გადატვირთვა"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "განახლების _გაგრძელება"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "განახლების _დაწყება"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "ვერ მოინახა ჩანაწერი გამოშვების შესახებ"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "შესაძლებელია სერვერი გადატვირთულია. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "შეუძლებელია გამოშვების შესახებ ჩანაწერის ჩამოქაჩვა"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "გთხოვთ შეამოწმოთ თქვენი ინტერნეტ-კავშირი."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "განახლების უტილიტა ვერ გაიშვა"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "როგორც სჩანს, ეს განახლების უტილიტის ბრალია. გაგზავნეთ ხარვეზის "
-#~ "შეტყობინება"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "მიმდინარეობს განახლების უტილიტის ჩამოქაჩვა"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "განახლების უტილიტა დაგეხმარებათ განახლების მიმდინარეობისას."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "განახლების უტილიტის ხელმოწერა"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "განახლების უტილიტა"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "მიღება ვერ მოხერხდა"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "ვერ მოხერხდა განახლების მიღება. შესაძლოა ქსელის პრობლემა იყოს. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "განარქივება ვერ განხორციელდა"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "განახლების განარქივება ვერ განხორციელდა. შესაძლოა ქსელის ან სერვერის "
-#~ "პრობლემა იყოს. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "შეცდომა გადამოწმებისას"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "განახლების შეჯერება წარუმატებლად დამთავრდა. შესაძლოა ქსელის ან სერვერის "
-#~ "პრობლემა იყოს. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "აუტენტიფიკაცია ვერ მოხერხდა"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "განახლების აუტენტიფიკაცია ვერ მოხერხდა. შესაძლოა ქსელის ან სერვერის "
-#~ "პრობლემა იყოს. "
-
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr ""
-#~ "მე-%(current)li ფაილის ჩამოქაჩვა %(total)li-დან. სიჩქარე - %(speed)s/s"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "მე-%(current)li ფაილის ჩამოქაჩვა %(total)li-დან"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "ცვლილებების სია არ არის ხელმისაწვდომი."
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "ცვლილებების სია ჯერჯერობით არ არის ხელმისაწვდომი. \n"
-#~ "სცადეთ მოგვიანებით."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "ვერ განხორციელდა ცვლილებების სიის ჩამოქაჩვა.\n"
-#~ "შეამოწმეთ ინტერნეტ-კავშირი."
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "ბექპორტები"
-
-#~ msgid "Distribution updates"
-#~ msgstr "დისტრიბუტივის განახლებები"
-
-#~ msgid "Other updates"
-#~ msgstr "სხვა განახლებები"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "ვერსია %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "მიმდინარეობს ცვლილებათა სიის ჩამოქაჩვა..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "_ყველას გაუქმება"
-
-#~ msgid "_Check All"
-#~ msgstr "_ყველას მონიშვნა"
-
-#~ msgid "Download size: %s"
-#~ msgstr "ჩამოსატვირთის ზომა: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "თქვენ შეგიძლიათ %s განახლების ჩადგმა"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "გთხოვთ მოითმინოთ, მიმდინარე პროცესს საკმაო დრო სჭირდება."
-
-#~ msgid "Update is complete"
-#~ msgstr "განახლება გასრულებულია"
-
-#~ msgid "Checking for updates"
-#~ msgstr "განახლებების არსებობის შემოწმება"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "%(old_version)s ვერსიიდან %(new_version)s-მდე"
-
-#~ msgid "Version %s"
-#~ msgstr "ვერსია %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(ზომა: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "თქვენს დისტრიბუტივს აღარ გააჩნია მხარდაჭერა"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "თქვენ ვეღარ მიიღებთ უსაფრთხოების შესწორებებსა და კრიტიკულ განახლებებს. "
-#~ "განაახლეთ სისტემა უბუნტუ-ლინუქსის ახალ ვერსიამდე. იხილეთ http://www."
-#~ "ubuntu.com."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>ხელმისწვდომია ახალი გამოშვება '%s'</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "პროგრამების სიის ინდექსი დაზიანებულია"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "შეუძლებელია პროგრამების დაყენება ან წაშლა. ჯერ გამოასწორეთ დეფექტი "
-#~ "პაკეტების მენეჯერით Synaptic ან ტერმინალში \"sudo apt-get install -f\" "
-#~ "ბრძანებით."
-
-#, fuzzy
-#~ msgid "None"
-#~ msgstr "არაფერი"
-
-#~ msgid "1 KB"
-#~ msgstr "1 კბ"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f კბ"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f მბ"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>თქვენ თვითონ მოსინჯეთ განახლებები</big></b>\n"
-#~ "\n"
-#~ "სისტემამ არ ეძებს განახლებებს ავტომატურ რეჟიმში. შეგიძლიათ ეს თვისება "
-#~ "შეცვალოთ ჩანართში <i>განახლება ინტერნეტიდან</i> ფანჯარაში <i>წყარო-"
-#~ "პროგრამები</i>."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>განაახლეთ ხოლმე სისტემა</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>ვერ მოხერხდა ყველა განახლების დაყენება</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>განახლების მენეჯერის გაშვება</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "ცვლილებები"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "განახლების აღწერა და ცვლილებები"
-
-#~ msgid "Chec_k"
-#~ msgstr "შე_მოწმება"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "პროგრამათა წყაროების შემოწმება განახლებების არსებობაზე"
-
-#~ msgid "Description"
-#~ msgstr "აღწერილობა"
-
-#~ msgid "Release Notes"
-#~ msgstr "გამოშვების მონაცემები"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "მაქსიმალური განახლებისათვის გაუშვით დისტრიბუტივის განახლება.\n"
-#~ "\n"
-#~ "ამის მიზეზი შეიძლება იყოს განახლების შეწყვეტა, არაოფიციალური პროგრამებისა "
-#~ "და დეველოპერ-ვერსიის გამოყენება."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "პროგრესის ჩვენება ცალკეული ფაილებისათვის"
-
-#~ msgid "Software Updates"
-#~ msgstr "პროგრამათა განახლებები"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "პროგრამათა განახლებები ასწორებს შეცდომებს, უსაფრთხოების ხარვეზებს და "
-#~ "ამატებს ახალ შესაძლებლობებს."
-
-#~ msgid "U_pgrade"
-#~ msgstr "_განახლება"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "განახლება უბუნტუს ბოლო ვერსიამდე"
-
-#~ msgid "_Check"
-#~ msgstr "შ_ემოწმება"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_დისტრიბუტივის განახლება"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_დავმალოთ ეს ინფორმაცია მომავალში"
-
-#~ msgid "_Install Updates"
-#~ msgstr "განახლებების _დაყენება"
-
-#~ msgid "_Upgrade"
-#~ msgstr "_განახლება"
-
-#~ msgid "changes"
-#~ msgstr "ცვლილებები"
-
-#~ msgid "updates"
-#~ msgstr "განახლებები"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>ავტომატური განახლებები</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>ინტერნეტ-განახლებები</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>ინტერნეტი</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>მიიღეთ მონაწილეობა პოპულარობის რეიტინგის შექმნაში - ამით თქვენ ხელს "
-#~ "შეუწყობთ უბუნტუს გაუმჯობესებას; შეიქმნება თქვენს მიერ დაყენებული "
-#~ "პროგრამების სია მათი გამოყენების სიხშირის ჩვენებით, რომელიც ანონიმურად, "
-#~ "კვირაში ერთხელ გაიგზავნება უბუნტუს პროექტში.\n"
-#~ "\n"
-#~ "შედეგები გამოყენებულ იქნება პოპულარული პროგრამების უკეთ მხარდაჭერისათვის "
-#~ "და ძებნის შედეგებში პროგრამების რეიტინგის შესაფასებლად.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Cdrom-ის დამატება"
-
-#~ msgid "Authentication"
-#~ msgstr "აუთენტიფიკაცია"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "ჩამოტვირთული პროგრამების ფაილების წ_აშლა:"
-
-#~ msgid "Download from:"
-#~ msgstr "ჩამოტვირთვა წყაროდან:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "სანდო პროგრამების მომწოდებლის ღია გასაღების იმპორტი"
-
-#~ msgid "Internet Updates"
-#~ msgstr "ინტერნეტ-განახლებები"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "ავტომატურად დაყენდება მხოლოდ უსაფრთხოების განახლებები უბუნტუს ოფიციალური "
-#~ "სერვერებიდან"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "ნაგულისხმევი პარამეტრების აღდგენა"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "ნაგულისხმევი გასაღებების აღდგენა დისტრიბუტივიდან"
-
-#~ msgid "Software Sources"
-#~ msgstr "წყარო-პროგრამები"
-
-#~ msgid "Source code"
-#~ msgstr "საწყისი კოდი"
-
-#~ msgid "Statistics"
-#~ msgstr "სტატისტიკა"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "სტატისტიკური ინფორმაციის გაგზავნა"
-
-#~ msgid "Third Party"
-#~ msgstr "სხვა მომწოდებლები"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "განახლებების ავტომატური შ_ემოწმება:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_განახლებების ავტომატური ჩამოტვირთვა დაყენების გარეშე"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_გასაღები ფაილის იმპორტი"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_უსაფრთხოების განახლებების დაყენება შეკითხვის გარეშე"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>ინფორმაცია ხელმისაწვდომი პროგრამების შესახებ ვადაგასულია</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "ახალი ან შეცვლილი წყაროდან პროგრამის დასაყენებლად განაახლეთ ინფორმაცია "
-#~ "ხელმისაწვდომი პროგრამების შესახებ."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>კომენტარი:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>კომპონენტები:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>დისტრიბუტივი:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>ტიპი:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>შეიყვანეთ წყაროდ დასამატებელი რეპოზიტორიის სრული APT-სტრიქონი</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "\n"
-#~ "APT-სტრიქონი შეიცავს რეპოზიტორიის ტიპს, მდებარეობასა და კომპონენტებს. "
-#~ "მაგალითად <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "APT-სტრიქონი:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "ორობითი\n"
-#~ "წყარო"
-
-#~ msgid "Edit Source"
-#~ msgstr "წყაროს შეცვლა"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "CD-ROM-ის სკანირება"
-
-#~ msgid "_Add Source"
-#~ msgstr "_წყაროს დამატება"
-
-#~ msgid "_Reload"
-#~ msgstr "_გადატვირთვა"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "ახალი განახლებების ჩვენება და ჩადგმა"
-
-#~ msgid "Update Manager"
-#~ msgstr "განახლების მენეჯერი"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "დისტრიბუტივის ახალი ვერსიის ავტომატური მონახვა და თუ შესაძლებელია, "
-#~ "განახლების შემოთავაზება."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "დისტრიბუტივის ახალი გამოშვების მოსინჯვა"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "როცა განახლებების ავტომატური მოსინჯვის ფუნქცია გამორთულია, თქვენ ხელით "
-#~ "უნდა მოახდინოთ წყაროთა სიის განახლება, რასაც სისტემა შეგახსენებთ. ამ "
-#~ "პარამეტრით შეიძლება შეხსენების აკრძალვა."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "წყაროთა სიის განახლების შეხსენება"
-
-#~ msgid "Show details of an update"
-#~ msgstr "განახლების დეტალების ჩვენება"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "ინახავს განახლების მენეჯერის ფანჯრის ზომას"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "ინახავს ცვლილებებისა და აღწერილობების შემცველი ექსპანდერის მდგომარეობას"
-
-#~ msgid "The window size"
-#~ msgstr "ფანჯრის ზომა"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "პროგრამების დაყენებისა და განახლების წყაროების კონფიგურირება"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" უსაფრთხოების განახლებები"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "განახლებების _დაყენება"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr "მე-%(current)li ფაილის ჩამოქაჩვა %(total)li-დან. სიჩქარე - %(speed)s/s"
 
-#~ msgid "Cancel _Download"
-#~ msgstr "ჩამოტვირთვის _გაუქმება"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "მე-%(current)li ფაილის ჩამოქაჩვა %(total)li-დან"
 
-#, fuzzy
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "არა"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "ცნობები"
 
-#~ msgid "Could not find any upgrades"
-#~ msgstr "ვერ ვპოულობ განახლებებს"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "თქვენი სისტემა სულ ახლახანს განახლდა."
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\"> -სკენ</span>"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "ცვლილებების სია არ არის ხელმისაწვდომი."
 
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "განახლება -სკენ ვერსია ის"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "შეუძლებელია ყველა არსებული განახლების ჩაყენება"
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>ვამოწმებ თქვენს სისტემას</b></big>\n"
-#~ "\n"
-#~ "მოცემული პროგრამა გიჩვენებთ განახლებებს, გაასწორებს სისტემურ შეცდომებს და "
-#~ "წარმოგიდგენთ ახალ შესაძლებლობებს."
+#: ../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 ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "ის გამოყენება მონიშვნა ყველა ის Synaptic ან sudo -ში a ტერმინალი -სკენ "
-#~ "განახლება."
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"ვერ განხორციელდა ცვლილებების სიის ჩამოქაჩვა.\n"
+"შეამოწმეთ ინტერნეტ-კავშირი."
 
-#, fuzzy
-#~ msgid "Download is complete"
-#~ msgstr "ჩამოტვირთვა ტოლია სრული"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "ახლა."
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "მიმდინარეობს უბუნტუს განახლებების ჩაყენება"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Hide details"
-#~ msgstr "დეტალების დამალვა"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Show details"
-#~ msgstr "დეტალების ჩვენება"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "მხოლოდ ტოლია -სკენ დრო"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr "დახურვა სხვა პროგრამა e ან Synaptic."
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>არხები</b>"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "'%s' ვერ დაყენდა"
 
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>გასაღებები</b>"
+#: ../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 "Installation Media"
-#~ msgstr "დაყენება მედია"
+msgid "An essential package would be removed"
+msgstr "ამით საჭირო პაკეტი წაიშლება"
 
-#~ msgid "Software Preferences"
-#~ msgstr "პროგრამების პარამეტრები"
-
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>არხი</b>"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>კომპონენტები</b>"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#, fuzzy
-#~ msgid "Add Channel"
-#~ msgstr "არხის დამატება"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "არხის რედაქტორება"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "დამატება არხი"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ 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 ""
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 განახლებები"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS უსაფრთხოების განახლება"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS განახლებები"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS დამატებითი პროგრამები"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 2f795710..dea0a295 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -23,235 +23,266 @@ 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:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "우분투 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "우분투 4.10 'Warty Warthog' 씨디롬"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "우분투 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "우분투 4.10 'Warty Warthog' 씨디롬"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:135
+#, fuzzy
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "우분투 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:153
+#, fuzzy
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "우분투 5.04 'Hoary Hedgehog' 씨디롬"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:197
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "우분투 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "우분투 5.04 'Hoary Hedgehog' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "우분투 5.04 보안 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "우분투 5.10 'Breezy Badger' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "우분투 5.04 보안 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "우분투 5.10 'Breezy Badger' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "우분투 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "커뮤니티에서 관리"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "장치의 독점 드라이버"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "제한된 소프트웨어"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "우분투 6.10 'Edgy Eft' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "우분투 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Canonical이 지원하는 오픈 소스 소프트웨어"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "커뮤니티에서 관리 (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "커뮤니티에서 관리하는 오픈 소스 소프트웨어"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "비자유 드라이버"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "장치의 독점 드라이버 "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "장치의 독점 드라이버"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "제한된 소프트웨어 (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "우분투 6.06 LTS 'Dapper Drake' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "중요한 보안 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "추천하는 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "제안하는 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Backport 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "우분투 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "우분투 5.10 'Breezy Badger' 씨디롬"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "우분투 5.10 보안 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "우분투 5.10 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "우분투 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "우분투 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "우분투 5.04 'Hoary Hedgehog' 씨디롬"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "공식적으로 지원함"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "우분투 5.04 보안 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "우분투 5.04 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "우분투 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "우분투 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "커뮤니티에서 관리 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "비자유 (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "우분투 4.10 'Warty Warthog' 씨디롬"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "더 이상 공식적으로 지원하지 않음"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "저작권이 제한됨"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "우분투 4.10 보안 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "우분투 4.10 업데이트"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "우분투 4.10 Backports"
 
@@ -263,55 +294,68 @@ 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 "데비안 3.1 \"Sarge\""
+
+#. Description
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "데비안 3.1 \"Sarge\""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../data/templates/Debian.info.in:58
+#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "데비안 3.1 \"Sarge\""
+
+#. Description
+#: ../data/templates/Debian.info.in:83
 #, fuzzy
 msgid "Debian 3.1 'Sarge'"
 msgstr "데비안 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
 #, fuzzy
 msgid "Security updates"
 msgstr "중요한 보안 업데이트"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "데비안 \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "데비안 \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG 호환이 되지만 비자유 소프트웨어에 의존하는 소프트웨어"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG와 호환이 되지 않는 소프트웨어"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "%s 서버"
@@ -319,1042 +363,161 @@ 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:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "주 서버"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "사용자 정의 서버"
 
-#~ msgid "Daily"
-#~ msgstr "매일"
-
-#~ msgid "Every two days"
-#~ msgstr "이틀마다"
-
-#~ msgid "Weekly"
-#~ msgstr "매주"
-
-#~ msgid "Every two weeks"
-#~ msgstr "이주일마다"
-
-#~ msgid "Every %s days"
-#~ msgstr "%s일마다"
-
-#~ msgid "After one week"
-#~ msgstr "일주일 후에"
-
-#~ msgid "After two weeks"
-#~ msgstr "이주일 주 후에"
-
-#~ msgid "After one month"
-#~ msgstr "한달 후에"
-
-#~ msgid "After %s days"
-#~ msgstr "%s일 후에"
-
-#~ msgid "%s updates"
-#~ msgstr "%s 업데이트"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "가장 가까운 서버"
-
-#~ msgid "Software Channel"
-#~ msgstr "소프트웨어 채널"
-
-#~ msgid "Active"
-#~ msgstr "사용중"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(소스 코드)"
-
-#~ msgid "Source Code"
-#~ msgstr "소스 코드"
-
-#~ msgid "Import key"
-#~ msgstr "키 가져오기"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "선택한 파일 가져오기 오류"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "선택된 파일은 GPG 키 파일이 아니거나 잘못되었습니다."
-
-#~ msgid "Error removing the key"
-#~ msgstr "키 삭제 오류"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "선택한 키를 지울 수 없습니다. 버그를 보고하십시오."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>CD 검색 오류</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "디스크에 사용할 이름을 입력하십시오."
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "드라이브에 디스크를 넣으십시오:"
-
-#~ msgid "Broken packages"
-#~ msgstr "망가진 패키지"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "이 소프트웨어로 고칠 수 없는 망가진 패키지가 있습니다. 진행하기 전에 먼저 "
-#~ "시냅틱이나 apt-get을 사용하여 복구하십시오."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "요청한 메타 패키지를 업그레이드 할 수 없습니다"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "필수적인 패키지를 제거해야만 합니다."
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "업그레이드에 필요한 의존성을 계산할 수 없습니다."
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "업그레이드에 필요한 의존성을 계산하던 중 해결할 수 없는 문제가 발생했습니"
-#~ "다.\n"
-#~ "\n"
-#~ "'update-manager' 패키지의 버그를 보고하여 주십시오. 그리고 버그 보고에 /"
-#~ "var/log/dist-upgrade/에 있는 파일을 포함하여 주십시오."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "패키지 인증 오류"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "인증할 수 없는 패키지가 있습니다. 일시적인 네트워크 문제일 수 있으니 이 경"
-#~ "우라면 나중에 다시 시도하십시오. 인증되지 않은 패키지의 목록은 다음과 같습"
-#~ "니다."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "'%s'을(를) 설치할 수 없습니다"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr "요청한 패키지를 설치할 수 없습니다. 버그를 보고하여 주십시오. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "메타 패키지를 추측할 수 없습니다"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "시스템에 ubuntu-desktop이나 kubuntu-desktop 또는 edubuntu-desktop 패키지"
-#~ "가 없으며, 현재 실행중인 우분투의 버전을 알아낼 수 없습니다.\n"
-#~ " 위의 패키지 중 하나를 시냅틱이나 apt-get을 이용해서 먼저 설치하시기 바랍"
-#~ "니다."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "CD 추가하기 실패"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "CD를 더할 때 오류가 발생하였기 때문에 업그레이드는 중단될 것입니다. 올바"
-#~ "른 우분투 CD를 사용하고 있었다면 이 버그를 보고해 주십시오.\n"
-#~ "\n"
-#~ "오류 메시지:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "캐시를 읽고 있습니다"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "업그레이드할 때 네트워크에서 자료를 받을까요?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "업그레이드할 때 네트워크를 이용하여 최신 업데이트를 확인하고 현재 CD에 없"
-#~ "는 패키지를 받을 수 있습니다.\n"
-#~ "빠르고 값싼 네트워크를 이용하고 있다면 '예'를 선택하는 것이 좋습니다. 네트"
-#~ "워크를 이용하는 것이 값싸지 않다면 '아니오'를 선택하십시오."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "적합한 미러 서버를 찾지 못했습니다."
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "업그레이드를 하기 위해 저장소 정보를 검색할 때 미러 서버 항목을 찾지 못했"
-#~ "습니다. 내부 미러 서버를 운영하고 있거나 미러 서버 정보가 오래됐을 때 이러"
-#~ "한 문제가 일어날 수 있습니다.\n"
-#~ "\n"
-#~ "'sources.list' 파일을 다시 작성하시겠습니까? '예'를 선택하면 '%s' 전체를 "
-#~ "'%s' 항목으로 업데이트 합니다.\n"
-#~ "'아니오'를 선택하면 업데이트가 취소됩니다."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "기본 설정된 소스 목록을 만듭니까?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "'sources.list'를 검색했지만 '%s'에 적합한 항목을 찾지 못했습니다.\n"
-#~ "\n"
-#~ "'%s'에 대한 기본 항목을 추가하시겠습니까? '아니오'를 선택하면 업데이트가 "
-#~ "취소됩니다."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "저장소 정보가 올바르지 않습니다"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "저장소 정보를 업그레이드했는데 잘못된 파일이 만들어졌습니다. 버그를 보고하"
-#~ "여 주십시오."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "써드 파티 소스는 이용할 수 없습니다"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "souces.list에서 써드 파티 목록의 일부는 이용할 수 없게 되었습니다. "
-#~ "'software-properties' 도구나 시냅틱으로 업그레이드 한 후에 다시 사용가능하"
-#~ "게 할 수 있습니다."
-
-#~ msgid "Error during update"
-#~ msgstr "업데이트 중 오류"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "업데이트를 하는 동안에 문제가 발생했습니다. 보통 네트워크 문제인 경우가 많"
-#~ "습니다. 네트워크의 연결 상태를 확인하시고 다시 시도하십시오."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "디스크 여유 공간이 충분하지 않습니다."
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "업그레이드가 중단되었습니다. 적어도 %s 정도의 디스크 공간을 %s에 확보하시"
-#~ "기 바랍니다. 휴지통을 비우시고 'sudo apt-get clean' 명령으로 이전 설치 과"
-#~ "정 중에 사용했던 임시 패키지들을 삭제하시기 바랍니다."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "업그레이드를 시작하시겠습니까?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "업그레이드를 설치하지 못했습니다."
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "업그레이드가 중단되었습니다. 시스템을 이용할 수 없는 상태일 수 있습니다. "
-#~ "(dpkg --configure -a)를 실행하여 복구하십시오.\n"
-#~ "\n"
-#~ "'update-manager' 패키지의 버그를 보고하여 주십시오. 그리고 버그 보고에 /"
-#~ "var/log/dist-upgrade/에 있는 파일을 포함하여 주십시오."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "업그레이를 다운로드 할 수 없습니다."
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "업그레이드가 중단되었습니다. 인터넷 연결과 설치 미디어를 확인하시고 다시 "
-#~ "시도하십시오. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "일부 프로그램의 지원이 종료되었습니다"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Canonical Ltd.는 다음의 소프트웨어 패키지를 더 이상 지원하지 않습니다. 커"
-#~ "뮤니티를 통해서 여전히 지원받을 수 있습니다.\n"
-#~ "\n"
-#~ "커뮤니티 관리 소프트웨어를 (universe) 활성화하지 않았다면, 다음 단계에서 "
-#~ "이 패키지들을 삭제하도록 제안할 것입니다."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "구식 패키지를 삭제하시겠습니까?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "이 단계 건너뛰기(_S)"
-
-#~ msgid "_Remove"
-#~ msgstr "제거(_R)"
-
-#~ msgid "Error during commit"
-#~ msgstr "커밋 도중 오류 발생"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "정리하는 도중에 문제가 발생하였습니다. 다음의 메시지에서 더 많은 정보를 확"
-#~ "인할 수 있습니다. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "시스템을 원래의 상태로 복구하고 있습니다"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "'%s'의 백포트를 받고 있습니다"
-
-#~ msgid "Checking package manager"
-#~ msgstr "패키지 관리자를 확인하고 있습니다"
-
-#~ msgid "Updating repository information"
-#~ msgstr "저장소 정보를 업데이트하고 있습니다"
-
-#~ msgid "Invalid package information"
-#~ msgstr "잘못된 패키지 정보"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "패키지 정보를 업데이트한 다음에 필수 패키지 '%s'를 더이상 찾을 수 없습니"
-#~ "다.\n"
-#~ "심각한 오류입니다. 'update-manager' 패키지의 버그를 보고하여 주십시오. 그"
-#~ "리고 버그 보고에 /var/log/dist-upgrade/에 있는 파일을 포함하여 주십시오."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "확인을 요청하고 있습니다"
-
-#~ msgid "Upgrading"
-#~ msgstr "업그레이드하고 있습니다"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "구식 소프트웨어를 검색하고 있습니다"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "완전히 시스템을 업그레이드하였습니다."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "'%s'을(를) 드라이브 '%s'에 넣으십시오."
-
-#~ msgid "Fetching is complete"
-#~ msgstr "완전히 받았습니다"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "내려받는 중, %li의 %li 파일, 속도 %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "%s분 정도 남음"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "%li의 %li 파일 내려받는 중"
-
-#~ msgid "Applying changes"
-#~ msgstr "변경 사항을 적용하고 있습니다"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "'%s'을(를) 설치할 수 없음"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "업그레이드가 중단되었습니다. 'update-manager' 패키지의 버그를 보고하여 주"
-#~ "십시오. 그리고 버그 보고에 /var/log/dist-upgrade/에 있는 파일을 포함하여 "
-#~ "주십시오."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "바뀐 설정 파일 '%s'을(를)\n"
-#~ "교체하시겠습니까?"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "'diff' 명령어를 찾지 못했습니다."
-
-#~ msgid "A fatal error occured"
-#~ msgstr "심각한 오류 발생"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "이 버그를 보고하여 주십시오. 그리고 버그 보고에 /var/log/dist-upgrade/"
-#~ "main.log 파일과 /var/log/dist-upgrade/apt.log 파일을 포함하여 주십시오. 업"
-#~ "그레이드가 중단되었습니다.\n"
-#~ "원래의 sources.list는 /etc/apt/sources.list.distUpgrade에 저장되어 있습니"
-#~ "다."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "패키지 %d개를 삭제할 것입니다."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "새로운 패키지 %d개를 설치할 것입니다."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "패키지 %d개를 업그레이드할 것입니다."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "총 %s개의 패키지를 다운로드해야 합니다. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "업그레이드를 받아 설치하는 것은 여러 시간이 걸릴 수 있으며, 이후 어떤 경우"
-#~ "에도 취소할 수 없습니다."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr "데이터 손실을 막으려면 열려있는 모든 프로그램과 문서를 닫으십시오."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "시스템이 최신의 상태입니다."
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr "시스템에 업그레이드할 것이 없습니다. 업그레이드를 취소합니다."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>%s 제거</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "%s 설치"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "%s 업그레이드"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li일 %li시간 %li분"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li시간 %li분"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li분"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li초"
-
-#~ msgid "Reboot required"
-#~ msgstr "다시 시작해야 합니다"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr "업그레이드가 끝났으며 다시 시작해야 합니다. 지금 하시겠습니까?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>실행 중인 업그레이드를 취소하시겠습니까?</big></b>\n"
-#~ "\n"
-#~ "업그레이드를 취소하면 시스템이 사용할 수 없는 상태가 될 수 있습니다. 업그"
-#~ "레이드를 계속 하시기를 강력히 건의합니다."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>업그레이드를 완료하기 위해 시스템을 다시 시작합니다.</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>업그레이드를 시작하시겠습니까?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>우분투를 버전 6.10으로 업그레이드하고 있습니다</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "정리하고 있습니다"
-
-#~ msgid "Details"
-#~ msgstr "자세한 정보"
-
-#~ msgid "Difference between the files"
-#~ msgstr "파일 간의 차이점"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "업그레이드를 받아서 설치하고 있습니다"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "소프트웨어 채널을 수정하고 있습니다"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "업그레이드를 준비하고 있습니다"
-
-#~ msgid "Restarting the system"
-#~ msgstr "시스템을 다시 시작하고 있습니다"
-
-#~ msgid "Terminal"
-#~ msgstr "터미널"
-
-#~ msgid "_Keep"
-#~ msgstr "유지(_K)"
-
-#~ msgid "_Replace"
-#~ msgstr "바꾸기(_R)"
-
-#~ msgid "_Report Bug"
-#~ msgstr "버그 보고(_R)"
-
-#~ msgid "_Restart Now"
-#~ msgstr "지금 다시 시작(_R)"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "계속 업그레이드(_R)"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "릴리즈 정보를 찾을 수 없습니다."
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "서버에 접속자가 너무 많습니다. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "릴리즈 정보를 다운로드 할 수 없습니다."
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "인터넷 연결 상태를 확인하십시오."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "업그레이드 도구를 실행할 수 없습니다."
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "업그레이드 도구에 버그가 있는 것 같습니다. 버그를 보고하여 주십시오."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "업그레이드 도구를 다운로드하고 있습니다"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "업그레이드 도구가 업그레이드 과정으로 안내할 것입니다."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "업그레이드 도구 서명"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "업그레이드 도구"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "받기 실패"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "업그레이드를 받는데 실패했습니다. 네트워크에 문제가 있을 수 있습니다. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "압축 풀기 실패"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "업그레이드의 압축을 푸는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 "
-#~ "있습니다. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "확인 실패"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "업그레이드를 확인하는데 실패했습니다.  네트워크나 서버에 문제가 있을 수 있"
-#~ "습니다. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "인증 실패"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "업그레이드를 인증하는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 있"
-#~ "습니다. "
-
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr ""
-#~ "%(total)li개중 %(current)li번째 파일을 %(speed)s/s의 속도로 받고 있습니다"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "%(total)li개중 %(current)li번째 파일을 받고 있습니다"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "변경 사항 목록이 없습니다"
-
-#~ msgid "Backports"
-#~ msgstr "Backports"
-
-#~ msgid "Distribution updates"
-#~ msgstr "배포판 업데이트"
-
-#~ msgid "Other updates"
-#~ msgstr "기타 업데이트"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "버전 %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "변경 사항 목록을 다운로드하고 있습니다..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "전체 선택 취소(_U)"
-
-#~ msgid "_Check All"
-#~ msgstr "전체 선택(_C)"
-
-#~ msgid "Download size: %s"
-#~ msgstr "다운로드 크기: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "업데이트 %s개를 설치할 수 있습니다."
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "잠시만 기다리십시오. 이 작업은 약간의 시간이 걸립니다."
-
-#~ msgid "Update is complete"
-#~ msgstr "완전히 업데이트하였습니다."
-
-#~ msgid "Checking for updates"
-#~ msgstr "업데이트 확인"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "버전 %(old_version)s에서 %(new_version)s(으)로"
-
-#~ msgid "Version %s"
-#~ msgstr "버전 %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(크기: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "더 이상 지원되지 않는 배포판입니다."
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "더 이상 보안이나 중요 업데이트를 받을 수 없습니다. 최신의 우분투 리눅스로 "
-#~ "업그레이드 하십시오. 업그레이드에 대한 더 많은 정보는 http://www.ubuntu."
-#~ "com에서 보실 수 있습니다."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>새 배포판 '%s'을(를) 설치할 수 있습니다</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "소프트웨어 목록이 망가졌습니다."
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "어떤 소프트웨어도 설치하거나 삭제할 수 없습니다. \"시냅틱\"이나 터미널에"
-#~ "서 \"sudo apt-get install -f\"를 실행하여 이 문제를 먼저 해결하십시오."
-
-#~ msgid "None"
-#~ msgstr "없음"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+"%(total)li개중 %(current)li번째 파일을 %(speed)s/s의 속도로 받고 있습니다"
 
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "%(total)li개중 %(current)li번째 파일을 받고 있습니다"
 
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>업데이트 확인을 직접 해야 합니다.</big></b>\n"
-#~ "\n"
-#~ "업데이트 확인이 자동으로 되지 않습니다. 이 동작은 <i>인터넷 업데이트</i> "
-#~ "탭의 <i>소프트웨어 소스</i>에서 설정할 수 있습니다."
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "자세한 정보"
 
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>시스템을 최신으로 유지하십시오.</b></big>"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>설치하지 못한 업데이트가 있습니다</b></big>"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>업그레이드 관리자를 시작합니다</big></b>"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Changes"
-#~ msgstr "변경 사항"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "변경 사항 목록이 없습니다"
 
-#~ msgid "Changes and description of the update"
-#~ 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 ""
 
-#~ msgid "Chec_k"
-#~ msgstr "확인(_k)"
+#: ../apt/package.py:1053
+#, fuzzy
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"변경 사항 목록을 다운로드하는데 실패했습니다. 인터넷 연결을 확인해 주십시오."
 
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "새로운 업데이트를 위해 소프트웨어 채널을 확인합니다."
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Description"
-#~ msgstr "설명"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Release Notes"
-#~ msgstr "릴리즈 정보"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "배포판 업그레이드를 수행하여 가능한 많은 업데이트를 설치합니다. \n"
-#~ "\n"
-#~ "이것은 완료되지 않은 업그레이드나 비공식 소프트웨어 패키지, 또는 개발버전"
-#~ "에서 실행했기 때문일 수 있습니다."
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Show progress of single files"
-#~ msgstr "각 파일의 진행 상황 표시"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Software Updates"
-#~ msgstr "소프트웨어 업데이트"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "소프트웨어 업데이트는 에러를 고치고, 보안 문제를 제거하며 새로운 기능을 제"
-#~ "공합니다."
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "U_pgrade"
-#~ msgstr "업그레이드(_p)"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "우분투 최신 버전으로 업그레이드 합니다."
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "'%s'을(를) 설치할 수 없습니다"
 
-#~ msgid "_Check"
-#~ msgstr "확인(_C)"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "배포판 업그레이드(_D)"
+#: ../apt/debfile.py:494
+#, fuzzy
+msgid "An essential package would be removed"
+msgstr "필수적인 패키지를 제거해야만 합니다."
 
-#~ msgid "_Hide this information in the future"
-#~ msgstr "앞으로 이 정보 숨김(_H)"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "_Install Updates"
-#~ msgstr "업데이트 설치(_I)"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "업그레이드(_p)"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "changes"
-#~ msgstr "변경 사항"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "updates"
-#~ msgstr "업데이트"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>자동 업데이트</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>씨디롬/DVD</b>"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>인터넷 업데이트</b>"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>인터넷</b>"
+#: ../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 ""
 
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>우분투의 사용자 경험을 개선하기 위해 인기 경연에 참여해 주십시오. 그러"
-#~ "면 설치된 소프트웨어의 목록과 사용하는 빈도를 수집하여 우분투 프로젝트로 "
-#~ "일주일에 한번씩 익명으로 전송합니다.\n"
-#~ "\n"
-#~ "그 결과는 인기있는 프로그램의 지원을 개선하고 검색 결과에서 프로그램의 순"
-#~ "위를 매기는데 사용합니다.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "씨디롬 추가"
-
-#~ msgid "Authentication"
-#~ msgstr "인증"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "다운로드한 소프트웨어 파일 삭제(_E):"
-
-#~ msgid "Download from:"
-#~ msgstr "다운로드 위치:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "믿을 수 있는 소프트웨어 제공자로부터 공개 키를 가져옵니다."
-
-#~ msgid "Internet Updates"
-#~ msgstr "인터넷 업데이트"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr "공식 우분투 서버의 보안 업데이트만 자동으로 설치합니다."
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "기본값으로 되돌리기(_D)"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "배포판의 기본 키로 되돌리기"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Software Sources"
-#~ msgstr "소프트웨어 소스"
-
-#~ msgid "Source code"
-#~ msgstr "소스 코드"
-
-#~ msgid "Statistics"
-#~ msgstr "통계"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "통계 정보 제출"
-
-#~ msgid "Third Party"
-#~ msgstr "써드 파티"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "업데이트를 자동으로 확인(_C):"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "업데이트를 자동으로 다운로드하지만 설치는 하지 않습니다(_D)"
-
-#~ msgid "_Import Key File"
-#~ msgstr "키 파일 가져오기(_I)"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "보안 업데이트는 확인 없이 설치(_I)"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>이용할 수 있는 소프트웨어에 대한 정보가 오래되었습니다.</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "새로 추가하거나 변경한 소스로부터 소프트웨어를 설치하거나 업데이트하려면, "
-#~ "이용할 수 있는 소프트웨어에 대한 정보를 다시 읽어야 합니다.\n"
-#~ "\n"
-#~ "계속하기 위해서는 인터넷 연결이 필요합니다."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>설명:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>구성 요소:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>배포판:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>종류:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>추가하고자 하는 소스 저장소의 APT 줄을 완전히 입력하십시오.</b></"
-#~ "big>\n"
-#~ "\n"
-#~ "APT 줄은 다음 예와 같이 채널의 종류, 위치, 구성요소를 포함합니다. <i>"
-#~ "\"deb http://ftp.debian.org sarge main\"</i>"
-
-#~ msgid "APT line:"
-#~ msgstr "APT 줄:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "바이너리\n"
-#~ "소스"
-
-#~ msgid "Edit Source"
-#~ msgstr "소스 편집"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "씨디롬을 검색하고 있습니다"
-
-#~ msgid "_Add Source"
-#~ msgstr "소스 추가(_A)"
-
-#~ msgid "_Reload"
-#~ msgstr "다시 읽기(_R)"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "가능한 업데이트를 보여주고, 설치합니다."
-
-#~ msgid "Update Manager"
-#~ msgstr "업데이트 관리자"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "현재 배포판에 새로운 버전이 있어서 업그레이드가 가능한지 자동으로 확인합니"
-#~ "다."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "새로운 배포판 발표를 확인합니다."
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "자동 업데이트 확인 기능을 사용하지 않으면, 채널 목록을 수동으로 다시 읽어"
-#~ "야 합니다. 이 옵션은 이 경우에 알림 기능이 나타나지 않도록 합니다."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "채널 목록을 다시 읽도록 알려줍니다."
-
-#~ msgid "Show details of an update"
-#~ msgstr "업데이트의 자세한 정보를 보여줍니다."
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "업데이트 관리자 창의 크기 저장"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr "변경 사항과 설명의 목록을 포함하는 확장자의 상태를 저장합니다."
-
-#~ msgid "The window size"
-#~ msgstr "창 크기"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "설치할 수 있는 소프트웨어와 업데이트를 위한 소스를 설정"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "데비안 3.1 \"Sarge\" 보안 업데이트"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid ""
-#~ "You will loose all customizations, that have been made by yourself or by "
-#~ "a script, if you replace the file by its latest version."
-#~ msgstr ""
-#~ "파일을 최신 버전으로 교체할 경우 직접 또는 스크립트에 의해서 바뀐 모든 것"
-#~ "을 잃어버릴 것입니다."
-
-#~ msgid ""
-#~ "This download will take about %s with a 56k modem and about %s with a "
-#~ "1Mbit DSL connection"
-#~ msgstr ""
-#~ "이것을 다운로드하려면 56k 모뎀으로는 약 %s이(가) 걸리고 1Mbit DSL 연결로"
-#~ "는 약 %s이(가) 걸립니다."
-
-#~ msgid "The list of changes is not available yet. Please try again later."
-#~ msgstr "변경 사항 목록이 아직 없습니다. 잠시 후 다시 시도해 주십시오."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. Please check your Internet "
-#~ "connection."
-#~ msgstr ""
-#~ "변경 사항 목록을 다운로드하는데 실패했습니다. 인터넷 연결을 확인해 주십시"
-#~ "오."
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "저작권나 법적 문제가 제한된 소프트웨어"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/ku.po b/po/ku.po
index e3009cc0..357e7c42 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -24,236 +24,267 @@ 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: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 "Cdroma 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 "Cdroma 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 "Cdroma 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdroma Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Rojanekirinên Ewlekariyên yên Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cdroma Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Rojanekirinên Ewlekariyên yên Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cdroma Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Yên ji aliyê komekê ber çav hatiye derbaskirin"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Ji bo cîhazan ajokerên ku çavkaniyên wan girtî ne"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Nivîsbariya bi sînor"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cdroma Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Çavkaniya xwezayî ya li gorî bingeha nermalavê"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Yên ji aliyê koman lê hatine nihêrtin"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained 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:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Ajokerên ne azad"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Ji bo cîhazan ajokarên xwedî-bawername "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Ji bo cîhazan ajokerên ku çavkaniyên wan girtî ne"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Nivîsbariya bi sînor"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 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:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cdroma Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Rojanekirinên ewlekariyê yên girîng"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Rojanekirinên têne pêşniyarkirin"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Rojanekirinên hatine pêşniyarkirin"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Rojanekirinên paş de hatine kişandin"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cdroma Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Rojanekirinên Ewlekariyê yên Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Rojanekirina Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Rojanekirinên Paş de Hatine Kişandin yên Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdroma Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Bi piştgiriya fermî"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Rojanekirinên Ewlekariyên yên Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Rojanekirinên Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Rojanekirinên Paş de Hatine Kişandin yên Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Yên ji aliyê koman ve lê tê nihêrîn (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Ne-azad (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdroma Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Êdi bi awayekî fermî nayê destekkirin"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Mafê kopîkrinê yê sînorkirî"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Rojanekirinên Ubuntu 4.10 yên Ewlekarî"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Rojanekirinên Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 nivîsbariyên bi paş de kişandî (Backports)"
 
@@ -265,55 +296,68 @@ 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:58
+#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 3.1 \"Sarge\""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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 "Rojanekirinên hatine pêşniyarkirin"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Rojanekirinên ewlekariyê yên girîng"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-nivîsbariya hevgirtî ya ne azad"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "nivîsbariya hevgirtî ya ne li gorî -DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Pêşkêşkera %s"
@@ -321,1103 +365,160 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Pêşkêşkera Mak"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Pêşkêşkera taybet"
 
-#~ msgid "Daily"
-#~ msgstr "Rojane"
-
-#~ msgid "Every two days"
-#~ msgstr "Her du rojan"
-
-#~ msgid "Weekly"
-#~ msgstr "Heftane"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Her du hefteyan"
-
-#~ msgid "Every %s days"
-#~ msgstr "Her %s rojan"
-
-#~ msgid "After one week"
-#~ msgstr "Piştî hefteyekê"
-
-#~ msgid "After two weeks"
-#~ msgstr "Piştî du hefteyan"
-
-#~ msgid "After one month"
-#~ msgstr "Piştî mehekê"
-
-#~ msgid "After %s days"
-#~ msgstr "Piştî %s roj"
-
-#~ msgid "%s updates"
-#~ msgstr "%s rojanekirin"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Pêşkêşkera herî nêzîk"
-
-#~ msgid "Software Channel"
-#~ msgstr "Qanala Nivîsbariyê"
-
-#~ msgid "Active"
-#~ msgstr "Çalak"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Koda Çavkanî)"
-
-#~ msgid "Source Code"
-#~ msgstr "Koda Çavkaniyê"
-
-#~ msgid "Import key"
-#~ msgstr "Mifteyê veguhezîne"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Di dema veguheztina dosyeya hilbijartî de çewtî"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Dosyeya hilbijartî dibe ku ne dosyeya mifteyan ya GPG be an jî dibe ku "
-#~ "xerabe be."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Di dema rakirina mifteyan de çewtî"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Mifteya ku te hilbijart nehate rakirin. Ji kerema xwe re vê weke "
-#~ "çewtiyekê ragihîne."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Di venihêrina CDyê de çewtî</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Ji kerema xwe navê ji bo diskê binivîse"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Ji kerema xwe re dîskekê têxe ajokar:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Paketên şikestî"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Pergala te tevî vê nivîsbariyê hin pakêtên xerabe yên ku nayên "
-#~ "sererastkirin dihewîne. Berî ku tu berdewam bikî ji kerema xwe van "
-#~ "bernameyan bi synaptic an jî i apt-get sererast bikî."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Pakêtên agahiyan yên pêwist nayên rojanekirin."
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Dê pêwiste be ku pakêta bingehîn were jêbirin"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Rojanekirin nikaribû were hesabkirin"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Dema bilindkirin hesab dikir çewtiyeke ku nayê veçirandin derkete holê.\n"
-#~ "\n"
-#~ "Ji kerema xwe re vê çewtiyê bo 'update-manager' ragihîne, pelgehên ku li /"
-#~ "var/log/dist-upgrade/ de ye jî li rapora çewtiyan zêde bike."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Di piştrastkirina çend paketan de çewtî derket"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Hin pakêt nehatin piştrastkirin. Dibe ku ev pirsgirêkeke derbasdar ya "
-#~ "torê be. Ji bo lîsteya pakêtên ku nehatine piştrastkirin li jêr binihêre."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Nikarî '%s' saz bike"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Pakêta pêwist nehate barkirin. Ji kerema xwe re vê yekê weke çewtiyekê "
-#~ "ragihîne. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Pakêta-meta nehate kifşkirin"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Pergala te tu pakêtên sermaseya-ubuntu, sermaseya-kubuntu yan jî "
-#~ "sermaseya-kubuntu nahundirîne û nehate tespîtkirin ku tu kîjan guhertoya "
-#~ "ubuntuyê bikar tîne.\n"
-#~ "Ji kerema xwe re berî ku tu berdewam bikî, bi synaptic yan jî bi apt-getê "
-#~ "pakêtên ku li jor in yekê saz bike."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Dema têxistina CDyê de çewtî"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Dema CD lê dihate zêdekirin, bilindkirin disekine. Heke tu CDyeke rast ya "
-#~ "Ubuntuyê bikar tîne vê çewtiyê ragihîne.\n"
-#~ "\n"
-#~ "Peyama çewtiyê:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "veşartok tê xwendin"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Ji bo bilindkirinê bila dane ji toreyê were daxistin?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "Tu dikarî bi xêra tora bilindkirinê rojanekirinên herî dawî kontrol bike "
-#~ "û pakêtên ku di CDyê de tuneye daxe.\n"
-#~ "Heke gihiştina te ya torê ne lez be yan jî ne biha be divê tu pêl 'Ere' "
-#~ "bike. Yan jî pêl 'Na' bike."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Şewqdereke derbasdar nehate dîtin."
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Dema çav li agahiyên we yên depoyê dihate gerîn bo rojanekirinê ketana "
-#~ "şewqderê nehate dîtin. Dibe ku sedema wê ev be; yan te şewqdereke "
-#~ "hundurîn bikar aniye an jî agahiyên şewqderê ne rojane ye.\n"
-#~ "\n"
-#~ "Tu dixwazî dosyeya xwe ya 'sources.list' ji nû ve çêbike?\n"
-#~ "Heke tu li vir 'Erê' hilbijêrî hemû ketanên 'ji %s' heta '%s' wê bêne "
-#~ "rojanekirin.\n"
-#~ "Heke tu bibêjî 'Na' wê rojanekirin betal bibe."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Bile çavkaniyên rawêjî pêk bên?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Piştî ku çav li 'sources.list' gerand ji bo '%s' tu têketineke derbasdar "
-#~ "nedît.\n"
-#~ "\n"
-#~ "Ji bo '%s' bila têketinên heyî lê zêde bibe? Heke tu bibêjî 'Na'  dê "
-#~ "rojanekirin were betalkirin."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Agahiya depoyê ne derbasdar e"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Karê rojanekirina agahiya depoyê, dosyeye nederbasdar çêkir. Ji kerema "
-#~ "xwe re vê çewtiyê ragihîne."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Ji çavkaniyên partiyên sêyemîn têkilî hate birîn."
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Ketanên aligirên sêyemîn yên di pelê sources.listê de ne bandora wan hate "
-#~ "rakirin. Piştî bilindkirinê tu dikarî van ketanan bi 'software-"
-#~ "properties' yan jî bi synapticê dîsa çalak bike."
-
-#~ msgid "Error during update"
-#~ msgstr "Di rojanekirinê de çewtî derket"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Di dema rojanekirinê de çewtiyek derket. Ev çewtî piranî pirsgirêka torê "
-#~ "ye, ji kerema xwe re girêdana xwe ya torê kontrol bike û ji nû ve "
-#~ "biceribîne."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Cihê vala yê diskê têr nake"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Bilindkirin diqede. Ji kerema xwe re di %s de herî kêm %s qada dîskê vala "
-#~ "bike. Çopa xwe vala bikin û xêra 'sudo apt-get clean' pakêtên derbasdar "
-#~ "yên sazkirinên berê rake."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Tu dixwazî dest bi bilindkirinê bikî?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Sazkirina hemû bilindkirinan biserneket"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Bêyî bilindkirin niha tê betalkirin. Dibe ku pergala te di rewşeke dudilî "
-#~ "de be. Karekî xelaskirinê pêk hat. (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Ji kerema xwe re bo pakêta 'update-manager' vê çewtiyê ragihîne. Dosyeyên "
-#~ "ku li /var/log/dist-upgrade/ de ye jî li peyama çewtiyê zêde bike."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Daxistina bilindkirinan serneket"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Rojanekirin niha tê betalkirin. Ji kerema xwe girêdana înternetê an "
-#~ "medyaya sazkirinê kontrol bike û ji nû ve biceribîne. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Ji bo hin sepanan piştrastkirin qediya"
-
-#, fuzzy
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Canonical Ltd. êdî nema xizmetan ji van pakêtên nermalav re pêşkêş dike. "
-#~ "Tu hê jî dikarî sûdê ji komeleyê bigire.\n"
-#~ "\n"
-#~ "heke destûra te ji bo nivîsbariyê tunebe, Di gava duyemîn de ev pakêt dê "
-#~ "ji bo jêbirinê werin tercîhkirin."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Bila pakêtên ku nayên bikaranîn were rakirin?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "Vê gavê derbas bike"
-
-#~ msgid "_Remove"
-#~ msgstr "_Jê bibe"
-
-#~ msgid "Error during commit"
-#~ msgstr "çewtî di dema xebitandinê de"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Di dema paqijkirinê de hin pirsgirêk derketin. Ji bo agahiyan ji kerema "
-#~ "xwe re li peyama jêr binihêre. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Vedigere rewşa pergala orjînal"
-
-#, fuzzy
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "backport a  '%s' vedigerîne"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Bireveberiya paketan tê kontrol kirin"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Amadekrinên nûjenkirinê biserneket"
-
-#, fuzzy
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Pergalê ji bo têkçûneke mezin amade dike. Ji kerema xwe re bike rapor li "
-#~ "dijî pakêta rojanekirina gerînende 'update-manager'"
-
-#~ msgid "Updating repository information"
-#~ msgstr "Agahiyên depoyê tê rojanekirin"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Agahiya paketê nederbasdar e"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Piştî ku agahiyê te yên pakêtê hate rojanekirin, yek ji wan pakêtên "
-#~ "girîng '%s' êdî nayê dîtin.\n"
-#~ "Dibe ku ev çewtiyeke girîng e, ji kerema xwe re bo pakêta 'update-"
-#~ "manager' vê çewtiyê ragihîne. Dosyeyên ku li /var/log/dist-upgrade/ de ye "
-#~ "jî li peyama çewtiyê zêde bike."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Pirsa piştrastkirinê"
-
-#~ msgid "Upgrading"
-#~ msgstr "Tê bilindkirin"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Li nivîsbariya kevin tê gerandin"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Bilindkirina sîstemê temam bû."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Ji kerema xwe '%s' bixe nav ajokera '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Rojanekirin temam bû"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Dosyan dadixe %li daxistin ji %li di %s/s de"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Nêzîka %s ma"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Dosyan dadixe %li daxistin ji %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Guherandin tê bi kar anîn"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Nikaribû '%s' saz bike"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "Bilindkirin tê betalkirin. Ji kerema xwe re bo pakêta 'update-manager' vê "
-#~ "çewtiyê ragihîne. Dosyeyên ku li /var/log/dist-upgrade/ de ye jî li "
-#~ "peyama xwe ya çewtiyê zêde bike."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Pelgeha veavakirinan ya hatiye taybetkirin ya\n"
-#~ "'%s' bila were guherandin?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Heke tu vê guhertoyê bi yeke nû biguherînî tu yê hemû guhertinên xwe yên "
-#~ "di pelê mîhengkirinê de winda bikî."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Fermana 'diff' nehatiye dîtin"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Çewtiyeke giran derket"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Ji kerema xwe re vê çewtiyê ragihîne.Dosyeyên ku li /var/log/dist-"
-#~ "upgrade/ de ye jî li peyama xwe ya çewtiyê zêde bike. Bilindkirin niha tê "
-#~ "betalkirin.\n"
-#~ "Dosyeya te ya sources.list ya orjînal wekî /etc/apt/sources.list."
-#~ "distUpgrade hate tomarkirin."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d pakêt dê were rakirin."
-#~ msgstr[1] "%d pakêt dê werine rakirin."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "Dê %d pakêtên nû were sazkirin."
-#~ msgstr[1] "Dê %d pakêtên nû werine sazkirin."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "Dê %d pakêt were bilindkirin"
-#~ msgstr[1] "Dê %d pakêt werine bilindkirin"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Pêwîst e tu %s bi tevahî daxî. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Daxistin û sazkirina bilindkirinê dibe ku bi saetan bidome û dû re jî tu "
-#~ "nikare betal bike."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Ji bo ku dane winda nebin hemû sepan û pelgeyên ku vekirî ne bigire."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Sîstema te rojane ye"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Ji bo pergala te bilindkirin tuneye. Karê bilindkirinê wê a niha were "
-#~ "betalkirin."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>%s rake</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "%s saz bike"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "%s bilind bike"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li roj %li saet %li xulek"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li saet %li xulek"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li xulek"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li çirke"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Ev daxistin dê derdora %s bidomîne bi têkiliya 1Mbit DSL û derdora %s bi  "
-#~ "56k modem."
-
-#~ msgid "Reboot required"
-#~ msgstr "Destpêkirina nû pêwîst e"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Bilindkirin bi dawî bû û destpêkirina nû pêwîst e. Tu dixwazî niha bikî?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Bilindkirina çalak bila were betal kirin?</big></b>\n"
-#~ "\n"
-#~ "Dibe ku pergal neyê bikaranîn. Pêşniyar ew e ku bilindkirin were "
-#~ "dewamkirin."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Ji bo bidawîanîna bilindkirinê pergalê ji nû ve bide destpêkirin</"
-#~ "big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Dest bi bilindkirinê were kirin?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Ubuntu li guhertoya 6.10 tê bilindkirin</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Tê pakij kirin"
-
-#~ msgid "Details"
-#~ msgstr "Hûragahî"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Cudahiyên navbera dosiyan"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Bilindkirin nehatne sazkirin"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Kanalên nivîsbariyê tên guherandin"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Bilinkirin amade dibe"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Pergal tê nûdestpêkirin"
-
-#~ msgid "Terminal"
-#~ msgstr "Termînal"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Ji nûjenkirinê derkeve"
-
-#~ msgid "_Continue"
-#~ msgstr "_Bidomîne"
-
-#~ msgid "_Keep"
-#~ msgstr "Bi_parêze"
-
-#~ msgid "_Replace"
-#~ msgstr "Bide _ser"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_çewtiyeke sepanê"
-
-#~ msgid "_Restart Now"
-#~ msgstr "Niha _ji nû ve bide destpêkirin"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "Bilindkirinan _Bidomînî"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Destpêkirina nûjenkirinê"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "nîşeyên derxistinan nayên dîtin"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Dibe ku barê pêşkêşkerê pir zêde be "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Nîşeyên weşanê nehate daxistin"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Ji kerema xwe girêdana înternetê kontrol bike."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Amûra bilindkirinê nikaribû bimeşîne"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Qey ev çewtiyeke amûra bilindkirinê ye. Ji kerema xwe çewtiyê rapor bike"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Amûra bilindkirinê tê daxistin"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Amûra bilindkirinê te ber bi pêvajoya bilindkirinê dibe."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Destnîşana amûra bilindkirinê"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Amûra bilindkirinê"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Anîn biserneket"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "Anîna bilindkirinê biserneket. Dibe ku pirsgirêkeke torê hebe. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Derxistin biserneket"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Derxistina bilindkirinê biserneket. Dibe ku pirsgirekeke tor an "
-#~ "pêşkêşkarê hebe. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Piştrastkirin biserneket."
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Di dema erêkirina bilindkirinê de çewtî. Dibe ku yan di torê de yan jî di "
-#~ "pêşkêşkerê de pirsgirêk hebe "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Naskirin lê nehat"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Naskirina bilindkirnê lê nehat. Dibe ku pirsgirekeke tor an pêşkêşkarê "
-#~ "hebe. "
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#~ 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
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Pelgeha %(current)li ji %(total)li"
 
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Pelgeha %(current)li ji %(total)li"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Hûragahî"
 
-#~ msgid "The list of changes is not available"
-#~ msgstr "Lîsteya guherînan ne gihiştbar e"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Lîsteya guhertinan hîna jî ne derbasbare.\n"
-#~ "ji kerema xwe re piştre cardin biceribîne."
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Daxistina lîsteya guhertinan biserneket.\n"
-#~ "Ji kerema xwe re girêdana internetê kontrol bike."
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Backports"
-#~ msgstr "Nivîsbariyên bi paş de şandî"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Lîsteya guherînan ne gihiştbar e"
 
-#~ msgid "Distribution updates"
-#~ msgstr "Rojanekirinên dîstrîbusiyonê"
+#: ../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 ""
 
-#~ msgid "Other updates"
-#~ msgstr "Rojanekirinên din"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Daxistina lîsteya guhertinan biserneket.\n"
+"Ji kerema xwe re girêdana internetê kontrol bike."
 
-#~ msgid "Version %s: \n"
-#~ msgstr "Guherto %s: \n"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Lîsteya guhartinan tê daxistin..."
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "_Uncheck All"
-#~ msgstr "Yekê Jî _Hilnebijêre"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "_Check All"
-#~ msgstr "Hemûyan _Hilbijêrî"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Download size: %s"
-#~ msgstr "Mezinahiya daxistinê: %s"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Tu dikarî %s rojanekirinê saz bikî"
-#~ msgstr[1] "Tu dikarî %s rojanekirinan saz bikî"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Divê raweste, dibe ku ev hinekî demdijêj be."
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Update is complete"
-#~ msgstr "Rojanekirin temam bû"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Nikarî '%s' saz bike"
 
-#~ msgid "Checking for updates"
-#~ msgstr "Rojanekirin têne venihartin."
+#: ../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 "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Guhertoya nû: %s (Mezinahî: %s)"
-
-#~ msgid "Version %s"
-#~ msgstr "Guherto %s:"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Mezinahî:%s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Belavkariya ku tu êdî bikar tîne nayê destekirin"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Ji vir û pê ve tu yê êdî sererastkirinên ewlehiyê û rojanekirinên krîtîk "
-#~ "nestîne. Pergala xwe ya xebatê bilindî guhertoya Ubuntu Linuxê bike. Ji "
-#~ "bo agahiyên berfireh malpera http://www.ubuntu.com ziyaret bike."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Weşana belavkariya nû dikare bigihêje '%s'</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Pêrista nivîsbariyê xera bûye"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Sazkirin an jî rakirina nivîsbariyê qet ne gengaz e. Ji kerema xwe berî "
-#~ "her tiştî vê pirsgirêkê bi gerînendeyê pakêtan ya \"Synaptic\" and jî bi "
-#~ "fermana \"sudo apt-get install -f\" re di termînalê de çareser bike."
-
-#~ msgid "None"
-#~ msgstr "Ne yek jî"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Divê tu bi destan rojane bikî</big></b>\n"
-#~ "Pergala ta rê nade rojanekirina jixweber. Tu dikarî vê tevgerê mîheng "
-#~ "bikî  <i>Software Sources</i> di tabloya <i>rojanekirina internetê</i>de."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Pergala xwe rojane hilîne</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>Di lênihertina CDyê de çewtî</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<big><b>Rêveberê rojanekirinê tê destpêkirin</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "Guhartin"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Daxuyaniya guherîn û rojanekirinan"
-
-#~ msgid "Chec_k"
-#~ msgstr "_Kontrol bike"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Ji bo rojanekirinên nû qanalên nivîsbariyê kontrol bike"
-
-#~ msgid "Description"
-#~ msgstr "Daxuyanî"
-
-#~ msgid "Release Notes"
-#~ msgstr "Nîşeyên Weşanê"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Ji bo hemû rojanekirinên gengaz in bilindkirina belavkariyê pêk bîne.\n"
-#~ "\n"
-#~ "Dibe ku ev ji ber bilindkirina nehatiye temamkirin, pakêtên nermalavên ne "
-#~ "fermî yan jî ji ber ku guhertoya pêşvebirinê hatiye bikaranîn pêk hatibe."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Pêşketina dosiyan yek bi yek nîşan bide"
-
-#~ msgid "Software Updates"
-#~ msgstr "Rojanekirinên Nivîsbariyê"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Rojanekirinên nivîsbariyê çewtiyan serrast dikin, valahiyên ewlêkariyê "
-#~ "dadigirin û funksiyonên nû tînin."
-
-#~ msgid "U_pgrade"
-#~ msgstr "_Bilindkirin"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Ber bi guhertoya dawî ya Ubuntu bilind bike"
-
-#~ msgid "_Check"
-#~ msgstr "_Kontrol bike"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "Bilindkirina _Belavkirinê"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "Di pêşerojê de vê agahiyê _veşêre"
-
-#~ msgid "_Install Updates"
-#~ msgstr "Rojanekirinan _Saz bike"
-
-#~ msgid "_Upgrade"
-#~ msgstr "_Bilindkirin"
-
-#~ msgid "changes"
-#~ msgstr "guhertin"
-
-#~ msgid "updates"
-#~ msgstr "rojanekirin"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Rojanekirina bixweber</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Rojanekirinên înternetê</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Înternet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Ji bo pêşvebirina azmûna Ubuntuyê ya bikarhêneran ji kerema xwe re tev "
-#~ "li pêşbirka populertiyê bibe. Heke tu beşdar bibe, wê nivîsbariyên ku tê "
-#~ "de tu agahiyên şexsî tê de tuneye û bikaranîna van tiştan wê bi hefteyî "
-#~ "ji projeya Ubuntuyê re were ragihandin.\n"
-#~ "\n"
-#~ "Encam wê ji bo pêşvebirina desteka ku ji bo sepanan û ji bo diyarkirina "
-#~ "rêzkirina lêgerînan were bikaranîn.<i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Cdrom lê zêde bike"
-
-#~ msgid "Authentication"
-#~ msgstr "Erêkirina Nasnameyê"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "Dosiyên nivîsbariyê yên daxistî _jê bibe:"
-
-#~ msgid "Download from:"
-#~ msgstr "Daxistin ji:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Ji peydakereke ku tu pê ewle yî, mifteyeke vekirî veguhezîne hundir"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Rojanekirinên Înternetê"
+msgid "An essential package would be removed"
+msgstr "Dê pêwiste be ku pakêta bingehîn were jêbirin"
 
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Rojanekirinên ewlehiyê tenê wê ji aliyê pêşkêşkerên fermî yên Ubuntuyê ve "
-#~ "bixweber were sazkirin."
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Vegerîne ser Nirxên _Destpêke"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Mifteyên peşdanasînî yên belavkariya te paş de vedigerîne"
-
-#~ msgid "Software Sources"
-#~ msgstr "Çavkaniyên Nivîsbariyê"
-
-#~ msgid "Source code"
-#~ msgstr "Koda çavkanî"
-
-#~ msgid "Statistics"
-#~ msgstr "Îstatîstîk"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Agahiyên Îstatîskî Ragihîne"
-
-#~ msgid "Third Party"
-#~ msgstr "Aliyê Sêyemîn"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "Xwebixwe li rojanekirinan bi_gerîne:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "Rojanekirinan bixweber _daxe lê saz neke"
-
-#~ msgid "_Import Key File"
-#~ msgstr "Dosyeya mifteyan _veguhezîne hundir"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "Bêpesendkirin rojaneyên ewlehiyê _saz bike"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Agahiyên nivîsbariyê yên mevcûd ne rojane ye</big></b>\n"
-#~ "\n"
-#~ "Ji bo ku tu karibî ji çavkaniyên ku nû lê hatine barkirin yan jî yên "
-#~ "guherîne nivîsbarî û rojanekirinan bar bike divê tu agahiyên nivîsbariyê "
-#~ "dîsa bar bike.\n"
-#~ "\n"
-#~ "Ji bo domandinê girêdaneke înternetê ya dixebite pêwist e."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Şîrove:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Parçe:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Belavkirin:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Cure:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid "APT line:"
-#~ msgstr "Rêzika APT:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Dubendî (Binary)\n"
-#~ "Çavkanî (Source)"
-
-#~ msgid "Edit Source"
-#~ msgstr "Sererastkirina Çavkaniyê"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Li CD-ROM tê gerîn"
-
-#~ msgid "_Add Source"
-#~ msgstr "Çavkaniyekê _Têxê"
-
-#~ msgid "_Reload"
-#~ msgstr "_Rojane bike"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Rojanekirinên amade nîşan bide û saz bike"
-
-#~ msgid "Update Manager"
-#~ msgstr "Rêveberiya Rojanekirinê"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Bixweber kontrol bike bê ka guhertoya nû ya belavkariya mevcûd heye yan "
-#~ "na  û (heke pêkan be) bê ka bilindkirinan pêşkeş dike yan na."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Li derketina belavkirina nû bigerîne"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Heke rojanekirinên jixweber ne çalak be, pêwiste tu qenalê lîsteyê bi "
-#~ "destan daxî. Ev vebijark xuyakirina bibîrxistker vedişêre."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Ji nû ve barkirina lîsteya kanalan bi bîr bixe"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Hûragahiyên rojanekirinekê nîşan bide"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Mezinahiya paceya rêveberê rojanekirinan hiltîne."
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Rewşa pêşdebirên ku di wan de lîsteya guhertinan û şîrove hene , ambar "
-#~ "dike"
-
-#~ msgid "The window size"
-#~ msgstr "Mezinahiyê paceyê"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Ji bo nivîsbarî û rojanekirinên têne sazkirin çavkaniyan veava bike"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" Rojanekirinên Ewlekariyê"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Cancel _Download"
-#~ msgstr "Daxistinê _betal bike"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Sîstema xwe berê hat bilindkirin."
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Rojanekirinên Ubuntu"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "Bi piştgirtiya fermî"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Download is complete"
-#~ msgstr "Daxistin hatiye temam kirin"
+#: ../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 ""
 
-#~ msgid "Hide details"
-#~ msgstr "Hûragahiyan veşêre"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Show details"
-#~ msgstr "Hûragahiyan nîşan bide"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Kanal</b>"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 63e7c7f8..adc096fa 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -24,240 +24,271 @@ 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: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 "CD diskas su 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 "CD diskas su 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 "CD diskas 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD diskas Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 saugumo atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD diskas su Ubuntu 5.10 „Breezy Badger“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 saugumo atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD diskas su Ubuntu 5.10 „Breezy Badger“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Prižiūrima bendruomenės"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "Ne Laisva (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD diskas su Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS „Dapper Drake“"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Prižiūrima bendruomenės (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Prižiūrima bendruomenės (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Bendruomenės prižiūrima laisva programinė įranga"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Ne Laisva (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Nuosavybinės įrenginių valdyklės "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Ne Laisva (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 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:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Svarbūs saugumo atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Rekomenduojami atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Testuojami atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Naujos ir atnaujintos programos"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 „Breezy Badger“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD diskas su Ubuntu 5.10 „Breezy Badger“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 saugumo atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Naujos programos Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD diskas Ubuntu 5.04 „Hoary Hedgehog“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Oficialiai palaikoma"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 saugumo atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Naujos programos Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 „Warty Warthog“"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Prižiūrima bendruomenės (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Ne Laisva (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD diskas su Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Apribotos autorinės teisės"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 saugumo atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 atnaujinimai"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Naujos programos Ubuntu 4.10"
 
@@ -269,55 +300,68 @@ 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:31
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 3.1 „Sarge“"
+
+#. Description
+#: ../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 "Testuojami atnaujinimai"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Svarbūs saugumo atnaujinimai"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian „Etch“ (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian „Sid“ (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 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:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Su DFSG nesuderinama programinė įranga"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -325,1084 +369,160 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Kasdien"
-
-#~ msgid "Every two days"
-#~ msgstr "Kas dvi dienas"
-
-#~ msgid "Weekly"
-#~ msgstr "Kas savaitę"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Kas dvi savaites"
-
-#~ msgid "Every %s days"
-#~ msgstr "Kas %s dienas"
-
-#~ msgid "After one week"
-#~ msgstr "Po savaitės"
-
-#~ msgid "After two weeks"
-#~ msgstr "Po dviejų savaičių"
-
-#~ msgid "After one month"
-#~ msgstr "Po mėnesio"
-
-#~ msgid "After %s days"
-#~ msgstr "Po %s dienų"
-
-#~ msgid "%s updates"
-#~ msgstr "%s atnaujinimai"
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "Programinės įrangos atnaujinimai"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Programų pradinis kodas)"
-
-#~ msgid "Source Code"
-#~ msgstr "Programų pradinis kodas"
-
-#~ msgid "Import key"
-#~ msgstr "Importuoti raktą"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Importuojant pasirinktą failą įvyko klaida"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Pasirinktas failas gali būti sugadintas arba ne GPG rakto failas."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Šalinant raktą įvyko klaida"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą."
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Klaida skanuojant CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Įveskite disko pavadinimą"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Įdėkite diską į įrenginį:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Sugadinti paketai"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Jūsų sistemoje yra sugadintų paketų, kurie negali būti sutaisyti šia "
-#~ "programa. Prieš tęsdami pirmiausia sutaisykite juos naudodamiesi "
-#~ "„synaptic“ arba „apt-get“."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Negalima atnaujinti reikiamų metapaketų"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Turėtų būti pašalintas esminis paketas"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Nepavyko paskaičiuoti atnaujinimo"
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Iškilo neišsprendžiama problema apskaičiuojant atnaujinimą. Praneškite "
-#~ "apie tai kaip klaidą."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Klaida autentikuojant keletą paketų"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Nepavyko patvirtinti kelių paketų autentiškumo. Tai gali būti laikina "
-#~ "tinklo problema. Galite bandyti vėliau. Žemiau yra nepatvirtintų paketų "
-#~ "sąrašas."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Negalima įdiegti „%s“"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Buvo neįmanoma įdiegti reikalingo paketo. Praneškite apie tai, kaip "
-#~ "klaidą. "
-
-#, fuzzy
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Negalima nuspėti meta paketo"
-
-#, fuzzy
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Jūsų sistemoje nėra „ubuntu-desktop“, „kubuntu-desktop“ ar „edubuntu-"
-#~ "desktop“ paketų ir buvo neįmanoma nustatyti, kokią „Ubuntu“ versiją "
-#~ "naudojate.\n"
-#~ " Prieš tęsdami pirmiausia įdiekite vieną iš šių paketų naudodamiesi "
-#~ "„synaptic“ arba „apt-get“."
-
-#, fuzzy
-#~ msgid "Failed to add the CD"
-#~ msgstr "Atsiųsti nepavyko"
-
-#~ msgid "Reading cache"
-#~ msgstr "Nuskaitoma talpykla"
-
-#, fuzzy
-#~ msgid "No valid mirror found"
-#~ msgstr "Nerasta tinkamo įrašo"
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Ar sukurti numatytųjų programinės įrangos saugyklų sąrašą?"
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Saugyklų informacija netinkama"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Saugyklos informacijos atnaujinimo rezultatas buvo sugadinta byla. "
-#~ "Praneškite apie tai kaip klaidą."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Trečiųjų šalių programinės įrangos saugyklos išjungtos"
-
-#, fuzzy
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Kai kurie trečiųjų šalių įrašai Jūsų „sources.list“ faile buvo išjungti. "
-#~ "Juos galėsite vėl įjungti, kai baigsite atnaujinimą su „programų savybių“ "
-#~ "įrankiu arba „Synaptic“ paketų tvarkykle."
-
-#~ msgid "Error during update"
-#~ msgstr "Klaida atnaujinant"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Atnaujinant iškilo problema. Tai greičiausiai kokia nors tinklo problema, "
-#~ "todėl iš naujo patikrinkite tinklo jungtis ir bandykite dar."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Diske nepakanka laisvos vietos"
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "At norite pradėti atnaujinimą?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Nepavyko įdiegti atnaujinimų"
-
-#, fuzzy
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Atnaujinimas dabar bus nutrauktas. Jūsų sistema gali būti netinkama "
-#~ "naudoti. Dabar bus vykdomas atkūrimas (dpkg --configure -a)."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Nepavyko atsiųsti atnaujinimų"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Atnaujinimas dabar bus nutrauktas. Patikrinkite Interneto ryšį arba "
-#~ "įdiegimo laikmeną ir bandykite dar. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Šie įdiegti paketai nebėra oficialiai palaikomi. Dabar juos palaiko "
-#~ "bendruomenė („universe“).\n"
-#~ "\n"
-#~ "Jei nesate įjungę „universe“ skyriaus, šie paketai bus siūlomi "
-#~ "pašalinimui kitame žingsnyje."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Pašalinti pasenusius paketus?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Praleisti šį žingsnį"
-
-#~ msgid "_Remove"
-#~ msgstr "P_ašalinti"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Išvalymo metu iškilo problema. Daugiau informacijos rasite žemiau "
-#~ "esančiame pranešime. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Perkraunama sistema"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Tikrinama paketų valdyklė"
-
-#, fuzzy
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Ruošiamas atnaujinimas"
-
-#, fuzzy
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Iškilo neišsprendžiama problema apskaičiuojant atnaujinimą. Praneškite "
-#~ "apie tai kaip klaidą."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Atnaujinama saugyklų informacija"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Netinkama paketo informacija"
-
-#, fuzzy
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Po to, kai buvo atnaujinta Jūsų paketo informacija, nebegalima rasti "
-#~ "esminio paketo „%s“.\n"
-#~ "Tai labai rimta problema, praneškite apie tai kaip klaidą."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Klausiama patvirtinimo"
-
-#~ msgid "Upgrading"
-#~ msgstr "Atnaujinama"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Ieškoma pasenusios programinės įrangos"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Sistemos atnaujinimas baigtas."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Įdėkite „%s“ į įrenginį „%s“"
-
-#, fuzzy
-#~ msgid "Fetching is complete"
-#~ msgstr "Atnaujinimas užbaigtas"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Atsiunčiamas failas %li iš %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Pritaikomi pakeitimai"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Nepavyko įdiegti „%s“"
-
-#, fuzzy
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Ar pakeisti konfigūracijos bylą\n"
-#~ "„%s“?"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Nerasta komanda „diff“"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Įvyko lemtinga klaida"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Praneškite apie tai kaip klaidą ir prie pranešimo pridėkite „/var/log/"
-#~ "dist-upgrade.log“ bei „/var/log/dist-upgrade-apt.log“ bylas. Atnaujinimas "
-#~ "dabar bus nutrauktas.\n"
-#~ "Jūsų originalioji „sources.list“ byla buvo išsaugota „/etc/apt/sources."
-#~ "list.distUpgrade“ aplanke."
-
-#, fuzzy
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "Bus pašalintas %s paketas."
-#~ msgstr[1] "Bus pašalinti %s paketai."
-#~ msgstr[2] "Bus pašalinta %s paketų."
-
-#, fuzzy
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "Bus įdiegtas %s naujas paketas."
-#~ msgstr[1] "Bus įdiegti %s nauji paketai."
-#~ msgstr[2] "Bus įdiegta %s naujų paketų."
-
-#, fuzzy
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "Bus atnaujintas %s paketas."
-#~ msgstr[1] "Bus atnaujinti %s paketai."
-#~ msgstr[2] "Bus atnaujinta %s paketų."
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Turite atsisiųsti viso %s. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Atnaujinimas gali užtrukti keletą valandų ir vėliau jo negalima atšaukti."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Norint išvengti duomenų praradimo turite užverti visas atvertas programas "
-#~ "ir dokumentus."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Jūsų sistema atnaujinta"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Pašalinti %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Įdiegti %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Atnaujinti %s"
-
-#~ msgid "Reboot required"
-#~ msgstr "Reikia perkrauti kompiuterį"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Atnaujinimas baigtas ir reikia perkrauti kompiuteri. Ar norite tai "
-#~ "atlikti dabar?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Ar nutraukti vykdomą atnaujinimą?</big></b>\n"
-#~ "\n"
-#~ "Jei nutrauksite atnaujinimą, sistema gali tapti netinkama naudoti. "
-#~ "Patartina pratęsti atnaujinimą."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Norėdami užbaigti atnaujinimą paleiskite operacijų sistemą iš "
-#~ "naujo</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Pradėti atnaujinimą?</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Išvaloma"
-
-#~ msgid "Details"
-#~ msgstr "Detalės"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Skirtumai tarp bylų"
-
-#, fuzzy
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Atsiunčiami ir įdiegiami atnaujinimai"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Keičiami programinės įrangos kanalai"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Ruošiamas atnaujinimas"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Perkraunama sistema"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminalas"
-
-#, fuzzy
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Tęsti atnaujinimą"
-
-#~ msgid "_Keep"
-#~ msgstr "_Palikti"
-
-#~ msgid "_Replace"
-#~ msgstr "Pa_keisti"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Pranešti apie klaidą"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Perkrauti dabar"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Tęsti atnaujinimą"
-
-#, fuzzy
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Tęsti atnaujinimą"
-
-#, fuzzy
-#~ msgid "Could not find the release notes"
-#~ msgstr "Nepavyko rasti jokių atnaujinimų"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Serveris gali būti perkrautas. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Nepavyko atsiųsti laidos informacijos"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Patikrinkite savo Interneto ryšį."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Nepavyko paleisti atnaujinimo priemonės"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Greičiausiai tai yra atnaujinimo priemonės klaida. Praneškite apie tai "
-#~ "kaip klaidą"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Atsiunčiama atnaujinimo priemonė"
-
-#, fuzzy
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Atnaujinimo priemonės parašas"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Atnaujinimo priemonė"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Atsiųsti nepavyko"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "Nepavyko gauti atnaujinimo. Tai gali būti tinklo problema. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Nepavyko išpakuoti"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Nepavyko išpakuoti atnaujinimo. Gali būti tinklo arba serverio problema. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Tapatumo nustatymas nepavyko"
-
-#, fuzzy
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Atnaujinimo tapatumo nustatymas nepavyko. Gali būti tinklo arba serverio "
-#~ "problema. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Autentikacija nepavyko"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Nepavyko patvirtinti atnaujinimo autentiškumo. Gali būti tinklo arba "
-#~ "serverio problema. "
-
-#~ 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"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Atsiunčiamas failas %(current)li iš %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "Pakeitimų sąrašas neprieinamas"
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Pakeitimų sąrašas kol kas neprieinamas.\n"
-#~ "Pabandykite vėliau."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Nepavyko atsiųsti pakeitimų sąrašo. \n"
-#~ "Patikrinkite Interneto ryšį."
-
-#~ msgid "Backports"
-#~ msgstr "Naujos programos"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Distributyvo atnaujinimai"
-
-#~ msgid "Other updates"
-#~ msgstr "Kiti atnaujinimai"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versija %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Atsiunčiamas pakeitimų sąrašas..."
-
-#, fuzzy
-#~ msgid "_Check All"
-#~ msgstr "_Patikrinti"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Atsiuntimo dydis: %s"
-
-#, fuzzy
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Rodyti ir įdiegti galimus atnaujinimus"
-#~ msgstr[1] "Rodyti ir įdiegti galimus atnaujinimus"
-#~ msgstr[2] "Rodyti ir įdiegti galimus atnaujinimus"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Palaukite, tai gali užtrukti."
-
-#~ msgid "Update is complete"
-#~ msgstr "Atnaujinimas užbaigtas"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Ieškoma atnaujinimų"
-
-#, fuzzy
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Nauja versija: %s (Dydis: %s)"
-
-#~ msgid "Version %s"
-#~ msgstr "Versija %s"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Jūsų distributyvas daugiau nebepalaikomas"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Jūs nebegausite jokių saugumo pataisymų ar kritinių atnaujinimų. "
-#~ "Atnaujinkite į naujausią „Ubuntu Linux“ versiją. Daugiau informacijos "
-#~ "apie atnaujinimą rasite http://www.ubuntu.com ."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Nauja distributyvo versija '%s' yra išleista</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Programinės įrangos turinys sugadintas"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Neįmanoma įdiegti ar pašalinti jokios programinės įrangos. Pirmiausia "
-#~ "pasinaudokite „Synaptic“ arba terminale įvykdykite komandą „sudo apt-get "
-#~ "install -f“, norėdami ištaisyti šią problemą."
-
-#, fuzzy
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Jūs turite patikrinti dėl atnaujinimų rankiniu būdu</big></b>\n"
-#~ "\n"
-#~ "Jūsų sistema automatiškai neieško atnaujinimų. Šią elgseną galite "
-#~ "pakeisti naudodamiesi „Sistema“ -> „Administravimas“ -> „Programinės "
-#~ "įrangos savybės“."
-
-#, fuzzy
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Klaida skanuojant CD</b></big>\r\n"
-#~ "\r\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Pradėti atnaujinimą?</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "Pakeitimai"
-
-#~ msgid "Chec_k"
-#~ msgstr "Ti_krinti"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Patikrinti programų kanalus dėl atnaujinimų"
-
-#~ msgid "Description"
-#~ msgstr "Aprašymas"
-
-#~ msgid "Release Notes"
-#~ msgstr "Leidimo aprašymas"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Rodyti pavienių failų progresą"
-
-#~ msgid "Software Updates"
-#~ msgstr "Programinės įrangos atnaujinimai"
-
-#, fuzzy
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti "
-#~ "saugumo spragas bei suteikti naujas funkcijas."
-
-#~ msgid "U_pgrade"
-#~ msgstr "At_naujinti"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Atnaujinti iki naujausios Ubuntu versijos"
-
-#~ msgid "_Check"
-#~ msgstr "_Patikrinti"
-
-#, fuzzy
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Tęsti atnaujinimą"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Nerodyti šios informacijos ateityje"
-
-#~ msgid "_Install Updates"
-#~ msgstr "Į_diegti atnaujinimus"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "At_naujinti"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "Pakeitimai"
-
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Internetiniai atnaujinimai</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Internetiniai atnaujinimai</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internetiniai atnaujinimai</b>"
-
-#, fuzzy
-#~ msgid "Add Cdrom"
-#~ msgstr "Pridėti _CD"
-
-#~ msgid "Authentication"
-#~ msgstr "Autentikacija"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "Iš_trinti atsiųstus programinės įrangos failus:"
-
-#, fuzzy
-#~ msgid "Download from:"
-#~ msgstr "Atsiųsta"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Importuoti viešą raktą iš patikimo programinės įrangos tiekėjo"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Internetiniai atnaujinimai"
-
-#, fuzzy
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Tik saugumo atnaujinimai iš oficialių „Ubuntu“ serverių bus automatiškai "
-#~ "įdiegti, todėl turi būti įdiegtas „unattended-upgrades“ programų paketas."
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Atkurti _numatytuosius"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Atkurti _numatytuosius Jūsų distributyvui raktus"
-
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "Programinės įrangos šaltiniai"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Ieškoti atnaujinimų automatiškai:"
-
-#, fuzzy
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Atsiųsti atnaujinimus fone, tačiau jų neįdiegti"
-
-#, fuzzy
-#~ msgid "_Import Key File"
-#~ msgstr "Importuoti raktą"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "Į_diegti saugumo atnaujinimus neklausiant patvirtinimo"
-
-#, fuzzy
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Kanalo informacija yra pasenusi</big></b>\n"
-#~ "\n"
-#~ "Jūs turite iš naujo įkelti kanalo informaciją, kad galėtumėte įdiegti "
-#~ "programinę įrangą ir atnaujinimus iš naujai pridėtų ar pakeistų kanalų. \n"
-#~ "\n"
-#~ "Tęsimui reikia veikiančio Interneto ryšio."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Komentaras:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Komponentai:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribucija:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipas:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Įveskite visą Jūsų norimo pridėti kanalo APT eilutę</b></big>\n"
-#~ "\n"
-#~ "APT eilutė nurodo saugyklos tipą, vietą bei kanalo skyrius, pvz., <i>„deb "
-#~ "http://ftp.debian.org sarge main“</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "APT eilutė:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Dvejetainis\n"
-#~ "Pradinis kodas"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Skanuojamas CD-ROM"
-
-#~ msgid "_Reload"
-#~ msgstr "Į_kelti iš naujo"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Rodyti ir įdiegti galimus atnaujinimus"
-
-#~ msgid "Update Manager"
-#~ msgstr "Atnaujinimų valdyklė"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Automatiškai patikrinti, ar yra nauja dabartinės distribucijos versija "
-#~ "ir, jei yra, pasiūlyti atnaujinti."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Tikrinti, ar yra išleista nauja distribucijos (OS) versija"
-
-#, fuzzy
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Jei automatinis atnaujinimų patikrinimas yra išjungtas, iš naujo įkelti "
-#~ "kanalų sąrašą Jūs turėsite rankiniu būdu. Šiuo atveju nebus automatiškai "
-#~ "pranešama apie atnaujinimus."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Priminti įkelti iš naujo kanalų sąrašą"
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#~ msgid "Show details of an update"
-#~ msgstr "Rodyti atnaujinimo detales"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Atsiunčiamas failas %(current)li iš %(total)li"
 
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Išsaugo update-manager dialogų dydį"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detalės"
 
-#~ msgid "The window size"
-#~ msgstr "Lango dydis"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr ""
-#~ "Nustatykite programinės įrangos įdiegimo šaltinius bei atnaujinimus iš "
-#~ "interneto"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 „Sarge“ saugumo atnaujinimai"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Pakeitimų sąrašas neprieinamas"
 
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.lt.debian.org/debian/"
+#: ../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 ""
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Atsiunčiamas failas %li iš %li, nežinomu greičiu"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Nepavyko atsiųsti pakeitimų sąrašo. \n"
+"Patikrinkite Interneto ryšį."
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "Diegiami atnaujinimai"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Cancel _Download"
-#~ msgstr "Atšaukti _atsiuntimą"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Nepavyko rasti jokių atnaujinimų"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Jūsų sistema jau buvo atnaujinta."
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Atnaujinama į Ubuntu 6.06 LTS</"
-#~ "span>"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 saugumo atnaujinimai"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Atnaujinti iki naujausios Ubuntu versijos"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Negalima įdiegti „%s“"
 
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Negalima įdiegti visų galimų atnaujinimų"
+#: ../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 ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Ieškoma galimų atnaujinimų</b></big>\n"
-#~ "\n"
-#~ "Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti "
-#~ "saugumo spragas bei suteikti naujas funkcijas."
-
-#~ msgid "Oficially supported"
-#~ msgstr "Prižiūrima oficialiai"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Kai kuriems atnaujinimams reikia pašalinti programinę įrangą. Naudokitės "
-#~ "funkcija „Žymėti visus atnaujinimus“ paketų tvarkyklėje „Synaptic­“ arba "
-#~ "terminale įvykdykite komandą „sudo apt-get dist-upgrade“, kad Jūsų "
-#~ "sistema būtų visiškai atnaujinta."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Šie atnaujinimai nebus įdiegti:"
-
-#~ msgid "Download is complete"
-#~ msgstr "Atsiųsta"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Atnaujinimas nutrūko. Praneškite apie tai kaip apie klaidą."
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Atnaujinama Ubuntu"
-
-#~ msgid "Hide details"
-#~ msgstr "Slėpti detales"
-
-#~ msgid "Show details"
-#~ msgstr "Rodyti detales"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr ""
-#~ "Tik viena programinės įrangos tvarkymo priemonė gali veikti vienu metu"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr "Pirmiausia užverkite kitą programą, pvz., „aptitude“ ar „Synaptic“."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Kanalai</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Raktai</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Diegimo laikmenos"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Programinės įrangos nustatymai"
+msgid "An essential package would be removed"
+msgstr "Turėtų būti pašalintas esminis paketas"
 
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Kanalas</b>"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponentai:</b>"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Add Channel"
-#~ msgstr "Pridėti kanalą"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "Keisti kanalą"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Pridėti kanalą"
-#~ msgstr[1] "_Pridėti kanalus"
-#~ msgstr[2] "_Pridėti kanalų"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "_Kita"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
+#: ../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 ""
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS saugumo atnaujinimai"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS atnaujinimai"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS atnaujinimai"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "While scaning your repository information no valid entry for the upgrade "
-#~ "was found.\n"
-#~ msgstr ""
-#~ "Skanuojant Jūsų saugyklos informaciją nebuvo rasta tinkamo atnaujinimo "
-#~ "įrašo.\n"
-
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Skyriai</b>"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Skyriai:</b>"
-
-#~ msgid ""
-#~ "<b><big>You need to manually reload the latest information about updates</"
-#~ "big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties"
-#~ "\"."
-#~ msgstr ""
-#~ "<b><big>Jūs turite patys įkelti naujausią informaciją apie atnaujinimus</"
-#~ "big></b>\n"
-#~ "\n"
-#~ "Jūsų sistema automatiškai neieško atnaujinimų. Šią elgseną galite "
-#~ "konfigūruoti „Sistema“ -> „Administravimas“ -> „Programinės įrangos "
-#~ "savybės“."
-
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Įkelti naujausią informaciją apie atnaujinimus"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/lv.po b/po/lv.po
index 34198e14..8532bf82 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lp-upd-manager-lv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -27,227 +27,252 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Sabiedrības uzturētie (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Sabiedrības uzturētie (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Sabiedrības uzturētie (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "%s atjauninājumi"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Oficiāli atbalstītie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Sabiedrības uzturētie (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Maksas (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Saistītie autortiesību"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -259,52 +284,62 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../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:42
+#: ../data/templates/Debian.info.in:94
 msgid "Proposed updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "%s atjauninājumi"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -312,136 +347,157 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Galvenais serveris"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Ikdienas"
-
-#~ msgid "Every two days"
-#~ msgstr "Reizi divās dienās"
-
-#~ msgid "Weekly"
-#~ msgstr "Nedēļas izdevums"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Reizi divās nedēļās"
-
-#~ msgid "Every %s days"
-#~ msgstr "Reizi %s dienās"
-
-#~ msgid "After one week"
-#~ msgstr "Pēc vienas nedēļas"
-
-#~ msgid "After two weeks"
-#~ msgstr "Pēc divām nedēļām"
-
-#~ msgid "After one month"
-#~ msgstr "Pēc viena mēneša"
-
-#~ msgid "After %s days"
-#~ msgstr "Pēc %s dienām"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Active"
-#~ msgstr "Aktīvs"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Source Code"
-#~ msgstr "Izejas kods"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Error importing selected file"
-#~ msgstr "Kļūda importējot izvēlēto failu"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detaļas"
 
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Izvēlētais fails varētu nebūt GPG atslēga vai arī tas ir bojāts."
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Error removing the key"
-#~ msgstr "Kļūda aizvācot atslēgu"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "Jūsu izvēlēto atslēgu nevar noņemt. Lūdzu, ziņojiet par šo kļūdu."
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Nevar aprēķināt atjauninājumu"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "Can't install '%s'"
-#~ msgstr "Nevar instalēt '%s'"
+#: ../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 ""
 
-#~ msgid "_Remove"
-#~ msgstr "_Izņemt"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#~ msgid "    "
-#~ msgstr "    "
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Details"
-#~ msgstr "Detaļas"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Terminal"
-#~ msgstr "Terminālis"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "_Replace"
-#~ msgstr "_Aizvietot"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Authentication failed"
-#~ msgstr "Autentifikācija neveiksmīga"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Version %s: \n"
-#~ msgstr "Versija %s: \n"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "None"
-#~ msgstr "Nekas"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Nevar instalēt '%s'"
 
-#~ msgid "Changes"
-#~ msgstr "Izmaiņas"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "Description"
-#~ msgstr "Apraksts"
+#: ../apt/debfile.py:494
+msgid "An essential package would be removed"
+msgstr ""
 
-#~ msgid "Authentication"
-#~ msgstr "Autentifikācija"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Source code"
-#~ msgstr "Izejas kods"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Statistics"
-#~ msgstr "Statistika"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Komentārs:</b>"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distributīvs:</b>"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tips:</b>"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
+#: ../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 ""
 
-#~ msgid "APT line:"
-#~ msgstr "APT rindiņa:"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binārais\n"
-#~ "Pirmkoda"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "_Reload"
-#~ msgstr "_Pārlādēt"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Select _All"
-#~ msgstr "Izvēlēties _Visu"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 9cf8fbc0..ad7e6faf 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -24,252 +24,283 @@ 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:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:135
+#, fuzzy
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:153
+#, fuzzy
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:197
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Безбедносни надградби за Убунту 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Безбедносни надградби за Убунту 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Надградби за Убунту 5.10"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Оддржувано од заедницата (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "Додатен софтвер"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Надградби за Убунту 5.04"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Оддржувано од заедницата (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Оддржувано од заедницата (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Оддржувано од заедницата (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Неслободно (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Неслободно (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Надградби за Убунту 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 #, fuzzy
 msgid "Important security updates"
 msgstr "Безбедносни надградби за Debian Stable"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Инсталирам надградби..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Инсталирам надградби..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Безбедносни надградби за Убунту 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Надградби за Убунту 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Надградби за Убунту 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Официјално поддржано"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Безбедносни надградби за Убунту 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Надградби за Убунту 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Надградби за Убунту 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Оддржувано од заедницата (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Неслободно (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD диск со Убунту 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Официјално поддржано"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Restricted copyright"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Безбедносни надградби за Убунту 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Надградби за Убунту 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Надградби за Убунту 5.10"
@@ -282,57 +313,70 @@ 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:31
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 3.1 \"Sarge\""
+
+#. Description
+#: ../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
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Инсталирам надградби..."
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Безбедносни надградби за Debian Stable"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 #, fuzzy
 msgid "Debian current stable release"
 msgstr "Debian Unstable \"Sid\""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian Testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian Non-US (Unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-компатибилен софтвер со неслободни зависности"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Не-DFSG-компатибилен софтвер"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -340,1108 +384,164 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Daily"
-#~ msgstr "Дневно"
-
-#~ msgid "Every two days"
-#~ msgstr "Секои два дена"
-
-#~ msgid "Weekly"
-#~ msgstr "Неделно"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Секои две недели"
-
-#~ msgid "Every %s days"
-#~ msgstr "Секои %s дена"
-
-#~ msgid "After one week"
-#~ msgstr "После една недела"
-
-#~ msgid "After two weeks"
-#~ msgstr "После две недели"
-
-#~ msgid "After one month"
-#~ msgstr "После еден месец"
-
-#~ msgid "After %s days"
-#~ msgstr "После %s дена"
-
-#, fuzzy
-#~ msgid "%s updates"
-#~ msgstr "Инсталирам надградби..."
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "Надградба на софтвер"
-
-#, fuzzy
-#~ msgid "(Source Code)"
-#~ msgstr "Изворен код"
-
-#, fuzzy
-#~ msgid "Source Code"
-#~ msgstr "Изворен код"
-
-#~ msgid "Import key"
-#~ msgstr "Внеси клуч"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Грешка при увоз на избраната датотека"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Избраната датотека може да не е GPG датотека или пак може да е расипана."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Грешка при отстранување на клучот"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го "
-#~ "ова како бубачка."
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Ве молам внесете име за дискот"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Ве молам внесете диск во уредот:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Оштетени пакети"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Вашиот систем содржи оштетени пакети кои не може да се поправат со овој "
-#~ "софтвер. Ве молам поправете ги со Синаптик или apt-get пред да продолжите."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Не може да се надградат потребните мета пакети"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Важен пакет мора да се отстрани"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Не може да се одреди надградбата"
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го "
-#~ "ова како бубачка."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Грешка при автентикација на некои пакети"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Не можат да се автентицираат некои пакети. Може да има мрежни пречки. "
-#~ "Обидете се повторно. Видете подолу за листа на неавтентицирани пакети."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Не може да се инсталира %s'"
-
-#, fuzzy
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го "
-#~ "ова како бубачка. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Не може да се погоди мета пакетот"
-
-#~ msgid "Reading cache"
-#~ msgstr "Читање на кешот"
-
-#, fuzzy
-#~ msgid "No valid mirror found"
-#~ msgstr "Не е пронајден валиден помошен сервер"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "При скенирањето на Вашите информации за складиштата не беше најден запис "
-#~ "за помошен сервер. Ова може да се случи ако извршувате внатрешен сервер "
-#~ "или ако информациите за помошниот сервер се застарени.\n"
-#~ "\n"
-#~ "Дали сакате да го презапишете Вашиот „sources.list“ и покрај тоа? Ако "
-#~ "изберете „Да“, ќе ги надградам '%s' до '%s' записи.\n"
-#~ "Ако изберете „не“, надградбата ќе прекине."
-
-#, fuzzy
-#~ msgid "Generate default sources?"
-#~ msgstr "Врати ги стандардните клучеви"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "По скенирањето на вашиот 'sources.list' не е пронајден валиден запис за '%"
-#~ "s'.\n"
-#~ "\n"
-#~ "Дали треба стандардните записи за '%s' да бидат додадени? Ако изберете "
-#~ "„Не“, надградувањето ќе прекини."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Информациите за складиштето се невалидни"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Од надградувањето на информациите за складиштето произлезе невалидна "
-#~ "датотека. Ве молам пријавете го ова како бубачка."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Додатните извори се оневозможени"
-
-#, fuzzy
-#~ msgid "Error during update"
-#~ msgstr "Грешка при отстранување на клучот"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Се случи проблем при надградбата. Ова е обично некој проблем со мрежата и "
-#~ "Ве молиме да ја проверете Вашата мрежна врска и да се обидете повторно."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Нема доволно место на дискот"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Надградбата сега прекинува. Ве молам, ослободете најмалку %s место на "
-#~ "дискот на %s. Испразнете го ѓубрето и отстранете ги привремените пакети "
-#~ "или поранешни инсталации со помош на 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Дали сакате да ја започнете надградбата?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Не можам да ги инсталирам надградбите"
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Не можам да ги симнам надградбите"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Надградбата сега прекинува. Проверете ја Вашата интернет врска или "
-#~ "медиумот за инсталација и обидете се повторно. "
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Да ги отстранам застарените пакети?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Прескокни го овој чекор"
-
-#~ msgid "_Remove"
-#~ msgstr "_Отстрани"
-
-#, fuzzy
-#~ msgid "Error during commit"
-#~ msgstr "Грешка во извршувањето"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Се случи некој проблем при расчистувањето. Видете ја пораката подолу за "
-#~ "повеќе информации. "
-
-#, fuzzy
-#~ msgid "Checking package manager"
-#~ msgstr "Веќе работи друг менаџер за пакети"
-
-#, fuzzy
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Преземам промени"
-
-#, fuzzy
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го "
-#~ "ова како бубачка."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Ги ажурирам информациите за складиштето"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Невалидни информации за пакетот"
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Прашувам за потврда"
-
-#, fuzzy
-#~ msgid "Upgrading"
-#~ msgstr "Надградбата е завршена"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Барам застарен софтвер"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Надградбата на системот е завршена."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Внесете '%s' во драјвот '%s'"
-
-#, fuzzy
-#~ msgid "Applying changes"
-#~ msgstr "Преземам промени..."
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Не можам да инсталирам '%s'"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Командата „diff“ не беше пронајдена"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Се случи фатална грешка"
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "За да спречите загуба на податоци, затворете ги сите отворени апликации и "
-#~ "документи."
-
-#, fuzzy
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Вашиот систем е надграден!"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Отстрани %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Инсталирај %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Надгради %s"
-
-#~ msgid "Reboot required"
-#~ msgstr "Потребно е рестартирање"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Надградбата е завршена и потребно е рестартирање. Дали сакате да го "
-#~ "направите сега?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Да ја прекинам тековната надградба?</big></b>\n"
-#~ "\n"
-#~ "Системот може да е во неупотреблива состојба ако ја прекинете "
-#~ "надградбата. Строго препорачливо е да надградбата да продолжи."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Рестартирајте го системот за да ја завршите надградбата</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Да ја започнам надградбата?</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Расчистувам"
-
-#, fuzzy
-#~ msgid "Details"
-#~ msgstr "<b>Детали</b>"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Разлика помеѓу датотеките"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Ги модифицирам софтверските канали"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Ја подготвувам надградбата"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Го рестартирам системот"
-
-#~ msgid "Terminal"
-#~ msgstr "Терминал"
-
-#~ msgid "_Keep"
-#~ msgstr "_Чувај"
-
-#, fuzzy
-#~ msgid "_Replace"
-#~ msgstr "Освежи"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Пријави бубачка"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Рестартирај сега"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Продолжи со надградбата"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Не можам да ги најдам белешките за изданието"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Серверот може да е преоптоварен. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Не можам да ги преземам белешките за изданието"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Ве молам проверете ја Вашата интернет врска."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Не можам да ја извршам алатката за надградба"
-
-#, fuzzy
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го "
-#~ "ова како бубачка."
-
-#, fuzzy
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Преземам промени"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Алатката за надградба ќе Ве води низ процесот на надградба."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Потпис на алатката за надградба"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Алатка за надградба"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Не можам да симнам"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Симнувањето на надградбите не успеа. Можеби има проблем со мрежата. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Не можам да отпакувам"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Отпакувањето на надградбата не успеа. Можеби има проблем со мрежата или "
-#~ "серверот. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Проверката не успеа"
-
-#, fuzzy
-#~ msgid "Authentication failed"
-#~ msgstr "Проверка"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Проверката на автентичност на надградбата не успеа. Можеби има проблем со "
-#~ "мрежата или серверот. "
-
-#, fuzzy
-#~ msgid "The list of changes is not available"
-#~ msgstr "Достапна е нова верзија на Убунту!"
-
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "Достапна е нова верзија на Убунту!"
-
-#, fuzzy
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Не успеав да ги преземам промените. Ве молам проверете дали Вашата "
-#~ "интернет врска е активна."
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "Надградби за Убунту 5.10"
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "Инсталирам надградби..."
-
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "Инсталирам надградби..."
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Верзија %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Преземам промени"
-
-#, fuzzy
-#~ msgid "Download size: %s"
-#~ msgstr "Преземам промени"
-
-#, fuzzy
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Инсталирам надградби..."
-#~ msgstr[1] "Инсталирам надградби..."
-#~ msgstr[2] "Инсталирам надградби..."
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Ве молам, почекајте, ова може да потрае."
-
-#~ msgid "Update is complete"
-#~ msgstr "Надградбата е завршена"
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "Проверувам за надградби..."
-
-#, fuzzy
-#~ msgid "Version %s"
-#~ msgstr "Верзија %s:"
-
-#, fuzzy
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Вашата дистрибуција повеќе не е поддржана"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Повеќе нема да добивате безбедносни поправки или критични надградби. "
-#~ "Надградете го системот на понова верзија на Ubuntu Linux. Видете на "
-#~ "http://www.ubuntu.com за повеќе информации за надградувањето."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Новото издание на дистрибуцијата, '%s', е достапно</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Индексот на софтвер е расипан"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Невозможно е да инсталирам или избришам некој софтвер. Користете го "
-#~ "менаџерот за пакети Синаптик или прво извршете „sudo apt-ge install -f“ "
-#~ "во терминал за да го надминете овој проблем."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Чувајте го Вашиот систем надграден</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "Промени"
-
-#~ msgid "Chec_k"
-#~ msgstr "Провер_и"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Провери ги софтверските канали за нови надградби"
-
-#~ msgid "Description"
-#~ msgstr "Опис"
-
-#~ msgid "Release Notes"
-#~ msgstr "Белешки за изданието"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Покажувај го напредокот поединечно"
-
-#~ msgid "Software Updates"
-#~ msgstr "Надградба на софтвер"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Надградбата на софтверот ги поправа грешките, ги елиминира сигурносните "
-#~ "пропусти и овозможува нови карактеристики."
-
-#~ msgid "U_pgrade"
-#~ msgstr "Н_адгради"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Надгради во најновата верзија на Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Провери"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Криј ги овие информации во иднина"
-
-#, fuzzy
-#~ msgid "_Install Updates"
-#~ msgstr "Инсталирам надградби..."
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "Н_адгради"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "Промени"
-
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Надградби од интернет</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Надградби од интернет</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Надградби од интернет</b>"
-
-#~ msgid "Authentication"
-#~ msgstr "Проверка"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "И_збриши ги преземените софтверски датотеки:"
-
-#, fuzzy
-#~ msgid "Download from:"
-#~ msgstr "Преземам промени"
-
-#, fuzzy
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Отстрани го избраниот клуч од доверливиот привезок."
-
-#, fuzzy
-#~ msgid "Internet Updates"
-#~ msgstr "<b>Надградби од интернет</b>"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Само безбедносните надградби од официјалните Ubuntu сервери ќе бидат "
-#~ "инсталирани автоматски"
-
-#, fuzzy
-#~ msgid "Restore _Defaults"
-#~ msgstr "Врати стандардно"
-
-#, fuzzy
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Врати ги стандардните клучеви"
-
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "Софтверски својства"
-
-#, fuzzy
-#~ msgid "Source code"
-#~ msgstr "Изворен код"
-
-#, fuzzy
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "Проверувај за надградби на секои"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Внеси датотека-клуч"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Инсталирај ги безбедносните ажурирања без потврдување"
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Коментар:</b>"
-
-#, fuzzy
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Компоненти</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Дистрибуција:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Тип:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>Адреса:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Внесете ја комплетната линија за APT складиштето за да го "
-#~ "додадете</b></big>\n"
-#~ "\n"
-#~ "APT линијата го содржи типот, локацијата и содржината на складиштето за "
-#~ "на пример <i>\"deb http://ftp.debian.org sarge main\"</i>. Во "
-#~ "документацијата можете да најдете детален опис на синтаксата."
-
-#~ msgid "APT line:"
-#~ msgstr "APT линија:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Бинарни\n"
-#~ "Изворен код"
-
-#, fuzzy
-#~ msgid "Edit Source"
-#~ msgstr "Изворен код"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Скенирам CD-ROM"
-
-#, fuzzy
-#~ msgid "_Add Source"
-#~ msgstr "Изворен код"
-
-#, fuzzy
-#~ msgid "_Reload"
-#~ msgstr "Освежи"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Прикажи и инсталирај ги достапните надградби"
-
-#~ msgid "Update Manager"
-#~ msgstr "Менаџер за надградба"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Провери автоматски дали е достапна нова верзија на дистрибуцијата и "
-#~ "понуди надградба (ако е возможно)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Провери за нови изданија од дистрибуцијата"
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Потсети за одново вчитување на листата со канали"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Прикажи детали за надградбата"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Ја зачувува големината на дијалогот на update-manager"
-
-#~ msgid "The window size"
-#~ msgstr "Големината на прозорецот"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#, fuzzy
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Безбедносни надградби за Debian Stable"
-
-#, fuzzy
-#~ msgid "Debian \"Etch\" (testing)"
-#~ msgstr "Debian Testing"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#, fuzzy
-#~ msgid "By copyright or legal issues restricted software"
-#~ 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 "Normal updates"
-#~ msgstr "Инсталирам надградби..."
+msgid "Details"
+msgstr "<b>Детали</b>"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Безбедносни надградби за Debian Stable"
+msgid "Starting..."
+msgstr "Поставувања"
 
-#, fuzzy
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Проверувам за надградби..."
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ 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 upgrade aborts now. Please report this bug."
-#~ msgstr ""
-#~ "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го "
-#~ "ова како бубачка."
+msgid "The list of changes is not available"
+msgstr "Достапна е нова верзија на Убунту!"
 
-#, fuzzy
-#~ msgid "Hide details"
-#~ msgstr "<b>Детали</b>"
+#: ../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 "<b>Channels</b>"
-#~ msgstr "<b>Копчиња</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Копчиња</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Медиум за инсталација"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Не успеав да ги преземам промените. Ве молам проверете дали Вашата интернет "
+"врска е активна."
 
-#~ msgid "Software Preferences"
-#~ msgstr "Софтверски преференци"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Копчиња</b>"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Компоненти</b>"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "_Сопствено"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Надградби за Убунту 5.10"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Безбедносни надградби за Убунту 5.04"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Надградби за Убунту 5.10"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Не може да се инсталира %s'"
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Надградби за Убунту 5.10"
+#: ../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 "<b>Sections</b>"
-#~ msgstr "<b>Оддели:</b>"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Оддели:</b>"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Уреди софтверски извори и поставувања"
-
-#~ msgid "<b>Internet Updates</b>"
-#~ msgstr "<b>Надградби од интернет</b>"
-
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Извори</b>"
-
-#~ msgid "Check for updates every"
-#~ msgstr "Проверувај за надградби на секои"
-
-#~ msgid "Restore Defaults"
-#~ msgstr "Врати стандардно"
-
-#~ msgid "day(s)"
-#~ msgstr "ден(а)"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Складиште</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Привремени датотеки</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Кориснички интерфејс</b>"
-
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Клучеви за проверка</b></big>\n"
-#~ "\n"
-#~ "Во овој дијалог можете да додадете или пак да отстраните клучеви за "
-#~ "проверка. Клучот Ви овозможува да се уверите во интегритетот на софтверот "
-#~ "што го преземате."
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Внесете ја комплетната линија за APT складиштето за да го "
-#~ "додадете</b></big>\n"
-#~ "\n"
-#~ "APT линијата го содржи типот, локацијата и содржината на складиштето за "
-#~ "на пример <i>\"deb http://ftp.debian.org sarge main\"</i>. Во "
-#~ "документацијата можете да најдете детален опис на синтаксата."
-
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Додајте нова датотека со клуч во доверливиот привезок. Осигурајте се дека "
-#~ "сте го добиле клучот преку безбеден канал и дека му верувате на неговиот "
-#~ "сопственик. "
-
-#~ msgid "Add repository..."
-#~ msgstr "Додај складиште..."
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Автоматски проверувај за софтверски _надградби."
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Автоматски чисти ги _привремените пакети"
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Интервал за чистење во денови: "
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Избриши _стари пакети од кешот за пакети"
-
-#~ msgid "Edit Repository..."
-#~ msgstr "Уреди складиште..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Максимална старост во денови:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Максимална големина во MB:"
+msgid "An essential package would be removed"
+msgstr "Важен пакет мора да се отстрани"
 
-#~ msgid "Remove the selected key from the trusted keyring."
-#~ msgstr "Отстрани го избраниот клуч од доверливиот привезок."
-
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Врати ги стандардните клучеви на дистрибуцијата. Ова нема да ги смени "
-#~ "клучевите инсталирани од корисникот."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Постави _ја максималната големина на кешот за пакети"
-
-#~ msgid "Settings"
-#~ msgstr "Поставувања"
-
-#~ msgid "Show detailed package versions"
-#~ msgstr "Покажи детали за верзиите на пакетите"
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "Покажи исклучени софтверски извори"
-
-#~ msgid "Update interval in days: "
-#~ msgstr "Интервал за надградба во денови: "
-
-#~ msgid "_Add Repository"
-#~ msgstr "_Додај складиште"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Преземи ги надградливите пакети"
-
-#~ msgid "<b>Details</b>"
-#~ msgstr "<b>Детали</b>"
-
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>Статус:</b>"
-
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Достапни надградби</b></big>\n"
-#~ "\n"
-#~ "Следниве пакети се надградливи. Можете да ги надградите со кликнување на "
-#~ "копчето „Инсталирај“."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Ги преземам промените</span>\n"
-#~ "\n"
-#~ "Треба да ги преземам промените од централниот сервер."
-
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "Откажи го преземањето на логот со промени"
-
-#~ msgid "Reload"
-#~ msgstr "Освежи"
-
-#~ msgid "Reload the package information from the server."
-#~ msgstr "Освежи ги информациите за пакетите на серверот."
-
-#~ msgid "_Install"
-#~ msgstr "_Инсталирај"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Покажи достапни надградби и избери кои да бидат инсталирани"
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Треба да сте root за да ја извршите оваа програма"
-
-#~ msgid "Binary"
-#~ msgstr "Бинарни"
-
-#~ msgid "Non-free software"
-#~ msgstr "Неслободен софтвер"
-
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian 3.0 \"Woody\""
-
-#~ msgid "Debian Stable"
-#~ msgstr "Debian Stable"
-
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Debian Non-US (Stable)"
-
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian Non-US (Testing)"
-
-#~ msgid "Debian Non-US (Unstable)"
-#~ msgstr "Debian Non-US (Unstable)"
-
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "Одберете датотека за клуч"
-
-#~ msgid "There is one package available for updating."
-#~ msgstr "Има еден достапен пакет за надградба."
-
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "Има %s достапни пакети за надградба."
-
-#~ msgid "There are no updated packages"
-#~ msgstr "Нема надградени пакети"
-
-#~ msgid "You did not select any of the %s updated package"
-#~ msgid_plural "You did not select any of the %s updated packages"
-#~ msgstr[0] "Не избравте ниеден од %s пакет за надградба."
-#~ msgstr[1] "Не избравте ниеден од %s пакети за надградба."
-#~ msgstr[2] "Не избравте ниеден од %s пакети за надградба."
-
-#~ msgid "You have selected %s updated package, size %s"
-#~ msgid_plural "You have selected all %s updated packages, total size %s"
-#~ msgstr[0] "Избравте %s пакет за надградба, со големина од %s"
-#~ msgstr[1] "Избравте %s пакети за надградба, со големина од %s"
-#~ msgstr[2] "Избравте %s пакети за надградба, со големина од %s"
-
-#~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
-#~ msgstr[0] "Избравте %s од %s пакет за надградба, со големина од %s"
-#~ msgstr[1] "Избравте %s од %s пакети за надградба, со големина од %s"
-#~ msgstr[2] "Избравте %s од %s пакети за надградба, со големина од %s"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "The updates are being applied."
-#~ msgstr "Наградбите се применуваат."
-
-#~ msgid "Upgrade finished"
-#~ msgstr "Надградбата е завршена"
-
-#~ msgid "Another package manager is running"
-#~ msgstr "Веќе работи друг менаџер за пакети"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Можете да работите само со една апликација за менаџмент на пакети "
-#~ "одеднаш. Ве молам прво исклучете ја оваа апликацијата."
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Updating package list..."
-#~ msgstr "Ја ажурирам листата на пакети..."
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Installing updates..."
-#~ msgstr "Инсталирам надградби..."
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "There are no updates available."
-#~ msgstr "Нема достапни надградби."
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "New version:"
-#~ 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 ""
 
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Ве молам надградете до понова верзија на Убунту Линукс. Верзијата на која "
-#~ "што работите повеќе нема да биде поддржана во смисол на безбедносни "
-#~ "поправки и други технички надградби. Ве молам побарајте информации за "
-#~ "надградба на http://www.ubuntulinux.org."
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "Постои ново издание објавено под кодното име '%s'. Ве молам побарајте ги "
-#~ "инструкциите за надградба на http://www.ubuntulinux.org."
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Never show this message again"
-#~ msgstr "Никогаш пак не ја покажувај поракава"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "Не се пронајдени промени, серверот може да не е надграден сеуште."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 0b2596ab..a259fddd 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,51 +276,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -303,11 +338,157 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../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
index 082ff845..4e0d1eed 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,223 +24,248 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../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:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -252,51 +277,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 6.0 'Squeeze' "
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -304,342 +339,159 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Harian"
-
-#~ msgid "Every two days"
-#~ msgstr "Setiap dua hari"
-
-#~ msgid "Weekly"
-#~ msgstr "Mingguan"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Setiap dua minggu"
-
-#~ msgid "Every %s days"
-#~ msgstr "Setiap %s hari"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "After one week"
-#~ msgstr "Selepas satu minggu"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "After two weeks"
-#~ msgstr "Selepas dua minggu"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+#, fuzzy
+msgid "Details"
+msgstr "Harian"
 
-#~ msgid "After one month"
-#~ msgstr "Selepas satu bulan"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "After %s days"
-#~ msgstr "Selepas %s hari"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Import key"
-#~ msgstr "Kekunci impot"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Error importing selected file"
-#~ msgstr "Ralat semasa mengimpot fail yang dipilih"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Fail yang dipilih mungkin bukan fail kekunci GPG atau fail mungkin rosak"
+#: ../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 ""
 
-#~ msgid "Error removing the key"
-#~ msgstr "Ralat semasa mengeluarkan kekunci"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Kekunci yang anda pilih tidak dapat di keluarkan. Sila laporkan ini "
-#~ "sebagai ralat pepijat."
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Ralat semasa mengimbas Cakera Padat</b></big>↵\n"
-#~ "↵\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Sila masukkan nama untuk cakera padat"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Sila masukkan cakera padat kedalam pemacu"
-
-#~ msgid "Broken packages"
-#~ msgstr "Pakej rosak"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Sistem anda mengandungi pakej rosak yang tidak dapat diperbetulkan "
-#~ "menggunakan sofwer ini. Sila baiki dahulu menggunakan synaptic atau apt-"
-#~ "get sebelum meneruskan."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Tidak dapat menaikkan taraf pakej-meta yang diperlukan"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Satu pakej yang perlu terpaksa dikeluarkan"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Tidak dapat menjangka penaikkan taraf"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Satu masaalah yang tidak dapat perbetulkan berlaku ketika menjangkakan "
-#~ "taraf penaikkan. Sila laporkan ini sebagai ralat pepijat."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Ralat mengesahkan sesetengah pakej"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Tidak mungkin untuk mengesahkan sesetengah pakej. Ini mungkin disebabkan "
-#~ "masalah sementara rangkaian. Anda mungkin mahu mencuba lagi kemudian. "
-#~ "Lihat dibawah untuk pakej-pakej yang belum disahkan."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Tidak dapat memasang '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Pakej yang diperlukan tidak dapat dipasang. Sila laporkan ini sebagai "
-#~ "ralat pepijat. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Pakej meta tidak dapat diduga."
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Sistem anda tidak mengandungi pakej 'ubuntu-dektop', 'kubuntu-desktop' "
-#~ "ataupun 'edubuntu-desktop' yang mana sukar untuk mengesan versi ubuntu "
-#~ "yang anda gunakan.\n"
-#~ "Sila pasangkan salah satu pakej diatas dahulu menggunakan synaptic "
-#~ "ataupun apt-get sebelum meneruskan pemasangan."
-
-#~ msgid "Reading cache"
-#~ msgstr "Membaca cache"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "No valid mirror found"
-#~ msgstr "Tiada mirror yang sah dijumpai"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Tiada mirror untuk naiktaraf dijumpai semasa mengimbas maklumat "
-#~ "repositori. Ini boleh berlaku sekiranya anda menjalankan mirror dalaman "
-#~ "atau maklumat mirror telah lapuk.\n"
-#~ "\n"
-#~ "Adakah anda tetap mahu menulis semula fail 'Sources.list' anda? Jika anda "
-#~ "memilih 'Ya' disini ianya akan mengemaskini kesemua kemasukan '%s' kepada "
-#~ "'%s'.\n"
-#~ "Jika anda memilih 'tidak' kemaskinian akan dibatalkan."
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Tiada kemasukan yang sah dijumpai untuk '%s' selepas mengimbas 'sources."
-#~ "list' anda.\n"
-#~ "\n"
-#~ "Adakah kemasukan default untuk '%s' perlu ditambah? Jika anda memilih "
-#~ "'Tidak' kemaskinian akan dibatalkan."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Maklumat repositori tidak sah"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Kemaskinian maklumat repositori menyebabkan fail yang tidak sah. Sila "
-#~ "laporkan ini sebagai masalah."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Sumber ketiga tidak diaktifkan."
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Sesetengah kemasukan sumber ketiga didalam 'sources.list' anda telah "
-#~ "dibekukan. Anda boleh mengaktifkan semula kemasukan sumber ketiga anda "
-#~ "selepas penaikkan taraf  menggunakan alatan 'software-properties' ataupun "
-#~ "'synaptic'."
-
-#~ msgid "Error during update"
-#~ msgstr "Ralat semasa pengemaskinian."
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Satu ralat berlaku semasa pemgemaskinian. Ini selalunya berlaku "
-#~ "disebabkan yang berkaitan dengan masaalah rangkaian, sila periksa dan "
-#~ "cuba lagi sambungan rangkaian anda."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Muatak cakera keras tidak mencukupi."
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Penaikkan taraf tidak dapat diteruskan. Sila pastikan ruang sebanyak %s "
-#~ "di cakera keras %s anda. Kosong dan padamkan pakej-pakej sementara dari "
-#~ "pemasangan sebelum ini menggunakan 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Anda mahu mulakan penaikkan taraf?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Tidak dapat memasang pakej-pakej penaikkan taraf."
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Penaikkan taraf tidak dapat diteruskan. Sistem anda mungkin tidak stabil. "
-#~ "Sistem 'recovery' telah dijalankan (dpkg --configure -a)"
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Pakej-pakej penaikan taraf tidak dapat dicapai."
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Penaikkan taraf tidak dapat diteruskan. Sila semak sambungan 'internet' "
-#~ "atau media pemasangan anda dan cuba lagi. "
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Tidak dapat memasang '%s'"
 
-#, fuzzy
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Pakej-pakej yang telah dipasang ini sudah tidak ada sokonga/bantuan rasmi "
-#~ "dan ianya hanya dibantu/sokong oleh 'community-supported('universe')\n"
-#~ "Jika anda tidak megaktifkan 'universe', pakej-pakej ini akan dicadangkan "
-#~ "untuk dikeluarkan di peringkat selanjutnya."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Keluarkan pakej-pakej yang sudah luput?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Abaikan langkah ini"
+#: ../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 ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Satu masaalah yang tidak dapat perbetulkan berlaku ketika menjangkakan "
-#~ "taraf penaikkan. Sila laporkan ini sebagai ralat pepijat."
-
-#~ msgid "Upgrading"
-#~ msgstr "Mengemaskini"
+msgid "An essential package would be removed"
+msgstr "Satu pakej yang perlu terpaksa dikeluarkan"
 
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Mencari perisian yang lapuk"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Naiktaraf sistem sempurna."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Sila masukkan '%s' kedalam pemacu '%s'"
-
-#, fuzzy
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "Satu pakej yang perlu terpaksa dikeluarkan"
-#~ msgstr[1] "Satu pakej yang perlu terpaksa dikeluarkan"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Untuk mengelakkan kehilangan data tutup kesemua aplikasi dan dokumen."
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Buang %s</b>"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Install %s"
-#~ msgstr "Pasang %s"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Upgrade %s"
-#~ msgstr "Naiktaraf %s"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "    "
-#~ msgstr "    "
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Tidak dapat memasang pakej-pakej penaikkan taraf."
+#: ../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 ""
 
-#, fuzzy
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Ralat semasa mengimbas Cakera Padat</b></big>↵\n"
-#~ "↵\n"
-#~ "%s"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr ""
-#~ "<big><b>Ralat semasa mengimbas Cakera Padat</b></big>↵\n"
-#~ "↵\n"
-#~ "%s"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "Naiktaraf %s"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/nb.po b/po/nb.po
index b6840767..5cc30e76 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -24,253 +24,284 @@ 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:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:135
+#, fuzzy
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:153
+#, fuzzy
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:197
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 5.10 Oppdateringer"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "Bidratt programvare"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 #, fuzzy
 msgid "Recommended updates"
 msgstr "Anbefalte oppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Installerer oppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Installerer oppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 #, fuzzy
 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:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Oppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Offisielt støttet"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Oppdateringer"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Noe programvare er ikke lenger offisielt støttet"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Begrenset opphavsrett"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
@@ -284,57 +315,69 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 #. Description
 #: ../data/templates/Debian.info.in:8
 #, fuzzy
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../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:42
+#: ../data/templates/Debian.info.in:94
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Installerer oppdateringer"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 #, fuzzy
 msgid "Debian current stable release"
 msgstr "Debian Unstable «Sid»"
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Ikke-DFSG-kompatibel programvare"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, fuzzy, python-format
 msgid "Server for %s"
 msgstr "Tjener for %s"
@@ -342,1454 +385,165 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 #, fuzzy
 msgid "Main server"
 msgstr "Hovedtjener"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 #, fuzzy
 msgid "Custom servers"
 msgstr "Egendefinerte tjenere"
 
-#~ msgid "Daily"
-#~ msgstr "Daglig"
-
-#~ msgid "Every two days"
-#~ msgstr "Annenhver dag"
-
-#~ msgid "Weekly"
-#~ msgstr "Ukentlig"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Hver andre uke"
-
-#~ msgid "Every %s days"
-#~ msgstr "Hver %s dag"
-
-#~ msgid "After one week"
-#~ msgstr "Etter en uke"
-
-#~ msgid "After two weeks"
-#~ msgstr "Etter to uker"
-
-#~ msgid "After one month"
-#~ msgstr "Etter en måned"
-
-#~ msgid "After %s days"
-#~ msgstr "Etter %s dager"
-
-#, fuzzy
-#~ msgid "%s updates"
-#~ msgstr "Installerer oppdateringer"
-
-#, fuzzy
-#~ msgid "Nearest server"
-#~ msgstr "Nermeste tjener"
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "Programvareoppdateringer"
-
-#, fuzzy
-#~ msgid "Active"
-#~ msgstr "I bruk"
-
-#, fuzzy
-#~ msgid "(Source Code)"
-#~ msgstr "Kilde"
-
-#, fuzzy
-#~ msgid "Source Code"
-#~ msgstr "Kilde"
-
-#~ msgid "Import key"
-#~ msgstr "Importer nøkkel"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Feil under importering av valgt fil"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Enten er valgt fil ikke en GPG-nøkkelfil, eller så er den kanskje skadet"
-
-#~ msgid "Error removing the key"
-#~ msgstr "Kunne ikke fjerne nøkkelen"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Nøkkelen du valgte kan ikke fjernes. Vennligst rapporter denne feilen."
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Kunne ikke søke gjennom CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Vennligst oppgi et navn for platen"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Vennligst sett inn en plate i CD-spilleren:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Skadede pakker"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Datamaskinen din inneholder skadede pakker som ikke kan repareres ved "
-#~ "bruk av dette programmet. Vennligst rett opp i dette ved å bruke Synaptic "
-#~ "eller apt-get før du fortsetter."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Kan ikke oppgradere nødvendige meta-pakker"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "En nødvendig pakke må fjernes"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Kunne ikke forberede oppgraderingen"
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Et uløselig problem oppstod ved forberedelse av oppgraderingen. Vennligst "
-#~ "rapporter dette som en feil."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Kunne ikke autentisere noen pakker"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Noen av pakkene kunne ikke autentiseres. Dette kan være et midlertidig "
-#~ "nettverksproblem, så du bør prøve igjen senere. Se under for listen over "
-#~ "pakker som ikke kunne autentiseres."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Kan ikke installere '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Kunne ikke installere en nødvendig pakke. Vennligst rapporter denne "
-#~ "feilen. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Kan ikke gjette på meta-pakke"
-
-#, fuzzy
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Ditt system inneholder ikke en ubuntu-desktop, kubuntu-desktop eller "
-#~ "edubuntu-desktop pakke, og det var ikke mulig å finne ut hvilken ubuntu-"
-#~ "versjon du bruker.\n"
-#~ " Vennligst installer én av de nevnte pakkene først ved å bruke synaptic "
-#~ "eller apt-get før du fortsetter."
-
-#, fuzzy
-#~ msgid "Failed to add the CD"
-#~ msgstr "Kunne ikke hente"
-
-#~ msgid "Reading cache"
-#~ msgstr "Leser mellomlager"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Fant ikke noe gyldig speil"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Under gjennomsøking av arkivinformasjonen din ble det ikke funnet noe "
-#~ "speil for oppgraderingen. Dette kan hende hvis du kjører et internt speil "
-#~ "eller hvis informasjonen om speilet er gammel.\n"
-#~ "\n"
-#~ "Vil du skrive din \"sources.list\"-fil likevel? Hvis du velger \"Ja\" vil "
-#~ "alle forekomster av '%s' endres til '%s'.\n"
-#~ "Hvis du velger \"Nei\" vil oppgraderingen avbrytes."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Vil du opprette standardkilder?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Etter gjennomsøkingen av din 'sources.list' filen din ble det ikke funnet "
-#~ "noen gyldig linje for '%s'.\n"
-#~ "\n"
-#~ "Skal standard linjer for '%s' legges til? Hvis du velger 'Nei' vil "
-#~ "oppdateringen avbrytes."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Ugyldig informasjon om arkiv"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Oppgradering av kanalinformasjon resulterte i en ugyldig fil. Vennligst "
-#~ "rapporter dette som en feil."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Tredjepartskilder er deaktivert"
-
-#, fuzzy
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Enkelte tredjeparts linjer i sources.list filen din ble deaktivert. Du "
-#~ "kan aktivere dem etter oppgraderingen ved hjelp av verktøyet 'Egenskaper "
-#~ "for programvare' eller med Synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Feil under oppdatering"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Det oppstod et problem under oppdateringen. Dette skyldes vanligvis et "
-#~ "problem med nettverkstilkoblingen. Vennligst sjekk nettverkstilkoblingen "
-#~ "din og prøv igjen."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Ikke nok ledig diskplass"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Oppgraderingen avbrytes nå. Vennligst frigi minst %s diskplass på %s. Tøm "
-#~ "papirkurven og fjern midlertidige pakker fra tidligere installasjoner ved "
-#~ "å bruke 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Ønsker du å starte oppgraderingen?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Kunne ikke installere oppgraderingene"
-
-#, fuzzy
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Oppgraderingen avbrytes nå. Systemet ditt kan være ubrukelig. En "
-#~ "reperasjon ble forsøkt kjørt (dpkg --configure -a)."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Kunne ikke laste ned alle oppgraderingene."
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Oppgraderingen avbrytes nå. Vennligst sjekk internet-tilkoblingen eller "
-#~ "installasjonsmediet og prøv på nytt. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Disse installerte pakkene er ikke lenger offisielt støttet og er nå kun "
-#~ "støttet av miljøet 'universe'.\n"
-#~ "\n"
-#~ "Hvis du ikke har 'universe' aktivert vil disse pakkene bli foreslått "
-#~ "fjernet i neste steg."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Ønsker du å fjerne utdaterte pakker?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Hopp over dette punktet"
-
-#~ msgid "_Remove"
-#~ msgstr "_Fjern"
-
-#~ msgid "Error during commit"
-#~ msgstr "Feil ved commit"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Et problem oppstod under opprydningen. Vennligst se meldingen under for "
-#~ "mer informasjon. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Gjenoppretter systemets originale tilstand"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Sjekker pakkehåndterer"
-
-#, fuzzy
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Forbereder oppgraderingen"
-
-#, fuzzy
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Et uløselig problem oppstod ved forberedelse av oppgraderingen. Vennligst "
-#~ "rapporter dette som en feil."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Oppdaterer informasjon om arkivet"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Ugyldig pakkeinformasjon"
-
-#, fuzzy
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Etter at pakkeinformasjonen ble oppdatert finnes ikke lenger den viktige "
-#~ "pakken '%s'.\n"
-#~ "Dette indikerer en alvorlig feil, vennligst rapportér denne feilen."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Spør om bekreftelse"
-
-#~ msgid "Upgrading"
-#~ msgstr "Oppgraderer"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Søker etter utdatert programvare"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Systemoppgraderingen er fullført"
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Vennligst sett inn '%s' i stasjonen '%s'"
-
-#, fuzzy
-#~ msgid "Fetching is complete"
-#~ msgstr "Oppdateringen er fullført"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Laster ned fil %li av %li med %s/s"
-
-#, fuzzy
-#~ msgid "About %s remaining"
-#~ msgstr "Rundt %li minutter gjenstår"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Laster ned fil %li av %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Lagrer endringer"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Kunne ikke installere '%s'"
-
-#, fuzzy
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Vil du erstatte konfigurasjonsfilen\n"
-#~ "'%s?'"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Kommandoen 'diff' ble ikke funnet"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "En uopprettelig feil oppsto"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Vennligst rapporter feilen og inkluder filene /var/log/dist-upgrade.log "
-#~ "og  /var/log/dist-upgrade-apt.log i din melding. Oppgraderingen avbrytes "
-#~ "nå.\n"
-#~ "Din orginale sources.list ble lagret i /etc/apt/sources.list.distUpgrade."
-
-#, fuzzy
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%s pakke vil bli fjernet."
-#~ msgstr[1] "%s pakker vil bli fjernet"
-
-#, fuzzy
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%s pakke vil bli installert."
-#~ msgstr[1] "%s pakker vil bli installert."
-
-#, fuzzy
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%s pakke vil bli oppgradert."
-#~ msgstr[1] "%s pakker vil bli oppgradert."
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Du må laste ned totalt %s. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Oppgraderingen kan ta flere timer og kan ikke avbrytes på noe senere "
-#~ "tidspunkt."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "For å forhindre tap av data bør du lukke alle åpne programmer og "
-#~ "dokumenter."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Systemet ditt er oppdatert!"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Fjern %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Installér %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Oppgradér %s"
-
-#, fuzzy
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "Rundt %li dager, %li timer og %li minutter gjenstår"
-
-#, fuzzy
-#~ msgid "%li hours %li minutes"
-#~ msgstr "Rundt %li timer og %li minutter gjenstår"
-
-#~ msgid "Reboot required"
-#~ msgstr "Omstart er nødvendig"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Oppgraderingen er fullført og en omstart av systemet er nødvendig. Vil du "
-#~ "gjøre dette nå?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Vil du avbryte oppgraderingen?</big></b>\n"
-#~ "\n"
-#~ "Systemet kan bli ubrukelig hvis du avbryter oppgraderingen. Det anbefales "
-#~ "på det sterkeste å fortsette med oppgraderingen."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Gjør en omstart av systemet for å fullføre oppgraderingen</big></"
-#~ "b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Vil du starte oppgraderingen?</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Rydder opp"
-
-#~ msgid "Details"
-#~ msgstr "Detaljer"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Forskjell mellom filene"
-
-#, fuzzy
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Laster ned og installerer oppgraderingene"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Endrer kanalene for programvare"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Forbereder oppgraderingen"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Starter systemet på nytt"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#, fuzzy
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Gjenoppta oppgradering"
-
-#~ msgid "_Keep"
-#~ msgstr "_Ta vare på"
-
-#~ msgid "_Replace"
-#~ msgstr "_Erstatt"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Rapportér en feil"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Omstart nå"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Gjenoppta oppgradering"
-
-#, fuzzy
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Gjenoppta oppgradering"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Kunne ikke finne utgivelsesnotatene"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Tjeneren kan være overbelastet. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Kunne ikke laste ned utgivelsesnotatene"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Vennligst kontrollér internettforbindelsen."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Kunne ikke kjøre oppgraderingsverktøyet"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Dette er mest sannsynlig en feil i oppgraderingsprogrammet. Vennligst "
-#~ "rapporter denne feilen"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Laster ned oppgraderingsverktøyet"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Dette programmet vil lede deg gjennom oppgraderingsprosessen."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Signatur for oppgraderingsprogrammet"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Oppgraderingsprogram"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Kunne ikke hente"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Henting av oppgraderingen mislykkes. En mulig årsak kan være "
-#~ "nettverksproblemer. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Utpakking feilet"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Feil ved utpakking av oppgraderingen. Det kan være et problem med "
-#~ "nettverket eller tjeneren. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Verifisering feilet"
-
-#, fuzzy
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Verifisering av oppgraderingen feilet. Det kan være en feil med "
-#~ "nettverket eller med tjeneren. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Autentiseringen mislyktes"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Autentiseringen av oppgraderingen feilet. Det kan være en feil med "
-#~ "nettverket eller med tjeneren. "
-
-#, fuzzy
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "Laster ned filen %li av %li med %s/s"
-
-#, fuzzy
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Laster ned filen %li av %li med %s/s"
-
-#, fuzzy
-#~ msgid "The list of changes is not available"
-#~ msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere."
-
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere."
-
-#, fuzzy
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Kunne ikke laste ned listen med endringer. Vennligst kontrollér "
-#~ "internettilkoblingen."
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "Ubuntu 5.10 Backports"
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "_Gjenoppta oppgradering"
-
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "Installerer oppdateringer"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versjon %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Laster ned listen med endringer..."
-
-#, fuzzy
-#~ msgid "_Check All"
-#~ msgstr "Sjekk"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Nedlastingsstørrelse: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Du kan installere %s oppdatering"
-#~ msgstr[1] "Du kan installere %s oppdateringer"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Vennligst vent, dette kan ta litt tid."
-
-#~ msgid "Update is complete"
-#~ msgstr "Oppdateringen er fullført"
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "Sjekker for tilgjengelige oppdateringer"
-
-#, fuzzy
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Ny versjon: %s (Størrelse: %s)"
-
-#, fuzzy
-#~ msgid "Version %s"
-#~ msgstr "Versjon %s:"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Din distribusjon er ikke lenger støttet"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Du vil ikke lenger motta flere sikkerhetsmessige eller kritiske "
-#~ "oppdateringer. Oppgradér til en nyere utgivelse av Ubuntu. Se http://www."
-#~ "ubuntu.com for mer informasjon om oppgradering."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Ny versjon \"%s\" er tilgjengelig</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Programvareoversikten er ødelagt."
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Du kan dessverre ikke installere eller fjerne programmer nå. Vennligst "
-#~ "bruk pakkehåndteringsprogrammet \"Synaptic\" eller kjør kommandoen \"sudo "
-#~ "apt-get install -f\" i en terminal for å løse denne situasjonen."
-
-#~ msgid "None"
-#~ msgstr "Ingen"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#, fuzzy
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Du må sjekke for oppdateringer manuelt</big></b>\n"
-#~ "\n"
-#~ "Systemet ditt sjekker ikke for oppdateringer automatisk. Du kan endre "
-#~ "dette under \"System\" -> \"Administrasjon\" -> \"Egenskaper for "
-#~ "programvare\""
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Hold systemet ditt oppdatert</b></big>"
-
-#, fuzzy
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Kunne ikke søke gjennom CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Vil du starte oppgraderingen?</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "Endringer"
-
-#~ msgid "Chec_k"
-#~ msgstr "Sjek_k"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Sjekk programvarekanalene for nye oppdateringer"
-
-#~ msgid "Description"
-#~ msgstr "Beskrivelse"
-
-#~ msgid "Release Notes"
-#~ msgstr "Utgivelsesinformasjon"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Vis fremdrift for enkeltfiler"
-
-#~ msgid "Software Updates"
-#~ msgstr "Programvareoppdateringer"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Programvareoppdateringer fikser feil, fjerner sikkerhetshull og tilbyr ny "
-#~ "funksjonalitet."
-
-#~ msgid "U_pgrade"
-#~ msgstr "O_ppgrader"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Oppgrader til siste versjon av Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "Sjekk"
-
-#, fuzzy
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Gjenoppta oppgradering"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "Skjul denne informasjonen i fremtiden"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Installerer oppdateringer"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "O_ppgrader"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "Endringer"
-
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Oppdateringer fra Internett</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Oppdateringer fra Internett</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Oppdateringer fra Internett</b>"
-
-#, fuzzy
-#~ msgid "Add Cdrom"
-#~ msgstr "Legg til _cdrom"
-
-#~ msgid "Authentication"
-#~ msgstr "Autentisering"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "Sl_ett nedlastede filer:"
-
-#, fuzzy
-#~ msgid "Download from:"
-#~ msgstr "Nedlastingen er fullført"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Importer den offentlige nøkkelen fra en tiltrodd programvareutgiver"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Oppdateringer fra Internett"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Kun sikkerhetsoppdateringer fra de offisielle Ubuntu-tjenerne vil bli "
-#~ "installert automatisk."
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Gjenopprett stan_dardverdier"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Gjenopprett standardnøkler for din distribusjon"
-
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "Egenskaper for programvare"
-
-#, fuzzy
-#~ msgid "Source code"
-#~ msgstr "Kilde"
-
-#~ msgid "Statistics"
-#~ msgstr "Statistikk"
-
-#, fuzzy
-#~ msgid "Third Party"
-#~ msgstr "Tredjepart"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Se etter oppdateringer automatisk:"
-
-#, fuzzy
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Last ned oppdateringer i bakgrunnen, men ikke installér dem"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Importer fil med nøkler"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Installer sikkerhetsoppdateringer uten bekreftelse"
-
-#, fuzzy
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Kanalinformasjonen er utdatert</big></b>\n"
-#~ "\n"
-#~ "Du må laste kanalinformasjonen på nytt for å installere programvare og "
-#~ "oppdateringer fra nye og endrede kanaler. \n"
-#~ "\n"
-#~ "Du trenger en fungerende internettilkobling for å kunne fortsette."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Kommentar:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Komponenter:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribusjon:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Skriv inn hele APT-linjen for kanalen du vil legge til</b> </"
-#~ "big>\n"
-#~ "\n"
-#~ "APT-linjen inneholder typen, adressen og innholdet til en kanal, for "
-#~ "eksempel <i>«deb http://ftp.debian.org sarge main»</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "APT-linje:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binær\n"
-#~ "Kilde"
-
-#, fuzzy
-#~ msgid "Edit Source"
-#~ msgstr "Kilde"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Søker gjennom CD-ROM"
-
-#, fuzzy
-#~ msgid "_Add Source"
-#~ msgstr "Kilde"
-
-#~ msgid "_Reload"
-#~ msgstr "_Last på nytt"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Vis og installér tilgjengelige oppdateringer"
-
-#~ msgid "Update Manager"
-#~ msgstr "Oppdateringshåndterer"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Se etter nyere utgivelser av distribusjonen og tilby om mulig "
-#~ "oppgradering."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Se etter nye utgivelser av distribusjonen"
-
-#, fuzzy
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Hvis automatisk sjekk for oppdateringer er slått av, så må du laste "
-#~ "kanallisten på nytt manuelt. Dette valget tillater å skjule påminnelsen "
-#~ "som er vist her."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Minn på å laste kanallisten på nytt"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Vis detaljer for en oppdatering"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Lagrer størrelsen for update-manager-vinduet"
-
-#, fuzzy
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Lagrer ditt valg for hvorvidt endringslogger og beskrivelse av programmer "
-#~ "skal vises"
-
-#~ msgid "The window size"
-#~ msgstr "Vindusstørrelsen"
-
-#, fuzzy
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Sett opp programvarekanaler og oppdateringer"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" sikkerhetsoppdateringer"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#, fuzzy
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "US eksport begrenset programvare"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Laster ned fil %li av %li ved ukjent hastighet"
-
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "Installerer oppdateringer"
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Avbryt ne_dlasting"
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Noe programvare er ikke lenger offisielt støttet"
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Kunne ikke finne noen oppgraderinger"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Systemet ditt er allerede oppgradert."
-
-#, fuzzy
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Oppgraderer til Ubuntu 6.06 LTS</"
-#~ "span>"
-
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
-
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Oppgrader til siste versjon av Ubuntu"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Kan ikke installere alle tilgjengelige oppdateringer."
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Analyserer systemet</b></big>\n"
-#~ "\n"
-#~ "Programvareoppdateringer reparerer feil, eliminerer sikkerhetsproblemer "
-#~ "og gir deg ny funksjonalitet."
-
-#~ msgid "Oficially supported"
-#~ msgstr "Offisielt støttet"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Noen oppdateringer krever fjerning av andre programpakker. Bruk "
-#~ "funksjonen \"Merk alle oppgraderinger\" i pakkehåndteringsprogrammet "
-#~ "\"Synaptic\" eller kjør kommandoen \"sudo apt-get dist-upgrade\" i en "
-#~ "terminal for å oppgradere systemet fullstendig."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Følgende pakker vil ikke bli oppgradert:"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Rundt %li sekunder gjenstår"
-
-#~ msgid "Download is complete"
-#~ msgstr "Nedlastingen er fullført"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Oppgraderingen avbrytes nå. Vennligst rapporter dette som en feil."
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Oppgraderer Ubuntu"
-
-#~ msgid "Hide details"
-#~ msgstr "Skjul detaljer"
-
-#~ msgid "Show details"
-#~ msgstr "Vis detaljer"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "Du kan ikke bruke flere pakkebehandlingsprogrammer samtidig"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Vennligst lukk andre programmer som f.eks \"aptitude\" eller \"Synaptic\" "
-#~ "først."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Kanaler</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Taster</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Installasjonsmedia"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Brukervalg for programvare"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Kanal</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponenter</b>"
-
-#~ msgid "Add Channel"
-#~ msgstr "Legg til kanal"
-
-#~ msgid "Edit Channel"
-#~ msgstr "Endre kanal"
-
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "Legg til k_anal"
-#~ msgstr[1] "Legg til k_analer"
-
-#~ msgid "_Custom"
-#~ msgstr "_Tilpasset"
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Sikkerhetsoppdateringer for Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Oppdateringer for Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Backports for Ubuntu 6.06 LTS"
-
-#~ msgid ""
-#~ "While scaning your repository information no valid entry for the upgrade "
-#~ "was found.\n"
-#~ msgstr ""
-#~ "Fant ikke noen gyldig oppføring for oppgradering ved lesing av "
-#~ "arkivinformasjon.\n"
-
-#~ msgid "Repositories changed"
-#~ msgstr "Arkiv har blitt endret"
-
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "Du må oppdatere pakkelisten for at endringene skal tre i kraft. Vil du "
-#~ "gjøre dette nå?"
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Seksjoner</b>"
+#: ../apt/progress/gtk2.py:265
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Laster ned filen %li av %li med %s/s"
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Seksjoner:</b>"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detaljer"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Oppdater pakkeinformasjonen fra tjeneren."
+msgid "Starting..."
+msgstr "Instillinger"
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Laster ned endringer</span>\n"
-#~ "\n"
-#~ "Må få endringene fra den sentrale tjeneren"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Vis tilgjengelige oppdateringer og velg hvilke som skal installeres"
+#: ../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 "Error fetching the packages"
-#~ msgstr "Feil under fjerning av nøkkel"
+msgid "The list of changes is not available"
+msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere."
 
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Rediger programvarekilder og instillinger"
-
-#, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Programvarekilder</b>"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Arkiv</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Midlertidige filer</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Brukergrensesnitt</b>"
-
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Autentiseringsnøkler</b></big>\n"
-#~ "\n"
-#~ "Du kan legge til eller fjerne autentiseringsnøkler i dette vinduet. "
-#~ "Nøkler gjør det mulig å kontrollere integriteten til programvare som blir "
-#~ "lastet ned."
-
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Legg til en ny nøkkelfil til den sikre nøkkelringen. Vær sikker på at du "
-#~ "mottok nøkkelen over en sikker kanal og at du stoler på eieren. "
+#: ../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 "Add repository..."
-#~ msgstr "_Legg til arkiv"
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Se etter programvare_oppdateringer automatisk."
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Fjern _midlertidige pakkefiler automatisk."
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Intervaller for tømming i dager: "
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Slett _gamle pakker i pakkelageret."
-
-#~ msgid "Edit Repository..."
-#~ msgstr "Rediger arkiv..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Maksimum alder i dager:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Maksimum størrelse i MB:"
-
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr "Gjenoppret nøklene som kom med distri"
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Sett _maksimal størrelse på hurtiglageret"
-
-#~ msgid "Settings"
-#~ msgstr "Instillinger"
-
-#~ msgid "Show detailed package versions"
-#~ msgstr "Vis detaljert pakkeversjoner"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Kunne ikke laste ned listen med endringer. Vennligst kontrollér "
+"internettilkoblingen."
 
-#~ msgid "Show disabled software sources"
-#~ msgstr "Vis deaktiverte programvarekilder"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Update interval in days: "
-#~ msgstr "Intervall for oppdatering i dager: "
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "_Add Repository"
-#~ msgstr "_Legg til arkiv"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Last ned oppgraderbare pakker"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>Status:</b>"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Tilgjengelige oppdateringer</b></big>\n"
-#~ "\n"
-#~ "De følgende pakkene kan oppgraderes. Du kan oppgradere dem ved å trykke "
-#~ "på «Installer»-knappen."
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "Avbryt nedlasting av endringslogg"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Debian sarge"
-#~ msgstr "Debian 3.1 «Sarge»"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Kan ikke installere '%s'"
 
-#, fuzzy
-#~ msgid "Debian sid"
-#~ msgstr "Debian Testing"
+#: ../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 "Oficial Distribution"
-#~ msgstr "<b>Distribusjon:</b>"
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Du må være «root» for å kjøre dette programmet"
+msgid "An essential package would be removed"
+msgstr "En nødvendig pakke må fjernes"
 
-#~ msgid "Binary"
-#~ msgstr "Binær"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Non-free software"
-#~ msgstr "Non-free programvare"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian 3.0 «Woody»"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Debian Stable"
-#~ msgstr "Debian Stable"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Debian Non-US (Stable)"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian Non-US (Testing)"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
+#: ../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 ""
 
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Choose a key-file"
-#~ msgstr "Velg en nøkkelfil"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "There is one package available for updating."
-#~ msgstr "Det er ingen tilgjengelige oppdateringer."
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "Det er ingen tilgjengelige oppdateringer."
-
-#~ msgid "There are no updated packages"
-#~ msgstr "Det er ingen utdaterte pakker"
-
-#~ msgid "You did not select any of the %s updated package"
-#~ msgid_plural "You did not select any of the %s updated packages"
-#~ msgstr[0] "Du valgte ikke den %s oppdaterte pakken"
-#~ msgstr[1] "Du valgte ingen av de %s oppdaterte pakkene"
-
-#~ msgid "You have selected %s updated package, size %s"
-#~ msgid_plural "You have selected all %s updated packages, total size %s"
-#~ msgstr[0] "Du har valgt %s oppdatert pakke, størrelse %s"
-#~ msgstr[1] "Du har valgt alle de %s oppdaterte pakkene, total størrelse %s"
-
-#~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
-#~ msgstr[0] "Du har valgt %s av %s oppdaterte pakker, størrelse %s"
-#~ msgstr[1] "Du har valgt %s av de %s oppdaterte pakkene, total størrelse %s"
-
-#~ msgid "The updates are being applied."
-#~ msgstr "Oppdateringene blir tilført."
-
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Du kan bare kjøre et pakkehåndteringsprogram samtidig. Lukk det andre "
-#~ "programmet først."
-
-#~ msgid "Updating package list..."
-#~ msgstr "Oppdaterer pakkeliste..."
-
-#~ msgid "There are no updates available."
-#~ msgstr "Det er ingen tilgjengelige oppdateringer."
-
-#~ msgid "New version:"
-#~ msgstr "Ny versjon:"
-
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Oppgrader til en nyere versjon av Ubuntu Linux. Versjonen du kjører får "
-#~ "ikke sikkerhetsoppdateringer eller andre kritiske oppdateringer lenger. "
-#~ "Se http://www.ubuntulinux.org for informasjon om oppgradering."
-
-#~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "Det er en ny versjon av Ubuntu tilgjengelig!"
-
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "En ny versjon med kodenavnet «%s» er tilgjengelig. Se http://www. "
-#~ "ubuntulinux.org/ for instruksjoner om oppgradering."
-
-#~ msgid "Never show this message again"
-#~ msgstr "Ikke vis denne beskjeden igjen"
-
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "Ingen endringer funnet, tjeneren er kanskje ikke oppdatert enda."
-
-#~ msgid "A_uthentication"
-#~ msgstr "A_utentisering"
-
-#~ msgid "_Settings"
-#~ msgstr "_Instillinger"
-
-#~ msgid "Ubuntu Update Manager"
-#~ msgstr "Ubuntu oppdateringshåndterer"
-
-#~ msgid ""
-#~ "This means that some dependencies of the installed packages are not "
-#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
-#~ msgstr ""
-#~ "Dette betyr at det finnes avhengigheter til pakker som ikke er møtt. Bruk "
-#~ "«Synaptic» eller «apt-get» for å fikse problemet."
-
-#~ msgid "It is not possible to upgrade all packages."
-#~ msgstr "Det er ikke mulig å oppgradere alle pakkene."
-
-#~ msgid ""
-#~ "This means that besides the actual upgrade of the packages some further "
-#~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
-#~ msgstr ""
-#~ "Dette betyr at ved siden av å oppgradere pakkene kreves det ekstra "
-#~ "handling (som å installere eller fjerne pakker). Bruk «Synaptic» eller «apt-"
-#~ "get dist-upgrade» for å løse problemet."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/ne.po b/po/ne.po
index 9b3faeb2..30cb6542 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -25,256 +25,287 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../data/templates/Ubuntu.info.in:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:135
+#, fuzzy
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:153
+#, fuzzy
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:197
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "योगदान गरिएको सफ्टवेयर"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "नन-फ्री (बहुभर्स)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "नन-फ्री (बहुभर्स)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 #, fuzzy
 msgid "Important security updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 #, fuzzy
 msgid "Officially supported"
 msgstr "कार्यालय बाट समर्थित"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "नन-फ्री (बहुभर्स)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "कार्यालय बाट समर्थित"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "निषेधित प्रतिलिपि अधिकार"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "युबन्टु ४.१० सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
@@ -287,56 +318,69 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
-msgstr ""
+#, fuzzy
+msgid "Debian 6.0 'Squeeze' "
+msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु"
+
+#. Description
+#: ../data/templates/Debian.info.in:58
+#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../data/templates/Debian.info.in:83
 #, fuzzy
 msgid "Debian 3.1 'Sarge'"
 msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Debian.info.in:42
+#: ../data/templates/Debian.info.in:94
 #, fuzzy
 msgid "Proposed updates"
 msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 #, fuzzy
 msgid "Debian current stable release"
 msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -344,632 +388,161 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Daily"
-#~ msgstr "<b>विवरणहरु</b>"
-
-#, fuzzy
-#~ msgid "%s updates"
-#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "सफ्टवेयर अद्यावधिकहरु"
-
-#, fuzzy
-#~ msgid "(Source Code)"
-#~ msgstr "स्रोत"
-
-#, fuzzy
-#~ msgid "Source Code"
-#~ msgstr "स्रोत"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "चयन गरिएको फाइल आयात गर्दा त्रुटि"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "चयन गरिएको फाइल जिपिजि कुञ्जि फइल नहुन सक्छ अथवा यो दुषित हुन सक्दछ"
-
-#~ msgid "Error removing the key"
-#~ msgstr "कुञ्जि हटाउँदा त्रुटि"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
-
-#, fuzzy
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस "
-
-#, fuzzy
-#~ msgid "Error during update"
-#~ msgstr "कुञ्जि हटाउँदा त्रुटि"
-
-#, fuzzy
-#~ msgid "Checking package manager"
-#~ msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ"
-
-#, fuzzy
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "परिवर्तनहरु डाउनलोड गर्दै"
-
-#, fuzzy
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
-
-#, fuzzy
-#~ msgid "Upgrading"
-#~ msgstr "स्तरवृद्धि समाप्त"
-
-#, fuzzy
-#~ msgid "Applying changes"
-#~ msgstr "परिवर्तनहरु डाउनलोड गर्दै"
-
-#, fuzzy
-#~ msgid "Your system is up-to-date"
-#~ msgstr "तपाइं को प्रणालि अप-टु-डेट छ!"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#, fuzzy
-#~ msgid "Details"
-#~ msgstr "<b>विवरणहरु</b>"
-
-#, fuzzy
-#~ msgid "_Replace"
-#~ msgstr "फेरि लोड गर्नुहोस"
-
-#, fuzzy
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
-
-#, fuzzy
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "परिवर्तनहरु डाउनलोड गर्दै"
-
-#, fuzzy
-#~ msgid "Authentication failed"
-#~ msgstr "प्रमाणिकरण"
-
-#, fuzzy
-#~ msgid "The list of changes is not available"
-#~ msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!"
-
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!"
-
-#, fuzzy
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस"
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "संस्करण %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "परिवर्तनहरु डाउनलोड गर्दै"
-
-#, fuzzy
-#~ msgid "Download size: %s"
-#~ msgstr "परिवर्तनहरु डाउनलोड गर्दै"
-
-#, fuzzy
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "स्तरवृद्धिहरु स्थापना गर्दै"
-#~ msgstr[1] "स्तरवृद्धिहरु स्थापना गर्दै"
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-
-#, fuzzy
-#~ msgid "Version %s"
-#~ msgstr "संस्करण %s:"
-
-#, fuzzy
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "तपाईंको वितरण समर्थित छैन"
-
-#~ msgid "Changes"
-#~ msgstr "परिवर्तनहरु"
-
-#~ msgid "Description"
-#~ msgstr "बर्णन"
-
-#~ msgid "Software Updates"
-#~ msgstr "सफ्टवेयर अद्यावधिकहरु"
-
-#, fuzzy
-#~ msgid "_Install Updates"
-#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "स्तरवृद्धि समाप्त"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "परिवर्तनहरु"
-
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>"
-
-#, fuzzy
-#~ msgid "Add Cdrom"
-#~ msgstr "सिडि थप्नुहोस"
-
-#, fuzzy
-#~ msgid "Authentication"
-#~ msgstr "प्रमाणिकरण"
-
-#, fuzzy
-#~ msgid "Download from:"
-#~ msgstr "परिवर्तनहरु डाउनलोड गर्दै"
-
-#, fuzzy
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "विश्वास गरिएको कुञ्जिरिंग बाट चयन गरिएको कुञ्जि हटाउनुहोस"
-
-#, fuzzy
-#~ msgid "Internet Updates"
-#~ msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>"
-
-#, fuzzy
-#~ msgid "Restore _Defaults"
-#~ msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस"
-
-#, fuzzy
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस"
-
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "सफ्टवेयर गुणहरु"
-
-#, fuzzy
-#~ msgid "Source code"
-#~ msgstr "स्रोत"
-
-#, fuzzy
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>टिप्पणि:</b>"
-
-#, fuzzy
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>तत्वहरु</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>वितरण:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>प्रकार:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>युआरएल:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>तपाईंले थप्न चाहेको कोषको पुर्ण एपिटि हरफ प्रविष्ट गर्नुहोस</b></big>\n"
-#~ "\n"
-#~ "एपिटि हरफमा कोषको प्रकार, स्थान र सामग्री समाहित हुन्छ, उदाहरण को लागि <i>"
-#~ "\"deb http://ftp.debian.org sarge main\"</i>. तपाईंले मिसिलिकरण मा वाक्य "
-#~ "संरचनाको एउटा विस्तृत विवरण पाउन सक्नुहुन्छ"
-
-#~ msgid "APT line:"
-#~ msgstr "एपिटि हरफ:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "बाइनरी\n"
-#~ "स्रोत"
-
-#, fuzzy
-#~ msgid "Edit Source"
-#~ msgstr "स्रोत"
-
-#, fuzzy
-#~ msgid "_Add Source"
-#~ msgstr "स्रोत"
-
-#, fuzzy
-#~ msgid "_Reload"
-#~ msgstr "फेरि लोड गर्नुहोस"
-
-#~ msgid "Update Manager"
-#~ msgstr "अद्यावधिक व्यवस्थापक"
-
-#, fuzzy
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "युएस निषेधित सफ्टवेयर"
-
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-
-#, fuzzy
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!"
-
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
-
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "कार्यालय बाट समर्थित"
-
-#, fuzzy
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "निम्न प्याकेजहरु स्तरवृद्धि गरिएको छैन"
-
-#, fuzzy
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr ""
-#~ "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
-
-#, fuzzy
-#~ msgid "Hide details"
-#~ msgstr "<b>विवरणहरु</b>"
-
-#, fuzzy
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>विवरणहरु</b>"
-
-#, fuzzy
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>विवरणहरु</b>"
-
-#, fuzzy
-#~ msgid "Installation Media"
-#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-
-#~ msgid "Software Preferences"
-#~ msgstr "सफ्टवेयर प्राथमिकताहरु"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#, fuzzy
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>विवरणहरु</b>"
-
-#, fuzzy
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>तत्वहरु</b>"
-
-#~ msgid "_Custom"
-#~ msgstr "अनुकुलन गर्नुहोस"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
-
-#~ msgid "Repositories changed"
-#~ msgstr "कोषहरु परिवर्तित"
-
-#, fuzzy
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "कोष जानकारी संग परिवर्तनहरु छन. %s मा तपाईंको स्रोतहरु को सुची को ब्याकअप प्रति "
-#~ "भण्डारण गरिएको छ. बचत गर्नुहोस. \n"
-#~ "\n"
-#~ "तपाईको परिवर्तनहरुले प्रभाव लिनको लागि तपाईंले सर्भरहरु बाट प्याकेज सुची  फेरि लोड "
-#~ "गर्नुपर्दछ. के तपाईं यो अहिले गर्न चाहनुहुन्छ?"
-
-#, fuzzy
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>सेक्सनहरु:</b>"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>सेक्सनहरु:</b>"
-
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "सर्भर बाट प्याकेज जानकारी फेरि लोड गर्नुहोस"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">परिवर्तनहरु डसउनलोड गर्दै</span>\n"
-#~ "\n"
-#~ "केन्द्रिय सर्भर बाट परिवर्तनहरु प्राप्त गर्न आवश्यक छ"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "उपलब्ध अद्यावधिकहरु देखाउनुहोस र कुन स्थापना गर्ने रोज्नुहोस"
-
-#, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "कुञ्जि हटाउँदा त्रुटि"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "सफ्टवेयर स्रोतहरु र सेटिंगहरु सम्पादन गर्नुहोस"
-
-#, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>सफ्टवेयर स्रोतहरु</b>"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>कोष</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>अस्थायी फाइलहरु</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>प्रयोगकर्ता इन्टरफेस</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>प्रमाणीकरण कुञ्जिहरु</b></big>\n"
-#~ "\n"
-#~ "तपाईंले यो संवाद भित्र प्रमाणीकरण कुञ्जिहरु थप्न र हटाउन सक्नुहुन्छ. तपाईंले डाउनलोड "
-#~ "गरेको सफ्टवेयर को विश्वसनियता रुजु जाँच गर्नको लागि एउटा कुञ्जिले संभव पार्दछ"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ 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 "Add repository..."
-#~ msgstr "कोष थप्नुहोस"
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "सफ्टवेयर अद्यावधिकहरुको लागि स्वत:जाँच गर्नुहोस"
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "अस्थायी प्याकेजहरु फाइलहरु स्वत:सफा गर्नुहोस"
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "दिनहरु मा समयान्तर सफा गर्नुहोस "
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "प्याकेज क्यास मा पुरानो प्याकेजहरु मेट्नुहोस"
-
-#~ msgid "Edit Repository..."
-#~ msgstr "कोष सम्पादन गर्नुहोस"
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "दिनहरुमा अधिकतम आयु"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "एमबि मा अधिकतन आकार"
+msgid "Details"
+msgstr "<b>विवरणहरु</b>"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "वितरण संग शिप गरिएको पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस. यसले प्रयोगकर्ता "
-#~ "स्थापना गरिएको कुञ्जिहरु परिवर्तन गर्दैन"
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "प्याकेज क्यासको लागि अधिकतम आकार सेट गर्नुहोस"
+msgid "Starting..."
+msgstr "सेटिंगहरु"
 
-#~ msgid "Settings"
-#~ msgstr "सेटिंगहरु"
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "अक्षम पारिएको सफ्टवेयर स्रोतहरु देखाउनुहोस"
-
-#~ msgid "Update interval in days: "
-#~ msgstr "दिनहरुमा समयान्तर अद्यावधिक गर्नुहोस "
-
-#~ msgid "_Add Repository"
-#~ msgstr "कोष थप्नुहोस"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "_Download upgradable packages"
-#~ 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 "<b>Status:</b>"
-#~ msgstr "<b>सेक्सनहरु:</b>"
-
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>उपलब्ध अद्यावधिकहरु</b></big>\n"
-#~ "\n"
-#~ "निम्न प्याकेजहरु स्तरवृद्धि गर्न योग्य पाइयो. तपाईंले तिनिहरु लाइ स्थापना बटन प्रयोग "
-#~ "गरेर स्तरवृद्धि गर्न सक्नुहुन्छ"
+msgid "The list of changes is not available"
+msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!"
 
-#~ msgid "Cancel downloading the changelog"
-#~ 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
 #, fuzzy
-#~ msgid "Oficial Distribution"
-#~ msgstr "<b>वितरण:</b>"
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "यो कार्यक्रम चलाउनको लागि तपाईं रुट हुनुपर्दछ"
-
-#~ msgid "Binary"
-#~ msgstr "बाईनरी"
-
-#~ msgid "Non-free software"
-#~ msgstr "नन-फ्री सफ्टवेयर"
-
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "युबन्टु संग्रह स्वचालित हस्ताक्षर कुञ्जि <ftpmaster@ubuntu.com>"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस"
 
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "युबन्टु सिडि छवि स्वचालित हस्ताक्षर कुञ्जि <cdimage@ubuntu.com>"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Choose a key-file"
-#~ msgstr "एउटा कुञ्जि-फाइल रोज्नुहोस"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid "There is one package available for updating."
-#~ msgstr "कुनै स्तरवृद्धिहरु उपलब्ध छैन"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "कुनै स्तरवृद्धिहरु उपलब्ध छैन"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "There are no updated packages"
-#~ msgstr "कुनै स्तरवृद्धिहरु उपलब्ध छैन"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "The updates are being applied."
-#~ msgstr "स्तरवृद्धिहरु लागु हुँदैछन"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "तपाईंले उहि समयमा केवल एउटा प्याकेज व्यवस्थापन अनुप्रयोग चलाउन सक्नुहुन्छ.कृपया पहिला "
-#~ "यो अन्य अनुप्रयोग बन्द गर्नुहोस"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Updating package list..."
-#~ msgstr "प्याकेज सुची स्तरवृद्धि गर्दै"
+#: ../apt/debfile.py:376
+#, python-format
+msgid "Cannot install '%s'"
+msgstr ""
 
-#~ msgid "There are no updates available."
-#~ msgstr "कुनै स्तरवृद्धिहरु उपलब्ध छैन"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "New version:"
-#~ msgstr "नयाँ संस्करण: %s"
+#: ../apt/debfile.py:494
+msgid "An essential package would be removed"
+msgstr ""
 
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "कृपया युबन्टु लिनक्स को नयाँ संस्करण मा स्तरवृद्धि गर्नुहोस. तपाईंले चलाइरहेको संस्करण ले "
-#~ "सुरक्षा स्थिरहरु वा अन्य सूक्ष्म स्तरवृद्धिहरु प्राप्त गर्नेछैन. कृपया स्तरवृद्धि जानकारी को "
-#~ "लागि http://www.ubuntulinux.org हेर्नुहोस"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "एउटा नयाँ संकेतनाम '%s' भएको विमोचन उपलब्ध छ.  कृपया स्तरवृद्धि निर्देशन को लागि://"
-#~ "www.ubuntulinux.org/ हेर्नुहोस."
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Never show this message again"
-#~ msgstr "यो संदेश फेरि कहिले पनि नदेखाउनुहोस"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "परिवर्तनहरु भेटिएन, सर्भर अझै स्तरवृद्धि नगरिएको हुन सक्दछ."
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Ubuntu Update Manager"
-#~ msgstr "युबन्टु अद्यावधिक व्यवस्थापक"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "<b>Packages to install:</b>"
-#~ msgstr "<b>स्थापना गर्ने प्याकेजहरु:</b>"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "CD"
-#~ 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 ""
 
-#~ msgid ""
-#~ "This means that some dependencies of the installed packages are not "
-#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
-#~ msgstr ""
-#~ "यसको मतलब स्थापना गरिएका प्याकेजहरु को केहि निर्भरताहरु सन्तुष्ट छैनन. कृपया स्थिति "
-#~ "ठीक गर्नको लागि \"साइनाप्टिक\" अथवा \"एपिटि-गेट\" प्रयोग गर्नुहोस"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "It is not possible to upgrade all packages."
-#~ msgstr "सबै प्याकेजहरु स्तरवृद्धि गर्न संभव छैन"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid ""
-#~ "This means that besides the actual upgrade of the packages some further "
-#~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
-#~ msgstr ""
-#~ "यसको मतलब प्याकेजहरु को उचित स्तरवृद्धि बाहेक केहि अधिक कार्य (जस्तै प्याकेजहरुको स्थापन "
-#~ "र विस्थापन) आवश्यक छ. कृपया स्थिति ठीक गर्नको लागि साइनाप्टिक \"स्मार्ट स्तरवृद्धि\" "
-#~ "अथवा \"एपिटि-गेट डिस्ट-स्तरवृद्धि\" प्रयोग गर्नुहोस"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Initializing and getting list of updates..."
-#~ msgstr "अद्यावधिकहरुको इनिसियलाइज गर्दै र सुची प्राप्त गर्दै"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/nl.po b/po/nl.po
index ca03c557..b46d889f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -23,236 +23,267 @@ 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: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 "Cd-rom met 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 "Cd-rom met 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 "Cd-rom met 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cd-rom met Ubuntu 5.04 ‘Hoary Hedgehog’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 veiligheidsupdates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 veiligheidsupdates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 ‘Edgy Eft’"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Door de gemeenschap beheerd"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Niet-vrije stuurprogramma's voor apparaten"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Beperkte software"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cd-rom met Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Door Canonical beheerde Open Source software"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Door de gemeenschap beheerd (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Door de gemeenschap beheerde Open Source software"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Niet-vrije stuurprogramma's"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Niet-vrije stuurprogramma's voor apparaten "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Niet-vrije stuurprogramma's voor apparaten"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Beperkte software (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 "Software die door auteursrechten of wettelijke regelingen beperkt wordt."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cd-rom met Ubuntu 6.06 LTS ‘Dapper Drake’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Belangrijke veiligheidsupdates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Aanbevolen updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Voorgestelde updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Updates die van een nieuwere distributie afkomstig zijn (backports)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cd-rom met Ubuntu 5.10 ‘Breezy Badger’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 veiligheidsupdates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 ‘Hoary Hedgehog’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cd-rom met Ubuntu 5.04 ‘Hoary Hedgehog’"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Officieel ondersteund"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 veiligheidsupdates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 ‘Warty Warthog’"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Door de gemeenschap beheerd (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Niet-vrij (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cd-rom met Ubuntu 4.10 ‘Warty Warthog’"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Niet meer officieel ondersteund"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Beperkte auteursrechten"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 veiligheidsupdates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 backports"
 
@@ -264,55 +295,68 @@ 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:31
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 3.1 \"Sarge\""
+
+#. Description
+#: ../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 "Voorgestelde updates"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Belangrijke veiligheidsupdates"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (onstabiel)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Software compatibel met DFSG, maar met niet-vrije afhankelijkheden"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Software niet compatibel met DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Server voor %s"
@@ -320,1247 +364,160 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Hoofdserver"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Andere servers"
 
-#~ msgid "Daily"
-#~ msgstr "Dagelijks"
-
-#~ msgid "Every two days"
-#~ msgstr "Elke twee dagen"
-
-#~ msgid "Weekly"
-#~ msgstr "Wekelijks"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Elke twee weken"
-
-#~ msgid "Every %s days"
-#~ msgstr "Elke %s dagen"
-
-#~ msgid "After one week"
-#~ msgstr "Na één week"
-
-#~ msgid "After two weeks"
-#~ msgstr "Na twee weken"
-
-#~ msgid "After one month"
-#~ msgstr "Na één maand"
-
-#~ msgid "After %s days"
-#~ msgstr "Na %s dagen"
-
-#~ msgid "%s updates"
-#~ msgstr "%s updates"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "dichtsbijzijnde server"
-
-#~ msgid "Software Channel"
-#~ msgstr "Softwarekanaal"
-
-#~ msgid "Active"
-#~ msgstr "Actief"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(broncode)"
-
-#~ msgid "Source Code"
-#~ msgstr "Broncode"
-
-#~ msgid "Import key"
-#~ msgstr "Sleutel importeren"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Fout bij het importeren van het geselecteerde bestand"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Het geselecteerde bestand is misschien geen GPG-sleutel, of het kan "
-#~ "beschadigd zijn."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Fout bij het verwijderen van de sleutel"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "De door u geselecteerde sleutel kon niet verwijderd worden. Gelieve dit "
-#~ "als fout te melden."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Fout bij het lezen van de cd</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Geef het cd-schijfje een naam"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Plaats een schijf in de speler:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Niet-werkende pakketten"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Uw systeem bevat niet-werkende pakketten die niet gerepareerd kunnen "
-#~ "worden met deze software. Repareer deze eerst met synaptic of apt-get "
-#~ "voordat u verder gaat."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Kan de vereiste meta-pakketten niet upgraden"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Een essentieel pakket zou verwijderd worden"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Kan de vereisten voor de upgrade niet berekenen"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Tijdens het berekenen van de upgrade ontstond er een onoplosbaar "
-#~ "probleem.\n"
-#~ "\n"
-#~ "Meld deze fout voor het pakket ‘update-manager’ in een foutrapportage en "
-#~ "voeg daarbij de bestanden die zich in /var/log/dist-upgrade/ bevinden."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Fout bij het bepalen van de echtheid van sommige pakketten"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Het was niet mogelijk om de echtheid van sommige pakketten vast te "
-#~ "stellen. Dit kan liggen aan een tijdelijk netwerkprobleem. U kunt het "
-#~ "later opnieuw proberen. Hieronder vindt u een lijst met pakketten waarvan "
-#~ "de echtheid niet vastgesteld is."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Kan '%s' niet installeren"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Het was niet mogelijk om een vereist pakket te installeren. Gelieve dit "
-#~ "als fout te rapporteren. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Kan het meta-pakket niet raden"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Uw systeem bevat geen van de volgende pakketten:\n"
-#~ "ubuntu-desktop, kubuntu-desktop of edubuntu-desktop, waardoor het niet "
-#~ "mogelijk is om uw versie van Ubuntu te bepalen.\n"
-#~ " Installeer eerst één van de bovenstaande pakketten met Synaptic of apt-"
-#~ "get voordat u verder gaat."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Toevoegen van de cd is mislukt"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "De upgrade is gestopt omdat de cd niet toegevoegd kon worden. Meld dit "
-#~ "als een fout als dit een goede Ubuntu-cd is.\n"
-#~ "\n"
-#~ "De foutmelding was:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "Tijdelijke opslag inlezen"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Bestanden van het netwerk ophalen voor de upgrade?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "De upgrade-procedure kan gebruik maken van een netwerkverbinding om de "
-#~ "laatste updates, en pakketten die niet op de huidige cd staan, op te "
-#~ "halen\n"
-#~ "Wanneer u een snelle internetverbinding heeft of uw toegang tot het "
-#~ "netwerk is goedkoop, kunt u hier het beste op ‘Ja’ klikken. Wanneer "
-#~ "netwerken duur is voor u kunt u beter ‘Nee’ kiezen."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Geen geldige mirror-server gevonden"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Bij het scannen van de informatie over uw pakketbronnen is geen mirror-"
-#~ "server voor de upgrade gevonden. Dat kan gebeuren wanneer u gebruik maakt "
-#~ "van een interne mirror-server of wanneer de informatie over de mirror-"
-#~ "server verouderd is.\n"
-#~ "\n"
-#~ "Wilt u uw bestand 'sources.list' toch herschrijven? Wanneer u 'Ja' kiest, "
-#~ "zal overal '%s' worden vervangen door '%s'.\n"
-#~ "Wanneer u 'Nee' kiest, zal de update worden geannuleerd."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "De standaard bronnenlijst aanmaken?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Bij het scannen van uw 'sources.list' is er geen geldige regel voor '%s' "
-#~ "gevonden.\n"
-#~ "\n"
-#~ "Moeten de standaardregels voor '%s' worden toegevoegd? Wanneer u 'Nee' "
-#~ "kiest, zal de update worden geannuleerd."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "De informatie over de pakketbronnen is ongeldig"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Het upgraden van de informatie over de pakketbronnen heeft het bestand "
-#~ "ongeldig gemaakt. Rapporteer dit als een fout."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Pakketbronnen van derden uitgeschakeld"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Enkele pakketbronnen van derden in uw sources.list zijn uitgeschakeld. U "
-#~ "kunt ze na de upgrade weer inschakelen met het programma ‘software-"
-#~ "eigenschappen’ of met ‘synaptic’."
-
-#~ msgid "Error during update"
-#~ msgstr "Fout tijdens het updaten"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Tijdens het updaten is er iets misgegaan. Dit komt meestal door "
-#~ "netwerkproblemen. Controleer uw netwerkverbinding en probeer opnieuw."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Niet genoeg vrije schijfruimte"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "De upgrade wordt nu afgebroken. Zorg er voor dat minstens %s op %s wordt "
-#~ "vrijgemaakt. Leeg uw prullenbak en verwijder de tijdelijke pakketten van "
-#~ "vorige installaties via 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Wilt u beginnen met de upgrade?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Kon de upgrades niet installeren"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "De upgrade wordt nu afgebroken. Uw systeem bevindt zich mogelijk in een "
-#~ "onbruikbare toestand. Er is een hersteloperatie uitgevoerd (dpkg --"
-#~ "configure -a).\n"
-#~ "\n"
-#~ "Rapporteer deze fout voor het pakket 'update-manager' en voeg hierbij de "
-#~ "bestanden die zich in /var/log/dist-upgrade/ bevinden."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Kon de upgrades niet downloaden"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "De upgrade wordt nu afgebroken. Controleer uw internetverbinding of het "
-#~ "installatiemedium en probeer opnieuw. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Ondersteuning voor bepaalde toepassingen is beëindigd."
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "De volgende pakketten worden niet meer door Canonical Ltd. ondersteund. U "
-#~ "kunt nog wel ondersteuning krijgen uit de gemeenschap.\n"
-#~ "\n"
-#~ "Indien u ‘door de gemeenschap onderhouden software’ (universe) niet "
-#~ "geactiveerd heeft zal bij de volgende stap gevraagd worden om deze "
-#~ "pakketten te verwijderen."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Overbodige pakketten verwijderen?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Deze stap overslaan"
-
-#~ msgid "_Remove"
-#~ msgstr "_Verwijderen"
-
-#~ msgid "Error during commit"
-#~ msgstr "Fout bij het toepassen"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Tijdens het opruimen deed zich een probleem voor. Zie onderstaand bericht "
-#~ "voor meer informatie. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "De oorspronkelijke toestand wordt hersteld"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "Backport van ‘%s’ ophalen"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Pakkettenbeheer controleren"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Voorbereiden van de upgrade is mislukt"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Het voorbereiden van het systeem voor de upgrade is mislukt.\r\n"
-#~ " \r\n"
-#~ "Meld deze fout voor het pakket ‘update-manager’ in een foutrapportage en "
-#~ "voeg daarbij de bestanden die zich in /var/log/dist-upgrade/ bevinden."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Updaten van de informatie over de pakketbronnen"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Ongeldige pakketinformatie"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Nu uw pakkettenlijst bijgewerkt is, kan het essentiële pakket ‘%s’ niet "
-#~ "meer gevonden worden.\n"
-#~ "Dit is een ernstige fout, die gemeld moet worden. Rapporteer deze fout "
-#~ "voor het pakket ‘update-manager’ en voeg daarbij de bestanden die zich "
-#~ "in /var/log/dist-upgrade/ bevinden."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Vragen om bevestiging"
-
-#~ msgid "Upgrading"
-#~ msgstr "Bezig met upgraden"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Zoeken naar overbodige software"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Systeemupgrade is voltooid."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Plaats '%s' in station '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Het downloaden is voltooid"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Downloaden van bestand %li uit %li met %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Ongeveer %s resterend"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Downloaden van bestand %li uit %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Wijzigingen worden doorgevoerd"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Kon '%s' niet installeren"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "De upgrade wordt nu afgesloten. Rapporteer deze fout voor het pakket "
-#~ "‘update-manager’ en voeg hierbij de bestanden die zich in /var/log/dist-"
-#~ "upgrade/ bevinden."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Het aangepaste configuratiebestand vervangen?\n"
-#~ "'%s'"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Wanneer u besluit dit configuratiebestand te vervangen door een nieuwere "
-#~ "versie zullen al uw gemaakte wijzigingen verloren gaan."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "De opdracht 'diff' is niet gevonden"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Er is een ernstige fout ontstaan"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Meld dit als een fout en voeg de bestanden /var/log/dist-upgrade/main.log "
-#~ "en /var/log/dist-upgrade/apt.log bij uw foutrapport. De upgrade zal nu "
-#~ "worden afgebroken.\n"
-#~ "Uw oorspronkelijke sources.list is opgeslagen in /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d pakket zal verwijderd worden."
-#~ msgstr[1] "%d pakketten zullen verwijderd worden."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d nieuw pakket zal geïnstalleerd worden."
-#~ msgstr[1] "%d nieuwe pakketten zullen geïnstalleerd worden."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d pakket zal een upgrade krijgen"
-#~ msgstr[1] "%d pakketten zullen een upgrade krijgen."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "U moet in totaal %s downloaden. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Het upgraden kan enkele uren in beslag nemen en kan tussentijds niet "
-#~ "worden afgebroken."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Sluit alle openstaande toepassingen en documenten om dataverlies te "
-#~ "voorkomen."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Uw systeem is up-to-date"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Er zijn geen upgrades beschikbaar voor uw systeem. De upgrade wordt nu "
-#~ "afgebroken."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>%s verwijderen</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "%s installeren"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "%s upgraden"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li dagen %li uur en %li minuten"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li uur en %li minuten"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minuten"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li seconden"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Deze download duurt ongeveer %s met een 1Mbit DSL-verbinding of %s met "
-#~ "een 56k modem"
-
-#~ msgid "Reboot required"
-#~ msgstr "De computer moet opnieuw opgestart worden"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Het upgraden is voltooid en herstarten is noodzakelijk. Wilt u dit nu "
-#~ "doen?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>De in gang gezette upgrade afbreken?</big></b>\n"
-#~ "\n"
-#~ "Het systeem is mogelijk onbruikbaar wanneer u de upgrade nu afbreekt. Het "
-#~ "wordt sterk aangeraden om de upgrade te hervatten."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Herstart het systeem om de upgrade te voltooien</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Upgrade starten?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Upgraden van Ubuntu naar versie 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Opruimen"
-
-#~ msgid "Details"
-#~ msgstr "Details"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Verschillen tussen de bestanden"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Downloaden en installeren van de upgrades"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Aanpassen van de softwarekanalen"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Upgrade voorbereiden"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Systeem herstarten"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminalvenster"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "Upgrade _annuleren"
-
-#~ msgid "_Continue"
-#~ msgstr "_Doorgaan"
-
-#~ msgid "_Keep"
-#~ msgstr "_Behouden"
-
-#~ msgid "_Replace"
-#~ msgstr "_Vervangen"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Fout rapporteren"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Nu herstarten"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Upgrade hervatten"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "Upgrade _starten"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Kon de versie-informatie niet vinden"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "De server is waarschijnlijk overbelast. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Kon de versie-informatie niet downloaden"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Controleer uw internetverbinding."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Kon het upgrade-programma niet uitvoeren"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Dit is waarschijnlijk een fout in het upgrade-programma. Rapporteer deze "
-#~ "fout."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Downloaden van het upgrade-programma"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Het upgrade-programma zal u door het upgrade-proces gidsen."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Upgrade-programma handtekening"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Upgrade-programma"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Ophalen is mislukt"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Het ophalen van de upgrade is mislukt. Er is mogelijk een "
-#~ "netwerkprobleem. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Uitpakken is mislukt"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Het uitpakken van de upgrade is mislukt. Er is mogelijk een probleem met "
-#~ "het netwerk of de server. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Verificatie is mislukt"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Het verifiëren van de upgrade is mislukt. Er is mogelijk een probleem met "
-#~ "het netwerk of de server. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Echtheidscontrole is mislukt"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "De echtheidscontrole van de upgrade is mislukt. Er is mogelijk een "
-#~ "probleem met het netwerk of de server. "
-
-#~ 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"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Downloaden van bestand %(current)li uit %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "Een overzicht van de wijzigingen is nog niet beschikbaar."
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Een overzicht van de wijzigingen is nog niet beschikbaar.\n"
-#~ "Probeer het later nog eens."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Kon de lijst met wijzigingen niet downloaden. \n"
-#~ "Controleer uw internetverbinding."
-
-#~ msgid "Backports"
-#~ msgstr "Backports"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Distributie-updates"
-
-#~ msgid "Other updates"
-#~ msgstr "Andere updates"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versie %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Een overzicht van de wijzigingen wordt gedownload..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "Alles _deselecteren"
-
-#~ msgid "_Check All"
-#~ msgstr "Alles _controleren"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Downloadgrootte: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "U kunt %s update installeren"
-#~ msgstr[1] "U kunt %s updates installeren"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Een ogenblik geduld, dit kan even duren."
-
-#~ msgid "Update is complete"
-#~ msgstr "De update is voltooid"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Zoeken naar beschikbare updates"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Van versie: %(old_version)s naar %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Versie %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Grootte: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Uw distributie wordt niet langer ondersteund"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "U zult niet langer veiligheidsupdates of kritieke updates krijgen.  Voer "
-#~ "een upgrade uit naar een nieuwere versie van Ubuntu Linux. Zie http://www."
-#~ "ubuntu.com voor meer informatie over upgraden."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>De nieuwe distributie-versie ‘%s’ is beschikbaar</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Software-index is beschadigd"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Het is nu niet mogelijk om software te installeren of te verwijderen. "
-#~ "Gebruik het pakkettenbeheerprogramma \"Synaptic\" of gebruik \"sudo apt-"
-#~ "get install -f\" in een terminalvenster om eerst dit probleem te "
-#~ "verhelpen."
-
-#~ msgid "None"
-#~ msgstr "Geen"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>U moet zelf controleren of er updates zijn</big></b>\n"
-#~ "\n"
-#~ "Uw systeem controleert niet automatisch of er updates zijn. U kunt dit "
-#~ "configureren in <i>Softwarebronnen</i> op het tabblad <i>Internet-"
-#~ "updates</i>."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Houd uw systeem up-to-date</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Niet alle updates kunnen geïnstalleerd worden</b></big>\r\n"
-#~ "↵\r\n"
-#~ "%s"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Update-beheer opstarten</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "Wijzigingen"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Wijzigingen en omschrijving van de update"
-
-#~ msgid "Chec_k"
-#~ msgstr "_Controleren"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Controleer de softwarekanalen op nieuwe updates"
-
-#~ msgid "Description"
-#~ msgstr "Omschrijving"
-
-#~ msgid "Release Notes"
-#~ msgstr "Versie-informatie"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Voer een upgrade van de distributie uit om zoveel mogelijk updates te "
-#~ "installeren. \n"
-#~ "\n"
-#~ "Dit kan voorkomen bij een onvoltooide upgrade, onofficiële "
-#~ "softwarepaketten of bij gebruik van een ontwikkelaarsversie."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Voortgang tonen van individuele pakketten"
-
-#~ msgid "Software Updates"
-#~ msgstr "Software-updates"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Software-updates repareren fouten, verhelpen veiligheidsproblemen en "
-#~ "leveren nieuwe mogelijkheden."
-
-#~ msgid "U_pgrade"
-#~ msgstr "U_pgraden"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Upgrade naar de nieuwste versie van Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Controleren"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Distributie-upgrade"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Deze informatie in het vervolg niet meer tonen"
-
-#~ msgid "_Install Updates"
-#~ msgstr "Up_dates installeren"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "U_pgraden"
-
-#~ msgid "changes"
-#~ msgstr "wijzigingen"
-
-#~ msgid "updates"
-#~ msgstr "updates"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Automatische updates</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>cd-rom/dvd</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Internet-updates</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Om Ubuntu nog verder te verbeteren kunt u meedoen met de zogenaamde "
-#~ "populariteitswedstrijd. Er wordt dan wekelijks een anonieme rapportage "
-#~ "naar Ubuntu verzonden met een overzicht van de geïnstalleerde software en "
-#~ "hoe vaak deze gebruikt wordt.\n"
-#~ "\n"
-#~ "De resultaten worden gebruikt om de ondersteuning voor populaire "
-#~ "programma's te verbeteren en voor het bepalen van de rangorde van de "
-#~ "resultaten bij het zoeken naar programma's.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Cd-rom toevoegen"
-
-#~ msgid "Authentication"
-#~ msgstr "Echtheidscontrole"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "Gedownloade softwarebestanden _verwijderen:"
-
-#~ msgid "Download from:"
-#~ msgstr "Downloaden van:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr ""
-#~ "Importeer de publieke sleutel van een vertrouwde softwareleverancier"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Internet-updates"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Alleen veiligheidsupdates van de officiële Ubuntu servers zullen "
-#~ "automatisch geïnstalleerd worden"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "_Standaarden herstellen"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Herstel de standaard sleutels van uw distributie"
-
-#~ msgid "Software Sources"
-#~ msgstr "Softwarebronnen"
-
-#~ msgid "Source code"
-#~ msgstr "Broncode"
-
-#~ msgid "Statistics"
-#~ msgstr "Statistieken"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Statistische informatie verzenden"
-
-#~ msgid "Third Party"
-#~ msgstr "Derden"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Automatisch controleren op aanwezigheid van updates:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "Up_dates wel automatisch downloaden, maar niet installeren"
-
-#~ msgid "_Import Key File"
-#~ msgstr "Sleutel i_mporteren"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Veiligheids-updates zonder te vragen installeren"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>De informatie over beschikbare software is verouderd</big></b>\n"
-#~ "\n"
-#~ "Om updates te installeren uit nieuwe of gewijzigde softwarebronnen moet u "
-#~ "de informatie over beschikbare software vernieuwen.\n"
-#~ "\n"
-#~ "U heeft een internetverbinding nodig om door te gaan."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Bijschrift:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Componenten:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distributie:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Voer de volledige APT-regel in van het software-warenhuis dat u "
-#~ "als bron wilt toevoegen</b></big>\n"
-#~ "\n"
-#~ "De APT-regel bevat het type, de locatie en de componenten van een "
-#~ "software-warenhuis, bijvoorbeeld: <i>\"deb http://ftp.debian.org sarge "
-#~ "main\"</i>."
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#~ msgid "APT line:"
-#~ msgstr "APT-regel:"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Downloaden van bestand %(current)li uit %(total)li"
 
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binair\n"
-#~ "Bron"
-
-#~ msgid "Edit Source"
-#~ msgstr "Bron bewerken"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "De cd-rom wordt geanalyseerd"
-
-#~ msgid "_Add Source"
-#~ msgstr "_Bron toevoegen"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Details"
 
-#~ msgid "_Reload"
-#~ msgstr "He_rladen"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Show and install available updates"
-#~ msgstr "Beschikbare updates tonen en installeren"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Update Manager"
-#~ msgstr "Update-manager"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Automatisch controleren of er een nieuwe versie van de huidige "
-#~ "distributie beschikbaar is en aanbieden om te upgraden (indien mogelijk)"
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Controleren op nieuwe distributieversies"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Indien automatisch controleren voor updates uitgeschakeld is, moet u de "
-#~ "kanalenlijst zelf herladen. Met deze optie kunt u er voor zorgen dat in "
-#~ "dat soort gevallen geen herinnering gegeven wordt."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Herinneren om de kanaallijst te herladen"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Details van een update tonen"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Onthoudt de grootte van het dialoogvenster van de update-manager"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Onthoudt de toestand van het vensterdeel dat de lijst met wijzigingen en "
-#~ "de omschrijvingen bevat."
-
-#~ msgid "The window size"
-#~ msgstr "De venstergrootte"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Softwarekanalen en internet-updates configureren"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Een overzicht van de wijzigingen is nog niet beschikbaar."
 
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
+#: ../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 ""
 
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" veiligheidsupdates"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Kon de lijst met wijzigingen niet downloaden. \n"
+"Controleer uw internetverbinding."
 
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Downloaden van bestand %li uit %li, snelheid onbekend"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "Up_dates installeren"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Cancel _Download"
-#~ msgstr "Download _annuleren"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Bepaalde software wordt niet meer officieel ondersteund"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Kon geen upgrades vinden"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Uw systeem heeft al een upgrade gekregen"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Bezig met upgraden naar Ubuntu "
-#~ "6.06 LTS</span>"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 veiligheidsupdates"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Kan '%s' niet installeren"
 
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Upgrade naar de nieuwste versie van Ubuntu"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Kan de beschikbare updates niet installeren"
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Uw system wordt gecontroleerd</b></big>\n"
-#~ "\n"
-#~ "Software-updates repareren fouten, verhelpen veiligheidsproblemen en "
-#~ "leveren nieuwe mogelijkheden."
+#: ../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 "Oficially supported"
-#~ msgstr "Officieel ondersteund"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Enkele updates vereisen dat andere softwarepaketten verwijderd worden. "
-#~ "Gebruik de functie \"Pakketten bijwerken\" van het "
-#~ "pakkettenbeheerprogramma \"Synaptic\" of gebruik: \"sudo apt-get dist-"
-#~ "upgrade\" in een terminalvenster om uw systeem compleet bij te werken met "
-#~ "de laatste updates."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "De volgende updates worden overgeslagen:"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Ongeveer %li seconden resterend"
-
-#~ msgid "Download is complete"
-#~ msgstr "Downloaden is voltooid"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "De upgrade wordt nu afgebroken. Rapporteer deze fout."
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Upgraden van Ubuntu"
+msgid "An essential package would be removed"
+msgstr "Een essentieel pakket zou verwijderd worden"
 
-#~ msgid "Hide details"
-#~ msgstr "Details verbergen"
-
-#~ msgid "Show details"
-#~ msgstr "Details tonen"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "Er kan maar één softwarebeheerprogramma tegelijk actief zijn"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Sluit eerst het andere programma, bijvoorbeeld 'aptitude' of Synaptic."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Kanalen</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Sleutels</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Installatiemedium"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Software-eigenschappen"
-
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Kanaal</b>"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Componenten</b>"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Add Channel"
-#~ msgstr "Kanaal toevoegen"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "Kanaal bewerken"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Kanaal toevoegen"
-#~ msgstr[1] "_Kanalen toevoegen"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "_Aangepast"
+#: ../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 ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr ""
-#~ "Ubuntu 6.06 LTS\r\n"
-#~ "Ubuntu 6.06 updates"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS veiligheidsupdates"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS updates"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS backports"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/nn.po b/po/nn.po
index 31cc6fa0..1da62fa0 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,51 +276,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 6.0 'Squeeze' "
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -303,179 +338,159 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Kvar dag"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Every two days"
-#~ msgstr "Annankvar dag"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Weekly"
-#~ msgstr "Kvar veke"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+#, fuzzy
+msgid "Details"
+msgstr "Kvar dag"
 
-#~ msgid "Every two weeks"
-#~ msgstr "Annankvar veke"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Every %s days"
-#~ msgstr "Kvar %s dag"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "After one week"
-#~ msgstr "Etter ei veke"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "After two weeks"
-#~ msgstr "Etter to veker"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "After one month"
-#~ msgstr "Etter ein månad"
+#: ../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 ""
 
-#~ msgid "After %s days"
-#~ msgstr "Etter %s dagar"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Import key"
-#~ msgstr "Importer nykel"
+#: ../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 "Error importing selected file"
-#~ msgstr "Feil under importering av vald fil"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Entan er ikkje den valde fila ein GPG-nykjel, eller så er den kanskje "
-#~ "skada."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Kunne ikkje fjerne nykjelen"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Nykjelen du valde kan ikkje fjernast. Ver venleg å rapportere denne "
-#~ "feilen."
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Oppgi eit namn for plata"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Sett inn ei plate i stasjonen:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Øydelagde pakkar"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Systemet ditt inneheld øydelagde pakkar som ikkje kunne reparerast med "
-#~ "denne programvaren. Reparer dei med synaptic eller apt-get før du held "
-#~ "fram."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Kan ikkje oppgradere naudsynte meta-pakkar"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Ein naudsynt pakke vil måtte fjernast"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Kunne ikkje forberede oppgraderinga"
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Kunne ikkje autentisere somme pakkar"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Somme pakkar kunne ikkje bli autentisert. Dette kan vere eit forbigåande "
-#~ "nettverksproblem, så du bør prøve att seinare. Sjå under lista over "
-#~ "pakkar som ikkje kunne autentiserast."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Kan ikkje installere '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Ein naudsynt pakke kunne ikkje installerast. Ver venleg og rapporter "
-#~ "denne feilen. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Kan ikkje gjette på meta-pakke"
-
-#~ msgid "Reading cache"
-#~ msgstr "Les mellomlager"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Fann ikkje noko gyldig spegl"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Ingen spegl for oppgraderinga vart funne unnder gjennomsøking av "
-#~ "arkivinformasjonen din. Dette kan skje om du køyrer eit internt spegl "
-#~ "eller om speglinformasjonen er utdatert.\n"
-#~ "\n"
-#~ "Vil du skrive om \"sources.list\"-fila di likevel? Om du veljer \"Ja\" "
-#~ "her vil det oppdatere alle forekomstar av '%s' til '%s'.\n"
-#~ "Om du veljer \"Nei\" vil oppgraderinga verte avbroten."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Vil du opprette standardkjelder?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Inga gyldig oppføring for \"%s\" vart funne under gjennomsøking av "
-#~ "\"sources.list\"-fila di.\n"
-#~ "\n"
-#~ "Vil du legge till standard oppføring for \"%s\"? Om du vel \"Nei\" vil "
-#~ "oppdateringa verte avbroten."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Ugyldig arkivinformasjon"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Oppgraderinga av arkivinformasjonen resulterte i ei ugyldig fil. "
-#~ "Rapporter dette som ein feil."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Tredjepartskjelder er deaktivert"
-
-#~ msgid "Error during update"
-#~ msgstr "Feil under oppdatering"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Eit problem oppsto under oppdateringa. Dette er vanlegvis ei form for "
-#~ "nettverksproblem. Sjekk nettverkskoblinga di og prøv igjen."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Ikkje nok ledig diskplass"
-
-#~ msgid "    "
-#~ msgstr "    "
+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 3c6eb447..2a8259e8 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -24,255 +24,286 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../data/templates/Ubuntu.info.in:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:135
+#, fuzzy
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:153
+#, fuzzy
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:197
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 5.10 Updates"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "Bidratt programvare"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Updates"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 5.04 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Installerer oppdateringer..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Installerer oppdateringer..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 #, fuzzy
 msgid "Officially supported"
 msgstr "Offisielt støttet"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Non-free (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD med Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Offisielt støttet"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Begrenset opphavsrett"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 Updates"
@@ -286,57 +317,69 @@ msgstr ""
 #. Description
 #: ../data/templates/Debian.info.in:8
 #, fuzzy
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../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
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Installerer oppdateringer..."
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 #, fuzzy
 msgid "Debian current stable release"
 msgstr "Debian Unstable «Sid»"
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian Testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian Non-US (Unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -344,679 +387,161 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Daily"
-#~ msgstr "<b>Detaljer</b>"
-
-#, fuzzy
-#~ msgid "%s updates"
-#~ msgstr "Installerer oppdateringer..."
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "Programvareoppdateringer"
-
-#, fuzzy
-#~ msgid "(Source Code)"
-#~ msgstr "Kilde"
-
-#, fuzzy
-#~ msgid "Source Code"
-#~ msgstr "Kilde"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Feil under importering av fil"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Feil under fjerning av nøkkel"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
-
-#, fuzzy
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
-
-#, fuzzy
-#~ msgid "Error during update"
-#~ msgstr "Feil under fjerning av nøkkel"
-
-#, fuzzy
-#~ msgid "Checking package manager"
-#~ msgstr "En annen pakkehåndterer kjører"
-
-#, fuzzy
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Laster ned endringer"
-
-#, fuzzy
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
-
-#, fuzzy
-#~ msgid "Asking for confirmation"
-#~ msgstr "Undersøker systemkonfigurasjon"
-
-#, fuzzy
-#~ msgid "Upgrading"
-#~ msgstr "Oppgradering fullført"
-
-#, fuzzy
-#~ msgid "Applying changes"
-#~ msgstr "Laster ned endringer..."
-
-#, fuzzy
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Systemet er helt oppdatert!"
-
-#, fuzzy
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Detaljer</b>"
-
-#, fuzzy
-#~ msgid "Install %s"
-#~ msgstr "_Installer"
-
-#, fuzzy
-#~ msgid "Upgrade %s"
-#~ msgstr "Oppgradering fullført"
-
-#, fuzzy
-#~ msgid "Details"
-#~ msgstr "<b>Detaljer</b>"
-
-#, fuzzy
-#~ msgid "_Replace"
-#~ msgstr "Oppdater"
-
-#, fuzzy
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
-
-#, fuzzy
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Laster ned endringer"
-
-#, fuzzy
-#~ msgid "Upgrade tool"
-#~ msgstr "Oppgradering fullført"
-
-#, fuzzy
-#~ msgid "Authentication failed"
-#~ msgstr "Autentisering"
-
-#, fuzzy
-#~ msgid "The list of changes is not available"
-#~ msgstr "Det er en ny versjon av Ubuntu tilgjengelig!"
-
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "Det er en ny versjon av Ubuntu tilgjengelig!"
-
-#, 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."
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "Installerer oppdateringer..."
-
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "Installerer oppdateringer..."
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versjon %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Laster ned endringer"
-
-#, fuzzy
-#~ msgid "Download size: %s"
-#~ msgstr "Laster ned endringer"
-
-#, fuzzy
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Installerer oppdateringer..."
-#~ msgstr[1] "Installerer oppdateringer..."
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "Installerer oppdateringer..."
-
-#, fuzzy
-#~ msgid "Version %s"
-#~ msgstr "Versjon %s: \n"
-
-#, fuzzy
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Din distribusjon er ikke lenger støttet"
-
-#~ msgid "Changes"
-#~ msgstr "Endringer"
-
-#~ msgid "Description"
-#~ msgstr "Beskrivelse"
-
-#~ msgid "Software Updates"
-#~ msgstr "Programvareoppdateringer"
-
-#, fuzzy
-#~ msgid "_Install Updates"
-#~ msgstr "Installerer oppdateringer..."
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "Oppgradering fullført"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "Endringer"
-
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Oppdateringer fra Internett</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Oppdateringer fra Internett</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Oppdateringer fra Internett</b>"
-
-#, fuzzy
-#~ msgid "Add Cdrom"
-#~ msgstr "Legg til _CD"
-
-#~ msgid "Authentication"
-#~ msgstr "Autentisering"
-
-#, fuzzy
-#~ msgid "Download from:"
-#~ msgstr "Laster ned endringer"
-
-#, fuzzy
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Fjern den valgte nøkkelen fra den sikre nøkkelringen."
-
-#, fuzzy
-#~ msgid "Internet Updates"
-#~ msgstr "<b>Oppdateringer fra Internett</b>"
-
-#, fuzzy
-#~ msgid "Restore _Defaults"
-#~ msgstr "Gjenopprettt forvalgte nøkler"
-
-#, fuzzy
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Gjenopprettt forvalgte nøkler"
-
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "Egenskaper for programvare"
-
-#, fuzzy
-#~ msgid "Source code"
-#~ msgstr "Kilde"
-
-#, fuzzy
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "Installerer oppdateringer..."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Kommentar:</b>"
-
-#, fuzzy
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Komponenter</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribusjon:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Skriv inn hele APT-linjen til arkivet du vil legge til</b> </"
-#~ "big>\n"
-#~ "\n"
-#~ "APT-linjen inneholder typen, adressen og innholdet til et arkiv, for "
-#~ "eksempel <i>«deb http://ftp.debian.org sarge main»</i>. Du kan finne en "
-#~ "detaljert beskrivelse av syntaksen i dokumentasjonen."
-
-#~ msgid "APT line:"
-#~ msgstr "APT-linje:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binær\n"
-#~ "Kilde"
-
-#, fuzzy
-#~ msgid "Edit Source"
-#~ msgstr "Kilde"
-
-#, fuzzy
-#~ msgid "_Add Source"
-#~ msgstr "Kilde"
-
-#, fuzzy
-#~ msgid "_Reload"
-#~ msgstr "Oppdater"
-
-#~ msgid "Update Manager"
-#~ msgstr "Oppdateringshåndterer"
-
-#, fuzzy
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian Stable Security Updates"
-
-#, fuzzy
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "US eksport begrenset programvare"
-
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "Installerer oppdateringer..."
-
-#, fuzzy
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Systemet har ødelagte pakker!"
-
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 Security Updates"
-
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "Offisielt støttet"
-
-#, fuzzy
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "De følgende pakkene er ikke oppgradert:"
-
-#, fuzzy
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr ""
-#~ "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
-
-#, fuzzy
-#~ msgid "Hide details"
-#~ msgstr "<b>Detaljer</b>"
-
-#, fuzzy
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Detaljer</b>"
-
-#, fuzzy
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Detaljer</b>"
-
-#, fuzzy
-#~ msgid "Installation Media"
-#~ msgstr "Installerer oppdateringer..."
-
-#~ msgid "Software Preferences"
-#~ msgstr "Brukervalg for programvare"
-
-#, fuzzy
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Detaljer</b>"
-
-#, fuzzy
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponenter</b>"
-
-#~ msgid "_Custom"
-#~ msgstr "_Tilpasset"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 5.10 Updates"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 5.04 Security Updates"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 5.10 Updates"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 5.10 Updates"
-
-#~ msgid "Repositories changed"
-#~ msgstr "Arkiv har blitt endret"
-
-#, fuzzy
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "Arkivinformasjonen har blitt endret. En sikkerhetskopi av «sources.list»-"
-#~ "filen er lagret i %s.save.\n"
-#~ "\n"
-#~ "Du må oppdatere pakkelisten fra tjenerene for at endringene skal tre i "
-#~ "kraft. Vil du gjøre det nå?"
-
-#, fuzzy
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Seksjoner:</b>"
-
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Oppdater pakkeinformasjonen fra tjeneren."
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Seksjoner:</b>"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Laster ned endringer</span>\n"
-#~ "\n"
-#~ "Må få endringene fra den sentrale tjeneren"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Vis tilgjengelige oppdateringer og velg hvilke som skal installeres"
+#: ../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 "Error fetching the packages"
-#~ msgstr "Feil under fjerning av nøkkel"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Rediger programvarekilder og instillinger"
+msgid "Details"
+msgstr "<b>Detaljer</b>"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Programvarekilder</b>"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Arkiv</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Midlertidige filer</b>"
+msgid "Starting..."
+msgstr "Instillinger"
 
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Brukergrensesnitt</b>"
-
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Autentiseringsnøkler</b></big>\n"
-#~ "\n"
-#~ "Du kan legge til eller fjerne autentiseringsnøkler i dette vinduet. "
-#~ "Nøkler gjør det mulig å kontrollere integriteten til programvare som blir "
-#~ "lastet ned. "
-
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Legg til en ny nøkkelfil til den sikre nøkkelringen. Vær sikker på at du "
-#~ "mottok nøkkelen over en sikker kanal og at du stoler på eieren."
-
-#, fuzzy
-#~ msgid "Add repository..."
-#~ msgstr "_Legg til arkiv"
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Se etter programvare_oppdateringer automatisk."
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Fjern _midlertidige pakkefiler automatisk."
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Intervaller for tømming i dager:"
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Slett _gamle pakker i pakkelageret."
-
-#~ msgid "Edit Repository..."
-#~ msgstr "Rediger arkiv..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Maksimum alder i dager:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Maksimum størrelse i MB:"
-
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr "Gjenoppret nøklene som kom med distri"
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Sett _maksimal størrelse på hurtiglageret"
-
-#~ msgid "Settings"
-#~ msgstr "Instillinger"
-
-#~ msgid "Show detailed package versions"
-#~ msgstr "Vis detaljert pakkeversjoner"
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "Vis deaktiverte programvarekilder"
-
-#~ msgid "Update interval in days: "
-#~ msgstr "Intervall for oppdatering i dager:"
-
-#~ msgid "_Add Repository"
-#~ msgstr "_Legg til arkiv"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Last ned oppgraderbare pakker"
-
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>Status:</b>"
-
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Tilgjengelige oppdateringer</b></big>\n"
-#~ "\n"
-#~ "De følgende pakkene kan oppgraderes. Du kan oppgradere dem ved å trykke "
-#~ "på «Installer»-knappen."
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "Avbryt nedlasting av endringslogg"
+#: ../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 "Debian sarge"
-#~ msgstr "Debian 3.1 «Sarge»"
+msgid "The list of changes is not available"
+msgstr "Det er en ny versjon av Ubuntu tilgjengelig!"
 
-#, fuzzy
-#~ msgid "Debian sid"
-#~ msgstr "Debian Testing"
+#: ../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 "Oficial Distribution"
-#~ msgstr "<b>Distribusjon:</b>"
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Du må være «root» for å kjøre dette programmet"
-
-#~ msgid "Binary"
-#~ msgstr "Binær"
-
-#~ msgid "Non-free software"
-#~ msgstr "Non-free programvare"
-
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian 3.0 «Woody»"
-
-#~ msgid "Debian Stable"
-#~ msgstr "Debian Stable"
-
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Debian Non-US (Stable)"
-
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian Non-US (Testing)"
-
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "Velg en nøkkelfil"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr "Feil under nedlasting av endringer. Sjekk tilkoblingen til internett."
 
-#, fuzzy
-#~ msgid "There is one package available for updating."
-#~ msgstr "Det er ingen tilgjengelige oppdateringer."
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "Det er ingen tilgjengelige oppdateringer."
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "There are no updated packages"
-#~ msgstr "Det er ingen utdaterte pakker"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "You did not select any of the %s updated package"
-#~ msgid_plural "You did not select any of the %s updated packages"
-#~ msgstr[0] "Du valgte ikke den %s oppdaterte pakken"
-#~ msgstr[1] "Du valgte ingen av de %s oppdaterte pakkene"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "You have selected %s updated package, size %s"
-#~ msgid_plural "You have selected all %s updated packages, total size %s"
-#~ msgstr[0] "Du har valgt %s oppdatert pakke, størrelse %s"
-#~ msgstr[1] "Du har valgt alle de %s oppdaterte pakkene, total størrelse %s"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
-#~ msgstr[0] "Du har valgt %s av %s oppdaterte pakker, størrelse %s "
-#~ msgstr[1] "Du har valgt %s av de %s oppdaterte pakkene, total størrelse %s"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "The updates are being applied."
-#~ msgstr "Oppdateringene blir tilført."
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Du kan bare kjøre et pakkehåndteringsprogram samtidig. Lukk det andre "
-#~ "programmet først."
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "_Installer"
 
-#~ msgid "Updating package list..."
-#~ msgstr "Oppdaterer pakkeliste..."
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "There are no updates available."
-#~ msgstr "Det er ingen tilgjengelige oppdateringer."
+#: ../apt/debfile.py:494
+msgid "An essential package would be removed"
+msgstr ""
 
-#~ msgid "New version:"
-#~ msgstr "Ny versjon:"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Oppgrader til en nyere versjon av Ubuntu Linux. Versjonen du kjører får "
-#~ "ikke sikkerhetsoppdateringer eller andre kritiske oppdateringer lenger. "
-#~ "Se http://www.ubuntulinux.org for informasjon om oppgradering."
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "En ny versjon med kodenavnet «%s» er tilgjengelig. Se http://www. "
-#~ "ubuntulinux.org/ for instruksjoner om oppgradering."
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Never show this message again"
-#~ msgstr "Ikke vis denne beskjeden igjen"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "Ingen endringer funnet, tjeneren er kanskje ikke oppdatert enda."
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "A_uthentication"
-#~ msgstr "A_utentisering"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "_Settings"
-#~ msgstr "_Instillinger"
+#: ../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 ""
 
-#~ msgid "Ubuntu Update Manager"
-#~ msgstr "Ubuntu oppdateringshåndterer"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid ""
-#~ "This means that some dependencies of the installed packages are not "
-#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
-#~ msgstr ""
-#~ "Dette betyr at det finnes avhengigheter til pakker som ikke er møtt. Bruk "
-#~ "«Synaptic» eller «apt-get» for å fikse problemet."
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "It is not possible to upgrade all packages."
-#~ msgstr "Det er ikke mulig å oppgradere alle pakkene."
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid ""
-#~ "This means that besides the actual upgrade of the packages some further "
-#~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
-#~ msgstr ""
-#~ "Dette betyr at ved siden av å oppgradere pakkene kreves det ekstra "
-#~ "handling (som å installere eller fjerne pakker). Bruk «Synaptic» eller «apt-"
-#~ "get dist-upgrade» for å løse problemet."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/oc.po b/po/oc.po
index a896af03..7a18ca33 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+0200\n"
 "PO-Revision-Date: 2006-10-18 10:01+0000\n"
 "Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannick.marchegay@lokanova."
 "com>\n"
@@ -25,240 +25,271 @@ 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:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, 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
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, 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
+#, 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 "CD-ROM que conten 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, 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:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Mesas a jorn de seguretat per Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD-ROM amb Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Mesas a jorn de seguretat per Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD-ROM amb Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "Pas liure (multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD-ROM que conten Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Pilòts pas liures"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Pas liure (multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 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:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Mesas a jorn de seguretat importantas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Autras mesas a jorn"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Mesas a jorn de seguretat importantas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD-ROM amb Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Mesas a jorn de seguretat per Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "Mesas a jorn per Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Mesas a jorn de seguretat per Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Pas liure (multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -270,55 +301,68 @@ 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:58
+#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 3.1 \"Sarge\""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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
 #, fuzzy
 msgid "Security updates"
 msgstr "Mesas a jorn de seguretat importantas"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (en tèst)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (instable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor per %s"
@@ -326,518 +370,158 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Servidors personalizats"
 
-#~ msgid "Daily"
-#~ msgstr "Cada jorn"
-
-#~ msgid "Every two days"
-#~ msgstr "Cada dos jorns"
-
-#~ msgid "Weekly"
-#~ msgstr "Cada setmana"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Cada dos setmanas"
-
-#~ msgid "Every %s days"
-#~ msgstr "Cada %s jorns"
-
-#~ msgid "After one week"
-#~ msgstr "Una setmana aprèp"
-
-#~ msgid "After two weeks"
-#~ msgstr "Doas setmanas aprèp"
-
-#~ msgid "After one month"
-#~ msgstr "Un mes aprèp"
-
-#~ msgid "After %s days"
-#~ msgstr "%s jorns aprèp"
-
-#~ msgid "%s updates"
-#~ msgstr "%s mesas a jorn"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Servidor mai prèp"
-
-#~ msgid "Active"
-#~ msgstr "Actiu"
-
-#~ msgid "Import key"
-#~ msgstr "Importar clau"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Error al moment d'importar lo fichièr seleccionat"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Lo fichièr seleccionat es benlèu pas una clau GPG o es possible que siá "
-#~ "corrumput."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Error al moment de suprimir la clau"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Avem pas poscut suprimir la clau qu'avètz seleccionada. Raportatz "
-#~ "l'anomalia."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Error a moment d'examinar lo CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Picatz un nom pel disc"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Metètz un disc dins lo legidor :"
-
-#~ msgid "Broken packages"
-#~ msgstr "Paquetatges corromputs"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Impossible de calcular la mesa a jorn"
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Impossible d'installar '%s'"
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Impossible d'apondre lo CD"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "I a agut una error al moment d'apondre lo CD, anam anullar la mesa a "
-#~ "jorn. Raportatz aquò coma una anomalia s'es un CD valid d'Ubuntu.\n"
-#~ "\n"
-#~ "Lo messatge d'error era :\n"
-#~ "'%s'"
-
-#~ msgid "Error during update"
-#~ msgstr "Error al moment de metre a jorn"
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Pas pro d'espaci liure"
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Volètz començar la mesa a jorn ?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Impossible d'installar las mesas a jorn"
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Impossible de descargar las mesas a jorn"
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Suprimir los paquetatges obsolets ?"
-
-#~ msgid "_Remove"
-#~ msgstr "_Suprimir"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Verificacion del gestionari de paquetatges"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Preparacion de la mesa a jorn impossibla"
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Demanda de confirmacion"
-
-#~ msgid "Upgrading"
-#~ msgstr "Mesa a jorn"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Recèrca de logicials obsolets"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "La mesa a jorn del sistèma es acabada."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Inserissètz lo disc '%s' dins lo legidor '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "La telecarga dels fichièrs es terminada"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Telecarga del fichièr %li sus %li a %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Environ %s restantas"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Telecarga del fichièr %li sus %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Aplicacion dels cambis"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Impossible d'installar '%s'"
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Remplaçar lo fichièr de configuracion personalisat\n"
-#~ "'%s' ?"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Impossible de trobar la comanda 'diff'"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "I a agut una error fatala"
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "Anam suprimir %d paquetatge."
-#~ msgstr[1] "Anam suprimir %d paquetatges."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "Anam installar %d paquetatge nòu."
-#~ msgstr[1] "Anam installar %d paquetatges nòus."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "Anam metre a jorn %d paquetatge."
-#~ msgstr[1] "Anam metre a jorn %d paquetatges."
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Debètz telecargar un total de %s. "
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Vòstre sistèma es a jorn"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Suprimir %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Installar %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Metre a jorn %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li jorns %li oras %li minutas"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li jorns %li oras"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minutas"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li segondas"
-
-#~ msgid "Reboot required"
-#~ msgstr "Debètz tornar aviar l'ordenador"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Tornatz aviar lo sistèma per terminar la mesa a jorn</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Aviar la mesa a jorn ?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Mesa a jorn d'Ubuntu cap a la version 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Netejatge"
-
-#~ msgid "Details"
-#~ msgstr "Detalhs"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Diferéncia entre los fichièrs"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Impossible d'installar las mesas a jorn"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Preparacion de la mesa a jorn"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Anullar la mesa a jorn"
-
-#~ msgid "_Continue"
-#~ msgstr "_Contunhar"
-
-#~ msgid "_Keep"
-#~ msgstr "_Conservar"
-
-#~ msgid "_Replace"
-#~ msgstr "_Remplaçar"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Raportar una anomalia"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Tornar aviar ara"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Contunhar la mesa a jorn"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Aviar la mesa a jorn"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Impossible de trobar las informacions de version"
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Impossible de telecargar las informacions de version"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Verificatz vòstra connection internet."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Impossible aviar l'esplech de mesa a jorn"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Telecarga del esplech de mesa a jorn"
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Signatura del esplech de mesa a jorn"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Esplech de mesa a jorn"
-
-#~ msgid "Failed to extract"
-#~ msgstr "Impossible de traire"
-
-#~ msgid "Verfication failed"
-#~ msgstr "La verificacion a pas capitat"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "La tièra de las modificacioons es pas disponibla"
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "Ubuntu 5.10 'Breezy Badger'"
-
-#~ msgid "Distribution updates"
-#~ msgstr "<b>Mesas a jorn de la distribucion</b>"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Version %s : \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Telecarga de la tièra de las modificacions"
-
-#~ msgid "_Check All"
-#~ msgstr "Tot _verificar"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Talha de la descarga : %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Podètz installar %s mesa a jorn"
-#~ msgstr[1] "Podètz installar %s mesas a jorn"
-
-#~ msgid "Update is complete"
-#~ msgstr "La mesa a jorn es terminada"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Verificacion de mesas a jorn"
-
-#~ msgid "Version %s"
-#~ msgstr "Version %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Talha : %s)"
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Una version nòva '%s' es disponibla</b>"
-
-#~ msgid "None"
-#~ msgstr "Pas cap"
-
-#~ msgid "1 KB"
-#~ msgstr "1 ko"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f ko"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f Mo"
-
-#, fuzzy
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>Impossible d'installar totas las mesas a jorn</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<big><b>Aviada del gestionari de paquetatges</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "Cambis"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Cambis e descripcion de la mesa a jorn"
-
-#~ msgid "Chec_k"
-#~ msgstr "_Verificar"
-
-#~ msgid "Description"
-#~ msgstr "Descripcion"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Mostrar la progression de cada fichièr"
-
-#~ msgid "Software Updates"
-#~ msgstr "Mesa a jorn dels logicials"
-
-#~ msgid "U_pgrade"
-#~ msgstr "_Metre a jorn"
-
-#~ msgid "_Check"
-#~ msgstr "_Verificar"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "Mesa a jorn de la _distribucion"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Amagar aquestas informacions a partir d'ara"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Installar las mesas a jorn"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "_Metre a jorn"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "cambis"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "updates"
-#~ msgstr "mesas a jorn"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Mesas a jorn automaticas</b>"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detalhs"
 
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CD-ROM/DVD</b>"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Mesas a jorn per internet</b>"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Add Cdrom"
-#~ msgstr "Apondre un CD-ROM"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "La tièra de las modificacioons es pas disponibla"
 
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "Suprimir los fichièrs dels logicials t_elecargats :"
+#: ../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 "Download from:"
-#~ msgstr "Talha de la descarga : %s"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Mesas a jorn per internet"
-
-#~ msgid "Statistics"
-#~ msgstr "Estadisticas"
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comentari :</b>"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr "Verificatz vòstra connection internet."
 
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Components :</b>"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribucion :</b>"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipe :</b>"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI :</b>"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "APT line:"
-#~ msgstr "Linha APT :"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Examèn del CD-ROM"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "_Reload"
-#~ msgstr "_Tornar cargar"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Show and install available updates"
-#~ msgstr "Mostrar e installar las mesas a jorn disponiblas"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Impossible d'installar '%s'"
 
-#~ msgid "Update Manager"
-#~ msgstr "Gestionari de mesas a jorn"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "Show details of an update"
-#~ msgstr "Mostrar los detalhs d'una mesa a jorn"
+#: ../apt/debfile.py:494
+msgid "An essential package would be removed"
+msgstr ""
 
-#~ msgid "The window size"
-#~ msgstr "La talha de la fenèstra"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Mesas a jorn de securitat per Debian 3.1 \"Sarge\""
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "<b>Mesas a jorn per internet</b>"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Metre a jorn Ubuntu"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Claus</b>"
+#: ../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 ""
 
-#~ msgid "     "
-#~ msgstr "     "
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Components</b>"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "_Personalisar"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 8b4cbadc..fc645ce8 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,225 +24,250 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 #, fuzzy
 msgid "Important security updates"
 msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -254,53 +279,63 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../data/templates/Debian.info.in:83
 msgid "Debian 3.1 'Sarge'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:42
+#: ../data/templates/Debian.info.in:94
 #, fuzzy
 msgid "Proposed updates"
 msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -308,193 +343,158 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Daily"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
-
-#, fuzzy
-#~ msgid "%s updates"
-#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
-
-#, fuzzy
-#~ msgid "Upgrading"
-#~ msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#, fuzzy
-#~ msgid "Details"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
-
-#, fuzzy
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
-
-#, fuzzy
-#~ msgid "_Resume Upgrade"
-#~ msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
-
-#, fuzzy
-#~ msgid "_Start Upgrade"
-#~ msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
-
-#, fuzzy
-#~ msgid "Upgrade tool"
-#~ msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
-
-#, fuzzy
-#~ msgid "Authentication failed"
-#~ msgstr "ਪ੍ਰਮਾਣਿਕਤਾ"
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
-
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#, fuzzy
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#~ msgstr[1] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#, fuzzy
-#~ msgid "Software Updates"
-#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
-
-#, fuzzy
-#~ msgid "U_pgrade"
-#~ msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Distribution Upgrade"
-#~ 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 "_Install Updates"
-#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+msgid "Details"
+msgstr "<b>ਵੇਰਵਾ</b>"
 
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Add Cdrom"
-#~ msgstr "_CD ਸ਼ਾਮਲ"
+#: ../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 ""
 
-#~ msgid "Authentication"
-#~ msgstr "ਪ੍ਰਮਾਣਿਕਤਾ"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Internet Updates"
-#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "ਸਾਫਟਵੇਅਰ ਪਸੰਦ"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Show details of an update"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
+#: ../apt/debfile.py:376
+#, python-format
+msgid "Cannot install '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
+#: ../apt/debfile.py:494
+msgid "An essential package would be removed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Hide details"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Show details"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#, fuzzy
-#~ msgid "Installation Media"
-#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Software Preferences"
-#~ msgstr "ਸਾਫਟਵੇਅਰ ਪਸੰਦ"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "     "
-#~ 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 ""
 
-#, fuzzy
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>ਵੇਰਵਾ</b>"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 9acc28a9..d57ebc98 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager cvs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -24,236 +24,267 @@ 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: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 "CD-ROM z 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 "CD-ROM z 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 "CD-ROM z 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD-ROM z Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD-ROM z Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD-ROM z Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Pod opieką społeczeństwa"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Własnościowe sterowniki dla urządzeń"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Ograniczone oprogramowanie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CD-ROM z Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Oprogramowanie Open Source wspierane przez firmę Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Obsługiwane przez społeczność (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Oprogramowanie Open Source pod opieką społeczeństwa"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Sterowniki nie-wolnodostępne"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Własnościowe sterowniki dla urządzeń "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Własnościowe sterowniki dla urządzeń"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Oprogramowanie nie-wolnodostępne (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 "Oprogramowanie ograniczone prawami autorskimi lub problemami natury prawnej"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 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:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Ważne aktualizacje bezpieczeństwa"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Aktualizacje polecane"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Aktualizacje proponowane"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Aktualizacje backportowane"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD-ROM z Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Aktualizacje dla Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD-ROM z Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Wspierane oficjalnie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Aktualizacje dla Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Aktualizacje dla Ubuntu 5.04 (backporty)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu·4.10·\"Warty·Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Utrzymywane przez społeczność (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Nie-wolnodostępne (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Już nieobsługiwane"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "O ograniczonych prawach kopiowania"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Aktualizacje dla Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Aktualizacje dla Ubuntu 4.10 (backporty)"
 
@@ -265,55 +296,68 @@ 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 "Aktualizacje proponowane"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Ważne aktualizacje bezpieczeństwa"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (wersja testowa)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (wersja unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 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:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Oprogramowanie niekompatybilne z DFSG."
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Serwer dla kraju %s"
@@ -321,1743 +365,161 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Serwer główny"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Inne serwery"
 
-#~ msgid "Daily"
-#~ msgstr "Codziennie"
-
-#~ msgid "Every two days"
-#~ msgstr "Co dwa dni"
-
-#~ msgid "Weekly"
-#~ msgstr "Co tydzień"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Co dwa tygodnie"
-
-#~ msgid "Every %s days"
-#~ msgstr "Co %s dni"
-
-#~ msgid "After one week"
-#~ msgstr "Po tygodniu"
-
-#~ msgid "After two weeks"
-#~ msgstr "Po dwóch tygodniach"
-
-#~ msgid "After one month"
-#~ msgstr "Po miesiącu"
-
-#~ msgid "After %s days"
-#~ msgstr "Po %s dniach"
-
-#~ msgid "%s updates"
-#~ msgstr "%s aktualizacji"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Najbliższy serwer"
-
-#~ msgid "Software Channel"
-#~ msgstr "Kanał oprogramowania"
-
-#~ msgid "Active"
-#~ msgstr "Aktywna"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(kod źródłowy)"
-
-#~ msgid "Source Code"
-#~ msgstr "Kod źródłowy"
-
-#~ msgid "Import key"
-#~ msgstr "Zaimportuj klucz"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Błąd podczas importowania wybranego pliku"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Wybrany plik może nie być kluczem GPG lub może być uszkodzony."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Błąd podczas usuwania klucza"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Wystąpił błąd podczas skanowania płyty CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Proszę podać nazwę dla płyty"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Proszę włożyć płytę do napędu:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Uszkodzone pakiety"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "System zawiera błędne pakiety które nie mogły zostać naprawione. Przed "
-#~ "kontynuowaniem należy je naprawić używając Synaptic Menedżer Pakietów lub "
-#~ "apt-get."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Nie można zaktualizować wymaganych meta-pakietów"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Niezbędny pakiet musiałby zostać usunięty"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Nie można przetworzyć aktualizacji"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Wystąpił nierozwiązywalny problem podczas przetwarzania aktualizacji.\n"
-#~ "\n"
-#~ "Prosimy zgłosić błąd pakietu \"update-manager\" dołączając w zgłoszeniu "
-#~ "pliki z folderu /var/log/dist-upgrade/ ."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Błąd podczas uwierzytelniania niektórych pakietów"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Nie można było uwierzytelnić niektórych pakietów. Może to być chwilowy "
-#~ "błąd sieci. Można spróbować ponownie później. Poniżej znajduje się lista "
-#~ "nieuwierzytelnionych pakietów."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Nie można zainstalować \"%s\""
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Nie można odnaleźć żadnego z wymaganych meta-pakietów"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Twój system nie zawiera pakietu ubuntu-desktop, kubuntu-desktop lub "
-#~ "edubuntu-desktop, więc nie można określić, która wersja Ubuntu jest "
-#~ "uruchomiona.\n"
-#~ " Zainstaluj najpierw jeden z wymienionych pakietów używając programu "
-#~ "synaptic lub apt-get."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Nie można dodać płyty CD"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Wystąpił błąd podczas dodawania płyty CD, aktualizacja systemu zostanie "
-#~ "przerwana. Prosimy o wysłanie raport błędu jeśli jest to oficjalna płyta "
-#~ "Ubuntu.\n"
-#~ "\n"
-#~ "Treść błędu jest następująca:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "Odczytywanie bufora podręcznego"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Pobrać dane z sieci dla aktualizacji?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "Aktualizacja może użyć sieci aby sprawdzić obecność najnowszych "
-#~ "aktualizacji i pobrać pakiety któe nie znajdują się na aktualnej płycie "
-#~ "CD.\n"
-#~ "Jeśli posiadasz szybkie lub tanie łącze, powinieneś odpowiedzieć tutaj "
-#~ "'Tak'. W innym przypadku wybierz 'Nie'."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Nie odnaleziono poprawnego serwera lustrzanego"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Podczas skanowania informacji o repozytoriach nie wykryto serwera "
-#~ "lustrzanego dla aktualizacji. To może się zdarzyć, jeśli używasz "
-#~ "wewnętrzny serwer lustrzany lub informacje o serwerze są nieaktualne.\n"
-#~ "\n"
-#~ "Czy chcesz przepisać plik \"sources.list\" mimo tego? Jeśli wybierzesz "
-#~ "\"Tak\" wpisy \"%s\" do \"%s\" zostaną zaktualizowane.\n"
-#~ "Jeśli wybierzesz \"Nie\" aktualizacja zostanie anulowana."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Wygenerować domyślne źródła?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Po zeskanowaniu \"sources.list\" nie odnaleziono poprawnego wpisu dla \"%s"
-#~ "\".\n"
-#~ "\n"
-#~ "Czy mam dodać domyślne wpisy dla \"%s\"? Jeśli wybierzesz \"Nie\" "
-#~ "aktualizacja zostanie anulowana."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Błędne informacje o repozytoriach"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "W wyniku aktualizacji informacji o repozytoriach powstał błędny plik. "
-#~ "Proszę zgłosić ten błąd."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Źródła niezależnych dostawców zostały wyłączone"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Niektóre kanały niezależnych dostawców w pliku sources.list zostały "
-#~ "wyłączone. Możesz ponownie je włączyć po aktualizacji używając narzędzia "
-#~ "\"software-properties\" lub programu Synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Błąd podczas aktualizacji"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Wystąpił problem podczas aktualizacji. Zazwyczaj wynika on z problemów z "
-#~ "siecią, proszę sprawdzić połączenie sieciowe i spróbować ponownie."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Zbyt mało miejsca na dysku"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Aktualizacja zostanie zatrzymana. Proszę zwolnić co najmniej %s miejsca "
-#~ "na %s. Opróżnij kosz i usuń tymczasowe pakiety z poprzednich instalacji "
-#~ "używając \"sudo apt-get clean\"."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Czy chcesz rozpocząć aktualizację?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Instalacja aktualizacji zakończyła się niepowodzeniem."
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Aktualizacja została przerwana. Twój system może być teraz w stanie nie "
-#~ "nadającym się do użytku. Uruchomiono odzyskiwanie (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Prosimy zgłosić błąd pakietu \"update-manager\" dołączając w zgłoszeniu "
-#~ "pliki z folderu /var/log/dist-upgrade/ ."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Pobranie aktualizacji było niemożliwe"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Aktualizacja została przerwana. Proszę sprawdzić połączenie sieciowe oraz "
-#~ "dysk instalacyjny i spróbować ponownie. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Wsparcie dla niektórych aplikacji zostało zakończone"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Canonical Ltd. nie zapewnia już wsparcia dla tych pakietów. Nadal możesz "
-#~ "uzyskać wsparcie od społeczności Ubuntu.\n"
-#~ "\n"
-#~ "Jeśli nie włączyłeś repozytoriów utrzymywanych przez społeczność "
-#~ "(universe), zostanie zasugerowane ich usunięcie w następnym kroku."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Usunąć niepotrzebne pakiety?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Pomiń ten krok"
-
-#~ msgid "_Remove"
-#~ msgstr "_Usuń"
-
-#~ msgid "Error during commit"
-#~ msgstr "Błąd podczas zatwierdzania"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Wystąpił problem podczas oczyszczania. Więcej informacji znajduje się w "
-#~ "poniższych wiadomościach. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Przywracanie pierwotnego stanu systemu"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "Pobieranie backportu \"%s\""
-
-#~ msgid "Checking package manager"
-#~ msgstr "Sprawdzanie menedżera pakietów"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Przygotowanie aktualizacji nie powiodło się"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Przygotowanie systemu do aktualizacji nie powiodło się. Proszę zgłosić to "
-#~ "jako błąd pakietu \"update-manager\" i dołączyć do raportu pliki z /var/"
-#~ "log/dist-upgrade ."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Aktualizowanie informacji o repozytoriach"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Błędne informacje o pakietach"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Po aktualizacji informacji o pakietach niezbędny pakiet \"%s\" nie może "
-#~ "zostać odnaleziony.\n"
-#~ "To wskazuje na poważny problem, proszę zgłosić błąd pakietu \"update-"
-#~ "manager\" i dołączyć pliki zawarte w /var/log/dist-upgrade/ w raporcie."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Pytanie o potwierdzenie"
-
-#~ msgid "Upgrading"
-#~ msgstr "Aktualizacja w toku"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Wyszukiwanie zdezaktualizowanego oprogramowania"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Aktualizacja systemu zakończona powodzeniem."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Proszę włożyć \"%s\" do napędu \"%s\""
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Pobieranie zakończone"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Pozostało około %s"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Pobieranie pliku %li z %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Zatwierdzanie zmian"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Nie można było zainstalować \"%s\""
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "Aktualizacja zostaje przerwana. Prosimy o wysłanie raportu o błędzie "
-#~ "pakietu 'update-manager' dołączając pliki w /var/log/dist-upgrade/."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Zastąpić własny plik konfiguracji\n"
-#~ "\"%s\"?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Utracisz wszystkie wprowadzone zmiany do tego pliku konfiguracyjnego, "
-#~ "jeśli wybierzesz jego zamianę na nowszą wersję."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Polecenie \"diff\" nie zostało odnalezione"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Wystąpił błąd krytyczny"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Prosimy o wysłanie raportu o tym błędzie i dołączeniu plików /var/log/"
-#~ "dist-upgrade/main.log i /var/log/dist-upgrade/apt.log w swoim raporcie. "
-#~ "Aktualizacja zostaje przerwana.\n"
-#~ "Pierwotny plik sources.list został zapisany w /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d pakiet zostanie usunięty."
-#~ msgstr[1] "%d pakiety zostaną usunięte."
-#~ msgstr[2] "%d pakietów zostanie usuniętych."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d nowy pakiet zostanie zainstalowany."
-#~ msgstr[1] "%d nowe pakiety zostaną zainstalowane."
-#~ msgstr[2] "%d nowych pakietów zostanie zainstalowanych."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d pakiet zostanie zaktualizowany."
-#~ msgstr[1] "%d pakiety zostaną zaktualizowane."
-#~ msgstr[2] "%d pakietów zostanie zaktualizowanych."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Musisz pobrać w sumie %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Pobieranie i instalacja aktualizacji może potrwać kilka godzin i nie może "
-#~ "zostać przerwana."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Aby zapobiec utracie danych proszę zamknąć wszystkie otwarte aplikacje i "
-#~ "dokumenty."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Twój system jest w pełni zaktualizowany"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr "Brak dostępnych aktualizacji. Aktualizacja zostanie anulowana."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Usuń %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Instaluj %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Aktualizuj %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li dni %li godzin %li minut"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li godzin %li minut"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minut"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li sekund"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Pobieranie może trwać około %s przy łączu 1 Mbit i około %s przy łączu "
-#~ "56kbit."
-
-#~ msgid "Reboot required"
-#~ msgstr "Wymagane ponowne uruchomienie komputera"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Aktualizacja została ukończona i należy ponownie uruchomić komputer. "
-#~ "Uruchomić ponownie teraz?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Przerwać trwającą aktualizację?</big></b>\n"
-#~ "\n"
-#~ "System może stać się niezdatny do użytku jeśli aktualizacja zostanie "
-#~ "przerwana. Zalecane jest kontynuowanie aktualizacji."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Uruchom ponownie komputer w celu zakończenia aktualizacji</big></"
-#~ "b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Rozpocząć aktualizację?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Aktualizacja Ubuntu do wersji 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Sprzątanie"
-
-#~ msgid "Details"
-#~ msgstr "Szczegóły"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Różnice pomiędzy plikami"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Pobieranie i instalowanie aktualizacji"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Modyfikowanie kanałów aktualizacji"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Przygotowywanie aktualizacji"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Ponowne uruchamianie systemu"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Przerwij aktualizację"
-
-#~ msgid "_Continue"
-#~ msgstr "K_ontynuuj"
-
-#~ msgid "_Keep"
-#~ msgstr "_Zachowaj"
-
-#~ msgid "_Replace"
-#~ msgstr "Zas_tąp"
-
-#~ msgid "_Report Bug"
-#~ msgstr "Zgłoś _błąd"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Uruchom ponownie"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Wznów aktualizację"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Rozpocznij aktualizację"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Nie można było odnaleźć informacji o wydaniu"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Serwer może być przeciążony. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Pobranie informacji o wydaniu było niemożliwe"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Proszę sprawdzić swoje połączenie internetowe."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Nie można było uruchomić narzędzia aktualizacji"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "To najprawdopodobniej błąd w narzędziu aktualizacji. Proszę zgłosić to "
-#~ "jako błąd."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Pobieranie narzędzia aktualizacji"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Narzędzie aktualizacji przeprowadzi cię przez proces aktualizacji."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Podpis narzędzia aktualizacji"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Narzędzie aktualizacji"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Pobranie nie powiodło się"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Pobranie aktualizacji nie powiodło się. To może być problem sieciowy. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Wyodrębnienie nie powiodło się"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Wyodrębnienie aktualizacji nie powiodło się. To może być problem sieciowy "
-#~ "lub z serwerem. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Weryfikacja nie powiodła się"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Weryfikacja aktualizacji nie powiodła się. Mógł wystąpić problem z siecią "
-#~ "lub z serwerem. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Uwierzytelnienie nie powiodło się"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Uwierzytelnienie aktualizacji nie powiodło się. To może być problem "
-#~ "sieciowy lub z serwerem. "
-
-#~ 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"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Pobieranie pliku %(current)li z %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "Lista zmian nie jest dostępna."
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Lista zmian nie jest dostępna.\n"
-#~ "Proszę spróbować później."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Nie udało się pobrać listy zmian. \n"
-#~ "Proszę sprawdzić swoje połączenie intenetowe."
-
-#~ msgid "Backports"
-#~ msgstr "Backporty"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Aktualizacje dystrybucji"
-
-#~ msgid "Other updates"
-#~ msgstr "Inne aktualizacje"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Wersja %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Pobieranie listy zmian..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "Odznacz wszystkie"
-
-#~ msgid "_Check All"
-#~ msgstr "Zaznacz wszystkie"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Rozmiar do pobrania: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Ilość dostępnych aktualizacji: %s"
-#~ msgstr[1] "Ilość dostępnych aktualizacji: %s"
-#~ msgstr[2] "Ilość dostępnych aktualizacji: %s"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Proszę czekać, to może chwilę potrwać."
-
-#~ msgid "Update is complete"
-#~ msgstr "Aktualizacja została ukończona."
-
-#~ msgid "Checking for updates"
-#~ msgstr "Sprawdzanie dostępności aktualizacji"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Z wersji %(old_version)s do %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Wersja %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Rozmiar: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Twoja dystrybucja nie jest już wspierana"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Nie będziesz otrzymywać dalszych poprawek błędów bezpieczeństwa ani "
-#~ "krytycznych aktualizacji. Zaktualizuj do nowszej wersji Ubuntu Linux. "
-#~ "Odwiedź http://www.ubuntu.com po więcej informacji."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Nowe wydanie dystrybucji \"%s\" jest dostępne</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Spis oprogramowania jest uszkodzony"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Nie ma możliwości instalacji lub usunięcia jakiegokolwiek oprogramowania. "
-#~ "Proszę użyć \"Synaptic Menedżer Pakietów\" lub wydać polecenie \"sudo apt-"
-#~ "get install -f\" w terminalu, aby naprawić ten problem."
-
-#~ msgid "None"
-#~ msgstr "Brak"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Musisz sprawdzić dostępność aktualizacji ręcznie</b></big>\n"
-#~ "\n"
-#~ "Aktualizacja automatyczna nie jest włączona. Możesz ustawić tę funkcję w "
-#~ "<i>Źródła oprogramowania</i> w zakładce <i>Aktualizacje internetowe</i>"
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Utrzymuj system w pełni zaktualizowany</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Nie wszystkie aktualizacje mogą zostać zainstalowane</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<big><b>Uruchamianie menedżera aktualizacji</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "Zmiany"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Zmiany i opis aktualizacji"
-
-#~ msgid "Chec_k"
-#~ msgstr "Sp_rawdź"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Sprawdź kanały oprogramowania w poszukiwaniu nowych aktualizacji"
-
-#~ msgid "Description"
-#~ msgstr "Opis"
-
-#~ msgid "Release Notes"
-#~ msgstr "Informacje o wydaniu"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Uruchom aktualizację dystrybucji, aby zainstalować jak najwięcej "
-#~ "aktualizacji. \n"
-#~ "\n"
-#~ "Może to być spowodowane niekompletną aktualizacją, nieoficjalnymi "
-#~ "pakietami oprogramowania lub używaniem wersji rozwojowej."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Wyświetl postęp pobierania poszczególnych plików"
-
-#~ msgid "Software Updates"
-#~ msgstr "Aktualizacje oprogramowania"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe "
-#~ "punkty bezpieczeństwa i dostarczyć nowe funkcje."
-
-#~ msgid "U_pgrade"
-#~ msgstr "_Aktualizuj"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Zaktualizuj do najnowszej wersji Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "Sp_rawdź"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "Aktualizacja _dystrybucji"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Ukryj tę informację w przyszłości"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Instaluj aktualizacje"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "_Uaktualnij"
-
-#~ msgid "changes"
-#~ msgstr "zmiany"
-
-#~ msgid "updates"
-#~ msgstr "aktualizacje"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Aktualizacje automatyczne</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Aktualizacje internetowe</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Aby polepszyć doświadczenia użytkowników z Ubuntu proszę wziąć udział "
-#~ "w konkursie popularności. Jeśli zostanie na to wyrażona zgoda, lista "
-#~ "zainstalowanego oprogramowania i częstotliwość jego użytkowania będzie co "
-#~ "tydzień anonimowo wysyłana do projektu Ubuntu.\n"
-#~ "\n"
-#~ "Wyniki zostaną użyte do polepszenia obsługi popularnych aplikacji i "
-#~ "dorankingu aplikacji w wynikach wyszukiwania."
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Dodaj CD-ROM"
-
-#~ msgid "Authentication"
-#~ msgstr "Uwierzytelnianie"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "_Usuń pobrane pliki oprogramowania:"
-
-#~ msgid "Download from:"
-#~ msgstr "Pobieranie z:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Zaimportuj publiczny klucz od zaufanego dostawcy oprogramowania"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Aktualizacje internetowe"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Aktualizacje zabezpieczeń zostaną zainstalowane automatycznie wyłącznie z "
-#~ "oficjalnych serwerów Ubuntu"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Przywróć _domyślne klucze"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Przywróć domyślne klucze dystrybucji"
-
-#~ msgid "Software Sources"
-#~ msgstr "Źródła oprogramowania"
-
-#~ msgid "Source code"
-#~ msgstr "Kod źródłowy"
-
-#~ msgid "Statistics"
-#~ msgstr "Statystyki"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Wysyłanie informacji statystycznych"
-
-#~ msgid "Third Party"
-#~ msgstr "Kanały osób trzecich"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Sprawdzaj dostępność aktualizacji automatycznie:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Pobieraj aktualizacje automatycznie, ale ich nie instaluj"
-
-#~ msgid "_Import Key File"
-#~ msgstr "Za_importuj klucz"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Instaluj aktualizacje bezpieczeństwa bez potwierdzania"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Informacje o dostępnym oprogramowaniu są nieaktualne</big></b>\n"
-#~ "\n"
-#~ "Aby zainstalować oprogramowanie i aktualizacje z nowych lub zmienionych "
-#~ "źródeł należy ponownie wczytać informacje o oprogramowaniu.\n"
-#~ "\n"
-#~ "Aby kontynuować konieczne jest połączenie internetowe."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Komentarz:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Komponenty:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Dystrybucja:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Typ:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Podaj pełny wiersz APT repozytorium, które chcesz dodać jako "
-#~ "źródło<b></big>\n"
-#~ "\n"
-#~ "Wiersz APT zawiera typ, lokalizację i komponenty repozytorium, "
-#~ "przykładowo <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "Wiersz APT:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binarne\n"
-#~ "Źródłowe"
-
-#~ msgid "Edit Source"
-#~ msgstr "Modyfikuj źródło"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Przeszukiwanie CD-ROMu"
-
-#~ msgid "_Add Source"
-#~ msgstr "Dod_aj źródło"
-
-#~ msgid "_Reload"
-#~ msgstr "_Wczytaj ponownie"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Wyświetl i zainstaluj dostępne aktualizacje"
-
-#~ msgid "Update Manager"
-#~ msgstr "Menadżer aktualizacji"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Automatycznie sprawdzaj, czy jest dostępna nowa wersja bieżącej "
-#~ "dystrybucji i daj możliwość aktualizacji (jeśli to możliwe)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Sprawdzaj nowe wydania dystrybucji"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Jeśli automatycznie sprawdzanie dostępności aktualizacji jest wyłączone, "
-#~ "należy wczytywać listę kanałów ręcznie. Ta opcja pozwala na ukrycie "
-#~ "przypominania o tym fakcie."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Przypomnij o wczytaniu listy kanałów"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Wyświetl szczegóły poszczególnych aktualizacji"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Zapamiętuje rozmiar okna Menedżera aktualizacji"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Zapamiętuje położenie wysuwalnego obszaru zawierającego listę zmian i opis"
-
-#~ msgid "The window size"
-#~ msgstr "Rozmiar okna"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Konfiguruj źródła pakietów oprogramowania i aktualizacji"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Aktualizacje bezpieczeństwa dla Debiana 3.1 \"Sarge\""
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid ""
-#~ "<big><b>Error scaning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Błąd podczas przeszukiwania płyty CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "A unresolvable problem occured while calculating the upgrade. Please "
-#~ "report this as a bug. "
-#~ msgstr ""
-#~ "Wystąpił nierozwiązywalny problem podczas przetwarzania aktualizacji. "
-#~ "Proszę zgłosić to jako błąd. "
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are runing.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "System nie zawiera żadnego z pakietów: ubuntu-desktop, kubuntu-desktop "
-#~ "lub edubuntu-desktop. Nie jest możliwe określenie używanej wersji "
-#~ "Ubuntu.\n"
-#~ " Przed kontynuowaniem proszę zainstalować jeden z powyższych pakietów."
-
-#~ msgid ""
-#~ "Some third party entries in your souces.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Niektóre źródła stron niezależnych zostały wyłączone. Można je z powrotem "
-#~ "włączyć po aktualizacji używając narzędzia \"Właściwości oprogramowania\" "
-#~ "lub za pomocą Synaptic."
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system can be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a)."
-#~ msgstr ""
-#~ "Aktualizacja została przerwana. System może znajdować się w stanie "
-#~ "nienadającym się do użytku. Uruchamianie naprawiania systemu (dpkg --"
-#~ "configure -a)."
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Niektóre programy nie są już oficjalnie wspierane"
-
-#~ msgid ""
-#~ "These installed packages are no longer officially supported, and are now "
-#~ "only community-supported ('universe').\n"
-#~ "\n"
-#~ "If you don't have 'universe' enabled these packages will be suggested for "
-#~ "removal in the next step. "
-#~ msgstr ""
-#~ "Te zainstalowane pakiety nie są już oficjalnie wspierane, są teraz "
-#~ "obsługiwane przez społeczność (\"universe\").\n"
-#~ "\n"
-#~ "Jeśli nie masz włączonego \"universe\" w następnym kroku zostanie "
-#~ "zasugerowane ich usunięcie. "
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this as a bug."
-#~ msgstr ""
-#~ "Po aktualizacji informacji o pakietach, podstawowy pakiet \"%s\" nie mógł "
-#~ "być odnaleziony.\n"
-#~ "To wskazuje na poważny problem, proszę zgłosić ten błąd."
-
-#~ msgid "About %li days %li hours %li minutes remaining"
-#~ msgstr "Około %li dni %li godzin %li minut pozostało"
-
-#~ msgid "About %li hours %li minutes remaining"
-#~ msgstr "Około %li godzin %li minut pozostało"
-
-#~ msgid "About %li minutes remaining"
-#~ msgstr "Około %li minut pozostało"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Około %li sekund pozostało"
-
-#~ msgid "Download is complete"
-#~ msgstr "Pobieranie zostało zakończone."
-
-#~ msgid "Downloading file %li of %li at %s/s"
-#~ msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
-
-#~ msgid "Downloading file %li of %li"
-#~ msgstr "Pobieranie pliku %li z %li"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Aktualizacja została przerwana. Proszę zgłosić ten błąd."
-
-#~ msgid ""
-#~ "Replace configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Zastąpić plik konfiguracyjny\n"
-#~ "\"%s\"?"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade."
-#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts "
-#~ "now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Proszę zgłosić ten błąd i w raporcie dołączyć pliki ~/dist-upgrade.log "
-#~ "oraz ~/dist-upgrade-apt.log. Aktualizacja została przerwana.\n"
-#~ "Pierwotny plik sources.list został zapisany w /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%s package is going to be removed."
-#~ msgid_plural "%s packages are going to be removed."
-#~ msgstr[0] "%s pakiet zostanie usunięty."
-#~ msgstr[1] "%s pakiety zostaną usunięte."
-#~ msgstr[2] "%s pakietów zostanie usuniętych."
-
-#~ msgid "%s new package is going to be installed."
-#~ msgid_plural "%s new packages are going to be installed."
-#~ msgstr[0] "%s nowy pakiet zostanie zainstalowany."
-#~ msgstr[1] "%s nowe pakiety zostaną zainstalowane."
-#~ msgstr[2] "%s nowy pakietów zostanie zainstalowane."
-
-#~ msgid "%s package is going to be upgraded."
-#~ msgid_plural "%s packages are going to be upgraded."
-#~ msgstr[0] "%s pakiet zostanie zaktualizowany."
-#~ msgstr[1] "%s pakiety zostaną zaktualizowane."
-#~ msgstr[2] "%s pakietów zostanie zaktualizowanych."
-
-#~ msgid "You have to download a total of %s."
-#~ msgstr "Konieczne pobranie ogółem %s."
-
-#~ msgid ""
-#~ "The upgrade can take several hours and cannot be canceled at any time "
-#~ "later."
-#~ msgstr ""
-#~ "Aktualizacja może trwać wiele godzin i nie może zostać później anulowana."
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Nie odnaleziono żadnych aktualizacji"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "System został już zaktualizowany."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Aktualizacja do Ubuntu 6.10</span>"
-
-#~ msgid "Downloading and installing the upgrades"
-#~ msgstr "Pobieranie i instalowanie aktualizacji"
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Aktualizacja Ubuntu"
-
-#~ msgid ""
-#~ "Verfing the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Weryfikacja aktualizacji nie powiodła się. To może być problem sieciowy "
-#~ "lub z serwerem. "
-
-#~ msgid "Downloading file %li of %li with %s/s"
-#~ msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Pobieranie pliku %li z %li z nieznaną prędkością"
-
-#~ msgid "The list of changes is not available yet. Please try again later."
-#~ msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. Please check your Internet "
-#~ "connection."
-#~ msgstr ""
-#~ "Nie udało się pobrać informacji o zmianach. Proszę sprawdzić połączenie z "
-#~ "Internetem."
-
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ważne aktualizacje bezpieczeństwa dla Ubuntu"
-
-#~ msgid "Recommended updates of Ubuntu"
-#~ msgstr "Aktualizacje polecane dla Ubuntu"
-
-#~ msgid "Proposed updates for Ubuntu"
-#~ msgstr "Aktualizacje proponowane dla Ubuntu"
-
-#~ msgid "Backports of Ubuntu"
-#~ msgstr "Backporty dla Ubuntu"
-
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Aktualizacje dla Ubuntu"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Nie można zainstalować wszystkich dostępnych aktualizacji"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Niektóre aktualizacje wymagają dalszego usuwania oprogramowania. Aby "
-#~ "ukończyć proces aktualizacji użyj opcji \"Zaznacz wszystko do aktualizacji"
-#~ "\" w Mendżerze Pakietów Synaptic albo uruchom \"sudo apt-get dist-upgrade"
-#~ "\" w terminalu."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Następujące pakiety zostaną pominięte:"
-
-#~ msgid "Downloading the list of changes..."
-#~ msgstr "Pobieranie informacji o zmianach..."
-
-#~ msgid "Select _None"
-#~ msgstr "Odz_nacz wszystkie"
-
-#~ msgid "Select _All"
-#~ msgstr "Zaznacz w_szystkie"
-
-#~ msgid "From version %s to %s"
-#~ msgstr "Z wersji %s do %s"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties"
-#~ "\"."
-#~ msgstr ""
-#~ "<b><big>Wymagane jest ręczne sprawdzenie dostępności aktualizacji</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "System nie sprawdza dostępności aktualizacji automatycznie. To ustawienie "
-#~ "można to zmienić w \"System\" -> \"Administracja\" -> \"Software "
-#~ "Properties\"."
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Sprawdzanie systemu</b></big>\n"
-#~ "\n"
-#~ "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe "
-#~ "punkty bezpieczeństwa i dostarczyć nowe funkcje."
-
-#~ msgid "Cancel _Download"
-#~ msgstr "_Przerwij pobieranie"
-
-#~ msgid ""
-#~ "<b><big>The channel information is out-of-date</big></b>\n"
-#~ "\n"
-#~ "You have to reload the channel information to install software and "
-#~ "updates from newly added or changed channels. \n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Informacje o kanałach są nieaktualne</big></b>\n"
-#~ "\n"
-#~ "Musisz ponownie wczytać informacje o kanałach aby zainstalować "
-#~ "oprogramowanie i aktualizacje z nowododanych lub zmienionych kanałów. \n"
-#~ "\n"
-#~ "Aby kontynuować potrzebne jest działające połączenie internetowe."
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the source that you want to add</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a source, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Wpisz pełny wiersz APT opisujący kanał który chcesz dodać</b></"
-#~ "big>\n"
-#~ "\n"
-#~ "Wiersz APT zawiera typ, lokalizację i zawartość kanału, przykładowo <i>"
-#~ "\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabeld, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Jeśli automatycznie sprawdzanie dostępności aktualizacji jest wyłączone "
-#~ "to koniecznie jest ręczne wczytanie listy kanałów. Ta opcja pozwala na "
-#~ "ukrycie pokazywanego w tym przypadku.powiadamiania."
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changs and the "
-#~ "description"
-#~ msgstr ""
-#~ "Zapamiętuje stan obszaru z listą zmian i opisem poszczególnych "
-#~ "aktualizacji"
-
-#~ msgid ""
-#~ "OpenSource software that is officially supported by Canonical Ltd. (main)"
-#~ msgstr ""
-#~ "Otwarte oprogramowanie oficjalnie obsługiwane przez Canonical Ltd. (main)"
-
-#~ msgid "OpenSource software that is maintained by the community (universe)"
-#~ msgstr "Otwarte oprogramowanie obsługiwane przez społeczność (universe)"
-
-#~ msgid "Proprietary drivers for devices (restricted) "
-#~ msgstr "Własnościowe sterowniki dla urządzeń (restricted) "
-
-#, fuzzy
-#~ msgid ""
-#~ "Software that is restricted by copyright or legal issues (multiverse)"
-#~ msgstr ""
-#~ "Oprogramowanie ograniczone prawami kopiowania lub wątpliowściami prawnymi "
-#~ "(multiverse)"
-
-#~ msgid "Oficially supported"
-#~ msgstr "Wspierane oficjalnie"
-
-#~ msgid "Hide details"
-#~ msgstr "Ukryj szczegóły"
-
-#~ msgid "Show details"
-#~ msgstr "Wyświetl szczegóły"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr ""
-#~ "Jednocześnie można uruchomić tylko jedno narzędzie zarządzające "
-#~ "oprogramowaniem"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Proszę najpierw zamknąć to narzędzie, np. \"aptitute\" lub \"Synaptic "
-#~ "Menedżer Pakietów\"."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Kanały</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Klucze</b>"
-
-#~ msgid "Add _Cdrom"
-#~ msgstr "Dodaj płytę _CD"
-
-#~ msgid "Installation Media"
-#~ msgstr "Nośnik instalacji"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Ustawienia oprogramowania"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Kanał</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponenty</b>"
-
-#~ msgid "Add Channel"
-#~ msgstr "Dodaj kanał"
-
-#~ msgid "Edit Channel"
-#~ msgstr "Edytuj kanał"
-
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "Dod_aj kanał"
-#~ msgstr[1] "Dod_aj kanały"
-#~ msgstr[2] "Dod_aj kanały"
-
-#~ msgid "_Custom"
-#~ msgstr "_Zaawansowane"
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Aktualizacje dla Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Aktualizacje dla Ubuntu 6.06 LTS (Backporty)"
-
-#~ msgid ""
-#~ "While scaning your repository information no valid entry for the upgrade "
-#~ "was found.\n"
-#~ msgstr ""
-#~ "Podczas skanowania informacji o repozytoriach nie odnaleziono poprawnych "
-#~ "wpisów potrzebnych do aktualizacji.\n"
-
-#~ msgid "Repositories changed"
-#~ msgstr "Repozytoria zmienione"
-
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "Aby zastosować zmiany koniecznie jest ponowne wczytanie listy pakietów z "
-#~ "serwerów. Czy chcesz zrobić to teraz?"
-
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Sekcje:</b>"
-
-#~ msgid "Check for available updates"
-#~ msgstr "Sprawdź dostępne aktualizacje"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sekcje:</b>"
-
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Wczytuje ponownie z serwera informacje o pakietach."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Pobierz zmiany</span>\n"
-#~ "\n"
-#~ "Trzeba pobrać informacje o zmianach z centralnego serwera"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr ""
-#~ "Wyświetla dostępne aktualizacje i pozwala wybrać te, które chcemy "
-#~ "zainstalować"
-
-#, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "Błąd podczas usuwania klucza"
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Źródła oprogramowania</b>"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Pobieranie pliku %(current)li z %(total)li"
 
-#, fuzzy
-#~ msgid "Automatically check for updates"
-#~ msgstr "Automatycznie sprawdzaj dostępność akt_ualizacji oprogramowania."
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Szczegóły"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "Cancel downloading of the changelog"
-#~ msgstr "Anuluj pobieranie pliku zmian (Changelog)"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "Wybierz plik z kluczem"
+msgid "Starting..."
+msgstr "Ustawienia"
 
-#~ msgid "<b>Packages to install:</b>"
-#~ msgstr "<b>Pakiety do zainstalowania:</b>"
-
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Dostępne aktualizacje</b></big>\n"
-#~ "\n"
-#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować "
-#~ "klikając przycisk Instaluj."
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Repozytorium</b>"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Pliki tymczasowe</b>"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Interfejs użytkownika</b>"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Lista zmian nie jest dostępna."
 
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Klucze autentykacyjne</b></big>\n"
-#~ "\n"
-#~ "W tym oknie dialogowym można dodawać i usuwać klucze autentykacyjne. "
-#~ "Klucz pozwala na sprawdzenie integralności oprogramowania które jest "
-#~ "pobierane z sieci."
-
-#~ msgid "A_uthentication"
-#~ msgstr "A_utentykacja"
+#: ../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 ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Dodaje plik z kluczem do listy zaufanych kluczy. Należy upewnić sie, że "
-#~ "został otrzymany bezpiecznym kanałem oraz, że pochodzi z zaufanego "
-#~ "źródła. "
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Nie udało się pobrać listy zmian. \n"
+"Proszę sprawdzić swoje połączenie intenetowe."
 
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Usuwaj _tymczasowe pliki z pakietami"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Clean interval in days: "
-#~ msgstr "Co tyle dni: "
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Usuwaj stare pakiety z pamięci p_odręcznej"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Edit Repository..."
-#~ msgstr "Modyfikuj repozytorium..."
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Maximum age in days:"
-#~ msgstr "Po tylu dniach:"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Maksymalny rozmiar pakietu w MB:"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Przywraca domyślne klucze rozprowadzane wraz z dystrybucją. Nie wpływa to "
-#~ "na klucze zainstalowane przez użytkownika."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Maksymalny rozmiar pamięci podręcznej"
-
-#~ msgid "Settings"
-#~ msgstr "Ustawienia"
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "Pokaż nieaktywne źródła oprogramowania"
-
-#~ msgid "Update interval in days: "
-#~ msgstr "Co tyle dni: "
-
-#~ msgid "_Add Repository"
-#~ msgstr "_Dodaj repozytorium"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Pobierz uaktualnione pakiety"
-
-#~ msgid ""
-#~ "This means that some dependencies of the installed packages are not "
-#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
-#~ msgstr ""
-#~ "Oznacza to, że pewne zależności instalowanych pakietów nie są spełnione."
-#~ "Aby rozwiązać problem proszę skorzystać z programu \"Synaptic\" lub \"apt-"
-#~ "get\"."
-
-#~ msgid "It is not possible to upgrade all packages."
-#~ msgstr "Nie można uaktualnić wszystkich pakietów"
-
-#~ msgid ""
-#~ "This means that besides the actual upgrade of the packages some further "
-#~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
-#~ msgstr ""
-#~ "Oznacza to, że do aktualizacji wymagane sa dodatkowe działania (takie jak "
-#~ "dodanie lub usunięcie pakietów). Aby rozwiązać problem proszę skorzystać "
-#~ "z funkcji \"sprytnej aktualizacji\" programu Synaptic lub wykonać "
-#~ "polecenie \"apt-get dist-upgrade\"."
-
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr ""
-#~ "Nie odnaleziono informacji o zmianach, być może serwer nie został jeszcze "
-#~ "zaktualizowany"
-
-#~ msgid "The updates are being applied."
-#~ msgstr "Aktualizacje są teraz instalowane."
-
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. "
-#~ "Należy najpierw zamknąć aplikację która teraz działa."
-
-#~ msgid "Updating package list..."
-#~ msgstr "Aktualizacja listy pakietów..."
-
-#~ msgid "There are no updates available."
-#~ msgstr "Nie ma żadnych dostępnych aktualizacji"
-
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Proszę uaktualnić dystrybucję do nowszej wersji Ubuntu Linux. Obecna "
-#~ "wersja nie będzie już otrzymywać uaktualnień bezpieczeństwa oraz innych "
-#~ "krytycznych uaktualnień. Informacje o tym jak uaktualnić dystrybucję "
-#~ "można znaleźć na stronie http://www.ubuntulinux.org (Witryna w języku "
-#~ "angielskim)"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "Nie ma żadnych dostępnych aktualizacji"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Nie można zainstalować \"%s\""
 
-#~ msgid "Never show this message again"
-#~ msgstr "Nie pokazuj więcej tego komunikatu"
+#: ../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 ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
-#~ msgstr ""
-#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. "
-#~ "Należy najpierw zamknąć aplikację która teraz działa."
+msgid "An essential package would be removed"
+msgstr "Niezbędny pakiet musiałby zostać usunięty"
 
-#~ msgid "Initializing and getting list of updates..."
-#~ msgstr "Inicjowanie i pobieranie listy aktualizacji..."
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Aby uruchomić ten program wymagane są uprawnienia administratora"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Modyfikuje ustawienia i źródła oprogramowania"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Ubuntu Update Manager"
-#~ msgstr "Menadżer aktualizacji Ubuntu"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Binary"
-#~ msgstr "Binarny"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "CD"
-#~ msgstr "CD"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Contributed software"
-#~ msgstr "Inne oprogramowanie (Contributed)"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Non-free software"
-#~ msgstr "Oprogramowanie nie-wolnodostępne"
+#: ../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 ""
 
-#~ msgid "US export restricted software"
-#~ msgstr "Oprogramowanie objęte restrykcjami eksportowymi USA"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Klucz automatycznego podpisu archiwum Ubuntu <ftpmaster@ubuntu.com>"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "Klucz automatycznego podpisu płyty CD Ubuntu <cdimage@ubuntu.com>"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Dostępne aktualizacje</b></big>\n"
-#~ "\n"
-#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować "
-#~ "klikając przycisk Instaluj."
-
-#~ msgid "CD disk"
-#~ msgstr "Płyta CD"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/ps.po b/po/ps.po
index 1f2accdc..711ca4fe 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,51 +276,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -303,11 +338,157 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../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 1c6b1551..a8a52a99 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -22,235 +22,266 @@ 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: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 com 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 com 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 com o 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdrom com o Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Actualizações de Segurança do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cdrom com o Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Actualizações de Segurança do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cdrom com o Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Mantido pela comunidade"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Drivers proprietários para dispositivos"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Software Restrito"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cdrom com o Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Software de Código Aberto suportado pela Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Mantido pela comunidade (universal)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Software de Código Fonte Aberto mantido pela comunidade"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Controladores não-livres"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Drivers proprietários para dispositivos "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Drivers proprietários para dispositivos"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Software não-livre (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr "Software restringido por copyright ou questões legais"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 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:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Actualizações de segurança importantes"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Actualizações recomendadas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Actualizações propostas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Actualizações dos repositórios \"backport\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cdrom com o Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Actualizações de Segurança"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Actualizações"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdrom com o Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Suportado Oficialmente"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualizações de Segurança do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualizações do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Backports do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Mantido pela comunidade (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Não-livre (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Sem mais suporte oficial"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Direitos de autor restritos"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Actualizações de Segurança do Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualizações do Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Backports do Ubuntu 4.10"
 
@@ -262,55 +293,68 @@ 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:31
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 3.1 \"Sarge\""
+
+#. Description
+#: ../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 "Actualizações propostas"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Actualizações de segurança importantes"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 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:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Software compatível-DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor para %s"
@@ -318,1318 +362,160 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Servidores personalizados"
 
-#~ msgid "Daily"
-#~ msgstr "Diariamente"
-
-#~ msgid "Every two days"
-#~ msgstr "De 2 em 2 dias"
-
-#~ msgid "Weekly"
-#~ msgstr "Semanalmente"
-
-#~ msgid "Every two weeks"
-#~ msgstr "De 2 em 2 semanas"
-
-#~ msgid "Every %s days"
-#~ msgstr "Todos os %s dias"
-
-#~ msgid "After one week"
-#~ msgstr "Após uma semana"
-
-#~ msgid "After two weeks"
-#~ msgstr "Após duas semanas"
-
-#~ msgid "After one month"
-#~ msgstr "Após um mês"
-
-#~ msgid "After %s days"
-#~ msgstr "Depois de %s dias"
-
-#~ msgid "%s updates"
-#~ msgstr "actualizações do %s"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Servidor mais próximo"
-
-#~ msgid "Software Channel"
-#~ msgstr "Canal de Software"
-
-#~ msgid "Active"
-#~ msgstr "Activo"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Código Fonte)"
-
-#~ msgid "Source Code"
-#~ msgstr "Código Fonte"
-
-#~ msgid "Import key"
-#~ msgstr "Importar chave"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Erro ao importar ficheiro seleccionado"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "O ficheiro seleccionado pode não ser um ficheiro de chave GPG ou pode "
-#~ "estar corrompido."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Erro ao remover a chave"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "A chave que seleccionou não pôde ser removida. Por favor reporte este "
-#~ "erro."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Erro ao examinar o CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Por favor introduza um nome para o disco"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Por favor introduza um disco no leitor:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Pacotes Quebrados"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "O seu sistema contém pacotes quebrados que não puderam ser corrigidos com "
-#~ "este software. Por favor corrija-os usando o synaptic ou apt-get antes de "
-#~ "continuar."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Não foi possível actualizar os meta-pacotes necessários"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Um pacote essencial teria que ser removido"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Impossível de calcular a actualização"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Um problema irresolúvel ocorreu ao calcular a actualização. \n"
-#~ "\n"
-#~ "Por favor reporte este erro no pacote 'update-manager' e inclua os "
-#~ "ficheiros contidos em /var/log/dist-upgrade/ no seu relatório de erro."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Erro ao autenticar alguns pacotes"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Não foi possível autenticar alguns pacotes. Este pode ser um problema de "
-#~ "rede transitório. Pode tentar novamente mais tarde. Verifique abaixo uma "
-#~ "lista de pacotes não autenticados."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Impossível de instalar '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Foi impossível instalar um pacote essencial. Por favor reporte este erro. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Impossível de descobrir meta-pacote"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "O seu sistema não contém o pacote ubuntu-desktop, kubuntu-desktop ou "
-#~ "edubuntu-desktop e portanto não foi possível detectar que versão do "
-#~ "ubuntu está a executar.\n"
-#~ " Por favor instale um dos pacotes acima mencionados usando o synaptic ou "
-#~ "apt-get antes de continuar."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Falha ao adicionar o CD"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Ocorreu um erro ao adicionar o CD, a actualização será abortada. Por "
-#~ "favor relate este erro caso este seja um CD válido do Ubuntu.\n"
-#~ "\n"
-#~ "A mensagem de erro foi:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "A ler a cache"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Obter dados para a actualização a partir da rede?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "A actualização pode usar a rede para verificar as últimas actualizações e "
-#~ "obter pacotes que não estão no CD.\n"
-#~ "Se o seu acesso à internet for rápido ou barato deve responder 'Sim'. Se "
-#~ "a sua ligação é cara escolha 'Não'."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Nenhum repositório válido encontrada"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Enquanto estava a verificar a informação do seu repositório, nenhum "
-#~ "repositório válido para os pacotes foi encontrado. Isto pode acontecer se "
-#~ "estiver a correr um repositório interno ou se a informação do repositório "
-#~ "estiver desactualizada.↵\n"
-#~ "↵\n"
-#~ "Tem a certeza que quer re-escrever o seu ficheiro 'sources.list' na "
-#~ "mesma? Se escolher 'Sim' ele vai actualizar todos os '%s' para '%s' "
-#~ "pacotes.↵\n"
-#~ "Se escolher \"não\" a actualização irá ser cancelada."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Gerar as fontes padrão?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Depois de pesquisar 'sources.list' nenhuma entrada válida para '%s' foi "
-#~ "encontrada.\n"
-#~ "\n"
-#~ "Deverão ser adicionadas entradas para '%s'? Se seleccionar 'Não' a "
-#~ "actualização será cancelada."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Informação de repositório inválida"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "A actualização da informação de repositório resultou num ficheiro "
-#~ "inválido. Por favor reporte este erro."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Fontes de terceiros desactivadas"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Algumas entradas de terceiros em 'sources.list' foram desactivadas. Pode "
-#~ "reactivá-las depois da actualização com a ferramenta 'propriedades-"
-#~ "software' ou com o synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Erro durante a actualização"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Ocorreu um problema durante a actualização. Habitualmente trata-se de "
-#~ "algum tipo de problema na rede, por favor verifique a sua ligação à rede "
-#~ "e volte a tentar."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Não existe espaço livre em disco suficiente"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "A actualização abortará agora. Por favor liberte %s de espaço em disco em "
-#~ "%s. Esvazie o lixo e remova pacotes temporários de instalações anteriores "
-#~ "usando 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Deseja iniciar a actualização?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Impossível de instalar as actualizações"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "A actualização abortará agora. O seu sistema poderá estar num estado "
-#~ "inutilizável. Foi efectuada uma recuperação (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Por favor relate este erro sobre o pacote 'update-manager' e inclua os "
-#~ "ficheiros contidos em /var/log/dist-upgrade/ no relatório de erro."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Impossível de descarregar as actualizações"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "A actualização abortará agora. Por favor verifique a sua ligação à "
-#~ "internet ou media de instalação e volte a tentar. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "O suporte para algumas aplicações já terminou."
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "A Canonical Ltd. já não suporta oficialmente os pacotes de software que "
-#~ "se seguem. Pode ainda obter suporte a partir da comunidade.\n"
-#~ "\n"
-#~ "Caso não tenha activado o software mantido pela comunidade (universe),  "
-#~ "irá ser sugerida a remoção destes pacotes no próximo passo."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Remover Pacotes obsoletos?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Saltar Este Passo"
-
-#~ msgid "_Remove"
-#~ msgstr "_Remover"
-
-#~ msgid "Error during commit"
-#~ msgstr "Erro ao submeter"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Ocorreu algum problema durante a limpeza. Por favor verifique a mensagem "
-#~ "abaixo para mais informação. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "A restaurar o estado original do sistema"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "A obter backport de '%s'"
-
-#~ msgid "Checking package manager"
-#~ msgstr "A verificar gestor de pacotes"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "A preparação da actualização falhou"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Um problema irresolúvel ocorreu ao calcular a actualização. Por favor "
-#~ "reporte este erro no pacote 'update-manager' e inclua os ficheiros "
-#~ "contidos em /var/log/dist-upgrade/ no relatório de erro."
-
-#~ msgid "Updating repository information"
-#~ msgstr "A Actualizar informação de repositórios"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Informação de pacotes inválida"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Depois da informação de pacotes ser actualizada já não pode ser "
-#~ "encontrado o pacote essencial '%s'.\n"
-#~ "Isto indica um erro sério,  por favor relate este erro sobre o pacote "
-#~ "'update-manager' e inclua os ficheiros contidos em /var/log/dist-upgrade/ "
-#~ "no relatório de erro."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "A pedir confirmação"
-
-#~ msgid "Upgrading"
-#~ msgstr "A actualizar"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "À procura de software obsoleto"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "A actualização do sistema está completa."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Por favor insira '%s' no leitor '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "A transferência está completa"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "A obter o ficheiro %li de %li a %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Cerca de %s restantes"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "A obter o ficheiro %li de %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Aplicando alterações"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Não foi possível instalar '%s'"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "A actualização será agora abortada. Por favor relate a ocorrência deste "
-#~ "erro no pacote 'update-manager' e inclua os ficheiros que se encontram "
-#~ "em /var/log/dist-upgrade/ no relatório de erro."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Substituir ficheiro de configuração personalizado\n"
-#~ "'%s'?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Perderá todas as alterações que fez a este ficheiro de configuração caso "
-#~ "o substitua por uma versão mais recente."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "O comando 'diff' não foi encontrado"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Ocorreu um erro fatal"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Por favor relate este erro e inclua os ficheiros /var/log/dist-upgrade/"
-#~ "main.log e /var/log/dist-upgrade/apt.log no seu relatório de erro. A "
-#~ "actualização abortará agora.\n"
-#~ "O ficheiro original sources.list foi guardado em /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "o pacote %d será removido."
-#~ msgstr[1] "os pacotes %d serão removidos."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d novo pacote será instalado."
-#~ msgstr[1] "%d novos pacotes serão instalados."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d pacote será actualizado."
-#~ msgstr[1] "%d pacotes serão actualizados."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Tem que descarregar um de %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "A obtenção e instalação da actualização poderá demorar várias horas e não "
-#~ "poderá ser cancelada a qualquer instante posteriormente."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Para prevenir a perda de dados feche todas as aplicações e documentos "
-#~ "abertos."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "O seu sistema está actualizado"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Não há actualizações disponíveis para o seu sistema. A actualização será "
-#~ "agora cancelada."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Remover %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Instalar %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Actualizar %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li dias %li horas %li minutos"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li horas %li minutos"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minutos"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li segundos"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Esta transferência levará aprox. %s com uma ligação DSL de 1Mbit e aprox. "
-#~ "%s com um modem 56k"
-
-#~ msgid "Reboot required"
-#~ msgstr "Necessário reiniciar"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "A actualização terminou e é necessário reiniciar. Deseja reiniciar agora?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Cancelar a actualização em curso?</big></b>\n"
-#~ "\n"
-#~ "O sistema poderá ser deixado num estado inutilizável se cancelar a "
-#~ "actualização. É aconselhado a prosseguir com a actualização."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Reinicie o sistema para completar a actualização</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Iniciar a actualização?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>A actualizar o Ubuntu para a versão 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "A efectuar limpeza"
-
-#~ msgid "Details"
-#~ msgstr "Detalhes"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Diferença entre os ficheiros"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "A obter e instalar actualizações"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "A modificar os repositórios de software"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "A preparar actualização"
-
-#~ msgid "Restarting the system"
-#~ msgstr "A reiniciar o sistema"
-
-#~ msgid "Terminal"
-#~ msgstr "Consola"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Cancelar a Actualização"
-
-#~ msgid "_Continue"
-#~ msgstr "_Continuar"
-
-#~ msgid "_Keep"
-#~ msgstr "_Manter"
-
-#~ msgid "_Replace"
-#~ msgstr "_Substituir"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Reportar um erro"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Reiniciar agora"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Retomar Actualização?"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Iniciar a Actualização"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Impossível de encontrar notas de lançamento"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "O servidor poderá estar sobrecarregado. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Impossível de descarregar as notas de lançamento"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Por favor verifique a sua ligação à internet."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Impossível de executar a ferramenta de actualização"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Isto é provavelmente um erro na ferramenta de actualização. Por favor "
-#~ "reporte o problema."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "A descarregar a ferramenta de actualização"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr ""
-#~ "A ferramenta de actualização guiá-lo-á pelo processo de actualização."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Assinatura da ferramenta de actualização"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Ferramenta de actualização"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Falha a obter"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "Falha a obter a actualização. Poderá existir um problema de rede. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Falha ao extrair"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Extracção da actualização falhou. Poderá existir um problema com a rede "
-#~ "ou com o servidor. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Falhou a verificação"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "A verificação da actualização falhou. Poderá existir um problema com a "
-#~ "rede ou com o servidor. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Autenticação falhou"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Autenticação da actualização falhou. Poderá existir um problema com a "
-#~ "rede ou com o servidor. "
-
-#~ 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"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "A descarregar ficheiro %(current)li de %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "A lista de alterações não está disponível."
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "A lista de alterações ainda não está disponível. Por favor tente mais "
-#~ "tarde."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Falha ao descarregar a lista de alterações. \n"
-#~ "Por favor verifique a sua ligação à Internet."
-
-#~ msgid "Backports"
-#~ msgstr "Backports"
-
-#~ msgid "Distribution updates"
-#~ msgstr "_Actualizações de Distribuição"
-
-#~ msgid "Other updates"
-#~ msgstr "Outras actualizações"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versão %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "A descarregar a lista de alterações..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "_Desmarcar Todos"
-
-#~ msgid "_Check All"
-#~ msgstr "_Verificar Todos"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Tamanho do download: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Pode instalar %s actualização"
-#~ msgstr[1] "Pode instalar %s actualizações"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Por favor aguarde, isto pode levar algum tempo."
-
-#~ msgid "Update is complete"
-#~ msgstr "A actualização está completa"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Verificar por actualizações disponíveis"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Da versão: %(old_version)s para %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Versão %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Tamanho: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "A sua distribuição já não é suportada"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Não receberá mais actualizações críticas ou de segurança. Actualize para "
-#~ "um versão mais recente do Ubuntu Linux. Veja http://www.ubuntu.com para "
-#~ "mais informação em como actualizar."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Está disponível a nova versão '%s' da distribuição</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "O índice de software está quebrado"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "É impossível instalar ou remover qualquer software. Por favor utilize o "
-#~ "gestor de pacotes \"Synaptic\" ou execute \"sudo apt-get install -f\" "
-#~ "numa consola para corrigir este problema em primeiro lugar."
-
-#~ msgid "None"
-#~ msgstr "Nenhum"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Tem de verificar por actualizações manualmente</big></b>\n"
-#~ "\n"
-#~ "O seu sistema não procura por actualizações automaticamente. Pode "
-#~ "configurar este comportamento em <i>Fontes de Software</i> no separador "
-#~ "<i>Actualizações na Internet</i>"
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Mantenha o seu sistema actualizado</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Não é possível instalar todas as actualizações</b></big>\r\n"
-#~ "\r\n"
-#~ "%s"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<big><b>A iniciar o gestor de actualizações</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "Alterações"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Alterações e descrição da actualização"
-
-#~ msgid "Chec_k"
-#~ msgstr "Verific_ar"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Verificar os repositórios de software por novas actualizações"
-
-#~ msgid "Description"
-#~ msgstr "Descrição"
-
-#~ msgid "Release Notes"
-#~ msgstr "Notas de lançamento"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Execute uma actualização de distribuição para instalar tantas "
-#~ "actualizações quanto possível.\n"
-#~ "\n"
-#~ "Isto pode ter sido causado por uma actualização incompleta, pacotes de "
-#~ "software não oficiais ou a utilização de uma versão em desenvolvimento."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Mostrar progresso de ficheiros individuais"
-
-#~ msgid "Software Updates"
-#~ msgstr "Actualizações de Software"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Actualizações de software podem corrigir erros, eliminar problemas de "
-#~ "segurança, e fornecer novas funcionalidades."
-
-#~ msgid "U_pgrade"
-#~ msgstr "A_ctualização"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Actualize para a última versão do Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Verificar"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "Actualização de _Distribuição"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Ocultar esta informação no futuro"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Instalar Actualizações"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "A_ctualização"
-
-#~ msgid "changes"
-#~ msgstr "alterações"
-
-#~ msgid "updates"
-#~ msgstr "actualizações"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Actualizações automáticas</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Actualizações Internet</b>"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "A descarregar ficheiro %(current)li de %(total)li"
 
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detalhes"
 
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Para melhorar a experiência de utilização do Ubuntu, por favor "
-#~ "participe na análise de popularidade. Se o fizer, a listagem de software "
-#~ "instalado e a regularidade com que foi utilizado serão recolhidas e "
-#~ "enviadas anónimamente para o projecto Ubuntu semanalmente.\n"
-#~ "\n"
-#~ "Os resultados são utilizados para melhorar o suporte para aplicações "
-#~ "populares e para categorizar as aplicações nos resultados de buscas.</i>"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Add Cdrom"
-#~ msgstr "Adicionar Cdrom"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Authentication"
-#~ msgstr "Autenticação"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "A_pagar ficheiros descarregados:"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "A lista de alterações não está disponível."
 
-#~ msgid "Download from:"
-#~ msgstr "Transferir de:"
+#: ../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 ""
 
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Importar a chave pública de um fornecedor de software confiável"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Falha ao descarregar a lista de alterações. \n"
+"Por favor verifique a sua ligação à Internet."
 
-#~ msgid "Internet Updates"
-#~ msgstr "Actualizações Internet"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Apenas actualizações de segurança dos servidores oficiais do Ubuntu serão "
-#~ "instaladas automaticamente."
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Restore _Defaults"
-#~ msgstr "Restaurar _Definições"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Restaurar as chaves padrão da sua distribuição"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "Fontes de Software"
-
-#~ msgid "Source code"
-#~ msgstr "Código fonte"
-
-#~ msgid "Statistics"
-#~ msgstr "Estatísticas"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Submeter informação estatística"
-
-#~ msgid "Third Party"
-#~ msgstr "Terceira Pessoa"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Procurar por actualizações automaticamente:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Transferir actualizações automaticamente mas não as instalar"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Importar Chave de Ficheiro"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Instalar actualizações de segurança sem confirmação"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>A informação acerca de software disponível está desactualizada</"
-#~ "big></b>\n"
-#~ "\n"
-#~ "Tem de recarregar a informação sobre software disponível para instalar "
-#~ "software e actualizações a partir de repositórios recentemente "
-#~ "adicionados ou alterados. \n"
-#~ "\n"
-#~ "Necessita de uma ligação internet activa para continuar."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comentários:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Componentes:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribuição:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipo:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Introduza uma linha completa APT para o repositório que deseja "
-#~ "adicionar</b></big>\n"
-#~ "\n"
-#~ "A linha APT contém o tipo, localização e componentes de um repositório, "
-#~ "por exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "Linha do APT:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binário\n"
-#~ "Fonte"
-
-#~ msgid "Edit Source"
-#~ msgstr "Editar o Código Fonte"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "A pesquisar o CD-ROM"
-
-#~ msgid "_Add Source"
-#~ msgstr "_Adicionar Fonte"
-
-#~ msgid "_Reload"
-#~ msgstr "_Reler"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Mostrar e instalar actualizações disponíveis"
-
-#~ msgid "Update Manager"
-#~ msgstr "Gestor de Actualizações"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Verificar automaticamente se uma nova versão da distribuição actual está "
-#~ "disponível e oferecer para actualizar (se possível)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Verificar por novos lançamentos de distribuições"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Se a opção para verificar automaticamente por actualizações estiver "
-#~ "desactivada, tem de reler a lista de repositórios manualmente. Esta opção "
-#~ "permite esconder a lembrança mostrada neste caso."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Relembrar reler a lista de repositórios"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Mostrar detalhes de uma actualização"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Guarda o tamanho do diálogo do gestor de actualizações"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Guarda o estado do expansor que contém a lista de alterações e a descrição"
-
-#~ msgid "The window size"
-#~ msgstr "Tamanho da Janela"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Configurar os repositórios de software e actualizações instaláveis"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" Actualizações de Segurança"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Impossível de instalar '%s'"
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida"
+#: ../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 "Normal updates"
-#~ msgstr "A instalar actualizações"
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Cancelar _Descarregamento"
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Algum software já não é suportado oficialmente"
+msgid "An essential package would be removed"
+msgstr "Um pacote essencial teria que ser removido"
 
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Impossível de encontrar quaisquer actualizações"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "O seu sistema já foi actualizado."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">A actualizar para Ubuntu 6.10</"
-#~ "span>"
-
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Actualizações de segurança importantes do Ubuntu"
-
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Actualizações do Ubuntu"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Impossível de instalar todas as actualizações disponíveis"
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>A examinar o seu sistema</b></big>\n"
-#~ "\n"
-#~ "Actualizações de software podem corrigir erros, eliminar problemas de "
-#~ "segurança, e fornecer novas funcionalidades."
-
-#~ msgid "Oficially supported"
-#~ msgstr "Suportado Oficialmente"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Algumas actualizações requerem a remoção de software. Utilize a função "
-#~ "\"Marcar Todas as Actualizações\" ou execute \"sudo apt-get dist-upgrade"
-#~ "\" numa consola para actualizar completamente o seu sistema."
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "As seguintes actualizações serão ignoradas:"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Cerca de %li segundos restantes"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Download is complete"
-#~ msgstr "O Download está completo"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "A actualização abortará agora. Reporte este erro."
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "A actualizar o Ubuntu"
+#: ../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 ""
 
-#~ msgid "Hide details"
-#~ msgstr "Esconder detalhes"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Show details"
-#~ msgstr "Mostrar detalhes"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr ""
-#~ "Uma única ferramenta de gestão de software pode ser executada ao mesmo "
-#~ "tempo"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Por favor feche a outra aplicação primeiro, por ex. 'aptitude' ou "
-#~ "'Synaptic'."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Repositórios</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Chaves</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Media de Instalação"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Preferências de Software"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Repositórios</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Componentes:</b>"
-
-#~ msgid "Add Channel"
-#~ msgstr "Adicionar Repositório"
-
-#~ msgid "Edit Channel"
-#~ msgstr "Editar Repositório"
-
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Adicionar Repositório"
-#~ msgstr[1] "_Adicionar Repositórios"
-
-#~ msgid "_Custom"
-#~ msgstr "_Personalizado"
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Actualizações de Segurança Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Actualizações Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS Backports"
-
-#~ msgid ""
-#~ "While scaning your repository information no valid entry for the upgrade "
-#~ "was found.\n"
-#~ msgstr ""
-#~ "Ao pesquisar o seu repositório de informação não foi encontrada nenhuma "
-#~ "entrada válida de actualização.\n"
-
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Secções</b>"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Secções:</b>"
-
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Reler a última informação sobre actualizações"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">A efectuar download de alterações</"
-#~ "span>\n"
-#~ "\n"
-#~ "É necessário obter as alterações de um servidor central"
-
-#~ msgid ""
-#~ "There is not enough free space on your system to download the required "
-#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-"
-#~ "get clean'"
-#~ msgstr ""
-#~ "Não existe espaço suficiente no seu sistema para descarregar os pacotes "
-#~ "necessários. Por favor liberte algum espaço antes de tentar novamente por "
-#~ "exemplo usando 'sudo apt-get clean'"
-
-#~ msgid "Error fetching the packages"
-#~ msgstr "Erro ao descarregar os pacotes"
-
-#~ msgid ""
-#~ "Some problem occured during the fetching of the packages. This is most "
-#~ "likely a network problem. Please check your network and try again. "
-#~ msgstr ""
-#~ "Ocorreu algum problema ao descarregar pacotes. Trata-se provavelmente de "
-#~ "um problema de rede. Por favor verifique a rede e tente novamente. "
-
-#~ msgid ""
-#~ "%s packages are going to be removed.\n"
-#~ "%s packages are going to be newly installed.\n"
-#~ "%s packages are going to be upgraded.\n"
-#~ "\n"
-#~ "%s needs to be fetched"
-#~ msgstr ""
-#~ "%s pacotes serão removidos.\n"
-#~ "%s pacotes novos serão instalados.\n"
-#~ "%s pacotes serão actualizados.\n"
-#~ "\n"
-#~ "%s precisam de ser descarregados"
-
-#~ msgid "To be installed: %s"
-#~ msgstr "A ser instalado: %s"
-
-#~ msgid "To be upgraded: %s"
-#~ msgstr "A ser actualizado: %s"
-
-#~ msgid "Are you sure you want cancel?"
-#~ msgstr "Tem a certeza que pretende cancelar?"
-
-#~ msgid ""
-#~ "Canceling during a upgrade can leave the system in a unstable state. It "
-#~ "is strongly adviced to continue the operation. "
-#~ msgstr ""
-#~ "Cancelar durante uma actualização pode deixar o seu sistema num estado "
-#~ "instável. É fortemente aconselhado a prosseguir a operação. "
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Intervalo de limpeza em dias: "
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Excluir pacotes _antigos da cache de pacotes"
-
-#~ msgid "Never show this message again"
-#~ msgstr "Nunca exibir esta mensagem novamente"
-
-#~ msgid "CD"
-#~ msgstr "CD"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0faf8861..acbd62ea 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+0200\n"
 "PO-Revision-Date: 2006-10-21 01:31+0000\n"
 "Last-Translator: Rafael Proença <cypherbios@ubuntu.com>\n"
 "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n"
@@ -23,235 +23,266 @@ 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: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 com 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 com 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 com o 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdrom com o Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Atualizações de segurança do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cdrom com o Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Atualizações de segurança do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cdrom com o Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Mantido pela comunidade"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Controladores proprietários para dispositivos"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Software restrito"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cdrom com Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Programa de Código Aberto mantido pela Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Mantido pela Comunidade (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Programa de Código Aberto mantido pela Comunidade"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Drivers Não-livres"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Controladores proprietários para dispositivos "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Controladores proprietários para dispositivos"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Programas restritos (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr "Software restrito por copyright ou problemas legais"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 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:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Principais Atualizações de Segurança"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Atualizações recomendadas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Atualizações sugeridas"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Atualizações \"Backport\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cdrom com o Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Atualizações de segurança do Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Atualizações do Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Backports do Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdrom com o Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Suportadas oficialmente"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Atualizações de segurança do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Atualizações do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Backports do Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Mantido pela comunidade (Universo)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Não-livres (Multiverso)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Não é mais suportado oficialmente"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Copyright restrito"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Atualizações de segurança do Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Atualizações do Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Backports do Ubuntu 4.10"
 
@@ -263,55 +294,68 @@ 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 "Atualizações sugeridas"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Principais Atualizações de Segurança"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Programa compatível com a DFSG mas com dependências não-livres"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Programas não compatíveis com a DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Servidor no(a) %s"
@@ -319,1740 +363,161 @@ msgstr "Servidor no(a) %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:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Servidor principal"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Servidores personalizados"
 
-#~ msgid "Daily"
-#~ msgstr "Diário"
-
-#~ msgid "Every two days"
-#~ msgstr "A cada dois dias"
-
-#~ msgid "Weekly"
-#~ msgstr "Semanalmente"
-
-#~ msgid "Every two weeks"
-#~ msgstr "A cada duas semanas"
-
-#~ msgid "Every %s days"
-#~ msgstr "A cada %s dias"
-
-#~ msgid "After one week"
-#~ msgstr "Após uma semana"
-
-#~ msgid "After two weeks"
-#~ msgstr "Após duas semanas"
-
-#~ msgid "After one month"
-#~ msgstr "Após um mês"
-
-#~ msgid "After %s days"
-#~ msgstr "Após %s dias"
-
-#~ msgid "%s updates"
-#~ msgstr "Atualizações do %s"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Servidor mais próximo"
-
-#~ msgid "Software Channel"
-#~ msgstr "Canais de Programas"
-
-#~ msgid "Active"
-#~ msgstr "Ativo"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Código Fonte)"
-
-#~ msgid "Source Code"
-#~ msgstr "Código Fonte"
-
-#~ msgid "Import key"
-#~ msgstr "Importar Chave"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Erro ao importar o arquivo selecionado"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "O arquivo selecionado parece não ser um arquivo de chave GPG ou pode "
-#~ "estar corrompido."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Erro ao remover a chave"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "A chave selecionada não pôde ser removida. Por favor reporte isto como um "
-#~ "bug."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Erro procurando no CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Por favor digite um nome para o disco"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Por favor insira um disco no drive:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Pacotes quebrados"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "O seu sistema possui pacotes quebrados que não puderam ser fixados com "
-#~ "este programa. Por favor, arrume-os primeiro usando o Synaptic ou apt-get "
-#~ "antes de continuar."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Não foi possível atualizar os meta-pacotes requeridos"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Um pacote essencial teria que ser removido"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Não foi possível calcular a atualização"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Um erro impossível de se resolver ocorreu enquanto verificava a "
-#~ "atualização.\n"
-#~ "\n"
-#~ "Por favor reporte esse erro no pacote 'update-manager' e inclua os "
-#~ "arquivos contidos em /var/log/dist-upgrade/ no relatório de erros."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Erro autenticando alguns pacotes"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Não foi possível autenticar alguns pacotes. Isso pode ser devido a um "
-#~ "problema na rede. Você pode tentar novamente mais tarde. Veja abaixo uma "
-#~ "lista dos pacotes não-autenticados."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Não foi possível instalar '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Não foi possível instalar um pacote requerido. Por favor reporte isto "
-#~ "como um erro. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Não foi possível adivinhar o meta-pacote"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Seu sistema não possui nenhum dos pacotes ubuntu-desktop, kubuntu-desktop "
-#~ "ou edubuntu-desktop e não foi possível detectar qual a versão do Ubuntu "
-#~ "você esta rodando.\n"
-#~ " Por favor, instale um dos pacotes acima usando o synaptic ou apt-get "
-#~ "antes de continuar."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Falha ao adicionar o CD"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Ocorreu um erro ao adicionar o CD, a atualização será abortada. Por "
-#~ "favor, reporte isto como um erro caso este seja um CD válido do Ubuntu.\n"
-#~ "\n"
-#~ "Mensagem de erro:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "Lendo cache"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Buscar dados da rede para a atualização?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "A atualização pode usar a rede para checar as últimas melhorias e extrair "
-#~ "os pacotes que não estão no CD atual.\n"
-#~ "Se você possui acesso rápido ou barato à rede você deve responder 'Sim'. "
-#~ "Se o acesso à rede é caro para você, escolha 'Não'."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Nenhum repositório válido encontrado"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Enquanto buscava informações em seus repositórios nenhuma entrada para "
-#~ "atualizações foi encontrada. Isso pode acontecer se você está executando "
-#~ "um repositório interno ou se a informação do repositório está "
-#~ "desatualizada.\n"
-#~ "\n"
-#~ "Você quer reescrever seu 'sources.list' de qualquer forma? Se você "
-#~ "escolher  'Sim'  atualizará todas '%s' para '%s' entradas.\n"
-#~ "Se você selecionar 'não' a atualização será cancelada."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Gerar sources padrão?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Depois de checar seu 'sources.list' nenhuma entrada válida para '%s' foi "
-#~ "encontrada.\n"
-#~ "\n"
-#~ "Entradas padrões para '%s' devem ser adicionadas? Se você escolher 'Não' "
-#~ "a atualização será cancelada."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Informação de repositório inválida"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Atualizando a informações de repositórios resultou em um arquivo "
-#~ "inválido. Por favor reporte isso como um erro."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Fontes de terceiros desabilitadas"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Algumas entradas de terceiros em seu sources.list foram desabilitadas. "
-#~ "Você pode reabilitá-las após a atualização com a ferramenta 'software-"
-#~ "properties' ou com o synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Erro durante a atualização"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Um problema ocorreu durante a atualização. Isso geralmente pode ser por "
-#~ "problemas de rede, por favor verifique a sua conexão de rede e tente "
-#~ "novamente."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Não há espaço suficiente no disco"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "A atualização cancela agora. Por favor libere pelo menos %s de espaço de "
-#~ "disco no %s. Esvazie seu lixo e remova temporariamente pacotes de "
-#~ "instalações anteriores usando 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Você quer iniciar a atualização?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Não foi possível instalar as atualizações"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "A atualização será abortada agora. Seu sistema pode ter ficado instável. "
-#~ "O processo de recuperação foi executado (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Por favor, informe este erro no pacote 'update-manager' e inclua os "
-#~ "arquivos contidos em /var/log/dist-upgrade/ no relatório de erros."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Não foi possível obter as atualizações"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "A atualização será abortada agora. Por favor verifique sua conexão à "
-#~ "Internet ou mídia de instalação e tente de novo. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "O suporte para algumas aplicações foi descontinuado"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Canonical Ltd. não provê mais suporte para os seguintes pacotes de "
-#~ "softwares. Você pode continuar obtendo suporte da comunidade.\n"
-#~ "\n"
-#~ "Se você não tiver habilitado os softwares mantidos pela comunidade "
-#~ "(universe), esses pacotes serão sugeridos para remoção no próximo passo."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Remover Pacotes obsoletos?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Pular Este Passo"
-
-#~ msgid "_Remove"
-#~ msgstr "_Remover"
-
-#~ msgid "Error during commit"
-#~ msgstr "Erro ao aplicar as mudanças"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Alguns problemas ocorreram durante a limpeza. Por favor veja as mensagens "
-#~ "abaixo para maiores informações. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Restaurando o estado original do sistema"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "Baixando atualização de '%s'"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Verificando o Gerenciador de Pacotes"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Preparação para a atualização falhou"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Preparação do sistema para atualização falhou. Pro favor, reporte isso "
-#~ "como um bug do pacote 'update-manager' e inclua os arquivos no /var/log/"
-#~ "dist-upgrade/ no relatório do bug."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Atualizando informação do repositório"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Informação do pacote inválida"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Depois que a sua informação do pacote foi atualizada, o pacote essencial "
-#~ "'%s' não pôde mais ser encontrado.\n"
-#~ "Isso indica uma falha grave, por favor reporte isso como um erro no "
-#~ "pacote do  'update-manager' e inclua os arquivos contidos em /var/log/"
-#~ "dist-upgrade/ no relatório de erros."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Pedindi por confirmação"
-
-#~ msgid "Upgrading"
-#~ msgstr "Atualizando"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Buscando programas obsoletos"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "A Atualização do Sistema está completa."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Por favor insira '%s' no drive '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "A extração foi finalizada"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Obtendo arquivo %li de %li a %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Restam %s aproximadamente"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Obtendo arquivo %li de %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "..."
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Não foi possível instalar '%s'"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "A atualização irá abortar agora. Por favor, relate esse erro no pacote "
-#~ "'update-manager' e inclua os arquivos em /var/log/dist-upgrade/ no "
-#~ "relatório de erros."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Substituir o arquivo de configurações customizadas\n"
-#~ "'%s'?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Você irá perder qualquer mudança que tenha feito nesse arquivo de "
-#~ "configuração se você escolher substituir ele por uma versão mais nova."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "O comando 'diff' não foi encontrado"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Ocorreu um erro fatal"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Por favor relate isto como um bug e inclua os arquivos /var/log/dist-"
-#~ "upgrade.log e /var/log/dist-upgrade-apt.log em seu relatório. A "
-#~ "atualização será abortada agora.\n"
-#~ "Seu sources.list original foi salvo em /etc/apt/sources.list.distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d pacote será removido."
-#~ msgstr[1] "%d pacotes serão removidos."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d novo pacote será instalado."
-#~ msgstr[1] "%d novos pacotes serão instalados."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d pacote será atualizado."
-#~ msgstr[1] "%d pacotes serão atualizados."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Você tem que baixar um total de %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "A obtenção e instalação da atualização pode levar muitas horas e não "
-#~ "poderá ser cancelada depois."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr "Para evitar perda de dados, feche todas as aplicações e documentos."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Seu sistema está atualizado"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Não há atualizações disponíveis para o seu sistema. A atualização será "
-#~ "cancelada agora."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Remover %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Instalar %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Atualizar %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li dias %li horas %li minutos"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li horas %li minutos"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minutos"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li segundos"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Esse download irá durar %s com uma conexão ADSL de 1Mbps e %s com um "
-#~ "modem 56k"
-
-#~ msgid "Reboot required"
-#~ msgstr "Reinicialização requerida"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "A atualização está terminada e é necessário reiniciar o computador. Você "
-#~ "deseja fazer isso agora?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Cancelar a atualização em progresso?</big></b>\n"
-#~ "\n"
-#~ "O sistema pode ficar inutilizável se você cancelar a atualização. É "
-#~ "altamente recomendável que você prossiga com a atualização."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Reinicie o seu sistema para finalizar a atualização</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Iniciar a Atualização?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Atualizando o Ubuntu para a versão 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Limpando"
-
-#~ msgid "Details"
-#~ msgstr "Detalhes"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Diferenças entre os arquivos"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Obtendo e instalando as atualizações"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Modificando os canais de software"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Preparando a Atualização"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Reiniciando o sistema"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Cancelar Atualização"
-
-#~ msgid "_Continue"
-#~ msgstr "_Continuar"
-
-#~ msgid "_Keep"
-#~ msgstr "_Manter"
-
-#~ msgid "_Replace"
-#~ msgstr "_Subtituir"
-
-#~ msgid "_Report Bug"
-#~ msgstr "Reportar _Erro"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Reiniciar Agora"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "Continua_r Atualização"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Iniciar Atualização"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Não foi possível encontrar as notas de lançamento"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "O servidor pode estar sobrecarregado. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Não foi possível obter as notas de lançamento"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Por favor, verifique sua conexão de internet."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Não foi possível executar a ferramenta de atualização"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Este é, provavelmente, um bug na ferramenta de atualização. Por favor, "
-#~ "reporte-o como tal"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Obtendo a ferramenta de atualização"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "A ferramenta de atualização irá guia-lo pelo processo."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Assinatura da ferramenta de atualização"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Ferramenta de atualização"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Falha ao obter"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Falha ao obter a atualização. Pode ter havido algum problema com a rede. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Falha ao extrair"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Falha ao extrair a atualização. Pode ter havido um problema com a rede ou "
-#~ "com o servidor. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Falha na verificação"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Falha ao verificar atualização. Talvez devido a um problema com a rede ou "
-#~ "com o servidor. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Falha na autenticação"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Falha ao autenticar a atualização. Pode ter havido um problema com a rede "
-#~ "ou com o servidor. "
-
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "Baixando arquivo %(current)li de %(total)li a %(speed)s/s"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Baixando arquivo %(current)li de %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "A lista de alterações não está disponível"
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Essa lista de mudanças não está disponível ainda.\n"
-#~ "Por favor tente mais tarde."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Falha ao baixar a lista de mudanças. \n"
-#~ "Por favor verifique sua conexão internet."
-
-#~ msgid "Backports"
-#~ msgstr "Backports"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Atualizações da distribuição"
-
-#~ msgid "Other updates"
-#~ msgstr "Outras atualizações"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versão %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Baixando lista de mudanças..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "_Desmarcar Todos"
-
-#~ msgid "_Check All"
-#~ msgstr "_Marcar Todos"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Tamanho do download: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Você pode instalar %s atualização"
-#~ msgstr[1] "Você pode instalar %s atualizações"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Por favor, espere, isto pode levar algum tempo."
-
-#~ msgid "Update is complete"
-#~ msgstr "Atualização completa"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Verificando por atualizações"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Da versão %(old_version)s para %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Versão %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Tamanho: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Sua distribuição não é mais suportada"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Você não terá mais como instalar atualizações críticas ou correções para "
-#~ "falhas de segurança. Atualize para uma versão mais nova do Ubuntu Linux. "
-#~ "Veja http://www.ubuntu-br.org"
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Nova versão da distribuição '%s' está disponível</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "A índex de software está quebrado"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Não é possível instalar ou remover qualquer programa. Por favor use o "
-#~ "Gerenciador de Pacotes \"Synaptic\" ou execute \"sudo apt-get install -f"
-#~ "\" em um terminal para resolver esse problema primeiro."
-
-#~ msgid "None"
-#~ msgstr "Nenhum"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Você deve marcar para a atualização manualmente</big></b>\n"
-#~ "\n"
-#~ "Seu sistema não verifica as atualizações automaticamente. Você deve "
-#~ "configurar esse comportamento em <i>Fontes de Softwares</i> na aba "
-#~ "<i>Atualizações Internet</i>."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Manter o Sistema Atualizado</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>Nem todas as atualizações podem ser instaladas</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<big><b>Iniciando o gerenciador de atualizações</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "Modificações"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Mudanças e descrição da atualização"
-
-#~ msgid "Chec_k"
-#~ msgstr "_Verificar"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Verificar os canais de software por novas atualizações"
-
-#~ msgid "Description"
-#~ msgstr "Descrição"
-
-#~ msgid "Release Notes"
-#~ msgstr "Notas de Versão"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Fazer uma atualização da distribuição, para instalar quantas atualizações "
-#~ "forem possíveis. \n"
-#~ "\n"
-#~ "Isso pode ser causado por um upgrade incompleto, pacotes de programas não-"
-#~ "oficiais ou por executar uma versão em desenvolvimento."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Exibir progresso de arquivos únicos"
-
-#~ msgid "Software Updates"
-#~ msgstr "Atualizações de software"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades "
-#~ "de segurança, e prover novas funcionalidades para você."
-
-#~ msgid "U_pgrade"
-#~ msgstr "At_ualizar"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Atualizar para a última versão do Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Verificar"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "Atualização da _Distribuição"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Ocultar esta informação no futuro"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Instalar Atualizações"
-
-#~ msgid "_Upgrade"
-#~ msgstr "At_ualizar"
-
-#~ msgid "changes"
-#~ msgstr "mudanças"
-
-#~ msgid "updates"
-#~ msgstr "atualizações"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Atualizações automáticas</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Atualizações via Internet</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Para melhorar a experiência do usuário Ubuntu por favor participe "
-#~ "desta pesquisa de popularidade. Se você participar, uma lista dos "
-#~ "aplicativos instalados e com que frequência são utilizados será coletada "
-#~ "e enviada anonimamente para o projeto Ubuntu semanalmente.\n"
-#~ "\n"
-#~ "Os resultados são usados para melhorar o suporte de aplicativos populares "
-#~ "a para fazer um ranking de aplicações nos resultados de busca.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Adicionar CD-ROM"
-
-#~ msgid "Authentication"
-#~ msgstr "Autenticação"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "Apagar arquivos d_e programas obtidos:"
-
-#~ msgid "Download from:"
-#~ msgstr "Baixar de:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Importar a chave pública de um fornecedor de programas confiável"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Atualizações via Internet"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Somente atualizações de segurança do servidor oficial do Ubuntu serão "
-#~ "instaladas automaticamente."
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Restaurar Pa_drões"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Restaurar as chaves padrão da sua distribuição"
-
-#~ msgid "Software Sources"
-#~ msgstr "Canais de Software"
-
-#~ msgid "Source code"
-#~ msgstr "Código fonte"
-
-#~ msgid "Statistics"
-#~ msgstr "Estatísticas"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Enviar informações estatísticas"
-
-#~ msgid "Third Party"
-#~ msgstr "Outros Pacotes"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "Verifi_car por atualizações automaticamente:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Obter atualizações automaticamente, mas não instalá-las"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Importar Arquivo Chave"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Instalar novas atualizações de segurança sem confirmação"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>A informação sobre programas disponíveis está desatualizada</"
-#~ "big></b>\n"
-#~ "\n"
-#~ "Para instalar programas e atualizações de fontes recentemente adicionadas "
-#~ "ou alteradas, você tem que recarregar as informações sobre programas "
-#~ "disponíveis.\n"
-#~ "\n"
-#~ "Você precisa de uma conexão com a Internet funcionando para continuar."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comentário</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Componentes:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribuição:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipo:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Entre com a linha do APT completa do repositório que você deseja "
-#~ "adicionar como fonte</b></big>\n"
-#~ "\n"
-#~ "A linha do APT inclui o tipo, localização e componentes de um "
-#~ "repositório, por exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "Linha do APT:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binário\n"
-#~ "Fonte"
-
-#~ msgid "Edit Source"
-#~ msgstr "Editar Canal"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Procurando no CD-ROM"
-
-#~ msgid "_Add Source"
-#~ msgstr "_Adicionar Canal"
-
-#~ msgid "_Reload"
-#~ msgstr "_Recarregar"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Exibir e instalar as atualizações disponíveis"
-
-#~ msgid "Update Manager"
-#~ msgstr "Gerenciador de Atualizações"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Checar automaticamente se uma nova versão da distribuição atual está "
-#~ "disponível e oferecer a atualização (se possível)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Checar por novas versões da distribuição"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Se a verificação de atualizações estiver desabilitada, você tem que "
-#~ "recarregar a lista de canais manualmente. Esta opção oculta o lembrete "
-#~ "mostrado neste caso."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Lembrar de recarregar a lista de canais"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Exibir detalhes de uma atualização"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Armazena o tamanho do diálogo do update-manager"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Armazena o status do expansor que contém a lista de mudanças e a descrição"
-
-#~ msgid "The window size"
-#~ msgstr "O tamanho da janela"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Configurar os canais de software e atualizações via internet"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Atualizações de Segurança do Debian 3.1 \"Sarge\""
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid ""
-#~ "<big><b>Error scaning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Erro analisando o CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occured while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Um problema sem solução ocorreu durante o cálculo da atualização. Por "
-#~ "favor relate isto como um erro."
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are runing.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "O seu sistema não possui um pacote ubuntu-desktop, kubuntu-desktop ou "
-#~ "edubuntu-desktop e não foi possível detectar qual versão do Ubuntu você "
-#~ "está executando.\n"
-#~ "Por favor instale um desses pacotes primeiro usando o Synaptic ou apt-get "
-#~ "antes de continuar."
-
-#~ msgid ""
-#~ "Some third party entries in your souces.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Algumas entradas de terceiros de seu sources.list foram desabilitadas. "
-#~ "Você poderá reabilitá-las depois de atualizar com a ferramenta "
-#~ "'propriedades do programa' ou com o synaptic."
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Alguns softwares não são mais oficialmente suportado."
-
-#~ msgid ""
-#~ "These installed packages are no longer officially supported, and are now "
-#~ "only community-supported ('universe').\n"
-#~ "\n"
-#~ "If you don't have 'universe' enabled these packages will be suggested for "
-#~ "removal in the next step. "
-#~ msgstr ""
-#~ "Estes pacotes já instalados não são mais oficialmente suportados, e agora "
-#~ "são suportados somente pela comunidade ('universe').\n"
-#~ "\n"
-#~ "Se você não tem o repositório 'universe' habilitado, estes pacotes serão "
-#~ "sugeridos à remoção no próximo passo. "
-
-#~ msgid ""
-#~ "Replace configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Substituir arquivo de configuração\n"
-#~ "'%s' ?"
-
-#~ msgid "%s package is going to be removed."
-#~ msgid_plural "%s packages are going to be removed."
-#~ msgstr[0] "%s pacote será removido."
-#~ msgstr[1] "%s pacotes serão removidos."
-
-#~ msgid "%s new package is going to be installed."
-#~ msgid_plural "%s new packages are going to be installed."
-#~ msgstr[0] "%s novo pacote será instalado."
-#~ msgstr[1] "%s novos pacotes serão instalados."
-
-#~ msgid "%s package is going to be upgraded."
-#~ msgid_plural "%s packages are going to be upgraded."
-#~ msgstr[0] "%s pacote será atualizado."
-#~ msgstr[1] "%s pacotes serão atualizados."
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Não foi possível encontrar nenhuma atualização"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Seu sistema já foi atualizado."
-
-#~ msgid ""
-#~ "This download will take about %s with a 56k modem and about %s with a "
-#~ "1Mbit DSL connection"
-#~ msgstr ""
-#~ "Este download demorará cerca de %s com um modem 56k e cerca de %s com uma "
-#~ "conexão 1Mbit DSL."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Atualizando para o Ubuntu 6.10</"
-#~ "span>"
-
-#~ msgid ""
-#~ "Verfing the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Falha na verificação da atualização. Pode ter havido um problema com a "
-#~ "rede ou com o servidor. "
-
-#~ msgid "Downloading file %li of %li with %s/s"
-#~ msgstr "Obtendo arquivo %li de %li a %s/s"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida"
-
-#~ msgid "The list of changes is not available yet. Please try again later."
-#~ msgstr ""
-#~ "A lista de alterações não está disponível ainda. Por favor, tente "
-#~ "novamente mais tarde."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. Please check your Internet "
-#~ "connection."
-#~ msgstr ""
-#~ "Não foi possível baixar a lista de mudanças. Por favor, verifique sua "
-#~ "conexão com a internet."
-
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Atualizações de segurança importantes do Ubuntu"
-
-#~ msgid "Recommended updates of Ubuntu"
-#~ msgstr "Atualizações recomentadas do Ubuntu"
-
-#~ msgid "Proposed updates for Ubuntu"
-#~ msgstr "Atualizações propostas para o Ubuntu"
-
-#~ msgid "Backports of Ubuntu"
-#~ msgstr "Backports do Ubuntu"
-
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Atualizações do Ubuntu"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Não foi possível instalar todas as atualizações disponíveis"
-
-#~ msgid "Downloading the list of changes..."
-#~ msgstr "Obtendo a lista de alterações"
-
-#~ msgid "Select _None"
-#~ msgstr "Selecionar _Nenhum"
-
-#~ msgid "Select _All"
-#~ msgstr "Selecion_ar Todos"
-
-#~ msgid "From version %s to %s"
-#~ msgstr "Da versão %s para %s"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties"
-#~ "\"."
-#~ msgstr ""
-#~ "<b><big>Você deve verificar as atualizações manualmente</big></b>\n"
-#~ "\n"
-#~ "O seu sistema não procura por atualizações automaticamente. Você pode "
-#~ "configurar essa opção em \"Sistema\" -> \"Administração\" -> "
-#~ "\"Propriedades de Programas\"."
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Verificando as Atualizações Disponíveis</b></big>\n"
-#~ "\n"
-#~ "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades "
-#~ "de segurança, e prover novas funcionalidades para você."
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Cancelar _Download"
-
-#~ msgid ""
-#~ "<b><big>The channel information is out-of-date</big></b>\n"
-#~ "\n"
-#~ "You have to reload the channel information to install software and "
-#~ "updates from newly added or changed channels. \n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>O canal informação está desatualizado</big></b>\n"
-#~ "\n"
-#~ "Você tem que recarregar as informações do canal para instalar programas e "
-#~ "atualizações de canais adicionados ou alterados.\n"
-#~ "\n"
-#~ "Você necessita uma conexão de internet para continuar."
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the source that you want to add</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a source, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Insira a linha completa do APT referente ao canal que você quer "
-#~ "adicionar</b></big>\n"
-#~ "\n"
-#~ "A linha do APT contém o tipo, a localização e as seções do canal, por "
-#~ "exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabeld, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Se a verificação automática de atualizações for desativada, você terá que "
-#~ "recarregar manualmente a lista de canais. Esta opção perminte que você "
-#~ "esconda o lembrete mostrado neste caso."
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changs and the "
-#~ "description"
-#~ msgstr ""
-#~ "Armazena o estado do expansor que contém a lista de mudanças e a descrição"
-
-#~ msgid "By Canonical supported Open Source software"
-#~ msgstr "Programa de Código Aberto suportado pela Canonical"
-
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "Programas restritos por copyright ou questões legais"
-
-#~ msgid "Oficially supported"
-#~ msgstr "Suportado Oficialmente"
-
-#, fuzzy
-#~ msgid "No longer oficially supported"
-#~ msgstr "Alguns softwares não são mais oficialmente suportado."
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Algumas atualizações requerem a remoção de outros pacotes.Use a função "
-#~ "\"Marcar Todas Atualizações\" do gerenciador de pacotes \"Synaptic\" ou "
-#~ "rode \"sudo apt-get dist-upgrade\" em um terminal para atualizar seu "
-#~ "sistema completamente."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "As seguintes atualizações serão puladas:"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Aproximadamente %li segundos restando"
-
-#~ msgid "Download is complete"
-#~ msgstr "O Download está completo"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "A atualização será abortada agora. Por favor reporte este erro."
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Atualizando o Ubuntu"
-
-#~ msgid "Hide details"
-#~ msgstr "Esconder detalhes"
-
-#~ msgid "Show details"
-#~ msgstr "Exibir Detalhes"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr ""
-#~ "Apenas uma ferramenta de gerenciamento de pacotes pode rodar ao mesmo "
-#~ "tempo"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Por favor, feche a outra aplicação e.g. 'aptitude' ou 'Synaptic' primeiro."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Canais</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Chaves</b>"
-
-#~ msgid "Add _Cdrom"
-#~ msgstr "Adicionar _Cdrom"
-
-#~ msgid "Installation Media"
-#~ msgstr "Mídia de Instalação"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Preferências de software"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Canal</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Componentes</b>"
-
-#~ msgid "Add Channel"
-#~ msgstr "Adicionar Canal"
-
-#~ msgid "Edit Channel"
-#~ msgstr "Editar Canal"
-
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Adicionar Canal"
-#~ msgstr[1] "_Adicionar Canais"
-
-#, fuzzy
-#~ msgid "_Custom"
-#~ msgstr "_Personalizado"
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Atualizações de Segurança do Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Atualizações do Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Backports do Ubuntu 6.06 LTS"
-
-#~ msgid ""
-#~ "While scaning your repository information no valid entry for the upgrade "
-#~ "was found.\n"
-#~ msgstr ""
-#~ "Enquanto analisava as informações de repositórios não foi encontrada uma "
-#~ "entrada válida para a atualização.\n"
-
-#~ msgid "Repositories changed"
-#~ msgstr "Repositórios alterados"
-
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "Você precisa recarregar a lista de pacotes dos servidores para que suas "
-#~ "alterações tenham efeito. Você quer fazer isso agora?"
-
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Seções</b>"
-
-#~ msgid "Check for available updates"
-#~ msgstr "Procurar updates disponíveis"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Seções:</b>"
-
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Recarregar as últimas informações sobre atualizações"
-
-#, fuzzy
-#~ msgid "Add the following software channel?"
-#~ msgid_plural "Add the following software channels?"
-#~ msgstr[0] "Modificando os canais de programas"
-#~ msgstr[1] "Modificando os canais de programas"
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#, fuzzy
-#~ msgid "Could not add any software channels"
-#~ msgstr "Modificando os canais de programas"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Baixando modificações</span>\n"
-#~ "\n"
-#~ "É necessário obter as modificações do servidor central"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Exibir atualizações disponíveis e escolher quais instalar"
-
-#~ msgid ""
-#~ "There is not enough free space on your system to download the required "
-#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-"
-#~ "get clean'"
-#~ msgstr ""
-#~ "Não há espaço suficiente no seu sistema para obter os pacotes requeridos. "
-#~ "Por favor libere algum espaço antes de tentar novamente. Como: 'sudo apt-"
-#~ "get clean'"
-
-#~ msgid "Error fetching the packages"
-#~ msgstr "Erro ao obter os pacotes"
-
-#~ msgid ""
-#~ "Some problem occured during the fetching of the packages. This is most "
-#~ "likely a network problem. Please check your network and try again. "
-#~ msgstr ""
-#~ "Alguns problemas ocorreram durante a obtenção dos pacotes. Isso é bem "
-#~ "provável que seja por problemas de rede. Por favor verifique a sua "
-#~ "conexão de rede e tente novamente. "
-
-#~ msgid ""
-#~ "%s packages are going to be removed.\n"
-#~ "%s packages are going to be newly installed.\n"
-#~ "%s packages are going to be upgraded.\n"
-#~ "\n"
-#~ "%s needs to be fetched"
-#~ msgstr ""
-#~ "%s pacotes serão removidos.\n"
-#~ "%s pacotes serão instalados.\n"
-#~ "%s pacotes serão atualizados.\n"
-#~ "\n"
-#~ "%s precisam ser obtidos"
-
-#~ msgid "To be installed: %s"
-#~ msgstr "A serem instalados: %s"
-
-#~ msgid "To be upgraded: %s"
-#~ msgstr "A serem atualizados: %s"
-
-#~ msgid "Are you sure you want cancel?"
-#~ msgstr "Tem certeza que deseja cancelar?"
-
-#~ msgid ""
-#~ "Canceling during a upgrade can leave the system in a unstable state. It "
-#~ "is strongly adviced to continue the operation. "
-#~ msgstr ""
-#~ "Cancelar durante a atualização pode deixar o sistema em um estado "
-#~ "instável. É fortemente recomendável que a operação continue. "
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Baixando arquivo %(current)li de %(total)li"
 
-#, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Software Sources</b>"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detalhes"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "Automatically check for updates"
-#~ msgstr "Automatically check for software _updates."
+msgid "Starting..."
+msgstr "Configurações"
 
-#, fuzzy
-#~ msgid "Cancel downloading of the changelog"
-#~ msgstr "Cancel downloading the ChangeLog"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "Escolha um arquivo-chave"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "<b>Packages to install:</b>"
-#~ msgstr "<b>Pacotes a instalar:</b>"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Atualizações disponíveis</b></big>\n"
-#~ "\n"
-#~ "Os seguintes pacotes podem ser atualizados. Você pode atualizá-los "
-#~ "clicando no botão Instalar."
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "A lista de alterações não está disponível"
 
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Repositório</b>"
+#: ../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 ""
 
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Arquivos temporários</b>"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Falha ao baixar a lista de mudanças. \n"
+"Por favor verifique sua conexão internet."
 
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Interface de usuário</b>"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Chaves de autenticação</b></big>\n"
-#~ "\n"
-#~ "Você pode adicionar e remover chaves de autenticação neste diálogo. Uma "
-#~ "chave torna possível verificar a integridade do software que você baixar."
-
-#~ msgid "A_uthentication"
-#~ msgstr "A_utenticação"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Adicionar uma nova chave ao chaveiro de confiança. Assegure-se de que "
-#~ "você obteve a chave através de um canal seguro e que você confia no "
-#~ "proprietário. "
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Limpar automaticamente arquivos _temporários de pacotes"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Clean interval in days: "
-#~ msgstr "Intervalo de limpeza, em dias: "
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Excluir pacotes _antigos do cache de pacotes"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Edit Repository..."
-#~ msgstr "Editar repositório..."
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Maximum age in days:"
-#~ msgstr "Idade máxima em dias:"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Não foi possível instalar '%s'"
 
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Tamanho máximo em MB:"
+#: ../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 ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Restaura as chaves padrão fornecidas com a distribuição. Isso não irá "
-#~ "alterar as chaves instaladas pelo usuário."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Definir o tamanho _máximo para o cache de pacotes"
-
-#~ msgid "Settings"
-#~ msgstr "Configurações"
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "Exibir fontes de software desabilitadas"
-
-#~ msgid "Update interval in days: "
-#~ msgstr "Intervalo de atualização em dias: "
-
-#~ msgid "_Add Repository"
-#~ msgstr "_Adicionar repositório"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Baixar pacotes atualizáveis"
-
-#~ msgid ""
-#~ "This means that some dependencies of the installed packages are not "
-#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
-#~ msgstr ""
-#~ "Isso quer dizer que algumas dependências dos pacotes instalados não foram "
-#~ "satisfeitas. Por favor use \"Synaptic\" ou \"apt-get\" para resolver a "
-#~ "situação."
-
-#~ msgid "It is not possible to upgrade all packages."
-#~ msgstr "Não é possível atualizar todos os pacotes."
-
-#~ msgid ""
-#~ "This means that besides the actual upgrade of the packages some further "
-#~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
-#~ msgstr ""
-#~ "Isso quer dizer que além da atualização dos pacotes, uma ação a mais será "
-#~ "necessária (tais como instalar ou remover pacotes). Por favor use o "
-#~ "Synaptic \"Smart Upgrade\" ou \"apt-get dist-upgrade\" para arrumar a "
-#~ "situação."
-
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr ""
-#~ "Modificações não encontradas, o servidor pode não ter sido atualizado "
-#~ "ainda."
-
-#~ msgid "The updates are being applied."
-#~ msgstr "As atualizações estão sendo aplicadas."
-
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Você pode executar apenas uma aplicação gerenciadora de pacotes ao mesmo "
-#~ "tempo. Por favor feche a outra aplicação primeiro."
-
-#~ msgid "Updating package list..."
-#~ msgstr "Atualizando lista de pacotes..."
-
-#~ msgid "There are no updates available."
-#~ msgstr "Não existem atualizações disponíveis."
-
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Por favor atualize para uma nova versão do Ubuntu Linux. A versão que "
-#~ "você está utilizando não recebe mais atualizações de segurança ou outras "
-#~ "atualizações críticas. Por favor veja http://www.ubuntulinux.org para "
-#~ "informações sobre a atualização."
-
-#~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "Existe uma nova versão do Ubuntu disponível!"
-
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "Uma nova versão nomeada '%s' está disponível. Por favor veja http://www."
-#~ "ubuntulinux.org para instruções de atualização."
-
-#~ msgid "Never show this message again"
-#~ msgstr "Nunca exibir esta mensagem novamente"
+msgid "An essential package would be removed"
+msgstr "Um pacote essencial teria que ser removido"
 
-#, fuzzy
-#~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
-#~ msgstr ""
-#~ "Isso geralmente quer dizer que outra aplicação de gerenciamento de "
-#~ "pacotes (como apt-get ou aptitude) está em execução. Por favor feche essa "
-#~ "aplicação primeiro"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Initializing and getting list of updates..."
-#~ msgstr "Inicializando e obtendo lista de atualizações..."
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Você precisa ser root para executar este programa."
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Edit software sources and settings"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Ubuntu Update Manager"
-#~ msgstr "Ubuntu Update Manager"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Binary"
-#~ msgstr "Binário"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "CD"
-#~ msgstr "CD"
+#: ../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 ""
 
-#~ msgid "Non-free software"
-#~ msgstr "Softwares não-livres"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Chave de assinatura automática do Ubuntu <ftpmaster@ubuntu.com>"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr ""
-#~ "Chave de assinatura automática da imagem de CD do Ubuntu <cdimage@ubuntu."
-#~ "com>"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/qu.po b/po/qu.po
index 44c158ce..30815be8 100644
--- a/po/qu.po
+++ b/po/qu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,51 +276,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -303,14 +338,157 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "    "
-#~ 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 3a9d20ed..82b3c199 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -25,237 +25,268 @@ 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: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 cu 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 cu 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 cu 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cdrom cu Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Actualizări de Securitate Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cdrom cu Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Actualizări de Securitate Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cdrom cu Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Pachete întreţinute de comunitate (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "Software în contribuţie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cdrom cu Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Pachete întreţinute de comunitate (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Pachete întreţinute de comunitate (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Pachete întreţinute de comunitate (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Pachete non-libere"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Software restricţionat (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Cdrom cu Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Actualizări importante de securitate"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Actualizări recomandate"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Pachete propuse"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Actualizări portate înapoi"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cdrom cu Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Actualizări de Securitate Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Actualizări Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cdrom cu Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Pachete suportate oficial"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Actualizări de Securitate Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Actualizări Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Pachete întreţinute de comunitate (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Pachete non-libere (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Pachete suportate oficial"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Copyright restrictiv"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Actualizări de securitate Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Actualizări Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Backports"
 
@@ -267,55 +298,68 @@ 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:58
+#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 3.1 \"Sarge\""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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 "Pachete propuse"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Actualizări importante de securitate"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "Software compatibil DFSG cu dependenţe negratuite"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Software incompatibil DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Server pentru %s"
@@ -323,1168 +367,161 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Server principal"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Servere preferenţiale"
 
-#~ msgid "Daily"
-#~ msgstr "Zilnic"
-
-#~ msgid "Every two days"
-#~ msgstr "La fiecare două zile"
-
-#~ msgid "Weekly"
-#~ msgstr "Săptămânal"
-
-#~ msgid "Every two weeks"
-#~ msgstr "La fiecare 2 săptămâni"
-
-#~ msgid "Every %s days"
-#~ msgstr "La fiecare %s zile"
-
-#~ msgid "After one week"
-#~ msgstr "După o saptămână"
-
-#~ msgid "After two weeks"
-#~ msgstr "După două săptămâni"
-
-#~ msgid "After one month"
-#~ msgstr "După o lună"
-
-#~ msgid "After %s days"
-#~ msgstr "După %s zile"
-
-#~ msgid "%s updates"
-#~ msgstr "%s actualizări"
-
-#~ msgid "Nearest server"
-#~ msgstr "Cel mai apropiat server"
-
-#~ msgid "Software Channel"
-#~ msgstr "Canal software"
-
-#~ msgid "Active"
-#~ msgstr "Activ"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Cod sursă)"
-
-#~ msgid "Source Code"
-#~ msgstr "Cod sursă"
-
-#, fuzzy
-#~ msgid "Import key"
-#~ msgstr "Importă cheie"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Eroare la importarea fişierului selectat"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Fişierul selectat nu pare a fi o cheie GPG sau poate fi corupt."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Eroare la ştergerea cheii."
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "Cheia selectată nu poate fi ştearsă. Raportaţi această eroare."
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Eroare la scanarea CD-ului</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Introduceţi un nume pentru disc"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Introduceţi un disc în unitate:"
-
-#, fuzzy
-#~ msgid "Broken packages"
-#~ msgstr "Pachete deteriorate"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Sistemul dumneavoastră conţine pachete deteriorate care nu au putut fi "
-#~ "reparate cu acest program. Înainte de a continua vă rugăm să le remediaţi "
-#~ "utilizând synaptic sau apt-get."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Este imposibilă actualizarea meta-pachetelor cerute"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Un pachet esenţial ar trebui şters"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Imposibil de calculat actualizarea"
-
-#, fuzzy
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Eroare la autentificarea unor pachete."
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "A fost imposibilă identificarea unor pachete. Acest lucru se poate datora "
-#~ "unor probleme temporare pe reţea. Vă recomandăm să reveniţi mai târziu. "
-#~ "Dedesubt sunt afişate lista pachetelor neidentificate."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Nu pot instala '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Nu am reuşit să instalez pachetul cerut. Vă rugăm raportaţi acest lucru "
-#~ "ca bug (eroare). "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Imposibl de ghicit meta-pachet"
-
-#, fuzzy
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Sistemul conţine pachete deteriorate care nu au putut fi reparate cu "
-#~ "acest program. Înainte de a continua vă rugăm să le remediaţi utilizând "
-#~ "synaptic sau apt-get."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Adăugarea CD-ului a eşuat"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "A apărut o eroare la adăugarea CD-ului; eroarea se va opri. Vă rugăm "
-#~ "raporaţi o eroare dacă acest CD Ubuntu este unul valid.\n"
-#~ "\n"
-#~ "Mesajul de eroare a fost:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "Citire cache"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Descarc date de la reţea pentru actualizare?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "Actualizarea poate cauza reţeaua să verifice ultimele actualizări şi să "
-#~ "descarce pachete care nu se găsesc pe CD-ul curent.\n"
-#~ "Dacă aveţi o conexiune rapidă sau ieftină ar trebui să răspundeti cu "
-#~ "'Da'. Dacă accesul la reţea este scump pentru dumneavoastră alegeţi 'Nu'."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Nicio oglindă validă găsită"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "În timpul scanării datelor dumneavoastră despre depozit nicio intrare "
-#~ "oglindă nu a fost găsită. Acest lucru se poate întâmpla dacă rulaţi o "
-#~ "oglindă internă sau daca informaţiile sunt învechite.\n"
-#~ "\n"
-#~ "Doriţi să rescrieţi fişierul 'sources.list' oricum? Dacă selectaţi 'Da' "
-#~ "se vor modifica toate intrările din '%s' în '%s'."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Generez surse implicite?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "După scanarea fişierului 'sources.list' nicio intrare validă pentru '%s' "
-#~ "nu a fost găsită.\n"
-#~ "\n"
-#~ "Ar trebui ca intrările implicite pentru '%s' să fie adăugate? Daca "
-#~ "selectaţi 'Nu' actualizarea va înceta."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Informaţii despre depozit nevalide"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Actualizând informaţiile despre deposit a rezultat într-un fişier "
-#~ "nevalid. Vă rugăm să reportaţi acest lucru ca eroare."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Sursele terţe ar trebui dezactivate"
-
-#~ msgid "Error during update"
-#~ msgstr "Eroare în timpul actualizării"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "A apărut o problemă în timpul actualizării. De obicei este legată de "
-#~ "reţea, vă rugăm să verificaţi conexiunea dumneavoastra şi să încercaţi "
-#~ "din nou."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Spaţiu liber insuficient"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Actualizarea se opreşte acum. Vă rugăm să eliberaţi cel puţin %s de "
-#~ "spaţiu pe disc pe %s. Goliţi coşul de gunoi şi ştergeţi pachetele "
-#~ "temporare de la instalările vechi folosind 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Vrei sa începi upgrade-ul?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Nu s-au putut instalat upgrade-urile"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Actualizarea se opreşte acum. Sistemul dumneavoastră ar putea fi într-o "
-#~ "stare în care nu funcţionează. O recuperare a fost pornita (dpkg --"
-#~ "configure -a).\n"
-#~ "Vă rugăm raportaţi această eroare la pachetul 'update-manager' şi "
-#~ "includeţi fişierele din /var/log/dist-upgrade/ în raport."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Nu pot descărca actualizările"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Actualizarea se opreşte acum. Vă rugăm să verificaţi conexiunea la "
-#~ "Internet sau sursa de instalare şi să încercaţi din nou. "
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Şterg pachetele vechi?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Sari peste acest pas"
-
-#~ msgid "_Remove"
-#~ msgstr "Şter_ge"
-
-#~ msgid "Error during commit"
-#~ msgstr "Eroare în timpul salvării"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "O problemă a apărut în timpul acţiunii de curăţenie. Vă rugăm vedeţi "
-#~ "mesajul de mai jos pentru informaţii suplimentare. "
-
-#, fuzzy
-#~ msgid "Restoring original system state"
-#~ msgstr "Se reface starea iniţială a sistemului"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Se verifică managerul de pachete"
-
-#, fuzzy
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Se pregăteşte actualizarea"
-
-#~ msgid "Updating repository information"
-#~ msgstr "Actualizez informaţii depozit"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Informaţii pachet nevalide"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "După ce informaţiile despre pachete au fost actualizate pachetul esenţial "
-#~ "'%s' nu mai poate fi găsit.\n"
-#~ "Aceasta indică o eroare serioasă, vă rugăm raportaţi o eroare la pachetul "
-#~ "'update-manager' şi includeţi fişierele din /var/log/dist-upgrade/ în "
-#~ "raport."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Se aşteaptă confirmarea"
-
-#~ msgid "Upgrading"
-#~ msgstr "Se actualizează"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Caut software învechit"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Actualizarea sistemului este completă"
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Vă rugăm introduceţi '%s' în unitatea '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Descărcare completă"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Descarc fişierul %li din %li la %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Mai rămâne aproximativ %s"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Se descarcă fişierul %li din %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Se aplică modificările"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "'%s' nu s-a putut instala"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "Actualizarea se opreşte acum. Vă rugăm raportaţi o eroare la pachetul "
-#~ "'update-manager' şi includeţi fişierele din /var/log/dist-upgrade/ în "
-#~ "raport."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Comanda 'diff' nu a putut fi localizată"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "S-a produs o eroare fatală"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Vă rugăm raportaţi aceasta ca eroare şi includeţi fişierele /var/log/dist-"
-#~ "upgrade/main.log şi /var/log/dist-upgrade/apt.log în raportul "
-#~ "dumneavoastră. Actualizarea se orpeşte acum.\n"
-#~ "Fişierul iniţial sources.list a fost salvat în /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Trebuie să descărcaţi un total de %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Descărcarea şi intalarea actualizărilor poate dura câteva ore şi nu poate "
-#~ "fi abandonată mai târziu."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Pentru a preveni pierderea datelor închideţi toate aplicaţiile şi "
-#~ "documentele."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Sistemul dumneavoastră este actualizat la zi!"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Şterge %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Instalează %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Actualizează %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li zile %li ore %li minute"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li ore %li minute"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minute"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li secunde"
-
-#~ msgid "Reboot required"
-#~ msgstr "Este necesară repornirea"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Actualizarea s-a încheiat şi este necesară repornirea. Doriţi să faceţi "
-#~ "acest lucru acum?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Anulaţi actualizarea în curs de desfăşurare?</big></b>\n"
-#~ "\n"
-#~ "Este posibil ca sistemul să fie inoperabil dacă anulaţi actualizarea. Vă "
-#~ "recomandăm să continuaţi actualizarea."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Reporniţi sistemul pentru a încheia actualizarea</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Îcepeţi actualizarea?</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Curăţ"
-
-#~ msgid "Details"
-#~ msgstr "Detalii"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Diferenţa dintre fişiere"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Descarc şi instalez actualizări"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Modificând depozitele software"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Se pregăteşte actualizarea"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Se reporneşte sistemul"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#, fuzzy
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Continuă Actualizarea"
-
-#~ msgid "_Keep"
-#~ msgstr "_Păstrează"
-
-#~ msgid "_Replace"
-#~ msgstr "_Înlocuieşte"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Raportaţi eroare"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Reporneşte acum"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Continuă Actualizarea"
-
-#, fuzzy
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Continuă Actualizarea"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Nu găsesc notiţele de lansare"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Serverul ar putea fi supraîncărcat. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Nu pot descărca notiţele de lansare"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Verificaţi conexiunea internet"
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Nu pot rula utilitarul de actualizare"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Aceasta este cel mai probabil o eroare. Raportaţi acest lucru ca eroare."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Descarc utiliatul de actualizare"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Utilitarul de actualizare vă va ghida în procesul de actualizare."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Actualizează semnătura utilitarului"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Actualizează utilitar"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Descărcare eşuata"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Descărcarea actualizării a eşuat. Ar putea exista o problemă la reţea. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Nu s-a putut extrage"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Extragerea actualizării a eşuat. Ar putea exista o problemă cu reţeaua "
-#~ "sau cu serverul. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Verificare eşuată"
-
-#~ msgid "Authentication failed"
-#~ msgstr "Autentificare eşuată"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Autentificarea actualizării a eşuat.  Ar putea exista o problemă cu "
-#~ "reţeaua sau cu serverul. "
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "Lista schimbărilor nu este disponibilă"
-
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "Nu există nici un pachet de actualizat."
-
-#, fuzzy
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Nu am putut descărca lista modificărilor. Vă rog să verificaţi dacă aveţi "
-#~ "o conexiune internet activă."
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "Actualizări de securitate Ubuntu 5.04"
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "_Continuă Actualizarea"
-
-#~ msgid "Other updates"
-#~ msgstr "Alte actualizări"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Versiunea %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Se descarcă listă schimbărilor..."
-
-#~ msgid "Download size: %s"
-#~ msgstr "Dimensiune descărcare: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Puteţi instala actualizarea %s"
-#~ msgstr[1] "Puteţi instala actualizarea %s"
-#~ msgstr[2] "Puteţi instala actualizarea %s"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Vă rugăm aşteptaţi, ar putea dura."
-
-#~ msgid "Update is complete"
-#~ msgstr "Actualizare completă."
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "_Instalează actualizarile"
-
-#, fuzzy
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Versiunea nouă: %s (Mărime: %s)"
-
-#~ msgid "Version %s"
-#~ msgstr "Versiunea %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Dimensiune: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Distribuţia dvs. nu mai este asistată"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Nu veţi mai primi actualizări de securitate sau actualizări obligatorii. "
-#~ "Instalaţi o versiune mai nouă a Ubuntu Linux. Vedeţi http://www.ubuntu."
-#~ "com pentru mai multe informaţii legate de actualizare."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Noua versiune '%s' este disponibilă</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Indexul software este deteriorat"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Instalarea sau ştergerea de software este imposibilă. Vă rugăm să "
-#~ "folosiţi managerul de pachete \"Synaptic\" sau rulaţi \"sudo apt-get "
-#~ "install -f\" într-un terminal pentru a remedia această problemă."
-
-#~ msgid "None"
-#~ msgstr "Nimic"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Menţineţi sistemul la zi</b></big>"
-
-#, fuzzy
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Eroare la scanarea CD-ului</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr ""
-#~ "<big><b>Eroare la scanarea CD-ului</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Changes"
-#~ msgstr "Modificări"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Modificări şi descrierea actualizării"
-
-#~ msgid "Chec_k"
-#~ msgstr "Verific_ă"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Verifică depozitele software pentru actualizări noi"
-
-#~ msgid "Description"
-#~ msgstr "Descriere"
-
-#~ msgid "Release Notes"
-#~ msgstr "Notiţe de lansare"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Afişează progresul pentru fiecare fişier în parte"
-
-#~ msgid "Software Updates"
-#~ msgstr "Actualizări software"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Actualizările programelor corectează erorile, elimină vulnerabilităţile "
-#~ "şi vă pun la dispoziţie opţiuni suplimentare."
-
-#~ msgid "U_pgrade"
-#~ msgstr "A_ctualizează"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Instalaţi ultima versiune Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Verifică"
-
-#, fuzzy
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Continuă Actualizarea"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Nu mai afişa această informaţie pe viitor"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Instalează actualizări"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "A_ctualizează"
-
-#~ msgid "changes"
-#~ msgstr "modificări"
-
-#~ msgid "updates"
-#~ msgstr "actualizări"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Actualizări automate</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Actualizări de pe Internet</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Pentru a îmbunătăţii experienţa Ubuntu vă rugăm să luaţi parte la "
-#~ "concursul de popularitate. Dacă faceţi acest lucru lista de software "
-#~ "instalat şi frecveţa de folosire vor fi colectate şi trimise anonim către "
-#~ "proiectul Ubuntu săptămânal.\n"
-#~ "\n"
-#~ "Rezultatele sunt folosite pentru îmbunătăţirea asistenţei la aplicaţiile "
-#~ "populare şi pentru a ordona aplicaţiile în rezultatele căutărilor.</i>"
-
-#~ msgid "Authentication"
-#~ msgstr "Autentificare"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "Ş_terge fişierele software descărcate:"
-
-#~ msgid "Download from:"
-#~ msgstr "Descarcă din:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Importă cheia publică de la un furnizor software de încredere"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Actualizări de pe Internet"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Doar actualizările de securitate de pe serverele oficiale Ubuntu vor fi "
-#~ "instalate automat"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Restaurează _Setări"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Restaurează cheile iniţiale pentru distribuţia mea"
-
-#~ msgid "Software Sources"
-#~ msgstr "Surse software"
-
-#~ msgid "Source code"
-#~ msgstr "Cod sursă"
-
-#~ msgid "Statistics"
-#~ msgstr "Statistici"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Trimite informaţii statistice"
-
-#~ msgid "Third Party"
-#~ msgstr "Terţ"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Verifică pentru actualizări automat:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Descarcă actualizări automat, dar nu le instala"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Importă fişier cheie"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Instalează actualizări de securitate fără confirmare"
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comentariu:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Componente:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribuţie:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tip:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Introduceţi linia APT completă a locaţiei pe care doriţi să o "
-#~ "adăugaţi</b></big>\n"
-#~ "\n"
-#~ "Linia APT conţine tipul, adresa şi conţinutul unei locaţii, de exemplu<i>"
-#~ "\"deb http://ftp.debian.org sarge main\"</i>. Puteţi găsi o descriere "
-#~ "detaliată a sintaxei în documentaţie."
-
-#~ msgid "APT line:"
-#~ msgstr "Linie APT:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binar\n"
-#~ "Sursă"
-
-#~ msgid "Edit Source"
-#~ msgstr "Editează sursa"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Scanez CD-ROM"
-
-#~ msgid "_Add Source"
-#~ msgstr "_Adaugă sursă"
-
-#~ msgid "_Reload"
-#~ msgstr "_Reîncarcă"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Afişează şi instalează actualizările disponibile"
-
-#~ msgid "Update Manager"
-#~ msgstr "Manager actualizări"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Verifică automat dacă o versiune mai nouă a acestei distribuţii este "
-#~ "disponibilă şi oferă-te să actualizezi (dacă este posibil)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Verifică pentru lansări noi de distribuţie"
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Aminteşte-mi să reîncarc lista canalelor"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Arată detaliile unei actualizări"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Salvează dimensiunea ferestrei update-manager"
-
-#~ msgid "The window size"
-#~ msgstr "Dimensiunea ferestrei"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Configurează sursele pentru software instalabil şi actualizări"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Actualizări de securitate Debian 3.1 \"Sarge\""
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#, fuzzy
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "Software cu restricţii de export din SUA"
-
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "_Instalează actualizarile"
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Nu s-au găsit actualizări"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Sistemul dumneavoastră este actualizat la zi!"
-
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Actualizări importante de securitate pentru Ubuntu"
-
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Actualizări pentru Ubuntu"
-
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "Pachete suportate oficial"
-
-#~ msgid "Hide details"
-#~ msgstr "Ascunde detaliile"
-
-#, fuzzy
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Detalii</b>"
-
-#, fuzzy
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Chei</b>"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Preferinţe software"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#, fuzzy
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Detalii</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Componente</b>"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Actualizări de securitate Ubuntu 5.04"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Actualizări de securitate Ubuntu 5.04"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Actualizări de securitate Ubuntu 5.04"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Actualizări de securitate Ubuntu 6.06"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Repositories changed"
-#~ msgstr "Locaţiile au fost schimbate"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "Informaţiile despre locaţii au fost schimbate. O copie de siguranţă a "
-#~ "fişierului sources.list a fost salvată în %s.save.\n"
-#~ "\n"
-#~ "Pentru ca modificările să aibe efect, trebuie să reîncărcaţi lista de "
-#~ "pachete de pe servere. Doriţi să faceţi acum acest lucru?"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detalii"
 
-#, fuzzy
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Secţiuni:</b>"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Secţiuni:</b>"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Reîncarcă informaţiile despre pachete de pe server."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Descarc modificările</span>\n"
-#~ "\n"
-#~ "Trebuiesc obţinute schimbările de pe serverul central"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Surse software</b>"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Lista schimbărilor nu este disponibilă"
 
-#, fuzzy
-#~ msgid "Automatically check for updates"
-#~ msgstr "Verifică a_utomat actualizările software."
+#: ../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 "<b>Packages to install:</b>"
-#~ msgstr "Pachete de instalat:"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Nu am putut descărca lista modificărilor. Vă rog să verificaţi dacă aveţi o "
+"conexiune internet activă."
 
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Actualizări disponibile</b></big>\n"
-#~ "\n"
-#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările "
-#~ "apăsând pe butonul Instalează."
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Locaţie</b>"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Fişiere temporare</b>"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Interfaţă utilizator</b>"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Chei autentificare</b></big>\n"
-#~ "\n"
-#~ "Din acest dialog puteţi adăuga sau şterge chei de autentificare. Rolul "
-#~ "unei chei estede a permite verificarea integrităţii unui pachet software "
-#~ "descărcat."
-
-#~ msgid "A_uthentication"
-#~ msgstr "A_utentificare"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Adăugaţi o nouă cheie în keyring-ul de încredere. Asiguraţi-vă că aţi "
-#~ "obţinut cheia printr-un canal sigur şi că aveţi încredere în proprietarul "
-#~ "ei. "
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Curăţă automat fişierele _temporare ale pachetelor"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Clean interval in days: "
-#~ msgstr "Interval de curăţire în zile: "
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Nu pot instala '%s'"
 
-#~ msgid "Edit Repository..."
-#~ msgstr "Editează locaţia..."
+#: ../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 ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Restaurează cheile implicite furnizate împreună cu distribuţia. Această "
-#~ "acţiune nu va influenţa cheile instalate ca utilizator."
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "Afişează sursele software dezactivate"
-
-#~ msgid "Update interval in days: "
-#~ msgstr "Interval de actualizare în zile: "
+msgid "An essential package would be removed"
+msgstr "Un pachet esenţial ar trebui şters"
 
-#~ msgid "_Add Repository"
-#~ msgstr "_Adaugă locaţie"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Descarcă pachetele actualizate"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr ""
-#~ "Nu am găsit modificări, s-ar putea ca serverul să nu fi fost actualizat."
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "The updates are being applied."
-#~ msgstr "Actualizările sunt în curs de aplicare."
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Puteţi rula doar un singur manager de pachete la un moment dat. Vă rog să "
-#~ "închideţi ceilalţi manageri mai întâi."
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "There are no updates available."
-#~ msgstr "Nu există nici un pachet de actualizat."
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
-#~ msgstr ""
-#~ "Puteţi rula doar un singur manager de pachete la un moment dat. Vă rog să "
-#~ "închideţi ceilalţi manageri mai întâi."
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Initializing and getting list of updates..."
-#~ msgstr "Iniţializez şi obţin lista actualizărilor..."
+#: ../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 ""
 
-#, fuzzy
-#~ msgid "Binary"
-#~ msgstr ""
-#~ "Binar\n"
-#~ "Sursă"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "CD"
-#~ msgstr "CD"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Non-free software"
-#~ msgstr "Software non-liber"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Actualizări disponibile</b></big>\n"
-#~ "\n"
-#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările "
-#~ "apăsând pe butonul Instalează."
-
-#~ msgid "0"
-#~ msgstr "0"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 87314bb0..2b17faa0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -25,235 +25,266 @@ 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: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 "CD с 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 "CD с 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 "CD с 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Обновления безопасности Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "CD с Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Обновления безопасности Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "CD с Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Поддерживается сообществом"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Проприетарные драйвера устройств"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Несвободное ПО"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "CDROM с Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Open Source приложения, поддерживаемые Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Поддерживается сообществом (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Поддерживаемое сообществом свободное ПО"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Несвободные драйвера"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Проприетарные драйвера устройств "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Проприетарные драйвера устройств"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Несвободное обеспечение (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr "Программы, ограниченные патентами или законами"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "CD с Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Важные обновления безопасности"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Рекомендованые обновления"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Предлагаемые обновления"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Обновления в бэкпортах"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "CD с Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Обновления безопасности Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Обновления Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Официально поддерживается"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Обновления безопасности Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Обновления Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 бэкпорты"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Поддерживается сообществом (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Несвободное (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "CD с Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Официально больше не поддерживается"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Ограниченные авторские права"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Обновления безопасности Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Обновления Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 бэкпорты"
 
@@ -265,55 +296,68 @@ 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
 #, fuzzy
 msgid "Security updates"
 msgstr "Важные обновления безопасности"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-совместимое ПО с зависимостями от несвободного ПО"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Не-DFSG-совместимое ПО"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Сервер %s"
@@ -321,1258 +365,160 @@ 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:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Основной сервер"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Свои сервера"
 
-#~ msgid "Daily"
-#~ msgstr "Ежедневно"
-
-#~ msgid "Every two days"
-#~ msgstr "Каждые два дня"
-
-#~ msgid "Weekly"
-#~ msgstr "Еженедельно"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Каждые две недели"
-
-#~ msgid "Every %s days"
-#~ msgstr "Каждые %s дней"
-
-#~ msgid "After one week"
-#~ msgstr "Через неделю"
-
-#~ msgid "After two weeks"
-#~ msgstr "Через две недели"
-
-#~ msgid "After one month"
-#~ msgstr "Через месяц"
-
-#~ msgid "After %s days"
-#~ msgstr "Через %s дней"
-
-#~ msgid "%s updates"
-#~ msgstr "%s обновлений"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Ближайший сервер"
-
-#~ msgid "Software Channel"
-#~ msgstr "Источник программ"
-
-#~ msgid "Active"
-#~ msgstr "Активен"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Исходный код)"
-
-#~ msgid "Source Code"
-#~ msgstr "Исходный код"
-
-#~ msgid "Import key"
-#~ msgstr "Импортировать ключ"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Ошибка при импортировании выбранного файла"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Возможно выбранный файл не является файлом ключа GPG или поврежден."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Ошибка при удалении ключа"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Выбранный вами ключ нельзя удалить. Пожалуйста, отправьте отчет об ошибке."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Ошибка при сканировании CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Введите название для диска"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Пожалуйста, вставьте диск в привод:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Поврежденные пакеты"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Система содержит поврежденные пакеты, которые не могут быть исправлены "
-#~ "данной программой. Пожалуйста, исправьте их, используя synaptic или apt-"
-#~ "get, прежде чем продолжить."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Невозможно обновить требуемые мета-пакеты"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Будет удален необходимый пакет"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Невозможно подготовить обновление системы"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "При подготовке к обновлению системы возникла неразрешимая проблема.\n"
-#~ "\n"
-#~ "Пожалуйста, отправьте отчет об ошибке программы 'update-manager' и "
-#~ "добавьте файлы в /var/log/dist-upgrade/ к отчету."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Ошибка при проверке подлинности некоторых пакетов"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Невозможно проверить подлинность некоторых пакетов. Возможно, это "
-#~ "кратковременная проблема с сетью и стоит попробовать позже. Ниже приведен "
-#~ "список пакетов, не прошедших проверку."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Невозможно установить '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Невозможно установить необходимый пакет. Пожалуйста, отправьте отчет об "
-#~ "ошибке. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Невозможно подобрать мета-пакет"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Ваша система не содержит пакетов ubuntu-desktop, kubuntu-desktop или "
-#~ "edubuntu-desktop, поэтому невозможно определить используемую версию "
-#~ "Ubuntu.\n"
-#~ " Пожалуйста установите один из приведенных выше пакетов с помощью "
-#~ "synaptic или apt-get."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Не удалось добавить CD"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "При добавлении CD произошла ошибка, обновление будет прервано. Пожалуйста "
-#~ "сообщите об ошибке, если это был годный Ubuntu CD\n"
-#~ "\n"
-#~ "Сообщение об ошибке:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "Чтение кэша"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Получить из сети данные для обновления?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "Программа обновления может использовать сеть для проверки последних "
-#~ "обновлений и для получения пакетов, отсутствующих на текущем CD\n"
-#~ "Если у вас быстрое и недорогое подключение к сети, то ответь 'Да'. Если "
-#~ "подключение дорогое для вас, ответьте 'Нет'."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Не найдено действующее зеркало"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "При сканировании информации о репозитории не было найдено записи о "
-#~ "зеркале для обновления системы. Это может произойти если вы используете "
-#~ "внутреннее зеркало или если информация о зеркале устарела.\n"
-#~ "\n"
-#~ "Вы все равно хотите перезаписать файл 'sources.list'? При ответе 'Да' "
-#~ "будут обновлены все записи '%s' на '%s'.\n"
-#~ "Ответ 'Нет' отменит обновление."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Сгенерировать источники по умолчанию?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "В результате просмотра 'sources.list' не найдена действующая запись для '%"
-#~ "s'.\n"
-#~ "\n"
-#~ "Добавить записи по умолчанию для '%s'? Ответ 'Нет' прервет обновление."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Информация о репозитории неверна"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "В результате обновления информации о репозиториях образовался неверный "
-#~ "файл. Пожалуйста отправьте отчет об ошибке."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Источники третьих сторон отключены"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Некоторые источники третьих сторон в sources.list были отключены. После "
-#~ "обновления вы можете снова включить их с помощью утилиты 'software-"
-#~ "properties' или synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Ошибка при обновлении"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "При обновлении возникла проблема. Обычно это бывает вызвано проблемами в "
-#~ "сети, проверьте сетевые подключения и повторите попытку."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Недостаточно свободного места на диске"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Обновление будет прервано. Пожалуйста освободите по крайней мере %s на "
-#~ "диске %s. Очистите вашу корзину и удалите временные пакеты, оставшиеся от "
-#~ "предыдущих установок с помощью команды 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Вы хотите начать обновление системы?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Невозможно установить обновления"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Обновление прервано. Система, возможно, находится в неработоспособном "
-#~ "состоянии. Запущено восстановление системы (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Пожалуйста, отправьте отчет об ошибке программы 'update-manager' и "
-#~ "добавьте файлы в /var/log/dist-upgrade/ к отчету."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Невозможно загрузить обновления"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Обновление прервано. Проверьте соединение с Интернет или установочный "
-#~ "диск и попробуйте снова. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Некоторые программы больше не поддерживаются"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Эти пакеты больше не поддерживаются Canonical Ltd. Теперь их поддержкой "
-#~ "занимается сообщество.\n"
-#~ "\n"
-#~ "Если у вас не подключен репозиторий сообщества (universe), на следующем "
-#~ "шаге вам предложат удалить эти пакеты."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Удалить устаревшие пакеты?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Пропустить этот шаг"
-
-#~ msgid "_Remove"
-#~ msgstr "_Удалить"
-
-#~ msgid "Error during commit"
-#~ msgstr "Ошибка при фиксировании"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "При очистке возникла проблема. Более полная информация приведена в "
-#~ "сообщении ниже. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Восстановление первоначального состояния системы"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "Загрузка '%s' из репозитария backports"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Проверка менеджера пакетов"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Подготовка к обновлению завершилась неудачей"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Подготовка системы к обновлению завершилась неудачей. Пожалуйста, "
-#~ "отправьте отчет об ошибке приложения 'update-manager' и приложите к "
-#~ "отчету файлы в /var/log/dist-upgrade/."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Обновление информации о репозитории"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Неверная информация о пакете"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "После обновления информации о пакетах не найден важный пакет '%s'.\n"
-#~ "Это серьёзная проблема, пожалуйста, сообщите об ошибке пакета 'update-"
-#~ "manager', включив в отчёт об ошибке файлы, лежащие в /var/log/dist-"
-#~ "upgrade/."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Запрос подтверждения"
-
-#~ msgid "Upgrading"
-#~ msgstr "Обновление"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Поиск устаревших программ"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Обновление системы завершено."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Пожалуйста, вставьте '%s' в устройство '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Загрузка завершена"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Загрузка файла %li из %li со скоростью %s/с"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Осталось приблизительно %s минут"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Загрузка файла %li из %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Применение изменений"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Невозможно установить '%s'"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "Обновление прервано. Пожалуйста сообщите об ошибке в пакете 'update-"
-#~ "manager' и включите файлы, находящиеся в /var/log/dist-upgrade/ в "
-#~ "сообщение об ошибке"
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Заменить изменённый конфигурационный файл\n"
-#~ "'%s'?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Вы потеряете все изменения, которые сделали в этом файле конфигурации, "
-#~ "если замените его новой версией."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Не найдена команда 'diff'"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Произошла неисправимая ошибка"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Пожалуйста, отправьте отчет об ошибке и включите в него файлы /var/log/"
-#~ "dist-upgrade.log и /var/log/dist-upgrade-apt.log. Обновление прервано.\n"
-#~ "Оригинальный файл sources.list был сохранен как /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d пакет будет удален."
-#~ msgstr[1] "%d пакета будут удалены."
-#~ msgstr[2] "%d пакетов будут удалены."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d новый пакет будет установлен."
-#~ msgstr[1] "%d новых пакета будут установлены."
-#~ msgstr[2] "%d новых пакетов будут установлены."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d пакет будет обновлен."
-#~ msgstr[1] "%d пакета будут обновлены."
-#~ msgstr[2] "%d пакетов будут обновлены."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Всего требуется загрузить %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Загрузка и установка обновлений может занять несколько часов и не может "
-#~ "быть прервано в любой момент."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Чтобы избежать потерь данных, закройте все открытые приложения и "
-#~ "документы."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Ваша система не требует обновления"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Для вашей системы не доступно ни одно обновление. Обновление будет "
-#~ "отменено."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Удалить %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Установить %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Обновить %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li дней %li часов %li минут"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li часов %li минут"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li минут"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li секунд"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Эта загрузка займет примерно %s при использовании 1Мбит DSL-соединения и "
-#~ "примерно %s при использовании модема на скорости 56кбит"
-
-#~ msgid "Reboot required"
-#~ msgstr "Требуется перезагрузка"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Обновление завершено и требуется перезагрузка. Перезагрузиться сейчас?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Прервать текущее обновление?</big></b>\n"
-#~ "\n"
-#~ "Если вы прервете обновление, то система может оказаться в "
-#~ "неработоспособном состоянии. Настоятельно рекомендуется продолжить "
-#~ "обновление."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Для завершения обновления перезагрузите систему</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Начать обновление?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Обновление Ubuntu до версии 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Очистка"
-
-#~ msgid "Details"
-#~ msgstr "Подробности"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Различие между файлами"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Загрузка и установка обновлений"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Изменение каналов приложений"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Подготовка обновления"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Перезагрузка системы"
-
-#~ msgid "Terminal"
-#~ msgstr "Терминал"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "Отменить обновление"
-
-#~ msgid "_Continue"
-#~ msgstr "Продолжить"
-
-#~ msgid "_Keep"
-#~ msgstr "_Оставить"
-
-#~ msgid "_Replace"
-#~ msgstr "_Заменить"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Отправить сообщение об ошибке"
-
-#~ msgid "_Restart Now"
-#~ msgstr "Перезапустить _сейчас"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Продолжить обновление"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "Начать обновление"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Не могу найти сведения о релизе"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Возможно, сервер перегружен. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Не могу загрузить сведения о релизе"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Пожалуйста, проверьте соединение с интернет."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Невозможно запустить утилиту обновления"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Скорее всего это вызвано ошибкой в утилите обновления. Пожалуйста, "
-#~ "сообщите об ошибке."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Загрузка утилиты обновления"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Утилита обновления будет направлять вас в процессе обновления."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Подпись утилиты обновления"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Утилита обновления"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Не удалось получить"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Не удалось получить обновление. Возможно, возникла проблема в сети. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Не удалось извлечь"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Не удалось извлечь обновление. Возможно, возникла проблема в сети или на "
-#~ "сервере. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Проверка не удалась"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Проверка обновления не удалась. Возможно, возникла проблема в сети или на "
-#~ "сервере. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Проверка подлинности не удалась"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Проверка подлинности обновления не удалась. Возможно, возникла проблема в "
-#~ "сети или на сервере. "
-
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "Загрузка файла %(current)li из %(total)li со скоростью %(speed)s/с"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Загрузка файла %(current)li из %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "Список изменений недоступен или отсутствует."
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Список изменений еще недоступен.\n"
-#~ "Пожалуйста, повторите попытку позже."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Ошибка при загрузке списка изменений. \n"
-#~ "Пожалуйста, проверьте ваше соединение с Интернет."
-
-#~ msgid "Backports"
-#~ msgstr "Бэкпорты"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Обновления дистрибутива"
-
-#~ msgid "Other updates"
-#~ msgstr "Прочие обновления"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Версия %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Загрузка списка изменений..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "Сбросить все"
-
-#~ msgid "_Check All"
-#~ msgstr "Проверить все"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Размер загружаемых данных: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Вы можете установить %s обновление"
-#~ msgstr[1] "Вы можете установить %s обновления"
-#~ msgstr[2] "Вы можете установить %s обновлений"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Пожалуйста подождите, это может занять некоторое время."
-
-#~ msgid "Update is complete"
-#~ msgstr "Обновление завершено"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Проверка наличия обновлений"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "С версии %(old_version)s на %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Версия %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Размер: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Ваша версия Ubuntu больше не поддерживается"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Вы более не сможете получать исправления безопасности или критические "
-#~ "обновления. Обновите систему до более поздней версии Ubuntu Linux. Для "
-#~ "получения информации об обновлении посетите http://www.ubuntu.com"
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Доступен новый релиз дистрибутива '%s'</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Индекс программ поврежден"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Установка или удаление программ невозможна. Для исправления этой ситуации "
-#~ "используйте менеджер пакетов \"Synaptic\" или запустите в терминале "
-#~ "\"sudo apt-get install -f\"."
-
-#~ msgid "None"
-#~ msgstr "Нет"
-
-#~ msgid "1 KB"
-#~ msgstr "1 Кб"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f Кб"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f Мб"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Вы должны проверить наличие обновлений вручную</big></b>\n"
-#~ "\n"
-#~ "Ваша система не проверяет наличие обновлений автоматически. Это "
-#~ "настраивается в <i>Источники приложений</i> на вкладке <i>Обновления в "
-#~ "Интернет</i>."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Не забывайте обновлять систему</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>Не удается установить все обновления</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Запуск менеджера обновлений</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "Изменения"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Изменения и описание обновления"
-
-#~ msgid "Chec_k"
-#~ msgstr "_Проверить"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Проверить каналы приложений на наличие обновлений"
-
-#~ msgid "Description"
-#~ msgstr "Описание"
-
-#~ msgid "Release Notes"
-#~ msgstr "Сведения о релизе"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Для установки максимального числа обновлений, запустите обновление "
-#~ "дистрибутива.\n"
-#~ "\n"
-#~ "Это может быть вызвано незавершенным обновлением, нестандартными "
-#~ "программами или использованием бета-версии."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Показывать прогресс для отдельных файлов"
-
-#~ msgid "Software Updates"
-#~ msgstr "Обновления программ"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Обновления программ исправляют ошибки, уязвимости и добавляют новые "
-#~ "возможности."
-
-#~ msgid "U_pgrade"
-#~ msgstr "Обновить"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Обновить систему до последней версии Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "Проверить"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "Обновление дистрибутива"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "Не показывать эту информацию в дальнейшем"
-
-#~ msgid "_Install Updates"
-#~ msgstr "Установить обновления"
-
-#~ msgid "_Upgrade"
-#~ msgstr "_Обновить"
-
-#~ msgid "changes"
-#~ msgstr "изменения"
-
-#~ msgid "updates"
-#~ msgstr "обновления"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Автоматические обновления</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Обновления в Интернет</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Интернет</b>"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr "Загрузка файла %(current)li из %(total)li со скоростью %(speed)s/с"
 
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Для улучшения удобства использования Ubuntu, пожалуйста примите "
-#~ "участие в создании рейтинга популярности. Если вы это сделаете, список "
-#~ "установленных приложений и частоты их использования будет еженедельно "
-#~ "создаваться и анонимно отправляться в проект Ubuntu.\n"
-#~ "\n"
-#~ "Результаты используются для улучшения поддержки наиболее популярных "
-#~ "приложений и оценки рейтинга приложений в результатах поиска.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Добавить Cdrom"
-
-#~ msgid "Authentication"
-#~ msgstr "Авторизация"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "Удалить загруженные файлы программ:"
-
-#~ msgid "Download from:"
-#~ msgstr "Загрузить с:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Импортировать открытый ключ доверенного поставщика программ"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Обновления в Интернет"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Автоматически будут установлены только обновления безопасности с "
-#~ "официальных серверов Ubuntu"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "Восстановить начальные"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Загрузка файла %(current)li из %(total)li"
 
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Восстановить исходные ключи вашего дистрибутива"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Подробности"
 
-#~ msgid "Software Sources"
-#~ msgstr "Источники приложений"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Source code"
-#~ msgstr "Исходный код"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Statistics"
-#~ msgstr "Статистика"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Submit statistical information"
-#~ msgstr "Отправлять статистику"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Список изменений недоступен или отсутствует."
 
-#~ msgid "Third Party"
-#~ msgstr "Сторонние производители"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "Автоматически проверять наличие обновлений:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "Автоматически загружать обновления, но не устанавливать их"
-
-#~ msgid "_Import Key File"
-#~ msgstr "Импортировать файл ключа"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "Устанавливать обновления безопасности без запроса"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Информация о программном обеспечении устарела</big></b>\n"
-#~ "\n"
-#~ "Для установки программ и обновлений из новых или изменённых источников "
-#~ "нужно скачать информацию о доступном программном обеспечении.\n"
-#~ "\n"
-#~ "Для продолжения требуется действующее подключение к Интернет."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Комментарий:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Компоненты:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Дистрибутив:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Тип:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Введите полную APT-строку репозитория, который вы хотите добавить "
-#~ "как источник</b></big>\n"
-#~ "\n"
-#~ "APT-строка состоит из типа, расположения и компонентов репозитория, "
-#~ "например <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "Строка APT:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Бинарные файлы\n"
-#~ "Исходные тексты"
-
-#~ msgid "Edit Source"
-#~ msgstr "Редактировать источник"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Просмотр CD-ROM"
-
-#~ msgid "_Add Source"
-#~ msgstr "Добавить источник"
-
-#~ msgid "_Reload"
-#~ msgstr "Обновить"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Показать и установить доступные обновления"
-
-#~ msgid "Update Manager"
-#~ msgstr "Менеджер обновлений"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Автоматически проверять наличие новой версии дистрибутива и предлагать "
-#~ "обновление (если возможно)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Проверить на наличие новых релизов дистрибутива"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Если автоматическая проверка обновлений отключена, вам придется обновлять "
-#~ "список источников вручную. Этот параметр позволяет скрыть показываемое в "
-#~ "данном случае напоминание."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Напоминать обновить список каналов"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Показать подробности обновления"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Хранит размер окна менеджера обновлений"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Хранит состояние экспандера, содержащего описание и список изменений"
-
-#~ msgid "The window size"
-#~ msgstr "Размен окна"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Настроить источники установки программ и обновлений"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Обновления безопасности Debian 3.1 \"Sarge\""
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid ""
-#~ "You will loose all customizations, that have been made by yourself or by "
-#~ "a script, if you replace the file by its latest version."
-#~ msgstr ""
-#~ "Если вы замените файл его поздней версией, вы потеряете все изменения "
-#~ "сделанные вами или скриптами."
-
-#~ msgid ""
-#~ "This download will take about %s with a 56k modem and about %s with a "
-#~ "1Mbit DSL connection"
-#~ msgstr ""
-#~ "Скачивание займёт примерно %s при 56к модеме и примерно %s при 1Мбит DSL-"
-#~ "подключении"
-
-#~ msgid "The list of changes is not available yet. Please try again later."
-#~ msgstr ""
-#~ "На данный момент список изменений недоступен. Пожалуйста, попробуйте "
-#~ "позднее."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. Please check your Internet "
-#~ "connection."
-#~ msgstr ""
-#~ "Не удалось загрузить список изменений. Пожалуйста, проверьте соединение с "
-#~ "интернет."
-
-#~ msgid "By Canonical supported Open Source software"
-#~ msgstr "Открытое программное обеспечение, поддерживаемое Canonical"
-
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr ""
-#~ "Программное обеспечение, ограниченное копирайтом или другими правовыми "
-#~ "проблемами"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Загрузка файла %li из %li с неизвестной скоростью"
+#: ../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 ""
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "Установить обновления"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Ошибка при загрузке списка изменений. \n"
+"Пожалуйста, проверьте ваше соединение с Интернет."
 
-#~ msgid "Cancel _Download"
-#~ msgstr "Отменить _загрузку"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Некоторые программы больше не поддерживаются официально"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Обновления не найдены"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Система уже обновлена."
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Обновление до Ubuntu 6.10</span>"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Важные обновления безопасности для Ubuntu"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Обновления для Ubuntu"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Невозможно установить все доступные обновления"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Невозможно установить '%s'"
 
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Обследование системы</b></big>\n"
-#~ "\n"
-#~ "Обновления программ исправляют ошибки, уязвимости и добавляют новые "
-#~ "возможности."
+#: ../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 "Oficially supported"
-#~ msgstr "Официально поддерживается"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Некоторые обновления требуют удаления других приложений. Для полного "
-#~ "обновления системы используйте функцию \"Пометить все обновления\" "
-#~ "менеджера пакетов \"Synaptic\" или запустите в терминале \"sudo apt-get "
-#~ "dist-upgrade\"."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Следующие обновления будут пропущены:"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Осталось приблизительно %li секунд"
-
-#~ msgid "Download is complete"
-#~ msgstr "Загрузка завершена"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Обновление прервано. Пожалуйста, отправьте отчет об ошибке."
+msgid "An essential package would be removed"
+msgstr "Будет удален необходимый пакет"
 
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Обновление Ubuntu"
-
-#~ msgid "Hide details"
-#~ msgstr "Скрыть подробности"
-
-#~ msgid "Show details"
-#~ msgstr "Показать подробности"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr ""
-#~ "Одновременно может быть запущена только одна программа установки/удаления "
-#~ "пакетов"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Пожалуйста, сначала закройте другие приложения, такие как 'aptitude' или "
-#~ "'Synaptic'."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Каналы</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Ключи</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Установочный носитель"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Параметры приложений"
-
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Канал</b>"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Компоненты</b>"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Add Channel"
-#~ msgstr "Добавить канал"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "Изменить канал"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "Добавить канал"
-#~ msgstr[1] "Добавить каналы"
-#~ msgstr[2] "Добавить каналы"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ 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 ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Обновления безопасности Ubuntu 6.06 LTS"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Обновления Ubuntu 6.06 LTS"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS Backports"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/rw.po b/po/rw.po
index b0e55e48..fcc7d589 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -31,252 +31,283 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "5"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "Kohereza Nta gukoresha bisesuye"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "5"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Kigenga"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Kigenga"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 #, fuzzy
 msgid "Important security updates"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Kwinjiza porogaramu"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Kwinjiza porogaramu"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 #, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 #, fuzzy
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 #, fuzzy
 msgid "Ubuntu 5.10 Updates"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "5"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "5"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 #, fuzzy
 msgid "Non-free (Multiverse)"
 msgstr "Kigenga"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 #, fuzzy
 msgid "Restricted copyright"
 msgstr "Uburenganzira bw'umuhimbyi"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 #, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 #, fuzzy
 msgid "Ubuntu 4.10 Updates"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "5"
@@ -289,54 +320,67 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
-msgstr ""
+#, fuzzy
+msgid "Debian 6.0 'Squeeze' "
+msgstr "4. 10"
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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:42
+#: ../data/templates/Debian.info.in:94
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Kwinjiza porogaramu"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "5"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -344,566 +388,162 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Daily"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "%s updates"
-#~ msgstr "Kwinjiza porogaramu"
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "Ibihuzagihe bya porogaramumudasobwa"
-
-#, fuzzy
-#~ msgid "Error importing selected file"
-#~ msgstr "Kuzaza Byahiswemo IDOSIYE"
-
-#, fuzzy
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Byahiswemo IDOSIYE Gicurasi OYA a Urufunguzo IDOSIYE Cyangwa"
-
-#, fuzzy
-#~ msgid "Error removing the key"
-#~ msgstr "i Urufunguzo"
-
-#, fuzzy
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
-
-#, fuzzy
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a "
-
-#, fuzzy
-#~ msgid "Error during update"
-#~ msgstr "i Urufunguzo"
-
-#, fuzzy
-#~ msgid "Checking package manager"
-#~ msgstr "Muyobozi ni"
-
-#, fuzzy
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
-
-#, fuzzy
-#~ msgid "Upgrading"
-#~ msgstr "Byarangiye"
-
-#, fuzzy
-#~ msgid "Applying changes"
-#~ msgstr "Amahinduka"
-
-#, fuzzy
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Sisitemu ni Hejuru Kuri Itariki"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#, fuzzy
-#~ msgid "Details"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "Byarangiye"
-
-#, fuzzy
-#~ msgid "_Replace"
-#~ msgstr "Kongera Gutangiza"
-
-#, fuzzy
-#~ msgid "_Resume Upgrade"
-#~ msgstr "Byarangiye"
-
-#, fuzzy
-#~ msgid "_Start Upgrade"
-#~ msgstr "Byarangiye"
-
-#, fuzzy
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
-
-#, fuzzy
-#~ msgid "Upgrade tool"
-#~ msgstr "Byarangiye"
-
-#, fuzzy
-#~ msgid "The list of changes is not available"
-#~ msgstr "ni a Gishya Bya Bihari"
-
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "ni a Gishya Bya Bihari"
-
-#, 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"
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "5"
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "Byarangiye"
-
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "Kwinjiza porogaramu"
-
-#, fuzzy
-#~ msgid "Version %s: \n"
-#~ msgstr "Verisiyo \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Iyimura... i"
-
-#, fuzzy
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Sisitemu ni Hejuru Kuri Itariki"
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "Kwinjiza porogaramu"
-
-#, fuzzy
-#~ msgid "Version %s"
-#~ msgstr "Verisiyo"
-
-#, fuzzy
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Ikwirakwiza... ni Oya"
-
-#~ msgid "Changes"
-#~ msgstr "Amahinduka"
-
-#~ msgid "Description"
-#~ msgstr "Isobanuramiterere"
-
-#~ msgid "Software Updates"
-#~ msgstr "Ibihuzagihe bya porogaramumudasobwa"
-
-#, fuzzy
-#~ msgid "U_pgrade"
-#~ msgstr "Byarangiye"
-
-#, fuzzy
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "Byarangiye"
-
-#, fuzzy
-#~ msgid "_Install Updates"
-#~ msgstr "Kwinjiza porogaramu"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "Byarangiye"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "Amahinduka"
-
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "i Byahiswemo Urufunguzo Bivuye i"
-
-#, fuzzy
-#~ msgid "Internet Updates"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "Restore _Defaults"
-#~ msgstr "Mburabuzi Utubuto"
-
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "Ibihuzagihe bya porogaramumudasobwa"
-
-#, fuzzy
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<B i Byuzuye Umurongo Bya i Kuri Kongeramo B Umurongo Kirimo i Ubwoko "
-#~ "Ahantu Na Ibikubiyemo Bya a kugirango Urugero i HTTP FTP org i Gushaka a "
-#~ "Isobanuramiterere Bya i in i"
-
-#, fuzzy
-#~ msgid "APT line:"
-#~ msgstr "Umurongo"
-
-#, fuzzy
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr "Inkomoko"
-
-#, fuzzy
-#~ msgid "_Reload"
-#~ msgstr "Kongera Gutangiza"
-
-#, fuzzy
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "Kohereza Nta gukoresha bisesuye"
-
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "Kwinjiza porogaramu"
-
-#, fuzzy
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Sisitemu"
-
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "5"
-
-#, fuzzy
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "OYA"
-
-#, fuzzy
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
-
-#, fuzzy
-#~ msgid "Hide details"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<B B"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#, fuzzy
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "<b>Components</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "_Custom"
-#~ msgstr "Guhanga"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "5"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "5"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "5"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "5"
-
-#, fuzzy
-#~ msgid "Repositories changed"
-#~ msgstr "Byahinduwe"
-
-#, fuzzy
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr "Kubika."
-
-#, fuzzy
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Kongerakuyitangiza i Ibisobanuro Bivuye i Seriveri"
-
-#, fuzzy
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<Uburemere UTSINDAGIYE Ingano Kinini Amahinduka Kuri Kubona i Amahinduka "
-#~ "Bivuye i Seriveri"
-
-#, fuzzy
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Bihari Na Guhitamo Kuri Kwinjiza porogaramu"
-
-#, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "i Urufunguzo"
-
-#, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "Automatically check for updates"
-#~ msgstr "Kugenzura... kugirango"
-
-#, fuzzy
-#~ msgid "Choose a key-file"
-#~ msgstr "a Urufunguzo IDOSIYE"
-
-#, fuzzy
-#~ msgid "<b>Packages to install:</b>"
-#~ msgstr "<B Kuri Kwinjiza porogaramu B"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr "<B B Byabonetse Kuri ku ikoresha i Akabuto"
-
-#, fuzzy
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<B Idosiye B"
-
-#, fuzzy
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<B Utubuto B Kongeramo Na Gukuraho... Utubuto in iyi Ikiganiro A "
-#~ "Urufunguzo Kuri Kugenzura... i Bya i Gufungura"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr "a Gishya Urufunguzo IDOSIYE Kuri i i Urufunguzo KURI a Na i "
+#: ../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 "Automatically clean _temporary packages files"
-#~ msgstr "GUSUKURA By'igihe gito Idosiye"
+msgid "Details"
+msgstr "<B B"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "Clean interval in days: "
-#~ msgstr "Intera in Iminsi "
+msgid "Starting..."
+msgstr "Amagenamiterere"
 
-#, fuzzy
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "ki/ bishaje in i Ubwihisho"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Maximum age in days:"
-#~ msgstr "in Iminsi"
+#: ../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 "Maximum size in MB:"
-#~ msgstr "Ingano in"
+msgid "The list of changes is not available"
+msgstr "ni a Gishya Bya Bihari"
 
-#, fuzzy
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "i Mburabuzi Utubuto Na: i Ikwirakwiza... OYA Guhindura>> Ukoresha: Utubuto"
+#: ../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 "Set _maximum size for the package cache"
-#~ msgstr "Kinini Ingano kugirango i Ubwihisho"
-
-#~ msgid "Settings"
-#~ msgstr "Amagenamiterere"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Kuri Gufungura Amahinduka Kugenzura... NIBA ni Gikora Interineti Ukwihuza"
 
-#, fuzzy
-#~ msgid "Show disabled software sources"
-#~ msgstr "Yahagaritswe"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Update interval in days: "
-#~ msgstr "Intera in Iminsi "
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "This means that some dependencies of the installed packages are not "
-#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
-#~ msgstr "Bya i OYA Gukoresha Cyangwa Kubona Kuri i"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "It is not possible to upgrade all packages."
-#~ msgstr "ni OYA Kuri Byose"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "This means that besides the actual upgrade of the packages some further "
-#~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
-#~ msgstr ""
-#~ "i Bya i Igikorwa Nka gukora iyinjizaporogaramu:%s Cyangwa ni Bya ngombwa "
-#~ "Gukoresha Cyangwa Kubona Kuri i"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "OYA Byabonetse i Seriveri Gicurasi OYA"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "The updates are being applied."
-#~ msgstr "Byashyizweho"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Gukoresha Porogaramu ku i Igihe Gufunga iyi Ikindi Porogaramu Itangira"
+#: ../apt/debfile.py:376
+#, python-format
+msgid "Cannot install '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Updating package list..."
-#~ msgstr "Urutonde"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "There are no updates available."
-#~ msgstr "Oya Bihari"
+#: ../apt/debfile.py:494
+msgid "An essential package would be removed"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Kuri a Verisiyo Bya Verisiyo Oya Kubona Umutekano Cyangwa Ikindi "
-#~ "Ibyangombwa HTTP www org kugirango Ibisobanuro"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr "A Gishya Na: i ni Bihari HTTP www org kugirango Amabwiriza"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#, fuzzy
-#~ msgid "Never show this message again"
-#~ msgstr "Garagaza iyi Ubutumwa"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
-#~ msgstr ""
-#~ "Gukoresha Porogaramu ku i Igihe Gufunga iyi Ikindi Porogaramu Itangira"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#, fuzzy
-#~ msgid "Initializing and getting list of updates..."
-#~ msgstr "Na Urutonde Bya"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#, fuzzy
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Kuri Imizi Kuri Gukoresha iyi Porogaramu"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Na Amagenamiterere"
+#: ../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 ""
 
-#~ msgid "Binary"
-#~ msgstr "Nyabibiri"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Non-free software"
-#~ msgstr "Kigenga"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "com"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "com"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 69a774dd..eeac9dda 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,252 +24,283 @@ 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:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:135
+#, fuzzy
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:153
+#, fuzzy
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:197
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 5.10 - aktualizácie"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Udržiavané komunitou (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "Softvér závislý na neslobornom softvéri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Udržiavané komunitou (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Udržiavané komunitou (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Udržiavané komunitou (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Neslobodné (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Neslobodné (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 #, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Nainštalovať _aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Nainštalovať _aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 #, fuzzy
 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:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 - aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 - backporty"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 #, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 #, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Oficiálne podporované"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 #, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 - aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.10 - backporty"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 #, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Udržiavané komunitou (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Neslobodné (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 #, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Niektoré programy už nie sú viac oficiálne podporované"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "S obmedzujúcou licenciou"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 aktualizácie"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 5.10 - backporty"
@@ -282,57 +313,70 @@ 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:31
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "Debian 3.1 \"Sarge\""
+
+#. Description
+#: ../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
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Nainštalovať _aktualizácie"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 #, fuzzy
 msgid "Debian current stable release"
 msgstr "Debian Unstable \"Sid\""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 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:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Softvér nekompatibilný s DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Server pre %s"
@@ -340,1472 +384,165 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 #, fuzzy
 msgid "Main server"
 msgstr "Najbližší server"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 #, fuzzy
 msgid "Custom servers"
 msgstr "Najbližší server"
 
-#~ msgid "Daily"
-#~ msgstr "Denne"
-
-#~ msgid "Every two days"
-#~ msgstr "Každý druhý deň"
-
-#~ msgid "Weekly"
-#~ msgstr "Raz za týždeň"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Každý druhý týždeň"
-
-#~ msgid "Every %s days"
-#~ msgstr "Každých %s dní"
-
-#~ msgid "After one week"
-#~ msgstr "Po jednom týždni"
-
-#~ msgid "After two weeks"
-#~ msgstr "Po dvoch týždňoch"
-
-#~ msgid "After one month"
-#~ msgstr "Po mesiaci"
-
-#~ msgid "After %s days"
-#~ msgstr "Po %s dňoch"
-
-#, fuzzy
-#~ msgid "%s updates"
-#~ msgstr "Nainštalovať _aktualizácie"
-
-#, fuzzy
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "Aktualizácie softvéru"
-
-#, fuzzy
-#~ msgid "(Source Code)"
-#~ msgstr "Zdrojový"
-
-#, fuzzy
-#~ msgid "Source Code"
-#~ msgstr "Zdrojový"
-
-#~ msgid "Import key"
-#~ msgstr "Importovať kľúč"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Chyba pri importovaní vybraného súboru"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Vybraný súbor nie je autentifikačným kľúčom GPG alebo je poškodený."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Chyba pri odstraňovaní kľúča"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "Vybraný kľúč nebolo možné odstrániť. Nahláste to ako chybu."
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Chyba pri načítavaní CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Prosím, zadajte názov disku"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Prosím, vložte disk do mechaniky:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Poškodené balíky"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Váš systém obsahuje poškodené balíky, ktoré nemôžu byť týmto programom "
-#~ "opravené. Pred pokračovaním ich opravte programom synaptic alebo apt-get."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Nemôžem aktualizovať požadované meta-balíky"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Musel by byť odstránený dôležitý balík"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Nemôžem vypočítať aktualizáciu"
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Počas prípravy aktualizácie sa vyskytol neriešiteľný problém. Nahláste to "
-#~ "ako chybu."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Chyba pri overovaní niektorých balíkov"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Nebolo možné overiť niektoré balíky. Mohlo by to byť spôsobené prechodným "
-#~ "problémom v sieti. Môžete to opäť skúsiť neskôr. Nižšie je uvedený zoznam "
-#~ "neoverených balíčkov."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Nemôžem inštalovať '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr "Požadovaný balík nebolo možné nainštalovať. Nahláste to ako chybu. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Nemôžem odhadnúť meta balík."
-
-#, fuzzy
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Váš systém neobsahuje žiadny z balíkov ubuntu-desktop, kubuntu-desktop "
-#~ "alebo edubuntu-desktop a nebolo možné zistiť akú verziu Ubuntu "
-#~ "používate.\n"
-#~ "Pred pokračovaním nainštalujte jeden z vyššie uvedených balíkov pomocou "
-#~ "Synapticu alebo apt-get."
-
-#, fuzzy
-#~ msgid "Failed to add the CD"
-#~ msgstr "Zlyhalo získavanie aktualizácie"
-
-#~ msgid "Reading cache"
-#~ msgstr "Čítam vyrovnávaciu pamäť cache"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Nebol nájdený vhodný server"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Počas čítania informácií o zdrojoch softvéru nebol nájdený žiadny vhodný "
-#~ "server. Toto sa môže stať ak prevádzkujete vlastný server poskytujúci "
-#~ "inštalačné balíky, alebo keď zoznam serverov je zastaraný.\n"
-#~ "\n"
-#~ "Chcete aj napriek tomu prepísať súbor 'sources.list'? Ak zvolíte 'Áno' "
-#~ "budú nahradené všetky '%s' záznamy '%s' záznamami.\n"
-#~ "Pokiaľ zvolíte 'Nie', súbor nebude zmenený."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Vytvoriť štandardný zoznam zdrojov softvéru?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Počas čítania súboru 'sources.list' nebol nájdený žiadny platný záznam "
-#~ "pre '%s'.\n"
-#~ "\n"
-#~ "Majú byť pridané štandardné záznamy pre '%s'? Pokiaľ zvolíte 'Nie', súbor "
-#~ "nebude zmenený."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Neplatná informácia o zdrojoch softvéru"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Aktualizácia informácií o zdrojoch softvéru skončila neplatným súborom. "
-#~ "Nahláste to ako chybu."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Zdroje tretích strán sú zakázané"
-
-#, fuzzy
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Niektoré záznamy tretích strán vo vašom source.list súbore boli zakázané. "
-#~ "Môžete ich povoliť po upgrade pomocou nástroja 'vlastnosti-softwaru' "
-#~ "alebo pomocou synapticu."
-
-#~ msgid "Error during update"
-#~ msgstr "Chyba počas aktualizácie"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Počas aktualizácie sa objavil problém, ktorý je zvyčajne spôsobený chybou "
-#~ "sieťového pripojenia, preto skontrolujte vaše pripojenie a skúste znova."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Nedostatok voľného miesta na disku"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Aktualizácia bude teraz prerušená. Uvoľnite aspoň %s miesta v %s "
-#~ "vyprázdnením svojho kôša, prípadne odstránením dočasných inštalačných "
-#~ "súborov z predchádzajúcich inštalácií pomocou príkazu 'sudo apt-get "
-#~ "clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Chcete začať s aktualizáciou?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Nebolo možné nainštalovať aktualizácie"
-
-#, fuzzy
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Aktualizácia teraz skončí. Váš systém môže byť v nepoužiteľnom stave, "
-#~ "preto bol spustený príkaz na zotavenie sa z tohto stavu (dpkg --configure "
-#~ "-a)."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Nebolo možné stiahnuť požadované balíky"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Aktualizácia bola neočakávane prerušená. Skontrolujte svoje internetové "
-#~ "pripojenie alebo inštalačné médiá a skúste znova. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Tieto nainštalované balíky už viac nie sú oficiálne podporované, ale "
-#~ "stará sa o ne komunita.\n"
-#~ "\n"
-#~ "Pokiaľ nemáte zapnutý komunitou spravovaný zdroj softvéru 'universe', "
-#~ "budú tieto balíky v ďalšom kroku navrhnuté na odstránenie."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Odstrániť zastarané balíky?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Preskočiť tento krok"
-
-#~ msgid "_Remove"
-#~ msgstr "_Odstrániť"
-
-#~ msgid "Error during commit"
-#~ msgstr "Chyba počas potvrdzovania"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Počas čistenia sa vyskytli problémy. Pre viac informácií si pozrite "
-#~ "nižšie uvedené správy. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Obnovuje sa pôvodný stav systému"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Kontrola správcu balíkov"
-
-#, fuzzy
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Prebieha príprava aktualizácie"
-
-#, fuzzy
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Počas prípravy aktualizácie sa vyskytol neriešiteľný problém. Nahláste to "
-#~ "ako chybu."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Aktualizácia informácií o zdrojoch softvéru"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Neplatná informácia o balíku"
-
-#, fuzzy
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Po aktualizácií informácií o balíkoch nie je možné nájsť dôležitý balík '%"
-#~ "s'.\n"
-#~ "To znamená závažný problém. Nahláste to ako chybu."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Požaduje sa potvrdenie"
-
-#~ msgid "Upgrading"
-#~ msgstr "Prebieha aktualizácia"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Vyhľadávanie zastaraného softvéru"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Aktualizácia systému je dokončená."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Prosím, vložte '%s' do mechaniky '%s'"
-
-#, fuzzy
-#~ msgid "Fetching is complete"
-#~ msgstr "Aktualizácia je dokončená"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Sťahovanie súboru %li z %li pri %s/s"
-
-#, fuzzy
-#~ msgid "About %s remaining"
-#~ msgstr "Zostáva %li minút"
-
-#, fuzzy
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Sťahujem %li súbor z %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Aplikujem zmeny"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Nebolo možné nainštalovať '%s'"
-
-#, fuzzy
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Nahradiť konfiguračný súbor\n"
-#~ "'%s'?"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Príkaz 'diff' nebol nájdený."
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Nastala závažná chyba"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Nahláste to ako chybu a k svojmu hláseniu priložte súbory /var/log/dist-"
-#~ "upgrade.log a /var/log/dist-upgrade-apt.log. Aktualizácia bude teraz "
-#~ "prerušená.\n"
-#~ "Váš pôvodný súbor 'sources.list' bol uložený ako /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#, fuzzy
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "Bude odstránený %s balík."
-#~ msgstr[1] "Budú odstránené %s balíky."
-#~ msgstr[2] "Bude odstránených %s balíkov."
-
-#, fuzzy
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "Bude nainštalovaný %s nový balík."
-#~ msgstr[1] "Budú nainštalované %s nové balíky."
-#~ msgstr[2] "Bude nainštalovaných %s nových balíkov."
-
-#, fuzzy
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "Bude aktualizovaný %s balík."
-#~ msgstr[1] "Budú aktualizované %s balíky."
-#~ msgstr[2] "Bude aktualizovaných %s balíkov."
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Musíte stiahnuť celkom %s. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Aktualizácia môže trvať niekoľko hodín a nemôže byť neskôr prerušená."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Pre zamedzenie straty dát, zavrite všetky otvorené programy a dokumenty."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Váš systém je aktuálny"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Odstrániť %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Inštalovať %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Aktualizovať %s"
-
-#, fuzzy
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "Zostáva %li dní %li hodín %li minút"
-
-#, fuzzy
-#~ msgid "%li hours %li minutes"
-#~ msgstr "Zostáva %li hodín %li minút"
-
-#~ msgid "Reboot required"
-#~ msgstr "Je potrebný reštart"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Bola dokončená aktualizácia a je potrebné reštartovať počítač. Chcete "
-#~ "vykonať reštart teraz?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Zrušiť prebiehajúcu aktualizáciu?</big></b>\n"
-#~ "\n"
-#~ "Ak prerušíte aktualizáciu, systém môže zostať v nestabilnom stave. Je "
-#~ "dôrazne odporúčané pokračovať v aktualizácii."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Na dokončenie aktualizácie reštartujte počítač</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Spustiť aktualizáciu?</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Prebieha čistenie"
-
-#~ msgid "Details"
-#~ msgstr "Podrobnosti"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Rozdiel medzi súbormi"
-
-#, fuzzy
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Sťahovanie a inštalovanie aktualizácií"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Upravujú sa zdoje softvéru"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Prebieha príprava aktualizácie"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Reštartovanie systému"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminál"
-
-#, fuzzy
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Pokračovať v aktualizácii"
-
-#~ msgid "_Keep"
-#~ msgstr "_Ponechať"
-
-#~ msgid "_Replace"
-#~ msgstr "_Nahradiť"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Oznámiť chybu"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Reštartovať teraz"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Pokračovať v aktualizácii"
-
-#, fuzzy
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Pokračovať v aktualizácii"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Nebolo možné nájsť poznámky k vydaniu"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Server môže byť preťažený. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Nebolo možné stiahnuť poznámky k vydaniu"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Skontrolujte si internetové pripojenie."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Nebolo možné spustiť aktualizačný program"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Pravdepodobne je to chyba v aktualizačnom programe. Nahláste to ako chybu."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Sťahovanie aktualizačného programu"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Aktualizačný program vás prevedie procesom aktualizácie."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Podpis aktualizačného programu"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Aktualizačný program"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Zlyhalo získavanie aktualizácie"
+#: ../apt/progress/gtk2.py:259
+#, fuzzy, 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"
 
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Zlyhalo získavanie aktualizácie, čo môže byť spôsobené sieťovým "
-#~ "problémom. "
+#: ../apt/progress/gtk2.py:265
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Sťahovanie súboru %li z %li pri %s/s"
 
-#~ msgid "Failed to extract"
-#~ msgstr "Zlyhala extrakcia"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Nebolo možné rozbaliť aktualizáciu. Môže to byť spôsobené sieťovým "
-#~ "problémom alebo nedostupňosťou servera. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Zlyhala verifikácia"
-
-#, fuzzy
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Zlyhala verifikácia aktualizácie. Môže to byť spôsobené sieťovým "
-#~ "problémom alebo nedostupňosťou servera. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Autentifikácia zlyhala"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Zlyhalo overenie autenticity aktualizácie. Môže to byť spôsobené sieťovým "
-#~ "problémom alebo nedostupňosťou servera. "
-
-#, fuzzy
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr "Sťahovanie súboru %li z %li pri %s/s"
-
-#, fuzzy
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Sťahovanie súboru %li z %li pri %s/s"
-
-#, fuzzy
-#~ msgid "The list of changes is not available"
-#~ msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr."
-
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr."
-
-#, fuzzy
-#~ 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."
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "Ubuntu 5.10 - backporty"
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "_Pokračovať v aktualizácii"
-
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "Nainštalovať _aktualizácie"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Verzia %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Získava sa zoznam zmien..."
-
-#, fuzzy
-#~ msgid "_Check All"
-#~ msgstr "_Skontrolovať"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Veľkosť na stiahnutie: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Môžete nainštalovať %s aktualizáciu"
-#~ msgstr[1] "Môžete nainštalovať %s aktualizácie"
-#~ msgstr[2] "Môžete nainštalovať %s aktualizácií"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Čakajte prosím, toto môže chvíľu trvať."
-
-#~ msgid "Update is complete"
-#~ msgstr "Aktualizácia je dokončená"
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "Kontrolujem aktualizácie..."
-
-#, fuzzy
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Nová verzia: %s   (veľkosť: %s)"
-
-#, fuzzy
-#~ msgid "Version %s"
-#~ msgstr "Verzia %s:"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Vaša distribúcia už nie je podporovaná"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Nebudete mať k dispozícii žiadne nové bezpečnostné ani kritické "
-#~ "aktualizácie. Prejdite preto na najnovšiu verziu distribúcie Ubuntu "
-#~ "Linux. Pre viac informácií o prechode na novšiu verziu si pozrite http://"
-#~ "www.ubuntu.com.\""
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>K dispozícii je nové vydanie distribúcie '%s'</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Index softvéru je poškodený"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "V dôsledku chyby nie je možné nainštalovať alebo odstrániť žiadny "
-#~ "program. Na odstránenie tohto problému použite správcu balíkov 'Synaptic' "
-#~ "alebo spustite 'sudo apt-get install -f' v termáli."
-
-#, fuzzy
-#~ msgid "None"
-#~ msgstr "Žiadna"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#, fuzzy
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Musíte kontrolovať aktualizácie·manuálne</big></b>\n"
-#~ "\n"
-#~ "Váš systém je nastavený aby nekontroloval aktualizácie automaticky. Toto "
-#~ "správanie môžete nastaviť v ponuke menu 'Systém' -> 'Správa' -> "
-#~ "'Vlastnosti softvéru'."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Udržujte si systém v aktuálnom stave</b></big>"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Podrobnosti"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>Chyba pri načítavaní CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Spustiť aktualizáciu?</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "Zmeny"
-
-#~ msgid "Chec_k"
-#~ msgstr "_Skontrolovať"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Skontrolovať, či zdroje softvéru neobsahujú nové aktualizácie"
-
-#~ msgid "Description"
-#~ msgstr "Popis"
-
-#~ msgid "Release Notes"
-#~ msgstr "Poznámky k vydaniu"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Zobraziť priebeh jednotlivých súborov"
-
-#~ msgid "Software Updates"
-#~ msgstr "Aktualizácie softvéru"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné "
-#~ "zraniteľnosti alebo poskytujú nové vlastnosti."
-
-#~ msgid "U_pgrade"
-#~ msgstr "_Aktualizovať"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Aktualizovať na najnovšiu verziu Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Skontrolovať"
-
-#, fuzzy
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Pokračovať v aktualizácii"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Túto správu už viac nezobrazovať"
-
-#~ msgid "_Install Updates"
-#~ msgstr "Nainštalovať _aktualizácie"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "_Aktualizovať"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "Zmeny"
-
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Internetové aktualizácie</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Internetové aktualizácie</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internetové aktualizácie</b>"
-
-#, fuzzy
-#~ msgid "Add Cdrom"
-#~ msgstr "Pridať _CD"
-
-#~ msgid "Authentication"
-#~ msgstr "Autentifikácia"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "_Zmazať stiahnuté inštalačné balíčky:"
-
-#, fuzzy
-#~ msgid "Download from:"
-#~ msgstr "Sťahovanie je dokončené"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Importovať verejný kľúč dôveryhodného poskytovateľa softvéru"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Internetové aktualizácie"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Automaticky budú inštalované iba bezpečnostné aktualizácie z oficiálnych "
-#~ "Ubuntu serverov."
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "_Obnoviť predvolené"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Obnoviť pôvodné kľúče distribúcie"
-
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "<b>Zdroje softvéru</b>"
-
-#, fuzzy
-#~ msgid "Source code"
-#~ msgstr "Zdrojový"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Kontrolovať aktualizácie:"
+msgid "Starting..."
+msgstr "Nastavenia"
 
-#, fuzzy
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Stiahnuť aktualizácie automaticky, no neinštalovať ich"
-
-#~ msgid "_Import Key File"
-#~ msgstr "Importovať _kľúč"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Bezpečnostné aktualizácie inštalovať automaticky bez potvrdenia"
-
-#, fuzzy
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Informácie o dostupných programoch sú neaktuálne</big></b>\n"
-#~ "\n"
-#~ "Aby ste mohli nainštalovať softvér alebo aktualizácie z novopridaných "
-#~ "zdrojov musíte znovunačítať zoznam dostupných balíkov zo serverov "
-#~ "uvedených vo vašich zdrojoch softvéru.\n"
-#~ "\n"
-#~ "Potrebujete na to funkčné internetové pripojenie."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Komentár:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Súčasti:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribúcia:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Typ:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>Adresa:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Zadajte kompletný APT riadok zdroja softvéru, ktorý chcete "
-#~ "pridať</b></big>\n"
-#~ "\n"
-#~ "APT riadok obsahuje typ, umiestnenie a súčasti zdrojov softvéru. Napr.: "
-#~ "<i>\"deb·http://ftp.debian.org·sarge·main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "APT riadok:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binárny\n"
-#~ "Zdrojový"
-
-#, fuzzy
-#~ msgid "Edit Source"
-#~ msgstr "Zdrojový"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Prehľadáva sa CD"
-
-#, fuzzy
-#~ msgid "_Add Source"
-#~ msgstr "Zdrojový"
-
-#~ msgid "_Reload"
-#~ msgstr "_Obnoviť"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Zobraziť a nainštalovať dostupné aktualizácie"
-
-#~ msgid "Update Manager"
-#~ msgstr "Správca aktualizácií"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Automaticky kontrolovať dostupnosť novšej verzie súčasnej distribúcie, a "
-#~ "ak je to možné ponúknuť možnosť jej aktualizácie."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Kontrolovať dostupnosť novšej verzie distribúcie"
-
-#, fuzzy
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Ak je automatická kontrola aktualizácií vypnutá, musíte manuálne "
-#~ "znovunačítavať zoznam dostupných balíkov zo serverov uvedených vo vašich "
-#~ "zdrojoch softvéru. Táto voľba vám umožní nezobrazovať upozorňovanie na "
-#~ "potrebu znovunačítavania tohto zoznamu."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Pripomínať znovunačítavanie zoznamu dostupných balíčkov"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Zobraziť podrobnosti o aktualizácii"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Uchováva veľkosť dialágu správcu aktualizácií"
+#: ../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 ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr "Uchováva veľkosť časti okna so zoznamom zmien a popisom balíka"
+msgid "The list of changes is not available"
+msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr."
 
-#~ msgid "The window size"
-#~ msgstr "Veľkosť okna"
+#: ../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 "Configure the sources for installable software and updates"
-#~ msgstr "Nastaviť zdroje softvéru a internetové aktualizácie"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" - bezpečnostné aktualizácie"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+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."
 
-#, fuzzy
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "Softvér s obmedzených exportom pre USA"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "Nainštalovať _aktualizácie"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Cancel _Download"
-#~ msgstr "_Zrušiť sťahovanie"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Niektoré programy už nie sú viac oficiálne podporované"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Nemôžno nájsť žiadne aktualizácie"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Váš systém už bol aktualizovaný."
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Prebieha aktualizácia na Ubuntu "
-#~ "6.06 LTS</span>"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Nemôžem inštalovať '%s'"
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
+#: ../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 "Updates of Ubuntu"
-#~ msgstr "Aktualizovať na najnovšiu verziu Ubuntu"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Nebolo možné nainštalovať všetky dostupné aktualizácie"
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Analyzuje sa váš systém</b></big>\n"
-#~ "\n"
-#~ "Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné "
-#~ "zraniteľnosti alebo poskytujú nové vlastnosti."
-
-#~ msgid "Oficially supported"
-#~ msgstr "Oficiálne podporované"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Niektoré aktualizácie vyžadujú odstránenie iných programov. Aby ste "
-#~ "vykonali úplnú aktualizáciu použite funkciu \"Označiť všetky aktualizácie"
-#~ "\" správcu balíkov \"Synaptic\" alebo spustite \"sudo apt-get dist-upgrade"
-#~ "\" v termináli."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Nasledujúce balíky nebudú aktualizované:"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Zostáva %li sekúnd"
-
-#~ msgid "Download is complete"
-#~ msgstr "Sťahovanie je dokončené"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Aktualizácia zlyhala. Oznámte to ako chybu."
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Aktualizuje sa Ubuntu"
-
-#~ msgid "Hide details"
-#~ msgstr "Skryť podrobnosti"
-
-#~ msgid "Show details"
-#~ msgstr "Zobraziť podrobnosti"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "Naraz môže byť spustený len jeden program na správu softvéru"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Musíte najprv zavrieť ostatné programy na správu softvéru, ako napr. "
-#~ "'aptitude' alebo 'Synaptic'."
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Zdroje</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Kľúče</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Inštalačné média"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Predvoľby softvéru"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Zdroj:</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Súčasti:</b>"
-
-#~ msgid "Add Channel"
-#~ msgstr "Pridať zdroj"
-
-#~ msgid "Edit Channel"
-#~ msgstr "Upraviť zdroje"
-
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Pridať zdroj"
-#~ msgstr[1] "_Pridať zdroje"
-#~ msgstr[2] "_Pridať zdroje"
-
-#~ msgid "_Custom"
-#~ msgstr "_Vlastný"
-
-#~ msgid "Software Properties"
-#~ msgstr "Vlastnosti softvéru"
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS - bezpečnostné aktualizácie"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS - aktualizácie"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS - backporty"
-
-#~ msgid "No valid entry found"
-#~ msgstr "Nebol nájdený žiadny platný záznam"
-
-#~ msgid ""
-#~ "While scaning your repository information no valid entry for the upgrade "
-#~ "was found.\n"
-#~ msgstr ""
-#~ "Vo vašich zdrojoch softvéru nebol nájdený žiadny záznam vhodný na "
-#~ "použitie pre upgrade.\n"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system can be in an unusable state. A "
-#~ "recovery is now run (dpkg --configure -a)."
-#~ msgstr ""
-#~ "Upgrade neočakávane skončil. Váš systém môže byt v nestabilnom stave. Pre "
-#~ "opravu skúste teraz spustiť (dpkg --configure -a)."
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files ~/dist-upgrade.log and "
-#~ "~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
-#~ msgstr ""
-#~ "Oznámte ju ako chybu a k vašej správe priložte súbory ~/dist-upgrade.log "
-#~ "a ~/dist-upgrade-apt.log. Upgrade teraz skončí. "
-
-#~ msgid "You can install one update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Môžete nainštalovať %s aktualizáciu"
-#~ msgstr[1] "Môžete nainštalovať %s aktualizácie"
-#~ msgstr[2] "Môžete nainštalovať %s aktualizácií"
-
-#~ msgid "Repositories changed"
-#~ msgstr "Zdroje softvéru boli zmenené"
-
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "Potrebujete znovunačítať zoznam dostupných balíčkov zo serverov uvedených "
-#~ "vo vašich zdrojoch softvéru. Chcete to urobiť teraz?"
-
-#~ msgid ""
-#~ "<big><b>Analysing your system</b></big>\n"
-#~ "\n"
-#~ "Software updates can correct errors, eliminate security vulnerabilities, "
-#~ "and provide new features to you."
-#~ msgstr ""
-#~ "<big><b>Analyzuje sa váš systém</b></big>\n"
-#~ "\n"
-#~ "Softvérové aktualizácie môžu opravovať chyby, odstraňovať bezpečnostné "
-#~ "zraniteľnosti alebo poskytnúť nové vlastnosti."
-
-#~ msgid ""
-#~ "Software updates can correct errors, eliminate security vulnerabilities, "
-#~ "and provide new features to you."
-#~ msgstr ""
-#~ "Softvérové aktualizácie môžu opravovať chyby, odstraňovať bezpečnostné "
-#~ "zraniteľnosti alebo poskytnúť nové vlastnosti."
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically. The software package \"unattended-upgrades\" needs to be "
-#~ "installed therefor"
-#~ msgstr ""
-#~ "Automaticky budú inštalované len bezpečnostné aktualizácie z oficiálnych "
-#~ "serverov Ubuntu. Preto musí byť nainštalovaný softvérový balíček "
-#~ "'unattended-upgrades'."
-
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Sekcie:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and sections of a channel, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Zadajte kompletný APT riadok zdroja softvéru, ktorý chcete "
-#~ "pridať</b></big>\n"
-#~ "\n"
-#~ "APT riadok obsahuje typ, umiestnenie a sekcie zdrojov softvéru. Napr.: <i>"
-#~ "\"deb·http://ftp.debian.org·sarge·main\"</i>."
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sekcie:</b>"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Upraviť zdroje a nastavenia softvéru"
-
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Zdroje</b>"
-
-#~ msgid "day(s)"
-#~ msgstr "deň/dní"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Dočasné súbory</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Používateľské rozhranie</b>"
-
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Autentifikačné kľúče</b></big>\n"
-#~ "\n"
-#~ "V tomto dialógu môžete pridať alebo odstrániť autentifikačné kľúče. Kľúč "
-#~ "umožňuje overiť integritu stiahnutého softvéru."
-
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Pridať nový kľúč do zväzku dôveryhodných kľúčov. Uistite sa, že ste kľúč "
-#~ "dostali bezpečnou cestou, a že môžete veriť jeho vydavateľovi. "
-
-#~ msgid "Add repository..."
-#~ msgstr "Pridať repozitár..."
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "_Automaticky kontrolovať aktualizácie softvéru"
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Automati_cky prečistiť stiahnuté balíky"
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Intervel prečistenia (v dňoch): "
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Zmazať staré balíky z archívu na pevnom disku"
-
-#~ msgid "Edit Repository..."
-#~ msgstr "Upraviť repozitáre..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Uchovávať balíky najviac (v dňoch):"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Maximálna veľkosť archívu na disku (v MB):"
-
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Obnoví pôvodné kľúče dodávané s vašou distribúciou. Toto neovplyvní "
-#~ "používateľom nainštalovnané kľúče."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Nastaviť maximálnu veľkosť archívu balíčkov na disku"
-
-#~ msgid "Settings"
-#~ msgstr "Nastavenia"
-
-#~ msgid "Show detailed package versions"
-#~ msgstr "Zobraziť podrovné informácie o verziách balíkov"
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "Zobraziť vypnuté zroje softvéru"
-
-#~ msgid "Update interval in days: "
-#~ msgstr "Interval aktualizácie v dňoch: "
-
-#~ msgid "_Add Repository"
-#~ msgstr "_Pridať repozitár"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Stiahnuť nájdené aktualizácie"
-
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>Stav:</b>"
-
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Dostupné aktualizácie</b></big>\n"
-#~ "\n"
-#~ "Boli nájdené aktualizácie nasledovných balíkov. Môžete ich zaktualizovať "
-#~ "použitím tlačidla Inštalovať."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Získava sa zoznam zmien</span>\n"
-#~ "\n"
-#~ "Zoznam zmien sa získava z centrálneho servera."
-
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "Zrušiť získavanie zoznamu zmien"
-
-#~ msgid "Reload the package information from the server."
-#~ msgstr "Znovu načítať informácie o balíkoch zo serverov."
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Zobraziť dostupné aktualizácie a vybrať, ktoré nainštalovať"
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr ""
-#~ "Aby ste mohli spustiť tento program musíte mať administrátorské práva"
-
-#~ msgid "Binary"
-#~ msgstr "Binárny"
+msgid "An essential package would be removed"
+msgstr "Musel by byť odstránený dôležitý balík"
 
-#~ msgid "Non-free software"
-#~ msgstr "Neslobodný softvér"
-
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian 3.0 \"Woody\""
-
-#~ msgid "Debian Stable"
-#~ msgstr "Debian Stable"
-
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Debian Non-US (Stable)"
-
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian Non-US (Testing)"
-
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Autentifikačný kľúč Ubuntu archívu <ftpmaster@ubuntu.com>"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "Autentifikačný kľúč Ubuntu CD <cdimage@ubuntu.com>"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Choose a key-file"
-#~ msgstr "Vyberte súbor s autentifikačným kľúčom"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "There is one package available for updating."
-#~ msgstr "Bol nájdený jeden balík, ktorý je možné aktualizovať."
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "Bolo nájdených %s balíkov, ktoré je možné aktualizovať."
-
-#~ msgid "There are no updated packages"
-#~ msgstr "Nebol nájdený žiadny balík, ktorý by bolo potrebné aktualizovať."
-
-#~ msgid "You did not select any of the %s updated package"
-#~ msgid_plural "You did not select any of the %s updated packages"
-#~ msgstr[0] "Nevybrali ste balík na aktualizáciu (%s dostupný)."
-#~ msgstr[1] "Nevybrali ste žiadny balík na aktualizáciu z %s dostupných."
-#~ msgstr[2] "Nevybrali ste žiadny balík na aktualizáciu z %s dostupných."
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "You have selected %s updated package, size %s"
-#~ msgid_plural "You have selected all %s updated packages, total size %s"
-#~ msgstr[0] "Vybrali ste %s balík na aktualizáciu, veľkosť %s"
-#~ msgstr[1] "Vybrali ste %s balíky na aktualizáciu, veľkosť %s"
-#~ msgstr[2] "Vybrali ste %s balíkov na aktualizáciu, veľkosť %s"
-
-#~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
-#~ msgstr[0] "Vybrali ste %s z %s balíkov na aktualizáciu, veľkosť %s"
-#~ msgstr[1] "Vybrali ste %s z %s balíkov na aktualizáciu, veľkosť %s"
-#~ msgstr[2] "Vybrali ste %s z %s balíkov na aktualizáciu, veľkosť %s"
-
-#~ msgid "The updates are being applied."
-#~ msgstr "Práve prebieha aktualizácia."
-
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Môžete mať spustenú najviac jednu aplikáciu na správu balíkov. Prosím, "
-#~ "najprv zavrite druhú aplikáciu."
-
-#~ msgid "Updating package list..."
-#~ msgstr "Aktualizujem zoznam balíkov..."
-
-#~ msgid "There are no updates available."
-#~ msgstr "Nie sú dostupné žiadne aktualizácie."
-
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Prejdite prosím, na novšiu verziu distribúcie Ubuntu Linux. Verzia, ktorú "
-#~ "používate nie je viac podporovaná. To znamená, že už nie sú k dispozícii "
-#~ "bezpečnostné ani kritické aktualizácie. Pre viac informácií o prechode na "
-#~ "novšiu verziu si pozrite http://www.ubuntulinux.org."
-
-#~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "Bola nájdená novšia verzia Ubuntu!"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "Je dostupná novšia verzia vašej distribúcie s kódovým označením \"%s\". "
-#~ "Pre viac informácií o prechode na vyššiu verziu si pozrite http://www."
-#~ "ubuntulinux.org."
+#: ../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 ""
 
-#~ msgid "Never show this message again"
-#~ msgstr "Už viac nezobrazovať toto upozornenie"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr ""
-#~ "Zoznam zmien nebol nájdený. Je možné, že ešte neboli nahrané na server."
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "A_uthentication"
-#~ msgstr "A_utentifikácia"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "<b>Packages to install:</b>"
-#~ msgstr "<b>Balíky na inštaláciu:</b>"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/sl.po b/po/sl.po
index ce48acb1..74822103 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+0200\n"
 "PO-Revision-Date: 2006-10-16 04:06+0000\n"
 "Last-Translator: Tadej <tadej.888@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -25,222 +25,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -252,51 +277,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../data/templates/Debian.info.in:83
 msgid "Debian 3.1 'Sarge'"
 msgstr ""
 
 #. 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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -304,296 +339,159 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Dnevno"
-
-#~ msgid "Every two days"
-#~ msgstr "Vsaka dva dneva"
-
-#~ msgid "Weekly"
-#~ msgstr "Tedensko"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Vsaka dva tedna"
-
-#~ msgid "Every %s days"
-#~ msgstr "Vsakih %s dni"
-
-#~ msgid "After one week"
-#~ msgstr "Po enem tednu"
-
-#~ msgid "After two weeks"
-#~ msgstr "Po dveh tednih"
-
-#~ msgid "After one month"
-#~ msgstr "Po enem mesecu"
-
-#~ msgid "After %s days"
-#~ msgstr "Po %s dnevih"
-
-#~ msgid "Import key"
-#~ msgstr "Uvozi ključ"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Napaka pri uvozu izbrane datoteke"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Izbrana datoteka verjetno ni GPG ključ ali pa je morda pokvarjena"
-
-#~ msgid "Error removing the key"
-#~ msgstr "Napaka pri odstranitvi kluča"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Kluč, katerega ste izbrali, se ne more odstraniti. Prosim, javite to kot "
-#~ "napako."
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Prosim, vnesite ime za ta disk"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Prosim, vstavite disk v pogon"
-
-#~ msgid "Broken packages"
-#~ msgstr "Pokvarjeni paketi"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Vaš sistem vsebuje pokvarjene pakete, ki se ne morejo obnoviti s to "
-#~ "programsko opremo.\r\n"
-#~ "Prosim, da popravite te pakete z uporabo synaptic ali apt-get, preden "
-#~ "nadaljujete."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Ne morem nadgraditi zahtevanih meta-paketov"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Bistven paket se bo moral odstraniti"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Ne morem izračunati nadgradnje"
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Napaka pristnosti nekaterih paketov"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Nekaterih paketov ni bilo mogoče preveriti. Napaka je lahko pri začasnem "
-#~ "omrežju. Morda poskusite kasneje. Spodaj poglejte seznam nepreverjenih "
-#~ "paketov."
+#: ../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 "Can't install '%s'"
-#~ msgstr "Ne morem namestiti '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Nemogoče je bilo namestiti zahtevani paket. Prosim, javite to kot napaka. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Ne morem ugibati meta-paketa"
-
-#~ msgid "Reading cache"
-#~ msgstr "Berem zalogo"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Najdena neveljavna zrcalnost"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Med preverjanjem vaših shranjenih informacij, ni bil najden noben zrcalni "
-#~ "vnos za nadgradnjo\n"
-#~ "To se lahko pripeti, če zaženete notranje zrcaljenje ali pa je zrcalna "
-#~ "informacija zastarala.\n"
-#~ "\n"
-#~ "Ali želite kljub temu prepisati vašo 'sources.list' datoteko? Če tukaj "
-#~ "izberete 'Yes', vam bo posodobilo vse vhode iz '%s' v '%s'.\n"
-#~ "Če izberete 'no', se bo posodobitev prekinila."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Proizvedem pomanjkljive izvore?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Po pregledu vaše 'sources.list', ni bilo najdenega nobenega vnosa za '%"
-#~ "s'.\n"
-#~ "\n"
-#~ "Se naj dodajo pomanjkljivi vnosi za '%s'? Če izberete 'No', se bo "
-#~ "posodabljanje prekinilo."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Neveljavna shranjena informacija"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Nadgradnja shranjene informacije je zaključena kot neveljavna datoteka. "
-#~ "Prosim, javite to kot napaka."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Izvor tretje skupine izključen"
-
-#~ msgid "Error during update"
-#~ msgstr "Napaka med posodobitvijo"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Med posodobitvijo je prišlo do napake. Ponavadi je to lahko omrežna "
-#~ "napaka, prosim, da preverite vaše omrežje in poskusite znova."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Premalo prostora na disku"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Nadgradnja se bo sedaj prekinila. Prosim, zagotovite najmanj %s prostega "
-#~ "prostora na %s. Izpraznite koš in odstranite začasne pakete prejšnjih "
-#~ "namesitev z uporabo 'sudo apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Želite pričeti z nadgradnjo?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Ne morem namestiti nadgradenj."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Ne morem sneti nadgradenj"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Nadgradnja sedaj končuje. Prosim, preverite internetno povezavo ali "
-#~ "namestitveni medij in poizkusite znova. "
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Odstranim neuporabne pakete?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Preskoči ta korak"
+msgid "Details"
+msgstr "Dnevno"
 
-#~ msgid "_Remove"
-#~ msgstr "_Odstrani"
-
-#~ msgid "Error during commit"
-#~ msgstr "Napaka med izvedbo"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Med čiščenjem je prišlo do problema. Prosim, poglejte sporočilo spodaj za "
-#~ "več informacij. "
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Checking package manager"
-#~ msgstr "Preverjam paketni upravitelj"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Updating repository information"
-#~ msgstr "Posodabljam shranjeno informacijo"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "Invalid package information"
-#~ msgstr "Neveljavna paketna informacija"
+#: ../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 ""
 
-#~ msgid "Asking for confirmation"
-#~ msgstr "Sprašujem za potrditev"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#~ msgid "Upgrading"
-#~ msgstr "Nadgrajevanje"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "System upgrade is complete."
-#~ msgstr "Nadgrajevanje sistema je dokončano"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Odstrani %s</b>"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Install %s"
-#~ msgstr "Namesti %s"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Upgrade %s"
-#~ msgstr "Nadgradi %s"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Reboot required"
-#~ msgstr "Potreben je ponoven zagon"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr "Nadgrajevanje je končano in potreben je ponoven zagon"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "    "
-#~ msgstr "    "
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Ne morem namestiti '%s'"
 
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Ponovno zaženite sistem da dokončate nadgradnjo</big></b>"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Pripravljam nadgradnjo"
+#: ../apt/debfile.py:494
+#, fuzzy
+msgid "An essential package would be removed"
+msgstr "Bistven paket se bo moral odstraniti"
 
-#~ msgid "Restarting the system"
-#~ msgstr "Ponovno zaganjam sistem"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "_Keep"
-#~ msgstr "_Obdrži"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "_Replace"
-#~ msgstr "_Zamenjaj"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "_Report Bug"
-#~ msgstr "_Poročaj hrošča"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "_Restart Now"
-#~ msgstr "_Ponovno zaženi zdaj"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Nadaljuj nadgradnjo"
+#: ../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 ""
 
-#~ msgid "Could not find the release notes"
-#~ msgstr "Ni bilo mogoče najti zapiskov ob izdaji"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Version %s: \n"
-#~ msgstr "Različica %s: \n"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Download size: %s"
-#~ msgstr "Velikost prenosa: %s"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "Nadgradi %s"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/sq.po b/po/sq.po
index 00fb881c..031f5955 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -24,223 +24,248 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "%s përmirësimet"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -252,52 +277,62 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 6.0 'Squeeze' "
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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:42
+#: ../data/templates/Debian.info.in:94
 msgid "Proposed updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "%s përmirësimet"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Serveri për %s"
@@ -305,161 +340,161 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 #, fuzzy
 msgid "Main server"
 msgstr "Serveri më i afërt"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 #, fuzzy
 msgid "Custom servers"
 msgstr "Serveri më i afërt"
 
-#~ msgid "Daily"
-#~ msgstr "Përditë"
+#: ../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 "Përditë"
+
+#: ../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 ""
 
-#~ msgid "Every two days"
-#~ msgstr "Çdo dy ditë"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Weekly"
-#~ msgstr "Përjavë"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "'%s' nuk mund të instalohet"
 
-#~ msgid "Every two weeks"
-#~ msgstr "Çdo dy javë"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "Every %s days"
-#~ msgstr "Çdo %s ditësh"
+#: ../apt/debfile.py:494
+#, fuzzy
+msgid "An essential package would be removed"
+msgstr "Një paketë themelore u deshtë të largohej"
 
-#~ msgid "After one week"
-#~ msgstr "Pas një jave"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "After two weeks"
-#~ msgstr "Pas dy javësh"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "After one month"
-#~ msgstr "Pas një muaji"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "After %s days"
-#~ msgstr "Pas %s ditësh"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Active"
-#~ msgstr "Aktiv"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "(Source Code)"
-#~ msgstr "(Kodi i hapur)"
-
-#~ msgid "Source Code"
-#~ msgstr "Kodi i hapur"
-
-#~ msgid "Import key"
-#~ msgstr "Importo çelës"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Gabim gjatë importimit të të dhënës së zgjedhur"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "E dhëna e zgjedhur sipas të gjitha gjasave nuk është GPG-çelës ose është "
-#~ "e dëmtuar."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Gabim gjatë largimit të çelësit"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Çelësi i zgjedhur nuk mund të largohet.Ju lutemi krijoni këtu një raport "
-#~ "për gabimin."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Gabim gjatë leximit të CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Jepni një emër për Mediumin."
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Ju lutemi futni një Medium në drive:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Paketat e dëmtuara"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Sistemi juaj përmban paketa defekt, të cilat nuk mund të riparohen me "
-#~ "këtë softuer.Ju lutemi riparoni këtë me Synaptic ose apt-get, para se të "
-#~ "shkoni përpara."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Metapaketat e nevojshme nuk mund të aktualizohen."
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Një paketë themelore u deshtë të largohej"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Aktualizimi nuk mund të llogaritej"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Një problem i pazgjidhshëm ndodhi gjatë aktualizimit.Ju lutemi krijoni "
-#~ "një raport për këtë gabim."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Gabim gjatë vërtetimit të origjinalitetit të disa paketave."
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Disa paketa nuk mund të vërtetoheshin për origjinalitet.Kjo ka si pasojë "
-#~ "problemet me rrjetin.Ju lutemi provoni më vonë edhe një herë.Paketat e "
-#~ "mëposhtme nuk mund të vërtetohen për nga origjinaliteti."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "'%s' nuk mund të instalohet"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Një paketë i nevojshëm nuk mundi të instalohet.Ju lutemi raportoni këtë "
-#~ "problem. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Can't guess meta-package"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Sistemi juaj nuk përmban një »ubuntu-desktop«-, një »kubuntu-desktop»- apo "
-#~ "një »edubuntu-desktop«-Paketë.Prandaj nuk mundi saktësohej Versioni juaj i "
-#~ "Ubuntu-se.\n"
-#~ "Ju lutemi instaloni njërën nga paketat e theksuara nëpërmjet Synaptic ose "
-#~ "apt-get, para se të vazhdoni."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Futja e CD dështoi"
-
-#~ msgid "    "
-#~ 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/sr.po b/po/sr.po
index 4f8c6390..905c0041 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+0200\n"
 "PO-Revision-Date: 2006-10-16 04:17+0000\n"
 "Last-Translator: Vladimir Samardzic <vladosam@hotmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -25,222 +25,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -252,51 +277,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 6.0 'Squeeze' "
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -304,139 +339,157 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Svaki dan"
-
-#~ msgid "Every two days"
-#~ msgstr "Svaki drugi dan"
-
-#~ msgid "Weekly"
-#~ msgstr "Svake nedelje"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Every two weeks"
-#~ msgstr "Svake druge nedelje"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Every %s days"
-#~ msgstr "Svakih %s dana"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Детаљи"
 
-#~ msgid "After one week"
-#~ msgstr "Posle jedne nedelje"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "After two weeks"
-#~ msgstr "Posle dve nedelje"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "After one month"
-#~ msgstr "Posle jednog meseca"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "After %s days"
-#~ msgstr "Posle %s dana"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "Import key"
-#~ msgstr "Importiranje kljuca"
+#: ../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 ""
 
-#, fuzzy
-#~ msgid "Error importing selected file"
-#~ msgstr "Грешка у учитавању изабранe datoteke"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Error removing the key"
-#~ msgstr "Грешка у уклањању кључа"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Кључ који сте изабрали није могуће уклонити. Молим вас пријавите ово као "
-#~ "грешку."
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Молим вас унесите име диска"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Молим вас убаците диск у јединицу диска:"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Broken packages"
-#~ msgstr "Оштећени пакети"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "У вашем систему постоје оштећени пакети који не могу бити поправљени овим "
-#~ "софтвером. Молим вас прво њих поправите користећи synaptic или apt-get "
-#~ "прије него што наставите."
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Not enough free disk space"
-#~ msgstr "Нема довољно места на диску"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Надоградња је прекинута. Молим вас ослободите најмање %s простора на "
-#~ "диску %s. Испразните канту за отпаtке и уклоните привремене пакете "
-#~ "предходних инсталација користећи команду 'sudo apt-get clean'."
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Инсталирај %s"
 
-#~ msgid "_Skip This Step"
-#~ msgstr "_Прескочи овај корак"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "_Remove"
-#~ msgstr "_Уклони"
+#: ../apt/debfile.py:494
+msgid "An essential package would be removed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "System upgrade is complete."
-#~ msgstr "Унапређење система је завршено"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#, fuzzy
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Команда 'diff' није нађена"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#, fuzzy
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Да би спречили губитак података затворите све активне програме и "
-#~ "документа."
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Install %s"
-#~ msgstr "Инсталирај %s"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Upgrade %s"
-#~ msgstr "Унапреди %s"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Reboot required"
-#~ msgstr "Потребно је поново покретање система"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "    "
-#~ 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 ""
 
-#~ msgid "Details"
-#~ msgstr "Детаљи"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Difference between the files"
-#~ msgstr "Разлике између датотека"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Terminal"
-#~ msgstr "Терминал"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "Унапреди %s"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/sv.po b/po/sv.po
index e6729ded..5926f2b4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -25,235 +25,266 @@ 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: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 "Cd-rom med 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 "Cd-rom med 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 "Cd-rom med 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Säkerhetsuppdateringar för Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Säkerhetsuppdateringar för Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Gemenskapsunderhållen"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Properitära drivrutiner för enheter"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Inskränkt programvara"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Cd-rom med Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Öppen källkodsprogramvara som stöds av Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Gemenskapsunderhållen (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Öppen källkodsprogramvara underhållen av gemenskapen"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Ickefria drivrutiner"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Properitära drivrutiner för enheter "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Properitära drivrutiner för enheter"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Inskränkt programvara (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr "Programvara begränsad av upphovsrätt eller juridiska avtal"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 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:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Viktiga säkerhetsuppdateringar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Rekommenderade uppdateringar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Föreslagna uppdateringar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Bakåtporterade uppdateringar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Uppdateringar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Bakåtportar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Stöds officiellt"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Säkerhetsuppdateringar för Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Uppdateringar för Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Bakåtporteringar för Ubuntu 5.04"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Gemenskapsunderhållen (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Ickefri (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Stöds inte längre officiellt"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Begränsad upphovsrätt"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Säkerhetsuppdateringar för Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Uppdateringar för Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Bakåtporteringar för Ubuntu 4.10"
 
@@ -265,55 +296,68 @@ 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 "Föreslagna uppdateringar"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Viktiga säkerhetsuppdateringar"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "DFSG-kompatibel programvara med icke-fria beroenden"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Icke-DFSG-kompatibel programvara"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Server för %s"
@@ -321,3582 +365,162 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Huvudserver"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Anpassade servrar"
 
-#~ msgid "Daily"
-#~ msgstr "Dagligen"
-
-#~ msgid "Every two days"
-#~ msgstr "Varannan dag"
-
-#~ msgid "Weekly"
-#~ msgstr "Varje vecka"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Varannan vecka"
-
-#~ msgid "Every %s days"
-#~ msgstr "Var %s:e dag"
-
-#~ msgid "After one week"
-#~ msgstr "Efter en vecka"
-
-#~ msgid "After two weeks"
-#~ msgstr "Efter två veckor"
-
-#~ msgid "After one month"
-#~ msgstr "Efter en månad"
-
-#~ msgid "After %s days"
-#~ msgstr "Efter %s dagar"
-
-#~ msgid "%s updates"
-#~ msgstr "Uppdateringar för %s"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "Närmaste server"
-
-#~ msgid "Software Channel"
-#~ msgstr "Programvarukanal"
-
-#~ msgid "Active"
-#~ msgstr "Aktiv"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Källkod)"
-
-#~ msgid "Source Code"
-#~ msgstr "Källkod"
-
-#~ msgid "Import key"
-#~ msgstr "Importera nyckel"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Fel vid importing av vald fil"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Den valda filen verkar inte vara en GPG-nyckel eller så är filen trasig."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Fel vid borttagning av nyckeln"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "Nyckeln du valde kan inte tas bort. Rapportera detta som ett fel."
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Fel vid avsökning av cd-skiva</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Ange ett namn för skivan"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Mata in en skiva i enheten:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Trasiga paket"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Ditt system innehåller trasiga paket som inte kunde repareras med det här "
-#~ "programmet. Reparera dem först med synaptic eller apt-get innan du "
-#~ "fortsätter."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Kan inte uppdatera de obligatoriska meta-paketen"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Ett grundläggande paket skulle behöva tas bort"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Kunde inte beräkna uppgraderingen"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Ett problem utan lösning inträffade vid beräkning av uppgraderingen.\n"
-#~ "\n"
-#~ "Rapportera det här felet mot paketet \"update-manager\" och inkludera "
-#~ "filerna i /var/log/dist-upgrade/ i felrapporten."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Det gick inte att autentisiera vissa paket"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Det gick inte att autentisiera vissa paket. Det kan vara ett tillfälligt "
-#~ "nätverksfel. Det kan hjälpa med att försöka senare. Se nedan för en lista "
-#~ "med icke-autentisierade paket."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Kan inte installera \"%s\""
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Det var inte möjligt att installera ett nödvändigt paket. Rapportera "
-#~ "detta som ett fel. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Kan inte gissa meta-paket"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Ditt system innehåller inte något av paketen ubuntu-desktop, kubuntu-"
-#~ "desktop eller edubuntu-desktop och det var inte möjligt att identifiera "
-#~ "vilken version av Ubuntu som du kör.\n"
-#~ " Installera först ett av paketen ovan med Synaptic eller apt-get innan du "
-#~ "fortsätter."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "Misslyckades med att lägga till cd-skivan"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "Det inträffade ett fel när cd-skivan lades till, uppgraderingen kommer "
-#~ "att avbrytas. Rapportera detta som ett fel om det gäller en giltig Ubuntu-"
-#~ "cd.\n"
-#~ "\n"
-#~ "Felmeddelandet var:\n"
-#~ "\"%s\""
-
-#~ msgid "Reading cache"
-#~ msgstr "Läser cache"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Hämta uppgraderingsdata från nätverket?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "Uppgraderingen kan använda nätverket för att leta efter de senaste "
-#~ "uppdateringarna och för att hämta paketen som inte finns på den aktuella "
-#~ "cd-skivan.\n"
-#~ "\n"
-#~ "Om du har en snabb nätverksanslutning bör du svara \"Ja\" här. Om "
-#~ "nätverket är långsamt kan du svara \"Nej\"."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Hittade ingen giltig serverspegel"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Kunde inte hitta någon serverspegelpost för uppgraderingen när "
-#~ "förrådsinformationen söktes igenom. Det här kan hända om du kör en intern "
-#~ "spegel eller om spegelinformationen är utdaterad.\n"
-#~ "\n"
-#~ "Vill du skriva över filen \"sources.list\" i alla fall? Om du väljer \"Ja"
-#~ "\" här kommer det att uppdatera alla \"%s\" till \"%s\".\n"
-#~ "Om du väljer \"Nej\" kommer uppdateringen avbrytas."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Generera standardkällor?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Hittade ingen giltig post för \"%s\" när \"sources.list\" söktes igenom.\n"
-#~ "\n"
-#~ "Ska standardposter för \"%s\" läggas till? Om du väljer \"Nej\" kommer "
-#~ "uppdateringen avbrytas."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Förrådsinformationen är ogiltig"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Uppdatering av förrådsinformationen orsakade en ogiltig fil. Rapportera "
-#~ "detta som ett fel."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Tredjepartskällor inaktiverade"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Vissa tredjepartsposter i din sources.list blev inaktiverade. Du kan "
-#~ "återaktivera dem efter uppgraderingen med verktyget \"software-properties"
-#~ "\" eller med Synaptic."
-
-#~ msgid "Error during update"
-#~ msgstr "Fel vid uppdatering"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Ett problem inträffade under uppdateringen. Detta beror oftast på någon "
-#~ "form av nätverksproblem, var god kontrollera din nätverksanslutning och "
-#~ "försök igen."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Inte tillräckligt med ledigt diskutrymme"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Uppgraderingen avbryts nu. Frigör åtminstone %s diskutrymme på %s. Töm "
-#~ "din papperskorg och ta bort temporära paket från tidigare installationer "
-#~ "genom att använda \"sudo apt-get clean\"."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Vill du starta uppgraderingen?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Det gick inte att installera uppgraderingarna"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Uppgraderingen avbryts nu. Ditt system kan vara i ett oanvändbart "
-#~ "tillstånd. En återhämtning kördes (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Rapportera detta fel mot paketet \"update-manager\" och bifoga filerna i /"
-#~ "var/log/dist-upgrade/ i felrapporten."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Det gick inte att hämta uppgraderingarna"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Uppgraderingen avbryts nu. Var god kontrollera din Internetanslutning "
-#~ "eller ditt installationsmedia, och försök igen. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Stöd för vissa program har upphört"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "Canonical Ltd. tillhandahåller inte längre stöd för följande "
-#~ "programvarupaket. Du kan fortfarande få stöd från gemenskapen.\n"
-#~ "\n"
-#~ "Om du inte har aktiverat gemenskapsunderhållen programvara (universe), "
-#~ "kommer dessa paket att föreslås för borttagning i nästa steg."
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Ta bort föråldrade paket?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Hoppa över det här steget"
-
-#~ msgid "_Remove"
-#~ msgstr "_Ta bort"
-
-#~ msgid "Error during commit"
-#~ msgstr "Fel inträffade vid verkställandet"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Något fel inträffade vid upprensningen. Se meddelandet nedan för mer "
-#~ "information. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Återställer ursprungligt systemtillstånd"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "Hämtar bakåtportering av \"%s\""
-
-#~ msgid "Checking package manager"
-#~ msgstr "Kontrollerar pakethanterare"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Förberedelse av uppgradering misslyckades"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Förberedelse av systemet för uppgraderingen misslyckades. Rapportera det "
-#~ "här som ett fel mot paketet \"update-manager\" och inkludera filerna i /"
-#~ "var/log/dist-upgrade/ i felrapporten."
-
-#~ msgid "Updating repository information"
-#~ msgstr "Uppdaterar förrådsinformation"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Ogiltig paketinformation"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Efter att din paketinformation blev uppdaterad kan det systemkritiska "
-#~ "paketet \"%s\" inte längre hittas.\n"
-#~ "Detta innebär att det finns ett allvarligt fel, vänligen rapportera detta "
-#~ "fel mot paketet \"update-manager\" och bifoga filerna i /var/log/dist-"
-#~ "upgrade/ i felrapporten."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Ber om bekräftelse"
-
-#~ msgid "Upgrading"
-#~ msgstr "Uppgraderar"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Söker efter föråldrad programvara"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Systemuppdateringen är klar."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Mata in \"%s\" i enheten \"%s\""
-
-#~ msgid "Fetching is complete"
-#~ msgstr "Hämtning är klar"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Hämtar fil %li av %li i %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Ungefär %s återstående"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Hämtar fil %li av %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Verkställer ändringar"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Kunde inte installera \"%s\""
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "Uppgraderingen avbryter nu. Rapportera detta fel mot paketet \"update-"
-#~ "manager\" och bifoga filerna i /var/log/dist-upgrade/ i felrapporten."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Ersätt den anpassade konfigurationsfilen\n"
-#~ "\"%s\"?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Du kommer att förlora de ändringar du har gjort i den här "
-#~ "konfigurationsfilen om du väljer att ersätta den med en senare version."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Kommandot \"diff\" hittades inte"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Ett ödesdigert fel uppstod"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Rapportera detta som ett fel och bifoga filerna /var/log/dist-upgrade/"
-#~ "main.log och /var/log/dist-upgrade/apt.log i din rapport. Uppgraderingen "
-#~ "avbryts nu.\n"
-#~ "Din ursprungliga sources.list sparades som /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d paket kommer att tas bort."
-#~ msgstr[1] "%d paket kommer att tas bort."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d nytt paket kommer att installeras."
-#~ msgstr[1] "%d nya paket kommer att installeras."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d paket kommer att uppgraderas."
-#~ msgstr[1] "%d paket kommer att uppgraderas."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Du måste hämta totalt %s. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Hämtning och installation av uppgraderingen kan ta flera timmar och kan "
-#~ "inte avbrytas."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Stäng alla öppna program och dokument för att förhindra dataförlust."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Ditt system är uppdaterat"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Det finns inga tillgängliga uppgraderingar för ditt system. "
-#~ "Uppgraderingen kommer nu att avbrytas."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Ta bort %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "Installera %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Uppgradera %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li dagar %li timmar %li minuter"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li timmar %li minuter"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li minuter"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li sekunder"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Den här hämtningen kommer att ta ungefär %s med en 1 Mbit DSL-"
-#~ "anslutningen och ungefär %s med ett 56k-modem"
-
-#~ msgid "Reboot required"
-#~ msgstr "Omstart krävs"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Uppgraderingen är klar och datorn behöver startas om. Vill du göra det nu?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Avbryt pågående uppgradering?</big></b>\n"
-#~ "\n"
-#~ "Systemet kan hamna i ett oanvändbart tillstånd om du avbryter "
-#~ "uppgraderingen. Det rekommenderas starkt att du fortsätter uppgraderingen."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Starta om systemet för att färdigställa uppgraderingen</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Starta uppgraderingen?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Uppgraderar Ubuntu till version 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Rensar upp"
-
-#~ msgid "Details"
-#~ msgstr "Detaljer"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Skillnad mellan filerna"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Hämtar och installerar uppgraderingarna"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Ändrar programvarukanalerna"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Förbereder uppgraderingen"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Startar om datorn"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminalfönster"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Avbryt uppgradering"
-
-#~ msgid "_Continue"
-#~ msgstr "_Fortsätt"
-
-#~ msgid "_Keep"
-#~ msgstr "_Behåll"
-
-#~ msgid "_Replace"
-#~ msgstr "_Ersätt"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Rapportera fel"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_Starta om nu"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Återuppta uppgraderingen"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Starta uppgradering"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Det gick inte att hitta versionsfaktan"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Servern kan vara överbelastad. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Det gick inte att hämta versionsfaktan"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Kontrollera din Internetanslutning."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Det gick inte att köra uppgraderingsverktyget"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Det är troligen ett fel i uppgraderingsverktyget. Rapportera det som ett "
-#~ "fel."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Hämtar uppgraderingsverktyget"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr ""
-#~ "Uppgraderingsverktyget kommer att guida dig genom uppgraderingsprocessen."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Uppgraderingsverktygets signatur"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Uppgraderingsverktyg"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Misslyckades med att hämta"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr ""
-#~ "Hämtningen av uppgraderingen misslyckades. Det kan vara ett problem med "
-#~ "nätverket. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Misslyckades med att extrahera"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Extraheringen av uppgraderingen misslyckades. Det kan vara ett problem "
-#~ "med nätverket eller med servern. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Verifieringen misslyckades"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Validering av uppgraderingen misslyckades. Det kan finnas ett problem i "
-#~ "nätverket eller med servern. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Autentisering misslyckades"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Autentisering av uppgraderingen misslyckades. Det kan vara ett problem "
-#~ "med nätverket eller med servern. "
-
-#~ 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"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "Hämtar fil %(current)li av %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "Listan över ändringar finns inte tillgänglig"
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Listan över ändringar är ännu inte tillgänglig.\n"
-#~ "Försök igen senare."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Misslyckades med att hämta listan över ändringar. \n"
-#~ "Kontrollera din Internetanslutning."
-
-#~ msgid "Backports"
-#~ msgstr "Bakåtporteringar"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Uppdateringar för utgåva"
-
-#~ msgid "Other updates"
-#~ msgstr "Övriga uppdateringar"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Version %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Hämtar lista över ändringar..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "_Avmarkera allt"
-
-#~ msgid "_Check All"
-#~ msgstr "_Kontrollera alla"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Hämtningsstorlek: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Du kan installera %s uppdatering"
-#~ msgstr[1] "Du kan installera %s uppdateringar"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Var god vänta, det här kan ta lite tid."
-
-#~ msgid "Update is complete"
-#~ msgstr "Uppdateringen är färdig"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Letar efter uppdateringar"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "Från version %(old_version)s till %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "Version %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Storlek: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Din distribution stöds inte längre"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Du kommer inte längre att få säkerhets- eller kritiska uppdateringar. "
-#~ "Uppgradera till en senare version av Ubuntu Linux. Se http://www.ubuntu."
-#~ "com för mer information om hur man uppgraderar."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Ny distributionsutgåva \"%s\" finns tillgänglig</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Programindexet är trasigt"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Det är inte möjligt att installera eller ta bort några program. Använd "
-#~ "pakethanteraren \"Synaptic\" eller kör \"sudo apt-get install -f\" i en "
-#~ "terminal för att rätta till det här problemet först."
-
-#~ msgid "None"
-#~ msgstr "Ingen"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Du måste manuellt leta efter uppdateringar</big></b>\n"
-#~ "\n"
-#~ "Ditt system letar inte automatiskt efter uppdateringar. Du kan konfiguera "
-#~ "det här beteendet i <i>Programvarukällor</i> under fliken "
-#~ "<i>Internetuppdateringar</i>."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Håll ditt system uppdaterat</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>Inte alla uppdateringar kan installeras</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<big><b>Startar Uppdateringshanterare</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "Ändringar"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "Ändringar och beskrivning av uppdateringen"
-
-#~ msgid "Chec_k"
-#~ msgstr "_Kontrollera"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Leta efter nya uppdateringar i programvarukanalerna"
-
-#~ msgid "Description"
-#~ msgstr "Beskrivning"
-
-#~ msgid "Release Notes"
-#~ msgstr "Versionsfakta"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Kör en uppgradering av utgåvan för att installera så många uppdateringar "
-#~ "som möjligt. \n"
-#~ "\n"
-#~ "Det här kan orsakas av en icke-komplett uppgradering, inofficiella "
-#~ "programvarupaket eller genom att köra en utvecklingsversion."
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Visa förlopp för enstaka filer"
-
-#~ msgid "Software Updates"
-#~ msgstr "Programvaruuppdateringar"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Programvaruuppdateringar rättar till fel, eliminerar säkerhetsproblem och "
-#~ "ger dig nya funktioner."
-
-#~ msgid "U_pgrade"
-#~ msgstr "U_ppgradera"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Uppgradera till senaste versionen av Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Kontrollera"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Uppgradering av utgåva"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Dölj denna information i framtiden"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Installera uppdateringar"
-
-#~ msgid "_Upgrade"
-#~ msgstr "_Uppgradera"
-
-#~ msgid "changes"
-#~ msgstr "ändrar"
-
-#~ msgid "updates"
-#~ msgstr "uppdaterar"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Automatiska uppdateringar</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>Cd-rom/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Internetuppdateringar</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>För att förbättra Ubuntus användarvänlighet ber vi dig att delta i "
-#~ "Ubuntus populäritetstävling. Om du deltar kommer en lista över de program "
-#~ "du har installerat och uppgifter om hur ofta de används att samlas in. "
-#~ "Listan skickas anonymt till Ubuntu-projektet veckovis.\n"
-#~ "\n"
-#~ "Resultatet används för att förbättra stödet för populära program och för "
-#~ "att ranka program i sökresultat.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Lägg till cd-rom"
-
-#~ msgid "Authentication"
-#~ msgstr "Autentisering"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "_Ta bort hämtade programvarufiler:"
-
-#~ msgid "Download from:"
-#~ msgstr "Hämta från:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Importera den publika nyckeln från en betrodd programvaruleverantör"
-
-#~ msgid "Internet Updates"
-#~ msgstr "Internetuppdateringar"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Endast säkerhetsuppdateringar från de officiella Ubuntuservrarna kommer "
-#~ "installeras automatiskt"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "_Återställ standardvärden"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Återställ standardnycklarna för din distribution"
-
-#~ msgid "Software Sources"
-#~ msgstr "Programvarukällor"
-
-#~ msgid "Source code"
-#~ msgstr "Källkod"
-
-#~ msgid "Statistics"
-#~ msgstr "Statistik"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "Skicka in statistik"
-
-#~ msgid "Third Party"
-#~ msgstr "Tredjepart"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "Leta efter uppdateringar _automatiskt:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_Hämta automatiskt uppdateringar, men installera dem inte"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_Importera nyckelfil"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Installera säkerhetsuppdateringar utan bekräftelse"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Informationen om tillgänglig programvara är utdaterad</big></b>\n"
-#~ "\n"
-#~ "För att installera programvara och uppdateringar från nyligen tillagda "
-#~ "eller ändrade källor behöver du läsa om information om tillgänglig "
-#~ "programvara.\n"
-#~ "\n"
-#~ "Du behöver en fungerande Internetanslutning för att fortsätta."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Kommentar:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Komponenter:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribution:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Typ:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Ange den kompletta APT-raden till förrådet som du vill lägga till "
-#~ "som källa</b></big>\n"
-#~ "\n"
-#~ "APT-raden inkluderar typen, platsen och komponenterna för ett förråd, "
-#~ "till exempel <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "APT line:"
-#~ msgstr "APT-rad:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binär\n"
-#~ "Källkod"
-
-#~ msgid "Edit Source"
-#~ msgstr "Redigera källa"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Söker igenom cd-skivan"
-
-#~ msgid "_Add Source"
-#~ msgstr "_Lägg till källa"
-
-#~ msgid "_Reload"
-#~ msgstr "_Läs om"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Visa och installera tillgängliga uppdateringar"
-
-#~ msgid "Update Manager"
-#~ msgstr "Uppdateringshanterare"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Kontrollera automatiskt om en snare version för nuvarande distribution "
-#~ "finns tillgänglig och fråga om du vill uppgradera (om möjligt)."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Sök efter nya utgåvor av distributionen"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Om automatisk kontroll efter uppdatering är inaktiverad behöver du läsa "
-#~ "om kanallistan manuellt. Det här alternativet tillåter att påminnelsen "
-#~ "döljs i det här fallet."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Påminn om att uppdatera kanallistan"
-
-#~ msgid "Show details of an update"
-#~ msgstr "Visa detaljer för en uppdatering"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Lagrar storleken för uppdateringshanterarens dialogfönster"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr ""
-#~ "Lagrar tillståndet för expanderaren som innehåller listan av ändringar "
-#~ "och beskrivningen"
-
-#~ msgid "The window size"
-#~ msgstr "Fönsterstorleken"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr ""
-#~ "Konfigurera källorna för installerbara programvaror och uppdateringar"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" Säkerhetsuppdateringar"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://ftp.se.debian.org/debian/"
-
-#~ msgid ""
-#~ "<big><b>Error scaning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Fel vid genomsökning av cd-skiva</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "A unresolvable problem occured while calculating the upgrade. Please "
-#~ "report this as a bug. "
-#~ msgstr ""
-#~ "Ett problem uppstod som inte gick att lösa när uppgraderingen beräknades. "
-#~ "Rapportera detta som ett fel. "
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are runing.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Ditt system innehåller varken ubuntu-desktop, kubuntu-desktop eller "
-#~ "edubuntu-desktop och det gick inte att identifiera vilken version av "
-#~ "Ubuntu du använder.\n"
-#~ " Installera ett av dessa paket först med synaptic eller apt-get innan du "
-#~ "fortsätter."
-
-#~ msgid ""
-#~ "Some third party entries in your souces.list where disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "Vissa tredjepartskällor i din sources.list blev inaktiverade. Du kan "
-#~ "återaktivera dem efter uppgraderingen med verktyget \"software-properties"
-#~ "\" eller med synaptic."
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system can be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a)."
-#~ msgstr ""
-#~ "Uppgraderingen avbryts nu. Ditt system kan vara i ett oanvändbart "
-#~ "tillstånd. En återhämtning kördes (dpkg --configure -a)."
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "Viss programvara stöds inte officiellt längre"
-
-#~ msgid ""
-#~ "These installed packages are no longer officially supported, and are now "
-#~ "only community-supported ('universe').\n"
-#~ "\n"
-#~ "If you don't have 'universe' enabled these packages will be suggested for "
-#~ "removal in the next step. "
-#~ msgstr ""
-#~ "Dessa installerade paket har inte längre officiellt stöd, och är nu "
-#~ "enbart gemenskapsunderhållna (\"universe\").Om du inte har \"universe\" "
-#~ "aktiverat kommer dessa paket föreslås för borttagning i nästa steg. "
-
-#~ msgid "Restoring originale system state"
-#~ msgstr "Återställer ursprunglig systemstatus"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this as a bug."
-#~ msgstr ""
-#~ "Efter att paketinformationen uppdaterades går det inte att hitta det "
-#~ "nödvändiga paketet \"%s\" längre.\n"
-#~ "Det här tyder på ett allvarligt fel, rapportera detta som ett fel."
-
-#~ msgid "About %li days %li hours %li minutes remaining"
-#~ msgstr "Ungefär %li dagar, %li timmar och %li minuter återstår"
-
-#~ msgid "About %li hours %li minutes remaining"
-#~ msgstr "Ungefär %li timmar och %li minuter återstår"
-
-#~ msgid "About %li minutes remaining"
-#~ msgstr "Ungefär %li minuter återstår"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "Ungefär %li sekunder återstår"
-
-#~ msgid "Download is complete"
-#~ msgstr "Hämtningen är färdig"
-
-#~ msgid "Downloading file %li of %li at %s/s"
-#~ msgstr "Hämtar fil %li av %li i %s/s"
-
-#~ msgid "Downloading file %li of %li"
-#~ msgstr "Hämtar fil %li av %li"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Uppdateringen avbryts nu. Rapportera detta som ett fel."
-
-#~ msgid ""
-#~ "Replace configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Ersätt konfigurationsfilen\n"
-#~ "\"%s\"?"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade."
-#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts "
-#~ "now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Rapportera detta som ett fel och inkludera filerna /var/log/dist-upgrade."
-#~ "log och /var/log/dist-upgrade-apt.log i din rapport. Uppgraderingen "
-#~ "avbryts nu.\n"
-#~ "Din ursprungliga sources.list sparades i /etc/apt/sources.list."
-#~ "distUpgrade."
-
-#~ msgid "%s package is going to be removed."
-#~ msgid_plural "%s packages are going to be removed."
-#~ msgstr[0] "%s paket kommer att tas bort."
-#~ msgstr[1] "%s paket kommer att tas bort."
-
-#~ msgid "%s new package is going to be installed."
-#~ msgid_plural "%s new packages are going to be installed."
-#~ msgstr[0] "%s nytt paket kommer att installeras."
-#~ msgstr[1] "%s nya paket kommer att installeras."
-
-#~ msgid "%s package is going to be upgraded."
-#~ msgid_plural "%s packages are going to be upgraded."
-#~ msgstr[0] "%s paket kommer att uppgraderas."
-#~ msgstr[1] "%s paket kommer att uppgraderas."
-
-#~ msgid "You have to download a total of %s."
-#~ msgstr "Du behöver hämta totalt %s."
-
-#~ msgid ""
-#~ "The upgrade can take several hours and cannot be canceled at any time "
-#~ "later."
-#~ msgstr ""
-#~ "Uppgraderingen kan ta flera timmar och kan inte avbrytas under tiden."
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Kunde inte hitta några uppgraderingar"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Ditt system har redan uppgraderats."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Uppgraderar till Ubuntu 6.06 LTS</"
-#~ "span>"
-
-#~ msgid "Downloading and installing the upgrades"
-#~ msgstr "Hämtar och installerar uppgraderingarna"
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Uppgraderar Ubuntu"
-
-#~ msgid ""
-#~ "Verfing the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Verifieringen av uppgraderingen misslyckades. Det kan vara ett problem "
-#~ "med nätverket eller med servern. "
-
-#~ msgid "Downloading file %li of %li with %s/s"
-#~ msgstr "Hämtar fil %li av %li i %s/s"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Hämtar fil %li av %li med okänd hastighet"
-
-#~ msgid "The list of changes is not available yet. Please try again later."
-#~ msgstr "Listan med ändringar är inte tillgänglig ännu. Försök igen senare"
-
-#~ msgid ""
-#~ "Failed to download the list of changes. Please check your Internet "
-#~ "connection."
-#~ msgstr ""
-#~ "Misslyckades med att hämta listan med ändringar. Kontrollera din "
-#~ "Internetanslutning."
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Det går inte att installera alla tillgängliga uppdateringar"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "Vissa uppdateringar kräver att andra program avinstalleras. Använd "
-#~ "funktionen \"Markera alla uppgraderingar\" i pakethanteraren Synaptic "
-#~ "eller kör \"sudo apt-get dist-upgrade\" i en terminal för att uppdatera "
-#~ "ditt system helt och hållet."
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "Följande uppdateringar kommer att hoppas över:"
-
-#~ msgid "Downloading the list of changes..."
-#~ msgstr "Hämtar listan med ändringar..."
-
-#~ msgid "Hide details"
-#~ msgstr "Dölj detaljer"
-
-#~ msgid "Show details"
-#~ msgstr "Visa detaljer"
-
-#~ msgid "New version: %s   (Size: %s)"
-#~ msgstr "Ny version: %s (storlek: %s)"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "Endast ett programvaruhanteringsverktyg tillåts att köra samtidigt"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr ""
-#~ "Stäng det andra programmet först, t.ex. \"aptitude\" eller \"Synaptic\"."
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties"
-#~ "\"."
-#~ msgstr ""
-#~ "<b><big>Du måste leta efter uppdateringar manuellt</big></b>\n"
-#~ "\n"
-#~ "Ditt system letar inte efter uppdateringar automatiskt. Du kan "
-#~ "konfigurera detta beteende i \"System\" -> \"Administration\" -> "
-#~ "\"Programvaruinställningar\"."
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>Undersöker ditt system</b></big>\n"
-#~ "\n"
-#~ "Programvaruuppdateringar rättar till fel, eliminerar säkerhetsproblem och "
-#~ "ger dig nya funktioner."
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Avbryt _hämtningen"
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Kanaler</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Nycklar</b>"
-
-#~ msgid "Add _Cdrom"
-#~ msgstr "Lägg till _cd-skiva"
-
-#~ msgid "Installation Media"
-#~ msgstr "Installationsmedia"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Programvaruinställningar"
-
-#~ msgid "_Download updates in the background, but do not install them"
-#~ msgstr "_Hämta uppdateringar i bakgrunden, men installera dem inte"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid ""
-#~ "<b><big>The channel information is out-of-date</big></b>\n"
-#~ "\n"
-#~ "You have to reload the channel information to install software and "
-#~ "updates from newly added or changed channels. \n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Kanalinformationen är gammal</big></b>\n"
-#~ "\n"
-#~ "Du behöver uppdatera kanalinformationen för att installera program och "
-#~ "uppdateringar från nya eller ändrade kanaler. \n"
-#~ "\n"
-#~ "Du behöver en fungerande Internetanslutning för att kunna fortsätta."
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Kanal</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponenter</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a channel, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Skriv in hela APT-raden till kanalen du vill lägga till</b></"
-#~ "big>\n"
-#~ "\n"
-#~ "APT-raden innehåller typ, plats och komponenter för en kanal, till "
-#~ "exempel <i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "Add Channel"
-#~ msgstr "Lägg till kanal"
-
-#~ msgid "Edit Channel"
-#~ msgstr "Redigera kanal"
-
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_Lägg till kanal"
-#~ msgstr[1] "_Lägg till kanaler"
-
-#~ msgid "_Custom"
-#~ msgstr "An_passad"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabeld, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Om automatisk kontroll av uppdateringar är inaktiverad behöver du läsa om "
-#~ "kanallistan manuellt. Det här alternativet möjliggör att dölja "
-#~ "påminnelser som visas i det här läget."
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changs and the "
-#~ "description"
-#~ msgstr ""
-#~ "Lagrar tillståndet på expanderaren som innehåller listan på ändringar och "
-#~ "beskrivningar"
-
-#~ msgid "Configure software channels and internet updates"
-#~ msgstr "Konfigurera programvarukanaler och Internetuppdateringar"
-
-#~ msgid "Software Properties"
-#~ msgstr "Programvaruegenskaper"
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS Säkerhetsuppdateringar"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS Uppdateringar"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS Bakåtporteringar"
-
-#~ msgid "Ubuntu 6.06 'Dapper Drake'"
-#~ msgstr "Ubuntu 6.06 \"Dapper Drake\""
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space. Empty your "
-#~ "trash and remove temporary packages of former installations using 'sudo "
-#~ "apt-get clean'."
-#~ msgstr ""
-#~ "Uppdateringen avbryter nu. Vänligen frigör minst %s diskutrymme. Töm din "
-#~ "papperskorg och ta bort temporära paket från tidigare installationer "
-#~ "genom att köra \"sudo apt-get clean\"."
-
-#~ msgid "%s remaining"
-#~ msgstr "%s återstår"
-
-#~ msgid "No valid entry found"
-#~ msgstr "Ingen giltig källa funnen"
-
-#~ msgid ""
-#~ "While scaning your repository information no valid entry for the upgrade "
-#~ "was found.\n"
-#~ msgstr ""
-#~ "Ingen giltig källa för uppdatering hittades när din förrådsinformation "
-#~ "söktes igenom.\n"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system can be in an unusable state. A "
-#~ "recovery is now run (dpkg --configure -a)."
-#~ msgstr ""
-#~ "Uppdateringen avbryts nu. Ditt system kan vara i ett oanvändbart läge. En "
-#~ "återställning körs nu (dpkg --configure -a)."
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files ~/dist-upgrade.log and "
-#~ "~/dist-upgrade-apt.log in your report. The upgrade aborts now. "
-#~ msgstr ""
-#~ "Var vänlig rapportera detta som en bugg och inkludera filerna ~/dist-"
-#~ "upgrade.log och ~/dist-upgrade-apt.log i din rapport. Uppdateringen "
-#~ "avbryts nu. "
-
-#~ msgid "You can install one update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Du kan installera en uppdatering"
-#~ msgstr[1] "Du kan installera %s uppdateringar"
-
-#~ msgid "Repositories changed"
-#~ msgstr "Förråd ändrade"
-
-#~ msgid ""
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "Du behöver uppdatera paketlistan från servrarna för att dina förändringar "
-#~ "ska börja gälla. Vill du göra det nu?"
-
-#~ msgid ""
-#~ "<big><b>Analysing your system</b></big>\n"
-#~ "\n"
-#~ "Software updates can correct errors, eliminate security vulnerabilities, "
-#~ "and provide new features to you."
-#~ msgstr ""
-#~ "<big><b>Analyserar ditt system</b></big>\n"
-#~ "\n"
-#~ "Programvaruuppdateringar kan åtgärda fel, eliminera säkerhetshål och ge "
-#~ "dig nya funktioner."
-
-#~ msgid ""
-#~ "Software updates can correct errors, eliminate security vulnerabilities, "
-#~ "and provide new features to you."
-#~ msgstr ""
-#~ "Programuppdateringar kan åtgärda fel, eliminera säkerhetshål och ge dina "
-#~ "program nya funktioner."
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically. The software package \"unattended-upgrades\" needs to be "
-#~ "installed therefor"
-#~ msgstr ""
-#~ "Endast säkerhetsuppdateringar från de officiella Ubuntu-servrarna kommer "
-#~ "att installeras automatiskt. Programpaketet \"unattended-upgrades\" "
-#~ "behöver därför installeras"
-
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Avdelningar:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and sections of a channel, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Skriv in den kompletta APT-raden för kanalen du vill lägga till</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "APT-raden innehåller typ, plats och avdelningar för kanalen, till exempel "
-#~ "<i>\"deb http://ftp.debian.org sarge main\"</i>."
-
-#~ msgid "Oficially supported"
-#~ msgstr "Stöds officiellt"
-
-#~ msgid "Installing updates"
-#~ msgstr "Installerar uppdateringar"
-
-#~ msgid "Check for available updates"
-#~ msgstr "Kontrollera efter tillgängliga uppdateringar"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Avdelningar:</b>"
-
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Läs om paketinformationen från servern."
-
-#, fuzzy
-#~ msgid "Add Software Channels"
-#~ msgstr "Programvaruuppdateringar"
-
-#, fuzzy
-#~ msgid "Could not add any software channels"
-#~ msgstr "inte installerad"
-
-#, fuzzy
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Nätverksinställningar</span>\n"
-#~ "Använd detta verktyg för att konfigurera det sätt som ditt system kommer "
-#~ "åt andra datorer"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Visa tillgängliga uppdateringar och välj vilka som ska installeras"
-
-#, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "Inga matchande paket hittades"
-
-#, fuzzy
-#~ msgid "To be installed: %s"
-#~ msgstr "inte installerad"
-
-#, fuzzy
-#~ msgid "Are you sure you want cancel?"
-#~ msgstr "Är du säker på att du vill avsluta?"
-
-#, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Programvarukällor</b>"
-
-#, fuzzy
-#~ msgid "Cancel downloading of the changelog"
-#~ msgstr "Avbryt hämtningen av changelog"
-
-#~ msgid "_Install"
-#~ msgstr "_Installera"
-
-#, fuzzy
-#~ msgid "Choose a key-file"
-#~ msgstr "Välj en spegel"
+#: ../apt/progress/gtk2.py:259
+#, 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"
 
-#~ msgid "<b>Details</b>"
-#~ msgstr "<b>Detaljer</b>"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Hämtar fil %(current)li av %(total)li"
 
-#~ msgid "<b>Packages to install:</b>"
-#~ msgstr "<b>Paket att installera:</b>"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Detaljer"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Säkerhet</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Temporära filer</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Användargränssnitt</b>"
-
-#~ msgid "A_uthentication"
-#~ msgstr "A_utentisering"
+msgid "Starting..."
+msgstr "Söker..."
 
+#: ../apt/progress/gtk2.py:373
 #, fuzzy
-#~ msgid "Edit Repository..."
-#~ msgstr "Redigera värdar..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Maximal ålder i dagar:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Maximal storlek i MB:"
-
-#~ msgid "Settings"
-#~ msgstr "Inställningar"
+msgid "Complete"
+msgstr "Komponenter"
 
-#~ msgid "Show disabled software sources"
-#~ msgstr "Visa inaktiverade programvarukällor"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Update interval in days: "
-#~ msgstr "Uppdateringsintervall i dagar: "
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Listan över ändringar finns inte tillgänglig"
 
-#, fuzzy
-#~ msgid "_Add Repository"
-#~ msgstr "_Lägg till värd"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Hämta uppgraderingsbara paket"
+#: ../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 ""
 
-#~ msgid "It is not possible to upgrade all packages."
-#~ msgstr "Det går inte att uppgradera alla paket."
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Misslyckades med att hämta listan över ändringar. \n"
+"Kontrollera din Internetanslutning."
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr ""
-#~ "Ändringar kunde inte hittas, servern har kanske inte uppdaterats än."
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "The updates are being applied."
-#~ msgstr "Uppdateringarna verkställs."
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Upgrade finished"
-#~ msgstr "Uppgradering slutförd"
+#: ../apt/debfile.py:149
+#, fuzzy, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr "Beroendeupplösning misslyckades"
 
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det "
-#~ "andra programmet först."
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Updating package list..."
-#~ msgstr "Hittade %d matchande paket"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "There are no updates available."
-#~ msgstr "Det finns inga tillgängliga uppdateringar."
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "Det finns inga tillgängliga uppdateringar."
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Never show this message again"
-#~ msgstr "Visa aldrig detta meddelande igen"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Kan inte installera \"%s\""
 
-#, fuzzy
-#~ msgid "Unable to get exclusive lock"
-#~ msgstr "Kan inte aktivera"
+#: ../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 ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
-#~ msgstr ""
-#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det "
-#~ "andra programmet först."
-
-#~ msgid "Initializing and getting list of updates..."
-#~ msgstr "Initierar och hämtar lista med uppdateringar..."
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Du måste vara root för att kunna köra detta program"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Redigera källor och inställningar för programvaror"
-
-#~ msgid "Ubuntu Update Manager"
-#~ msgstr "Ubuntu-uppdateringshanterare"
-
-#~ msgid "Binary"
-#~ msgstr "Binär"
-
-#~ msgid "Source"
-#~ msgstr "Källkod"
-
-#~ msgid "CD"
-#~ msgstr "CD"
-
-#~ msgid "Contributed software"
-#~ msgstr "Bidragen programvara"
-
-#~ msgid "Non-free software"
-#~ msgstr "Ickefri programvara"
-
-#~ msgid "US export restricted software"
-#~ msgstr "Programvara med USA-exportbegränsningar"
-
-#~ msgid "Sources"
-#~ msgstr "Källor"
-
-#~ msgid "Temporary files"
-#~ msgstr "Temporära filer"
-
-#~ msgid "Packages to install:"
-#~ msgstr "Paket att installera:"
-
-#~ msgid ""
-#~ "Failed to download changes. Please check if there is an active Internet "
-#~ "connection."
-#~ msgstr ""
-#~ "Misslyckades med att hämta ändringar. Kontrollera att det finns en aktiv "
-#~ "Internetanslutning."
-
-#~ msgid "Packages to install: "
-#~ msgstr "Paket att installera: "
-
-#~ msgid "Properties"
-#~ msgstr "Egenskaper"
-
-#~ msgid "Comment:"
-#~ msgstr "Kommentar:"
-
-#~ msgid "Components"
-#~ msgstr "Komponenter"
-
-#~ msgid "Distribution:"
-#~ msgstr "Distribution:"
-
-#~ msgid "Type:"
-#~ msgstr "Typ:"
-
-#~ msgid "<b>URL:</b>"
-#~ msgstr "<b>URL:</b>"
-
-#~ msgid "URI:"
-#~ msgstr "URI:"
-
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
-#~ msgid "User Interface"
-#~ msgstr "Användargränssnitt"
-
-#~ msgid "Version %s:"
-#~ msgstr "Version %s:"
-
-#~ msgid "New version:"
-#~ msgstr "Ny version"
-
-#~ msgid "Please wait while getting data."
-#~ msgstr "Var vänlig vänta vid hämtande av data."
-
-#~ msgid "Please ensure that your network settings are correct."
-#~ msgstr "Försäkra dig om att dina nätverksinställningar är korrekta."
-
-#~ msgid "Refreshing channel data"
-#~ msgstr "Uppdaterar kanaldata"
-
-#~ msgid "Downloading channel information"
-#~ msgstr "Hämtar kanalinformation"
-
-#~ msgid "Verifying"
-#~ msgstr "Verifierar"
-
-#~ msgid "Unable to verify package signature for"
-#~ msgstr "Kan inte verifiera paketsignatur för"
-
-#~ msgid "There is no package signature for"
-#~ msgstr "Det finns ingen paketsignatur för"
-
-#~ msgid "Installing"
-#~ msgstr "Installerar"
-
-#~ msgid "Removing"
-#~ msgstr "Tar bort"
-
-#~ msgid "Configuring"
-#~ msgstr "Konfigurerar"
-
-#~ msgid "Brought to you by:"
-#~ msgstr "Presenteras av:"
-
-#~ msgid "With love from:"
-#~ msgstr "Kramar från:"
-
-#~ msgid "Best wishes from:"
-#~ msgstr "Hälsningar från:"
-
-#~ msgid "Sincerely:"
-#~ msgstr "Med vänliga hälsningar:"
-
-#~ msgid "Developed by chimps:"
-#~ msgstr "Utvecklat av chimpanser:"
-
-#~ msgid "Licensed under the GNU General Public License, version 2"
-#~ msgstr "Licensierat under GNU General Public License, version 2"
-
-#~ msgid "Group Activation"
-#~ msgstr "Gruppaktivering"
-
-#~ msgid "Service:"
-#~ msgstr "Tjänst:"
-
-#~ msgid "Email:"
-#~ msgstr "E-post:"
-
-#~ msgid "Activation Code:"
-#~ msgstr "Aktiveringskod:"
-
-#~ msgid "Activate"
-#~ msgstr "Aktivera"
-
-#~ msgid "Please fill in both email and activation code."
-#~ msgstr "Fyll i både e-postadress och aktiveringskod."
-
-#~ msgid ""
-#~ "Please ensure you typed the email address and activation code correctly"
-#~ msgstr ""
-#~ "Försäkra dig om att du angav e-postadressen och aktiveringskoden korrekt"
-
-#~ msgid ""
-#~ "Unable to show help because the help files were missing.  Please report "
-#~ "this to your vendor."
-#~ msgstr ""
-#~ "Kan inte visa hjälp eftersom hjälpfilerna saknas. Rapportera detta till "
-#~ "din leverantör."
-
-#~ msgid ""
-#~ "Unable to show help because there are no applications available to view "
-#~ "help."
-#~ msgstr ""
-#~ "Kan inte visa hjälp eftersom inga program för att visa hjälp är "
-#~ "tillgängliga."
-
-#~ msgid "Are you sure you want to open %d package information windows?"
-#~ msgstr "Är du säker på att du vill öppna %d fönster med paketinformation?"
-
-#~ msgid "Run Now"
-#~ msgstr "Kör nu"
-
-#~ msgid "Perform installations and removals"
-#~ msgstr "Utför installationer och borttagningar"
-
-#~ msgid "Change your channel subscriptions"
-#~ msgstr "Ändra dina kanalprenumerationer"
-
-#~ msgid "Refresh"
-#~ msgstr "Uppdatera"
-
-#~ msgid "Refresh channel data"
-#~ msgstr "Uppdatera kanaldata"
-
-#~ msgid "Mark for _Installation"
-#~ msgstr "Markera för _installation"
-
-#~ msgid "Mark selected packages for installation"
-#~ msgstr "Markera valda paket för installation"
-
-#~ msgid "Mark for _Removal"
-#~ msgstr "Markera för _borttagning"
-
-#~ msgid "Mark selected packages for removal"
-#~ msgstr "Markera valda paket för borttagning"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Avbryt"
-
-#~ msgid "Cancel marked package actions"
-#~ msgstr "Avbryt markerade paketåtgärder"
-
-#~ msgid "I_nformation"
-#~ msgstr "I_nformation"
-
-#~ msgid "_File"
-#~ msgstr "_Arkiv"
-
-#~ msgid "_Edit"
-#~ msgstr "_Redigera"
-
-#~ msgid "_View"
-#~ msgstr "_Visa"
-
-#~ msgid "_Actions"
-#~ msgstr "_Åtgärder"
-
-#~ msgid "Connect to daemon..."
-#~ msgstr "Anslut till demon..."
-
-#~ msgid "Connect to a remote daemon"
-#~ msgstr "Anslut till en fjärrdemon"
-
-#~ msgid "Install from _File..."
-#~ msgstr "Installera från _fil..."
-
-#~ msgid "Install a package from a local file"
-#~ msgstr "Installera ett paket från en lokal fil"
-
-#~ msgid "Install from _URL..."
-#~ msgstr "Installera från _URL..."
-
-#~ msgid "Install a package from a remote URL"
-#~ msgstr "Installera ett paket från en fjärr-URL"
-
-#~ msgid "_Mount Directory..."
-#~ msgstr "_Montera katalog..."
-
-#~ msgid "Mount a directory as a channel"
-#~ msgstr "Montera en katalog som en kanal"
-
-#~ msgid "U_nmount Directory..."
-#~ msgstr "A_vmontera katalog..."
-
-#~ msgid "Unmount a directory"
-#~ msgstr "Avmontera en katalog"
-
-#~ msgid "_Activate..."
-#~ msgstr "_Aktivera..."
-
-#~ msgid "Quit"
-#~ msgstr "Avsluta"
-
-#~ msgid "Select _All"
-#~ msgstr "Markera _alla"
-
-#~ msgid "Select all items"
-#~ msgstr "Markera alla objekt"
-
-#~ msgid "Select _None"
-#~ msgstr "Markera _inga"
-
-#~ msgid "Deselect all items"
-#~ msgstr "Avmarkera alla objekt"
-
-#~ msgid "Services..."
-#~ msgstr "Tjänster..."
-
-#~ msgid "Edit services"
-#~ msgstr "Redigera tjänster"
-
-#~ msgid "Channel _Subscriptions..."
-#~ msgstr "Kanal_prenumerationer..."
-
-#~ msgid "Edit your channel subscriptions"
-#~ msgstr "Redigera dina kanalprenumerationer"
-
-#~ msgid "_Preferences..."
-#~ msgstr "_Inställningar..."
-
-#~ msgid "_Users..."
-#~ msgstr "_Användare..."
-
-#~ msgid "Edit user permissions for this daemon"
-#~ msgstr "Redigera användarrättigheter för denna demon"
-
-#~ msgid "_Sidebar"
-#~ msgstr "_Sidopanel"
-
-#~ msgid "Hide or show the Pending Actions sidebar"
-#~ msgstr "Dölj eller visa sidopanelen med förestående åtgärder"
-
-#~ msgid "_Advanced Search Options"
-#~ msgstr "_Avancerade sökalternativ"
-
-#~ msgid "Hide or show advanced search options"
-#~ msgstr "Dölj eller visa avancerade sökalternativ"
-
-#~ msgid "_Channel Names"
-#~ msgstr "_Kanalnamn"
-
-#~ msgid "Hide or show channel names in package lists"
-#~ msgstr "Dölj eller visa kanalnamn i paketlistor"
-
-#~ msgid "Package _Information..."
-#~ msgstr "Paket_information..."
-
-#~ msgid "View information about currently selected packages"
-#~ msgstr "Visa information om för tillfället markerade paket"
-
-#~ msgid "_Daemon Information..."
-#~ msgstr "_Demoninformation..."
-
-#~ msgid "View information about this daemon"
-#~ msgstr "Visa information om denna demon"
-
-#~ msgid "Run _Now"
-#~ msgstr "Kör _nu"
-
-#~ msgid "Run the current transaction"
-#~ msgstr "Kör den aktuella transaktionen"
-
-#~ msgid "_Verify System Dependencies"
-#~ msgstr "_Verifiera systemberoenden"
-
-#~ msgid "Verify that all system dependencies are met"
-#~ msgstr "Verifiera att alla systemberoenden är lösta"
-
-#~ msgid "Mark for I_nstallation"
-#~ msgstr "Markera för i_nstallation"
-
-#~ msgid "Mark this package for installation"
-#~ msgstr "Markera detta paket för installation"
-
-#~ msgid "Mark this package for removal"
-#~ msgstr "Markera detta paket för borttagning"
-
-#~ msgid "Cancel installation or removal mark"
-#~ msgstr "Ta bort installations- eller borttagningsmarkering"
-
-#~ msgid "Re_fresh Channel Data"
-#~ msgstr "_Uppdatera kanaldata"
-
-#~ msgid "Download latest channel data"
-#~ msgstr "Hämta senaste kanaldata"
-
-#~ msgid "_Contents"
-#~ msgstr "_Innehåll"
-
-#~ msgid "_About..."
-#~ msgstr "_Om..."
-
-#~ msgid "Go to the '%s' page"
-#~ msgstr "Gå till sidan \"%s\""
-
-#~ msgid "All Subscribed Channels"
-#~ msgstr "Alla prenumererade kanaler"
-
-#~ msgid "No Channel/Unknown Channel"
-#~ msgstr "Ingen kanal/Okänd kanal"
-
-#~ msgid ""
-#~ "Unable to connect to the daemon:\n"
-#~ " '%s'."
-#~ msgstr ""
-#~ "Kan inte ansluta till demonen:\n"
-#~ " \"%s\"."
-
-#~ msgid "Starting daemon..."
-#~ msgstr "Startar demon..."
-
-#~ msgid "Connect to this system"
-#~ msgstr "Anslut till detta system"
-
-#~ msgid "Connect to a remote system"
-#~ msgstr "Anslut till ett fjärrsystem"
-
-#~ msgid "Server:"
-#~ msgstr "Server:"
-
-#~ msgid "User name:"
-#~ msgstr "Användarnamn:"
-
-#~ msgid "Password:"
-#~ msgstr "Lösenord:"
-
-#~ msgid "Connect"
-#~ msgstr "Anslut"
-
-#~ msgid "Connection to daemon restored.\n"
-#~ msgstr "Anslutningen till demonen återställd.\n"
-
-#~ msgid "Lost contact with the daemon!"
-#~ msgstr "Tappade kontakten med demonen!"
-
-#~ msgid "Dependency Resolution"
-#~ msgstr "Beroendeupplösning"
-
-#~ msgid "Verifying System"
-#~ msgstr "Verifierar system"
-
-#~ msgid "Resolving Dependencies"
-#~ msgstr "Löser beroenden"
-
-#~ msgid ""
-#~ "You must agree to the licenses covering this software before installing "
-#~ "it."
-#~ msgstr ""
-#~ "Du måste acceptera villkoren i licenserna som rör denna programvara innan "
-#~ "du kan installera den."
-
-#~ msgid "I Agree"
-#~ msgstr "Jag accepterar"
-
-#~ msgid "Dependency Resolution Failed"
-#~ msgstr "Beroendeupplösning misslyckades"
-
-#~ msgid "System Verified"
-#~ msgstr "Systemet verifierat"
-
-#~ msgid ""
-#~ "All package dependencies are satisfied, and no corrective actions are "
-#~ "required."
-#~ msgstr ""
-#~ "Alla paketberoenden tillfredsställs och inga korrigeringsåtgärder behövs."
-
-#~ msgid "Requested Installations"
-#~ msgstr "Begärda installationer"
-
-#~ msgid "Requested Removals"
-#~ msgstr "Begärda borttagningar"
-
-#~ msgid "Required Installations"
-#~ msgstr "Nödvändiga installationer"
-
-#~ msgid "Required Removals"
-#~ msgstr "Nödvändiga borttagningar"
-
-#~ msgid "Continue"
-#~ msgstr "Fortsätt"
-
-#~ msgid "Package"
-#~ msgstr "Paket"
-
-#~ msgid "Current Version"
-#~ msgstr "Aktuell version"
-
-#~ msgid "Size"
-#~ msgstr "Storlek"
-
-#~ msgid "All"
-#~ msgstr "Alla"
-
-#~ msgid "Removals"
-#~ msgstr "Borttagningar"
-
-#~ msgid "User:"
-#~ msgstr "Användare:"
-
-#~ msgid "Timeframe (days):"
-#~ msgstr "Tidsperiod (dagar):"
-
-#~ msgid "Searching..."
-#~ msgstr "Söker..."
-
-#~ msgid "Time"
-#~ msgstr "Tid"
-
-#~ msgid "Action"
-#~ msgstr "Åtgärd"
-
-#~ msgid "User"
-#~ msgstr "Användare"
-
-#~ msgid "Old Version"
-#~ msgstr "Gammal version"
-
-#~ msgid "History"
-#~ msgstr "Historik"
-
-#~ msgid "_History"
-#~ msgstr "_Historik"
-
-#~ msgid "No results found."
-#~ msgstr "Inga resultat hittades."
-
-#~ msgid "%s is not a valid package"
-#~ msgstr "%s är inte ett giltigt paket."
-
-#~ msgid "There are no valid packages to install"
-#~ msgstr "Det finns inga giltiga paket att installera"
-
-#~ msgid "Install from File"
-#~ msgstr "Installera från fil"
+msgid "An essential package would be removed"
+msgstr "Ett grundläggande paket skulle behöva tas bort"
 
-#~ msgid "Install from URL"
-#~ msgstr "Installera från URL"
-
-#~ msgid "Package URL:"
-#~ msgstr "Paket-URL:"
-
-#~ msgid "ERROR: You cannot specify both -h/--host and -l/--local options"
-#~ msgstr "FEL: Du kan inte båda ange flaggorna -h/--host och -l/--local"
-
-#~ msgid "ERROR: You cannot specify a user to a local daemon"
-#~ msgstr "FEL: Du kan inte ange en användare till en lokal demon"
-
-#~ msgid "Mirror"
-#~ msgstr "Spegel"
-
-#~ msgid "Location"
-#~ msgstr "Plats"
-
-#~ msgid "Unable to unmount '%s'"
-#~ msgstr "Kan inte avmontera \"%s\""
-
-#~ msgid "Browse..."
-#~ msgstr "Bläddra..."
-
-#~ msgid "Mount Directory"
-#~ msgstr "Montera katalog"
-
-#~ msgid "Mount channel"
-#~ msgstr "Montera kanal"
-
-#~ msgid "Mount a directory as channel"
-#~ msgstr "Montera katalog som kanal"
-
-#~ msgid "Channel Name:"
-#~ msgstr "Kanalnamn:"
-
-#~ msgid "Directory:"
-#~ msgstr "Katalog:"
-
-#~ msgid "Look for packages recursively"
-#~ msgstr "Leta efter paket rekursivt"
-
-#~ msgid "Please choose the path for channel."
-#~ msgstr "Ange en sökväg för kanalen."
-
-#~ msgid "Unmount Channel"
-#~ msgstr "Avmontera kanal"
-
-#~ msgid "Unmount?"
-#~ msgstr "Avmontera?"
-
-#~ msgid "%s News"
-#~ msgstr "Nyheter för %s"
-
-#~ msgid "Connect to a locally running daemon"
-#~ msgstr "Anslut till en demon som körs lokalt"
-
-#~ msgid "hostname"
-#~ msgstr "värdnamn"
-
-#~ msgid "Contact daemon on specified host"
-#~ msgstr "Kontakta demon på angiven värd"
-
-#~ msgid "username"
-#~ msgstr "användarnamn"
-
-#~ msgid "Specify user name"
-#~ msgstr "Ange användarnamn"
-
-#~ msgid "password"
-#~ msgstr "lösenord"
-
-#~ msgid "Specify password"
-#~ msgstr "Ange lösenord"
-
-#~ msgid "Print client version and exit"
-#~ msgstr "Skriv ut klientversionsnummer och avsluta"
-
-#~ msgid "Get usage information"
-#~ msgstr "Hämta användningsinformation"
-
-#~ msgid "Usage: %s <options> ..."
-#~ msgstr "Användning: %s <flaggor> ..."
-
-#~ msgid "The following options are understood:"
-#~ msgstr "Följande flaggor förstås:"
-
-#~ msgid "installed"
-#~ msgstr "installerad"
-
-#~ msgid "newer"
-#~ msgstr "nyare"
-
-#~ msgid "older"
-#~ msgstr "äldre"
-
-#~ msgid "upgrade"
-#~ msgstr "uppgradera"
-
-#~ msgid "downgrade"
-#~ msgstr "nedgradera"
-
-#~ msgid "install"
-#~ msgstr "installera"
-
-#~ msgid "remove"
-#~ msgstr "ta bort"
-
-#~ msgid "Found 1 matching package"
-#~ msgstr "Hittade 1 matchande paket"
-
-#~ msgid "Found %d matching patches"
-#~ msgstr "Hittade %d matchande programfixar"
-
-#~ msgid "Found 1 matching patch"
-#~ msgstr "Hittade 1 matchande programfix"
-
-#~ msgid "No matching patches found"
-#~ msgstr "Inga matchande programfixar hittades"
-
-#~ msgid "Package Information"
-#~ msgstr "Paketinformation"
-
-#~ msgid "Unnamed"
-#~ msgstr "Namnlös"
-
-#~ msgid "Dependencies"
-#~ msgstr "Beroenden"
-
-#~ msgid "Provides"
-#~ msgstr "Tillhandahållanden"
-
-#~ msgid "Conflicts With"
-#~ msgstr "Är i konflikt med"
-
-#~ msgid "Name"
-#~ msgstr "Namn"
-
-#~ msgid "Version"
-#~ msgstr "Version"
-
-#~ msgid "Package Size"
-#~ msgstr "Paketstorlek"
-
-#~ msgid "Installed Size"
-#~ msgstr "Installerad storlek"
-
-#~ msgid "Section"
-#~ msgstr "Sektion"
-
-#~ msgid "Summary"
-#~ msgstr "Sammanfattning"
-
-#~ msgid "Info"
-#~ msgstr "Info"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Patches"
-#~ msgstr "Programfixar"
-
-#~ msgid "YOU Patches"
-#~ msgstr "YOU-programfixar"
-
-#~ msgid "Searching for matching patches..."
-#~ msgstr "Söker efter matchande programfixar..."
-
-#~ msgid "No matching patches found."
-#~ msgstr "Inga matchande programfixar hittades."
-
-#~ msgid "%.1f%% completed"
-#~ msgstr "%.1f%% klart"
-
-#~ msgid "Download cancelled"
-#~ msgstr "Hämtning avbruten"
-
-#~ msgid "Transaction cancelled"
-#~ msgstr "Transaktion avbruten"
-
-#~ msgid "Transaction Finished"
-#~ msgstr "Transaktion slutförd"
-
-#~ msgid "Unknown Error"
-#~ msgstr "Okänt fel"
-
-#~ msgid "Processing Transaction"
-#~ msgstr "Bearbetar transaktion"
-
-#~ msgid "The transaction has completed successfully"
-#~ msgstr "Transaktionen har färdigställts utan problem"
-
-#~ msgid "Transaction Failed"
-#~ msgstr "Transaktion misslyckades"
-
-#~ msgid "Interval to refresh channel data (in hours):"
-#~ msgstr "Intervall för att uppdatera kanaldata (i timmar):"
-
-#~ msgid "Packages"
-#~ msgstr "Paket"
-
-#~ msgid "Require package signatures"
-#~ msgstr "Kräv paketsignaturer"
-
-#~ msgid "Maximum number of packages to download at once:"
-#~ msgstr "Maximalt antal paket som ska hämtas på en gång:"
-
-#~ msgid "Enable package rollback"
-#~ msgstr "Aktivera pakettillbakarullning"
-
-#~ msgid "Proxy"
-#~ msgstr "Proxyserver"
-
-#~ msgid "Use a proxy"
-#~ msgstr "Använd en proxyserver"
-
-#~ msgid "Proxy URL:"
-#~ msgstr "Proxyserver-URL:"
-
-#~ msgid "Username:"
-#~ msgstr "Användarnamn:"
-
-#~ msgid "You do not have permissions to view proxy settings"
-#~ msgstr "Du har inte rättigheter att granska proxyserverinställningarna"
-
-#~ msgid "Cache downloaded packages and metadata"
-#~ msgstr "Mellanlagra hämtade paket och metadata"
-
-#~ msgid "Location of cached data:"
-#~ msgstr "Plats för mellanlagrad data:"
-
-#~ msgid "Expiration"
-#~ msgstr "Utgång"
-
-#~ msgid "Cache expires"
-#~ msgstr "Cachen utgår"
-
-#~ msgid "Current cache size:"
-#~ msgstr "Aktuell cachestorlek:"
-
-#~ msgid "Are you sure you want to delete the package files in your cache?"
-#~ msgstr "Är du säker på att du vill ta bort paketfilerna i din cache?"
-
-#~ msgid "Empty Cache"
-#~ msgstr "Töm cache"
-
-#~ msgid "%d MB"
-#~ msgstr "%d MB"
-
-#~ msgid "Value"
-#~ msgstr "Värde"
-
-#~ msgid "Loading preferences..."
-#~ msgstr "Läser in inställningar..."
-
-#~ msgid "%s Preferences"
-#~ msgstr "Inställningar för %s"
-
-#~ msgid "Search"
-#~ msgstr "Sök"
-
-#~ msgid "S_earch Packages"
-#~ msgstr "S_ök paket"
-
-#~ msgid "Searching for matching packages..."
-#~ msgstr "Söker efter matchande paket..."
-
-#~ msgid "No matching packages found."
-#~ msgstr "Inga matchande paket hittades."
-
-#~ msgid "All Packages"
-#~ msgstr "Alla paket"
-
-#~ msgid "Updates"
-#~ msgstr "Uppdateringar"
-
-#~ msgid "Uninstalled Packages"
-#~ msgstr "Avinstallerade paket"
-
-#~ msgid "Installed Packages"
-#~ msgstr "Installerade paket"
-
-#~ msgid "All Sections"
-#~ msgstr "Alla sektioner"
-
-#~ msgid "Productivity"
-#~ msgstr "Produktivitet"
-
-#~ msgid "Imaging"
-#~ msgstr "Bildbehandling"
-
-#~ msgid "Personal Info. Mgmt"
-#~ msgstr "Personlig informationshantering"
-
-#~ msgid "X Windows"
-#~ msgstr "X Windows"
-
-#~ msgid "Games"
-#~ msgstr "Spel"
-
-#~ msgid "Multimedia"
-#~ msgstr "Multimedia"
-
-#~ msgid "Internet"
-#~ msgstr "Internet"
-
-#~ msgid "Utilities"
-#~ msgstr "Verktyg"
-
-#~ msgid "System"
-#~ msgstr "System"
-
-#~ msgid "Documentation"
-#~ msgstr "Dokumentation"
-
-#~ msgid "Libraries"
-#~ msgstr "Bibliotek"
-
-#~ msgid "Development"
-#~ msgstr "Utveckling"
-
-#~ msgid "Development Tools"
-#~ msgstr "Utvecklingsverktyg"
-
-#~ msgid "Miscellaneous"
-#~ msgstr "Diverse"
-
-#~ msgid "Search descriptions"
-#~ msgstr "Sök i beskrivningar"
-
-#~ msgid "Match:"
-#~ msgstr "Matcha:"
-
-#~ msgid "Channel:"
-#~ msgstr "Kanal:"
-
-#~ msgid "The daemon identified itself as:"
-#~ msgstr "Demonen identifierade sig själv som:"
-
-#~ msgid "System type"
-#~ msgstr "Systemtyp"
-
-#~ msgid "Server URL"
-#~ msgstr "Server-URL"
-
-#~ msgid "Server supports enhanced features."
-#~ msgstr "Servern stöder utökade funktioner."
-
-#~ msgid "Unable to contact the daemon."
-#~ msgstr "Kunde inte kontakta demonen."
-
-#~ msgid "Dump daemon info to XML file"
-#~ msgstr "Dumpa demon i XML-fil"
-
-#~ msgid "Could not open file '%s': %s"
-#~ msgstr "Kunde inte öppna filen \"%s\": %s"
-
-#~ msgid "Choose file to write XML to"
-#~ msgstr "Välj fil att skriva XML till"
-
-#~ msgid "Edit Services"
-#~ msgstr "Redigera tjänster"
-
-#~ msgid "URL"
-#~ msgstr "URL"
-
-#~ msgid "_Remove service"
-#~ msgstr "_Ta bort tjänst"
-
-#~ msgid "_Add service"
-#~ msgstr "_Lägg till tjänst"
-
-#~ msgid "Add Service"
-#~ msgstr "Lägg till tjänst"
-
-#~ msgid "Service URL"
-#~ msgstr "Tjänst-URL"
-
-#~ msgid "Pending Actions"
-#~ msgstr "Förestående åtgärder"
-
-#~ msgid "%d pending install"
-#~ msgstr "%d förestående installation"
-
-#~ msgid "%d pending installs"
-#~ msgstr "%d förestående installationer"
-
-#~ msgid "%d pending removal"
-#~ msgstr "%d förestående borttagning"
-
-#~ msgid "%d pending removals"
-#~ msgstr "%d förestående borttagningar"
-
-#~ msgid "No pending actions"
-#~ msgstr "Inga förestående åtgärder"
-
-#~ msgid "I_nstalled Software"
-#~ msgstr "I_nstallerad programvara"
-
-#~ msgid "A_vailable Software"
-#~ msgstr "T_illgängliga program"
-
-#~ msgid "Connected to %s"
-#~ msgstr "Ansluten till %s"
-
-#~ msgid "Subscribed"
-#~ msgstr "Prenumererad"
-
-#~ msgid "Channel Name"
-#~ msgstr "Kanalnamn"
-
-#~ msgid "%s Channel Subscriptions"
-#~ msgstr "Kanalprenumerationer på kanal %s"
-
-#~ msgid ""
-#~ "You do not have permission to subscribe or unsubscribe from channels.  "
-#~ "You will be unable to make any changes to the subscriptions."
-#~ msgstr ""
-#~ "Du har inte rättighet att prenumerera eller säga upp prenumerationer på "
-#~ "kanaler. Du kommer inte att kunna göra ändringar i prenumerationer."
-
-#~ msgid "Untitled"
-#~ msgstr "Namnlös"
-
-#~ msgid "_Pending Actions"
-#~ msgstr "_Förestående åtgärder"
-
-#~ msgid "_Updates"
-#~ msgstr "_Uppdateringar"
-
-#~ msgid "_Update All"
-#~ msgstr "_Uppdatera alla"
-
-#~ msgid "Privilege"
-#~ msgstr "Privilegium"
-
-#~ msgid ""
-#~ "If you remove superuser privileges from yourself, you will be unable to "
-#~ "re-add them.\n"
-#~ "\n"
-#~ "Are you sure you want to do this?"
-#~ msgstr ""
-#~ "Om du tar bort superanvändarprivilegier från dig själv kommer du inte att "
-#~ "kunna lägga till dem igen.\n"
-#~ "\n"
-#~ "Är du säker på att du vill göra detta?"
-
-#~ msgid "Enabled"
-#~ msgstr "Aktiverad"
-
-#~ msgid "Edit Users"
-#~ msgstr "Redigera användare"
-
-#~ msgid "Confirm:"
-#~ msgstr "Bekräfta:"
-
-#~ msgid "Set Password"
-#~ msgstr "Ange lösenord"
-
-#~ msgid "Password can not be empty."
-#~ msgstr "Lösenord kan inte vara tomma."
-
-#~ msgid "Passwords do not match."
-#~ msgstr "Lösenorden stämmer inte överens."
-
-#~ msgid "Set %s's password"
-#~ msgstr "Ange lösenord för %s"
-
-#~ msgid "Users"
-#~ msgstr "Användare"
-
-#~ msgid "Add"
-#~ msgstr "Lägg till"
-
-#~ msgid "Are you sure you want to delete '%s'?"
-#~ msgstr "Är du säker på att du vill ta bort \"%s\"?"
-
-#~ msgid "Privileges"
-#~ msgstr "Privilegier"
-
-#~ msgid "Add new user"
-#~ msgstr "Lägg till ny användare"
-
-#~ msgid "Invalid user name."
-#~ msgstr "Ogiltigt användarnamn."
-
-#~ msgid "User '%s' already exists."
-#~ msgstr "Användaren \"%s\" finns redan."
-
-#~ msgid "Patch"
-#~ msgstr "Programfix"
-
-#~ msgid "Edit services..."
-#~ msgstr "Redigera tjänster..."
-
-#~ msgid "_Edit services"
-#~ msgstr "_Redigera tjänster"
-
-#~ msgid "Remove service"
-#~ msgstr "Ta bort tjänst"
-
-#~ msgid "Remove Service"
-#~ msgstr "Ta bort tjänst"
-
-#~ msgid "Add service"
-#~ msgstr "Lägg till tjänst"
-
-#~ msgid ""
-#~ "System could not be activated: Invalid activation code or email address."
-#~ msgstr ""
-#~ "Systemet kunde inte aktiveras: Ogiltig aktiveringskod eller e-postadress."
-
-#~ msgid "Services"
-#~ msgstr "Tjänster"
-
-#~ msgid "Unable to mount '%s' as a channel"
-#~ msgstr "Kan inte montera \"%s\" som en kanal"
-
-#~ msgid "Server"
-#~ msgstr "Server"
-
-#~ msgid "Server URL:"
-#~ msgstr "Server-URL:"
-
-#~ msgid "Mirrors"
-#~ msgstr "Speglar"
-
-#~ msgid "Connect..."
-#~ msgstr "Anslut..."
-
-#~ msgid "Connect to %s"
-#~ msgstr "Anslut till %s"
-
-#~ msgid "Update cancelled"
-#~ msgstr "Uppdatering avbruten"
-
-#~ msgid "Update Failed"
-#~ msgstr "Uppdatering misslyckades"
-
-#~ msgid "System successfully activated."
-#~ msgstr "Systemet aktiverades framgångsrikt."
-
-#~ msgid ""
-#~ "Please ensure you typed the email address and activation code correctly."
-#~ msgstr ""
-#~ "Försäkra dig om att du angav e-postadressen och aktiveringskoden korrekt."
-
-#~ msgid "Mark for Installation"
-#~ msgstr "Markera för installation"
-
-#~ msgid "Mark for Removal"
-#~ msgstr "Markera för borttagning"
-
-#~ msgid "Cancel"
-#~ msgstr "Avbryt"
-
-#~ msgid "Information"
-#~ msgstr "Information"
-
-#~ msgid ""
-#~ "Unable to show help because it was not found or because you don't have "
-#~ "any help viewers available."
-#~ msgstr ""
-#~ "Kan inte visa hjälp eftersom den inte hittades eller eftersom du inte har "
-#~ "några hjälpvisare tillgängliga."
-
-#~ msgid "Update All"
-#~ msgstr "Uppdatera alla"
-
-#~ msgid "System Packages"
-#~ msgstr "Systempaket"
-
-#~ msgid "S_ystem Packages"
-#~ msgstr "S_ystempaket"
-
-#~ msgid "Searching system for matching packages..."
-#~ msgstr "Söker efter matchande paket på systemet..."
-
-#~ msgid "News"
-#~ msgstr "Nyheter"
-
-#~ msgid "My Computer"
-#~ msgstr "Den här datorn"
-
-#~ msgid "_My Computer"
-#~ msgstr "_Den här datorn"
-
-#~ msgid "Installations and Removals"
-#~ msgstr "Installationer och borttagningar"
-
-#~ msgid "Update Summary"
-#~ msgstr "Uppdateringssammanfattning"
-
-#~ msgid "_Update Summary"
-#~ msgstr "_Uppdateringssammanfattning"
-
-#~ msgid "Installations and _Removals"
-#~ msgstr "Installationer och _borttagningar"
-
-#~ msgid "User name"
-#~ msgstr "Användarnamn"
-
-#~ msgid "Password"
-#~ msgstr "Lösenord"
-
-#~ msgid "Username"
-#~ msgstr "Användarnamn"
-
-#~ msgid "%d KB"
-#~ msgstr "%d kB"
-
-#~ msgid "%d kB"
-#~ msgstr "%d kB"
-
-#~ msgid "Subscribe"
-#~ msgstr "Prenumerera"
-
-#~ msgid "Package Information..."
-#~ msgstr "Paketinformation..."
-
-#~ msgid "No Channel"
-#~ msgstr "Ingen kanal"
-
-#~ msgid "Unknown Channel"
-#~ msgstr "Okänd kanal"
-
-#~ msgid "Preferences"
-#~ msgstr "Inställningar"
-
-#~ msgid "_About"
-#~ msgstr "_Om"
-
-#~ msgid "About"
-#~ msgstr "Om"
-
-#~ msgid "View"
-#~ msgstr "Visa"
-
-#~ msgid "_Verify Installed Packages"
-#~ msgstr "_Verifiera installerade paket"
-
-#~ msgid "_Install Local Packages..."
-#~ msgstr "_Installera lokala paket..."
-
-#~ msgid "_Refresh"
-#~ msgstr "_Uppdatera"
-
-#~ msgid "_Unsubscribe"
-#~ msgstr "_Säg upp prenumeration"
-
-#~ msgid "_Users Manual"
-#~ msgstr "_Användarhandbok"
-
-#~ msgid "Main Page"
-#~ msgstr "Huvudsida"
-
-#~ msgid "Pause"
-#~ msgstr "Pausa"
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Error Page"
-#~ msgstr "Felsida"
-
-#~ msgid "Misc Page"
-#~ msgstr "Diversesida"
-
-#~ msgid "Executive Summary"
-#~ msgstr "Sammanfattning"
-
-#~ msgid ""
-#~ "Update packages individually (NOTE: This is an unsupported operation)"
-#~ msgstr ""
-#~ "Uppdatera paket individuellt (OBSERVERA: Denna operation stöds inte)"
-
-#~ msgid "Actual widget tag"
-#~ msgstr "Riktig widgettagg"
-
-#~ msgid "No Proxy"
-#~ msgstr "Ingen proxyserver"
-
-#~ msgid "HTTP Proxy"
-#~ msgstr "HTTP-proxyserver"
-
-#~ msgid "SOCKS 4 Proxy"
-#~ msgstr "SOCKS 4-proxyserver"
-
-#~ msgid "SOCKS 5 Proxy"
-#~ msgstr "SOCKS 5-proxyserver"
-
-#~ msgid "Host"
-#~ msgstr "Värd"
-
-#~ msgid "Port"
-#~ msgstr "Port"
-
-#~ msgid "Authenticated Proxy"
-#~ msgstr "Autentiserad proxyserver"
-
-#~ msgid "Send requests using HTTP 1.0"
-#~ msgstr "Skicka begäran med HTTP 1.0"
-
-#~ msgid "Enable caching of downloaded data"
-#~ msgstr "Använd mellanlagring av hämtad data"
-
-#~ msgid "Clear cached packages on exit"
-#~ msgstr "Töm mellanlagrade paket vid avslut"
-
-#~ msgid "Clear cached packages after a period of time"
-#~ msgstr "Töm mellanlagrade paket efter en tid"
-
-#~ msgid "Days:"
-#~ msgstr "Dagar:"
-
-#~ msgid "Show more descriptive package names instead of the actual names."
-#~ msgstr "Visa mer beskrivande paketnamn istället för de riktiga paketnamnen."
-
-#~ msgid ""
-#~ "Ask before installing packages with signatures that cannot be verified."
-#~ msgstr ""
-#~ "Fråga innan installation av paket med signaturer som inte kan verifieras."
-
-#~ msgid "General"
-#~ msgstr "Allmänt"
-
-#~ msgid "Find text:"
-#~ msgstr "Sök text:"
-
-#~ msgid "Case sensitive"
-#~ msgstr "Gör skillnad på gemener/VERSALER"
-
-#~ msgid "%P%%"
-#~ msgstr "%P%%"
-
-#~ msgid "%P%% (%V of %U)"
-#~ msgstr "%P%% (%V av %U)"
-
-#~ msgid "Do not show this warning again."
-#~ msgstr "Visa inte denna varning igen."
-
-#~ msgid ""
-#~ "Warning! Removing this many packages can be dangerous\n"
-#~ "and should only be done if you know what you are doing.\n"
-#~ "\n"
-#~ "Are you sure you want to proceed with this transaction?"
-#~ msgstr ""
-#~ "Varning! Att ta bort så här många paket kan vara farligt\n"
-#~ "och du bör endast göra det om du vet vad du gör.\n"
-#~ "\n"
-#~ "Är du säker på att du vill fortsätta med denna\n"
-#~ "transaktion?"
-
-#~ msgid ""
-#~ "If you are behind a firewall and use a proxy to access web sites, you "
-#~ "should\n"
-#~ "enable proxy support here. If your proxy requires authentication, select\n"
-#~ "\"Use authentication\" and enter your username and password.\n"
-#~ "\n"
-#~ "You can change these settings in the future by selecting Preferences from "
-#~ "the\n"
-#~ "Settings menu. These settings are on the Proxy tab.\n"
-#~ "\n"
-#~ "When you have correctly entered your proxy information, click OK to "
-#~ "continue.\n"
-#~ msgstr ""
-#~ "Om du är bakom en brandvägg och använder en proxyserver för att komma åt\n"
-#~ "webbplatser bör du slå på proxystöd här. Om din proxyserver kräver\n"
-#~ "autentisering väljer du \"Använd autentisering\" och anger ditt\n"
-#~ "användarnamn och lösenord.\n"
-#~ "\n"
-#~ "Du kan ändra dessa inställningar i framtiden genom att välja\n"
-#~ "Inställningar i menyn Inställningar. Inställningarna finns på fliken\n"
-#~ "Proxyserver.\n"
-#~ "\n"
-#~ "När du har angett din proxyinformation klickar du på OK för att\n"
-#~ "fortsätta.\n"
-
-#~ msgid "Use authentication"
-#~ msgstr "Använd autentisering"
-
-#~ msgid "The password you have entered is incorrect."
-#~ msgstr "Lösenordet du angav är felaktigt."
-
-#~ msgid "Name: "
-#~ msgstr "Namn: "
-
-#~ msgid "Progress: "
-#~ msgstr "Förlopp: "
-
-#~ msgid "%P %%"
-#~ msgstr "%P%%"
-
-#~ msgid "Downloading"
-#~ msgstr "Hämtar"
-
-#~ msgid "First, the requested packages are downloaded from their source"
-#~ msgstr "Först hämtas de begärda paketen från deras källa"
-
-#~ msgid "Done"
-#~ msgstr "Klart"
-
-#~ msgid "Percent Complete"
-#~ msgstr "Procent färdigt"
-
-#~ msgid "Next, packages are verified to ensure cryptographic integrity"
-#~ msgstr "Sedan verifieras paketen för att garantera kryptografisk integritet"
-
-#~ msgid "Transacting"
-#~ msgstr "Verkställer"
-
-#~ msgid "The new packages are installed and old packages are removed."
-#~ msgstr "De nya paketen installeras och gamla paket tas bort."
-
-#~ msgid "Finishing up..."
-#~ msgstr "Städar upp..."
-
-#~ msgid ""
-#~ "The packages you requested are being downloaded and installed on your "
-#~ "system."
-#~ msgstr ""
-#~ "Paketen du begärde håller på att hämtas och installeras på ditt system."
-
-#~ msgid "Total"
-#~ msgstr "Totalt"
-
-#~ msgid "The packages you selected are being removed from your system"
-#~ msgstr "Paketen du valde håller på att tas bort från ditt system"
-
-#~ msgid "Removal has finished."
-#~ msgstr "Borttagningen har slutförts."
-
-#~ msgid "The packages you selected are being removed from your system."
-#~ msgstr "Paketen du valde håller på att tas bort från ditt system."
-
-#~ msgid "Keyword not found"
-#~ msgstr "Nyckelordet hittades inte"
-
-#~ msgid "<!--html-->Failed Dependencies"
-#~ msgstr "<!--html-->Misslyckade beroenden"
-
-#~ msgid "Click here to send a dependency report"
-#~ msgstr "Klicka här för att skicka en beroenderapport"
-
-#~ msgid "needed by: <b>%s</b>"
-#~ msgstr "behövd av: <b>%s</b>"
-
-#~ msgid "conflicts with: <b>%s</b>"
-#~ msgstr "är i konflikt med: <b>%s</b>"
-
-#~ msgid "depends on: <b>%s</b>"
-#~ msgstr "beror på: <b>%s</b>"
-
-#~ msgid "needed by"
-#~ msgstr "behövd av"
-
-#~ msgid "needs %s %s %s, which is being removed"
-#~ msgstr "behöver %s %s %s, som kommer att tas bort"
-
-#~ msgid "needs %s %s %s, which cannot be found"
-#~ msgstr "behöver %s %s %s, som inte kan hittas"
-
-#~ msgid "conflicts with %s %s %s"
-#~ msgstr "är i konflikt med %s %s %s"
-
-#~ msgid "<!--html-->This package will be pulled in from the %s channel."
-#~ msgstr "<!--html-->Detta paket kommer att hämtas från kanalen %s."
-
-#~ msgid ""
-#~ "<!--html-->This package will be pulled in from the <b>unsubscribed</b> %s "
-#~ "channel."
-#~ msgstr ""
-#~ "<!--html-->Detta paket kommer att hämtas från den <b>oprenumererade</b> "
-#~ "kanalen %s."
-
-#~ msgid "<!--html-->Package Dependencies"
-#~ msgstr "<!--html-->Paketberoenden"
-
-#~ msgid ""
-#~ "<!--html-->Your system's package database is valid!<br><br>Click the "
-#~ "Previous button to go back."
-#~ msgstr ""
-#~ "<!--html-->Ditt systems paketdatabas är giltig!<br><br>Klicka på knappen "
-#~ "Föregående för att gå tillbaka."
-
-#~ msgid "<b>1</b> Requested Package"
-#~ msgstr "<b>1</b> begärt paket"
-
-#~ msgid "<b>%d</b> Requested Packages"
-#~ msgstr "<b>%d</b> begärda paket"
-
-#~ msgid "<b>1</b> Necessary Removal"
-#~ msgstr "<b>1</b> nödvändig borttagning"
-
-#~ msgid "<b>%d</b> Necessary Removals"
-#~ msgstr "<b>%d</b> nödvändiga borttagningar"
-
-#~ msgid "<b>1</b> Necessary Installation"
-#~ msgstr "<b>1</b> nödvändig installation"
-
-#~ msgid "<b>%d</b> Necessary Installations"
-#~ msgstr "<b>%d</b> nödvändiga installationer"
-
-#~ msgid "<!--html--><b>%s</b> will need to be downloaded. "
-#~ msgstr "<!--html--><b>%s</b> kommer att behöva hämtas. "
-
-#~ msgid "<!--html-->After operations, <b>%s</b> of disk space will be used."
-#~ msgstr ""
-#~ "<!--html-->Efter åtgärderna kommer <b>%s</b> diskutrymme att användas."
-
-#~ msgid "<!--html-->After operations, <b>%s</b> of disk space will be freed."
-#~ msgstr ""
-#~ "<!--html-->Efter åtgärderna kommer <b>%s</b> diskutrymme att ha frigjorts."
-
-#~ msgid ""
-#~ "<!--html-->After operations, no additional space will be freed or used."
-#~ msgstr ""
-#~ "<!--html-->Efter åtgärderna kommer inget ytterligare utrymme att frigöras "
-#~ "eller användas."
-
-#~ msgid ""
-#~ "<!--html-->You have insufficient disk space to download the requested "
-#~ "packages. You must free up some disk space before you can continue. Some "
-#~ "options include:"
-#~ msgstr ""
-#~ "<!--html-->Du har inte tillräckligt med diskutrymme för att kunna hämta "
-#~ "de begärda paketen. Du måste skapa ledigt utrymme innan du kan fortsätta. "
-#~ "Det finns en del alternativ:"
-
-#~ msgid "<!--html-->Removing some packages from your system"
-#~ msgstr "<!--html-->Tar bort en del paket från ditt system"
-
-#~ msgid "Changing your <a href=\"updater:prefs_cache\">cache settings</a>."
-#~ msgstr "Ändrar dina <a href=\"updater:prefs_cache\">cacheinställningar</a>."
-
-#~ msgid "<a href=\"updater:cache_clear\">Clearing your cache</a>."
-#~ msgstr "<a href=\"updater:cache_clear\">Töm din cache</a>."
-
-#~ msgid ""
-#~ "<font color=#ff0000>Warning!</font> There may not be sufficient disk "
-#~ "space to install this package, and installation of this package may fail. "
-#~ "You should free up some disk space before continuing."
-#~ msgstr ""
-#~ "<font color=#ff0000>Varning!</font> Det kan finnas otillräckligt med "
-#~ "diskutrymme för att installera detta paket, och installation av detta "
-#~ "paket kan misslyckas. Du bör skapa en del ledigt diskutrymme innan du "
-#~ "fortsätter."
-
-#~ msgid "1&nbsp;Package"
-#~ msgstr "1&nbsp;paket"
-
-#~ msgid "%d&nbsp;Packages"
-#~ msgstr "%d&nbsp;paket"
-
-#~ msgid "<td width=25%>Old Version</td>"
-#~ msgstr "<td width=25%>Gammal version</td>"
-
-#~ msgid "Necessary Removals"
-#~ msgstr "nödvändiga borttagningar"
-
-#~ msgid "Necessary Installations"
-#~ msgstr "nödvändiga installationer"
-
-#~ msgid "<html><body><b>Please wait, loading page...</b></body></html>"
-#~ msgstr ""
-#~ "<html><body><b>Var vänlig vänta, läser in sidan...</b></body></html>"
-
-#~ msgid ""
-#~ "You have no packages from this channel currently installed on your system."
-#~ msgstr ""
-#~ "Du har för närvarande inte några paket från denna kanal installerade på "
-#~ "ditt system."
-
-#~ msgid ""
-#~ "You can visit the channel's <a href=\"updater:info_page\">about page</a> "
-#~ "to get more information about what software is available, or you can go "
-#~ "directly to the <a href=\"updater:available_page\">install page</a> to "
-#~ "install software."
-#~ msgstr ""
-#~ "Du kan besöka kanalens <a href=\"updater:info_page\">om-sida</a> för att "
-#~ "få mer information om vilken programvara som är tillgänglig, eller gå "
-#~ "direkt till <a href=\"updater:available_page\">installationssidan</a> för "
-#~ "att installera program."
-
-#~ msgid "View the <a href=\"updater:info_page\">about page</a>."
-#~ msgstr "Visa <a href=\"updater:info_page\">om-sidan</a>."
-
-#~ msgid "View the <a href=\"updater:available_page\">install page</a>."
-#~ msgstr "Visa <a href=\"updater:available_page\">installationssidan</a>."
-
-#~ msgid "Return to the <a href=\"updater:summary\">Summary</a>."
-#~ msgstr "Gå tillbaka till <a href=\"updater:summary\">sammanfattningen</a>."
-
-#~ msgid ""
-#~ "You don't have any packages installed from this channel. The following "
-#~ "pre-defined sets of packages are available, or you may select individual "
-#~ "packages from the <a href=updater:available_page>Install page</a>."
-#~ msgstr ""
-#~ "Du har inga paket installerade från denna kanal. Följande fördefinierade "
-#~ "paket är tillgängliga, eller så kan du välja enstaka paket från <a "
-#~ "href=updater:available_page>installationssidan</a>."
-
-#~ msgid ""
-#~ "To install new software from this channel, visit the <a href=\"updater:"
-#~ "available_page\">install page</a>."
-#~ msgstr ""
-#~ "För att installera ny programvara går du till <a href=\"updater:"
-#~ "available_page\">installationssidan</a>."
-
-#~ msgid ""
-#~ "To remove already installed software from this channel, visit the <a href="
-#~ "\"updater:installed_page\">remove page</a>."
-#~ msgstr ""
-#~ "För att ta bort redan installerad programvara från denna kanal går du "
-#~ "till <a href=\"updater:installed_page\">borttagningssidan</a>."
-
-#~ msgid "<a href=\"updater:unsubscribe\">Unsubscribe</a> from this channel."
-#~ msgstr ""
-#~ "<a href=\"updater:unsubscribed_page\">Säg upp prenumerationen</a> på "
-#~ "denna kanal."
-
-#~ msgid ""
-#~ "There is <b>1 update</b> available in this channel, totalling <b>%s</b> "
-#~ "of data to be downloaded."
-#~ msgstr ""
-#~ "Det finns <b>1 uppdatering</b> tillgänglig i denna kanal, som kräver att "
-#~ "<b>%s</b> data hämtas."
-
-#~ msgid ""
-#~ "There are <b>%s updates</b> available in this channel, totalling <b>%s</"
-#~ "b> of data to be downloaded."
-#~ msgstr ""
-#~ "Det finns <b>%s uppdateringar</b> tillgängliga i denna kanal, som kräver "
-#~ "att <b>%s</b> data hämtas."
-
-#~ msgid "Essential Updates"
-#~ msgstr "Nödvändiga uppdateringar"
-
-#~ msgid "Feature Enhancements"
-#~ msgstr "Programförbättringar"
-
-#~ msgid "Minor Fixes/Updates"
-#~ msgstr "Mindre fixar/uppdateringar"
-
-#~ msgid "1 update"
-#~ msgstr "1 uppdatering"
-
-#~ msgid "%d updates"
-#~ msgstr "%d uppdateringar"
-
-#~ msgid ""
-#~ "The following packages from this channel are currently installed on your "
-#~ "system."
-#~ msgstr ""
-#~ "Följande paket från denna kanal är för närvarande installerade på ditt "
-#~ "system."
-
-#~ msgid ""
-#~ "<p>All packages available in this channel are already installed on your "
-#~ "system.</p>"
-#~ msgstr ""
-#~ "<p>Alla paket som är tillgängliga i denna kanal är redan installerade på "
-#~ "ditt system.</p>"
-
-#~ msgid ""
-#~ "<p>You can go to the <a href=\"updater:update_page\">Update page</a> to "
-#~ "view available updates for your software in this channel, or return to "
-#~ "the <a href=\"updater:summary\">Summary</a> to view all available updates."
-#~ "</p>"
-#~ msgstr ""
-#~ "<p>Du kan gå till <a href=\"updater:update_page\">uppdateringssidan</a> "
-#~ "för att se de uppdateringar till din programvara som finns i denna kanal, "
-#~ "eller gå tillbaka till <a href=\"updater:summary\">sammanfattningen</a> "
-#~ "för att se alla tillgängliga uppdateringar.</p>"
-
-#~ msgid ""
-#~ "<p>You can go to the <a href=\"updater:summary\">Summary</a> to view all "
-#~ "available updates for your system.</p>"
-#~ msgstr ""
-#~ "<p>Du kan gå till <a href=\"updater:summary\">sammanfattningen</a> för "
-#~ "att se alla uppdateringar som är tillgängliga för ditt system.</p>"
-
-#~ msgid ""
-#~ "<!--html-->The following packages from this channel are available for "
-#~ "installation."
-#~ msgstr ""
-#~ "<!--html-->Följande paket från denna kanal är tillgängliga för "
-#~ "installation."
-
-#~ msgid ""
-#~ " Package names that are in <font color=\"#777777\">gray</font> indicate "
-#~ "that a newer version of this package is already installed."
-#~ msgstr ""
-#~ " Paketnamn som är <font color=\"#777777\">grå</font> indikerar att en "
-#~ "nyare version av detta paket redan är installerat."
-
-#~ msgid "Name:"
-#~ msgstr "Namn:"
-
-#~ msgid "Installed Version:"
-#~ msgstr "Installerad version:"
-
-#~ msgid "Size:"
-#~ msgstr "Storlek:"
-
-#~ msgid "bytes"
-#~ msgstr "byte"
-
-#~ msgid "Summary:"
-#~ msgstr "Sammanfattning:"
-
-#~ msgid "or"
-#~ msgstr "eller"
-
-#~ msgid " Update Now! "
-#~ msgstr " Uppdatera nu! "
-
-#~ msgid " Unsubscribe "
-#~ msgstr " Säg upp prenumeration "
-
-#~ msgid " Subscribe "
-#~ msgstr " Prenumerera "
-
-#~ msgid "Keyword&nbsp;Search:"
-#~ msgstr "Nyckelordssökning:"
-
-#~ msgid "Credits"
-#~ msgstr "Tack"
-
-#~ msgid "All links will open in an external browser window."
-#~ msgstr "Alla länkar kommer att öppnas i ett externt webbläsarfönster."
-
-#~ msgid "You are currently subscribed to all available channels!"
-#~ msgstr "Du prenumererar för närvarande på alla tillgängliga kanaler!"
-
-#~ msgid ""
-#~ "There is <b>one update</b> available for your system, totalling <b>%s</b> "
-#~ "of data to be downloaded."
-#~ msgstr ""
-#~ "Det finns <b>en uppdatering</b> tillgänglig för ditt system, som kräver "
-#~ "att <b>%s</b> data hämtas."
-
-#~ msgid ""
-#~ "There are <b>%s updates</b> available for your system, totalling <b>%s</"
-#~ "b> of data to be downloaded."
-#~ msgstr ""
-#~ "Det finns <b>%s uppdateringar</b> tillgängliga för ditt system, som "
-#~ "kräver att <b>%s</b> data hämtas."
-
-#~ msgid " Of these updates, <b>one</b> is <b>urgent</b>."
-#~ msgstr " Utav dessa uppdateringar är <b>en brådskande</b>."
-
-#~ msgid " Of these updates, <b>%s</b> are <b>urgent</b>."
-#~ msgstr " Utav dessa uppdateringar är <b>%s brådskande</b>."
-
-#~ msgid "1 other in the %s channel..."
-#~ msgstr "1 annan i kanalen %s..."
-
-#~ msgid "%d others in the %s channel..."
-#~ msgstr "%d andra i kanalen %s..."
-
-#~ msgid "Visible debugging level, ranges from 0 (nothing) to 6 (everything)"
-#~ msgstr "Synlig felsökningsnivå, går från 0 (ingenting) till 6 (allting)"
-
-#~ msgid "Log file debugging level, ranges from 0 (nothing) to 6 (everything)"
-#~ msgstr ""
-#~ "Felsökningsnivå för loggfil, går från 0 (ingenting) till 6 (allting)"
-
-#~ msgid "The XAuthority file (usually from GDM)"
-#~ msgstr "XAuthority-filen (vanligtvis från GDM)"
-
-#~ msgid "(Re)configure proxy settings before starting"
-#~ msgstr "(Om)konfigurera proxyinställningar innan start"
-
-#~ msgid ""
-#~ "Unable to access packaging subsystem:<br>%s<p>Please ensure that no other "
-#~ "package management programs are running, and try again."
-#~ msgstr ""
-#~ "Kan inte komma åt paketsystem:<br>%s<p>Försäkra dig om att inga andra "
-#~ "pakethanteringsprogram kör, och försök igen."
-
-#~ msgid "Downloading channel artwork..."
-#~ msgstr "Hämtar kanalgrafik..."
-
-#~ msgid ""
-#~ "An error occurred trying to parse the channel list. You should ensure "
-#~ "that you are running a supported distribution and try again later."
-#~ msgstr ""
-#~ "Ett fel inträffade vid försök att tolka kanallistan. Du bör försäkra dig "
-#~ "om att du använder en distribution som stöds och försöka igen senare."
-
-#~ msgid "Navigation"
-#~ msgstr "Navigering"
-
-#~ msgid "Downloading mirrors..."
-#~ msgstr "Hämtar speglar..."
-
-#~ msgid "%%p%%%% (%s of %s)"
-#~ msgstr "%%p%%%% (%s av %s)"
-
-#~ msgid "%s pulled from cache"
-#~ msgstr "%s togs från cachen"
-
-#~ msgid "%s downloaded %d bytes in %d seconds (%s/s)"
-#~ msgstr "%s hämtade %d byte på %d sekunder (%s/s)"
-
-#~ msgid "%p%% (%v of %u)"
-#~ msgstr "%p%% (%v av %u)"
-
-#~ msgid "Cryptographic verification of %s (%s) has FAILED."
-#~ msgstr "Kryptografisk verifiering av %s (%s) har MISSLYCKATS."
-
-#~ msgid ""
-#~ "INFO:\n"
-#~ "Name: %s (%s)\n"
-#~ "Version: %s\n"
-#~ "Release: %s\n"
-#~ "Package Filename:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "INFORMATION:\n"
-#~ "Namn: %s (%s)\n"
-#~ "Version: %s\n"
-#~ "Släpp: %s\n"
-#~ "Paketfilnamn:\n"
-#~ "%s"
-
-#~ msgid "Verification of %s (%s) is inconclusive; aborting"
-#~ msgstr "Verifiering av %s (%s) är inte beviskraftig; avbryter"
-
-#~ msgid "Verification of %s (%s) is inconclusive; continuing"
-#~ msgstr "Verifiering av %s (%s) är inte beviskraftig; fortsätter"
-
-#~ msgid "%s (%s) has been verified as cryptographically secure by %s"
-#~ msgstr "%s (%s) har verifierats som kryptografiskt säker av %s"
-
-#~ msgid "The integrity of %s (%s) has been confirmed."
-#~ msgstr "Integriteten av %s (%s) har bekräftats."
-
-#~ msgid "Unable to create directory %s for local package storage"
-#~ msgstr "Kan inte skapa katalogen %s för lokal paketlagring"
-
-#~ msgid "Download Log"
-#~ msgstr "Hämtningslogg"
-
-#~ msgid "Verification Log"
-#~ msgstr "Verifieringslogg"
-
-#~ msgid "%.2f MB"
-#~ msgstr "%.2f MB"
-
-#~ msgid "%d bytes"
-#~ msgstr "%d byte"
-
-#~ msgid "%%p%%%% (%s of %s) - %s/s"
-#~ msgstr "%%p%%%% (%s av %s) - %s/s"
-
-#~ msgid "%s - %s/s"
-#~ msgstr "%s - %s/s"
-
-#~ msgid "Downloading data..."
-#~ msgstr "Hämtar data..."
-
-#~ msgid "%%p%%%% (%s of %s) - Paused"
-#~ msgstr "%%p%%%% (%s av %s) - Gör paus"
-
-#~ msgid "%s - Paused"
-#~ msgstr "%s - Gör paus"
-
-#~ msgid "%.2f%sMB"
-#~ msgstr "%.2f%sMB"
-
-#~ msgid "%d%sKB"
-#~ msgstr "%d%skB"
-
-#~ msgid "%d%sbytes"
-#~ msgstr "%d%sbyte"
-
-#~ msgid "zero"
-#~ msgstr "noll"
-
-#~ msgid "one"
-#~ msgstr "en"
-
-#~ msgid "two"
-#~ msgstr "två"
-
-#~ msgid "three"
-#~ msgstr "tre"
-
-#~ msgid "five"
-#~ msgstr "fem"
-
-#~ msgid "six"
-#~ msgstr "sex"
-
-#~ msgid "seven"
-#~ msgstr "sju"
-
-#~ msgid "eight"
-#~ msgstr "åtta"
-
-#~ msgid "Fatal Error"
-#~ msgstr "Ödesdigert fel"
-
-#~ msgid "Error"
-#~ msgstr "Fel"
-
-#~ msgid "Possible actions:"
-#~ msgstr "Möjliga åtgärder:"
-
-#~ msgid "<li>Click <b>Quit</b> to quit."
-#~ msgstr "<li>Klicka på <b>Avsluta</b> för att avsluta."
-
-#~ msgid "<li>Click <b>Retry</b> to retry."
-#~ msgstr "<li>Klicka på <b>Försök igen</b> för att försöka igen."
-
-#~ msgid "<li>Click <b>Cancel</b> to cancel."
-#~ msgstr "<li>Klicka på <b>Avbryt</b> för att avbryta."
-
-#~ msgid "Retry"
-#~ msgstr "Försök igen"
-
-#~ msgid "Load file(s)"
-#~ msgstr "Läs in fil(er)"
-
-#~ msgid "Close"
-#~ msgstr "Stäng"
-
-#~ msgid "No mirror (always use default host)"
-#~ msgstr "Ingen spegel (använd alltid standardvärd)"
-
-#~ msgid "N/A"
-#~ msgstr "-"
-
-#~ msgid "Unable to parse mirror list."
-#~ msgstr "Kan inte tolka spegellista."
-
-#~ msgid "Unable to save mirror list (%s)."
-#~ msgstr "Kan inte tolka spegellista (%s)."
-
-#~ msgid "<p>You can continue without any mirrors by pressing \"Cancel\""
-#~ msgstr ""
-#~ "<p>Du kan fortsätta utan några speglar genom att trycka på \"Avbryt\""
-
-#~ msgid "Allowed cache difference:"
-#~ msgstr "Tillåten cacheskillnad:"
-
-#~ msgid "seconds"
-#~ msgstr "sekunder"
-
-#~ msgid "<b>%d</b> %s"
-#~ msgstr "<b>%d</b> %s"
-
-#~ msgid "Requested Packages"
-#~ msgstr "begärda paket"
-
-#~ msgid "Prefs"
-#~ msgstr "Inställn"
-
-#~ msgid "User Interface Design"
-#~ msgstr "Design av användargränssnittet"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Artwork"
-#~ msgstr "Artister"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Unable to access packaging subsystem:<br>%s"
-#~ msgstr "Kan inte komma åt paketeringsundersystem:<br>%s"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Transfer of %s did not complete: %s"
-#~ msgstr "Överföring av %s fullföljdes inte: %s"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "File not found"
-#~ msgstr "Filen hittades inte"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "IO error"
-#~ msgstr "IO-fel"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "User Registration"
-#~ msgstr "Användarregistrering"
+#: ../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 ""
 
-#~ msgid "GUI Options"
-#~ msgstr "Inställningar för användargränssnittet"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "No description available"
-#~ msgstr "Ingen beskrivning finns tillgänglig"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "translator_credits"
-#~ msgstr ""
-#~ "Christian Rose\n"
-#~ "Skicka synpunkter på översättningen till sv@li.org"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "translator-credits"
-#~ msgstr ""
-#~ "Christian Rose\n"
-#~ "Skicka synpunkter på översättningen till sv@li.org"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 05df304e..2189ffdc 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,51 +276,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -303,90 +338,158 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "தினமும்"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Every two days"
-#~ msgstr "ஒவ்வோரு இரு நாட்கள்"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Weekly"
-#~ msgstr "வாரம் தோறும்"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+#, fuzzy
+msgid "Details"
+msgstr "தினமும்"
 
-#~ msgid "Every two weeks"
-#~ msgstr "ஒவ்வோரு இரு வாரங்கள்"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Every %s days"
-#~ msgstr "ஒவ்வொரு %s நாட்கள்"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "After one week"
-#~ msgstr "ஒரு வார்த்திற்க்கு பிறகு"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "After two weeks"
-#~ msgstr "இரண்டு வாரத்திற்க்கு பிறகு"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "After one month"
-#~ 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 ""
 
-#~ msgid "After %s days"
-#~ msgstr "%s நாட்களுக்கு பிறகு"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "தெயவு செய்து இயக்கியினுள் வட்டை செலுத்தவும்:"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Can't install '%s'"
-#~ msgstr "'%s' நிறுவமுடியவில்லை"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Error during update"
-#~ msgstr "புதுப்பிக்கும் பொழுது பிழை ஏற்பட்டுள்ளது"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Not enough free disk space"
-#~ msgstr "வட்டுவில்் போதுமான காலி இடம் இல்லை"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Asking for confirmation"
-#~ msgstr "உறுதிப்படுத்த கேட்கிறது"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Upgrading"
-#~ msgstr "மேம்படுத்துகிறது"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "System upgrade is complete."
-#~ msgstr "கணிணி மேம்பாடு முடிந்தது."
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Could not install '%s'"
-#~ msgstr "'%s' நிறுவ முடியவில்லை"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "'%s' நிறுவமுடியவில்லை"
 
-#, fuzzy
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "'diff' என்ற கட்டளை இல்லை"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>%s நீக்கு</b>"
+#: ../apt/debfile.py:494
+msgid "An essential package would be removed"
+msgstr ""
 
-#~ msgid "Install %s"
-#~ msgstr "%s நிறுவு"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Upgrade %s"
-#~ msgstr "%s மேம்படுத்து"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#, fuzzy
-#~ msgid "Reboot required"
-#~ msgstr "மறு தொடக்கம் தேவைப்படுகிறது"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "    "
-#~ msgstr "    "
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "%s மேம்படுத்து"
+#: ../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 2253ebce..8070774e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -23,235 +23,266 @@ 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:13
+#, fuzzy
+msgid "Ubuntu 9.10 'Karmic Koala'"
+msgstr "อูบันตู 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:31
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
+msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:74
+#, fuzzy
+msgid "Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "อูบันตู 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:92
+#, fuzzy
+msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
+msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:135
+#, fuzzy
+msgid "Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "อูบันตู 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:153
+#, fuzzy
+msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
+msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'"
+
+#. Description
+#: ../data/templates/Ubuntu.info.in:197
 #, fuzzy
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "อูบันตู 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "อูบันตู 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "ชุมชนดูแล"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "ไดรเวอร์ที่มีกรรมสิทธิ์สำหรับอุปกรณ์"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "ซอฟต์แวร์จำกัดการใช้งาน"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "ซีดีรอมที่มีอูบันตู 6.10 'Edgy Eft'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "อูบันตู 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "ซอฟต์แบบเปิดเผยสนับสนุนโดย Canonical"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "ชุมชนดูแล (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "ชุมชนดูแล ซอฟต์แวร์แบบเปิดเผย"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "ไดรเวอร์ที่ไม่ฟรี"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "ไดรเวอร์ที่มีกรรมสิทธิ์สำหรับอุปกรณ์ "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "ไดรเวอร์ที่มีกรรมสิทธิ์สำหรับอุปกรณ์"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "ซอฟต์แวร์จำกัดการใช้งาน(Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr "ซอฟต์แวร์นี้มีลิขสิทธ์หรือข้อกฏหมายจำกัดอยู่"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "ซีดีรอมที่มีอูบันตู 6.06 LST 'Dapper Drake'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "ปรับปรุงด้านความปลอดภัยที่สำคัญ"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "การปรับปรุงที่แนะนำให้ทำ"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "การปรับปรุงที่เสนอให้ทำ"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "การปรับปรุงแบบย้อนหลัง"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "อูบันตู 5.10 Security Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "อูบันตู 5.10 Updates"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "อูบันตู 5.10 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "อูบันตู 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "สนับสนุนอย่างเป็นทางการ"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "อูบันตู 5.04 ปรับปรุง"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "อูบันตู 5.04 พอร์ตย้อนหลัง"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "อูบันตู 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "ชุมชนดูแล (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "ไม่ฟรี(ลิขสิทธิ์)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "ไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "จำกัดลิขสิทธิ์"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "อูบันตู 4.10 ปรับปรุงด้านความปลอดภัย"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "อูบันตู 4.10 ปรับปรุง"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "อูบันตู 4.10 พอร์ตย้อนหลัง"
 
@@ -263,55 +294,68 @@ 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 "เดเบียน 3.1 \"Sarge\""
+
+#. Description
+#: ../data/templates/Debian.info.in:33
+#, fuzzy
+msgid "Debian 5.0 'Lenny' "
+msgstr "เดเบียน 3.1 \"Sarge\""
+
+#. Description
+#: ../data/templates/Debian.info.in:58
+#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "เดเบียน 3.1 \"Sarge\""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../data/templates/Debian.info.in:83
 #, fuzzy
 msgid "Debian 3.1 'Sarge'"
 msgstr "เดเบียน 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
 #, fuzzy
 msgid "Security updates"
 msgstr "ปรับปรุงด้านความปลอดภัยที่สำคัญ"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "เดเบียน \"Etch\" (กำลังทดสอบ)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "เดเบียน  \"Sid\" (ผันผวน)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "เข้ากับ DFSG ซอฟแวร์แต่ขึ้นอยู่กับไม่ฟรี"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "ไม่เข้ากับ DFSG ซอฟแวร์"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "เซิร์ฟเวอร์สำหรับประเทศ %s"
@@ -319,1177 +363,161 @@ 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:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "เซิร์ฟเวอร์หลัก"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "เซิร์ฟเวอร์ที่กำหนดเอาเอง"
 
-#~ msgid "Daily"
-#~ msgstr "ทุกวัน"
-
-#~ msgid "Every two days"
-#~ msgstr "ทุก 2 วัน"
-
-#~ msgid "Weekly"
-#~ msgstr "ทุกอาทิตย์"
-
-#~ msgid "Every two weeks"
-#~ msgstr "ทุก 2 อาทิตย์"
-
-#~ msgid "Every %s days"
-#~ msgstr "ทุก %s วัน"
-
-#~ msgid "After one week"
-#~ msgstr "หลังจาก 1 อาทิตย์"
-
-#~ msgid "After two weeks"
-#~ msgstr "หลังจาก 2 อาทิตย์"
-
-#~ msgid "After one month"
-#~ msgstr "หลังจาก 1 เดือน"
-
-#~ msgid "After %s days"
-#~ msgstr "หลังจาก %s วัน"
-
-#~ msgid "%s updates"
-#~ msgstr "%s ปรับปรุง"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "เซิร์ฟเวอร์ที่ใกล้ที่สุด"
-
-#~ msgid "Software Channel"
-#~ msgstr "ซอฟต์แวร์แชนเนล"
-
-#~ msgid "Active"
-#~ msgstr "เปิดใช้งาน"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(ต้นฉบับโปรแกรม)"
-
-#~ msgid "Source Code"
-#~ msgstr "ต้นฉบับโปรแกรม"
-
-#~ msgid "Import key"
-#~ msgstr "นำเข้ากุญแจ"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "ไม่สามารถนำเข้าไฟล์ที่เลือกไว้"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "ไฟล์ที่เลือกไว้อาจจะไม่ใช่ GPG กุญแจไฟล์หรืออาจจะเสียหาย"
-
-#~ msgid "Error removing the key"
-#~ msgstr "มีปัญหาขณะลบกุจแจ"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "กุญแจที่คุณเลือกไม่สามารถลบออกได้ กรุณารายงานว่าเป็นปัญหา"
-
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>มีปัญหาในการตรวจสอบแผ่นซีดี</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "กรุณาใส่ชื่อสำหรับแผ่นดิสก์"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "กรุณาใส่แผ่นดิสก์เข้าไปในเครื่อง:"
-
-#~ msgid "Broken packages"
-#~ msgstr "แพกเกจเสียหาย"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "ระบบของคุณมีแพกเกจที่มีปัญหาที่ไม่สามารถซ่อมได้ด้วยโปรแกรมนี้ กรุณาซ่อมโดยใช้โปรแกรม "
-#~ "synaptic หรือ apt-get ก่อนดำเนินการต่อไป"
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "ไม่สามารถปรับปรุง meta แพกเกจที่ต้องการได้"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "แพจเกจที่สำคัญจะถูกลบออก"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "ไม่สามารถคำนวนการปรับปรุงได้"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "ไม่สามารถแก้ไขปัญหาที่เกิดขึ้นได้ขณะคำนวนการปรับปรุงรุ่น\n"
-#~ "\n"
-#~ "กรุณารายงานปัญหานี้ภายใต้แพ็กเกจ 'update-manager' และแนบไฟล์ใน /var/log/dist-"
-#~ "upgrade/ ในรายงานด้วย"
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "ไม่ปัญหาในการยืนยันว่าเป็บของจริงสำหรับบางแพกเกจ"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "ไม่สามารถที่จะยืนยันความถูกต้องของแพกเกจบางอันได้ นี่อาจจะเกี่ยวกับปัญหาในด้านเครือข่าย "
-#~ "คุณอาจจะลองอีกครั้งภายหลังก็ได้ กรุณาตรวจดูรายการของแพกเกจที่ไม่ผ่านการยืนยัน"
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "ไม่สามารถติดตั้ง  '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr "ไม่สามารถที่จะติดตั้งแพกเกจที่ต้องการได้ กรุณารายงานว่าเป็นปัญหา "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "ไม่สามารถเดาเมททาแพกเกจ(meta-package)ได้"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "ระบบของคุณไม่มีอูบันตูเดสก์ท็อป คูบันตูเดสก์ท็อป หรือ เอ็ดดูบันตูเดกส์ท็อป "
-#~ "แพกเกจและไม่สามารถที่จะตรวจสอบได้ว่าคุณใช้อูบันตูรุ่นไหนอยู่\n"
-#~ " กรุณาติดตั้งแพกเกจข้างบนอย่างใดอย่างหนึ่งก่อนโดยใช้โปรแกรม synaptic หรือโปรแกรม apt-"
-#~ "get ก่อนดำเนินการต่อไป"
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "ไม่สามารถเพิ่มซีดีได้"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "มีปัญหาในการเพิ่มซีดีการปรับปรุงรุ่นจะถูกยกเลิก กรุณารายงานปัญหานี้ถ้าเป็นซีดีที่ถูกต้องของอูบันตู\n"
-#~ "\n"
-#~ "ปัญหาคือ : \n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "กำลังอ่านจากที่เก็บชั่วคราว"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "ดึงข้อมูลจากเครือข่ายสำหรับปรับปรุงรุ่นหรือไม่?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "การปรับปรุงรุ่นสามารถใช้เครือข่ายเพื่อตรวจเช็คว่ามีรุ่นล่าสุดหรือไม่ ่และดึงแพ็กเกจอื่นๆที่ไม่อยู่ในแผ่นซีดี\n"
-#~ "ถ้าคุณติดต่อเครือข่ายได้โดยไม่เสียค่าใช้จ่ายมาก และมีความเร็วสูงคุณควรจะตอบ 'ตกลง' "
-#~ "ถ้าค่าใช้จ่ายในการใช้เครือข่ายแพงสำหรับคุณเลือก 'ไม่'"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "ไม่เจอเซิรฟ์เวอร์เสริม(mirror)"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "ไม่เจอรายการของเซิรฟ์เวอร์เสริมสำหรับปรับปรุงขณะที่ตรวจสอบแหล่งข้อมูลของคุณ "
-#~ "นี่อาจจะเกิดขึ้นได้ถ้าคุณใช้เซิรฟ์เวอร์เสริมภายในหรือข้อมูลของเซิรฟ์เวอร์เสริมล้าสมัย\n"
-#~ "\n"
-#~ "คุณต้องการที่จะเขียนทับไฟล์  'sources.list' ของคุณหรือไม่? ถ้าคุณเลือก  'Yes' "
-#~ "ตรงนี้มันจะถูกปรับปรุงรายการทั้งหมดจาก '%s' to '%s' \n"
-#~ "ถ้าคุณเลือก  'no' การปรับปรุงจะถูกยกเลิก"
-
-#~ msgid "Generate default sources?"
-#~ msgstr "สร้าง default sources?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "หลังจากตรวจสอบในไฟล์  'sources.list' ของคุณไม่เจอรายการสำหรับ  '%s'\n"
-#~ "\n"
-#~ "ควรเพิ่มรายการสำหรับ  '%s' หรือไม่?ถ้าคุณเลือก 'No' การปรับปรุงจะถูกยกเลิก"
-
-#~ msgid "Repository information invalid"
-#~ msgstr "ข้อมูลเกี่ยวกับแหล่งเก็บข้อมูลใช้ไม่ได้"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr "การปรับปรุงข้อมูลของแหล่งข้อมูลทำให้ไฟล์เสียหาย กรุณารายงานว่าเป็นปัญหา"
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "แหล่งอื่นๆใช้ไม่ได้"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "บางรายการใน souces.list ของคุณถุกปิดไว้ "
-#~ "คุณสามารถเปลี่ยนให้ใช้ได้หลังการปรับปรุงด้วยเครื่องมือ 'software-properties' "
-#~ "หรือด้วยโปรแกรม synaptic"
-
-#~ msgid "Error during update"
-#~ msgstr "เกิดข้อผิดพลาดขณะปรับปรุง"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "มีปัญหาเกิดขึ้นขณะทำการปรับปรุง โดยปกติแล้วจะเป็นปัญหาด้านเครือข่าย "
-#~ "กรุณาตรวจสอบการสื่อสารในเครือข่ายของคุณแล้วลองใหม่อีกที"
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "ไม่มีพื้นที่ว่างในดิสก์เพียงพอ"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "การปรับปรุงถูกยกเลิกแล้ว กรุณาฟรีอย่างน้อย %s ของดิสก์พื้นที่บน %s "
-#~ "เทถังขยะทิ้งและลบแพกเกจชั่วคราวจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo apt-get clean'"
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "คุณต้องการที่จะเริ่มการปรับปรุงหรือไม่?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "ไม่สามารถปรับปรุงได้"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "การปรับปรุงถูกยกเลิก ระบบของคุณอาจจะอยู่ในสภาพที่ไม่มั่นคง โปรแกรมกู้ระบบถูกเรียกใช้ (dpkg "
-#~ "--configure -a)\n"
-#~ "\n"
-#~ "กรุณารายงานปัญหานี้ภายใต้แพ็กเกจ 'update-manager' และแนบไฟล์ใน /var/log/dist-"
-#~ "upgrade/ ในรายงานด้วย"
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงรุ่น"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "การปรับปรุงถูกยกเลิก กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณหรือ installation "
-#~ "mediaและลองอีกครั้ง "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "สนับสนุนสำหรับบางแอพพลิเคชันสิ้นสุดลง"
-
-#~ msgid ""
-#~ "Canonical Ltd. no longer provides support for the following software "
-#~ "packages. You can still get support from the community.\n"
-#~ "\n"
-#~ "If you have not enabled community maintained software (universe), these "
-#~ "packages will be suggested for removal in the next step."
-#~ msgstr ""
-#~ "แพกเกจเหล่านีไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้วและตอนนี้ได้รับสนับสนุนจากชุมชน "
-#~ "แต่เพียงอย่างเดียว\n"
-#~ "\n"
-#~ "ถ้าคุณไม่ได้เลือกใช ้แพกเกจเหล่านี้จะถูกแนะนำให้ลบออกในขั้นต่อไป"
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "ลบแพจเกจที่ล้าสมัยทิ้งหรือไม่?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_ข้ามขั้นตอนนี้"
-
-#~ msgid "_Remove"
-#~ msgstr "เ_อาออก"
-
-#~ msgid "Error during commit"
-#~ msgstr "เกิดข้อผิดพลาดขณะแก้ไขปรับปรุง"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "เกิดปัญหาขึ้นขณะทำการเก็บกวาด กรุณาตรวจสอบข้อความข้างล่างสำหรับรายละเอียดเพิ่มเติม "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "คืนระบบสู่สถานะแรกเริ่ม"
-
-#~ msgid "Fetching backport of '%s'"
-#~ msgstr "ดึงพอร์ตย้อนหลังของ '%s'"
-
-#~ msgid "Checking package manager"
-#~ msgstr "กำลังตรวจสอบโปรแกรมจัดการแพกเกจ"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "การเตรียมการปรับปรุงรุ่นมีปัญหา"
-
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "การเตรียมระบบสำหรับการปรับปรุงรุ่นมีปัญหา กรุณารายงานปัญหานี้ภายใต้แพ็กเกจ 'update-"
-#~ "manager' และแนบไฟล์ใน /var/log/dist-upgrade/ ในรายงานด้วย"
-
-#~ msgid "Updating repository information"
-#~ msgstr "ปรับปรุงข้อมูลของแหล่งข้อมูล"
-
-#~ msgid "Invalid package information"
-#~ msgstr "ข้อมูลของแพกเกจไม่ถูกต้อง"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "หลังจากการปรับปรุงข้อมูลของแพจเกจ แพจเกจที่จำเป็น '%s'ได้หายไป\n"
-#~ "นี่แสดงว่าเป็นปัญหาร้ายแรง กรุณารายงานปัญหานี้ภายใต้แพ็กเกจ 'update-manager' "
-#~ "และแนบไฟล์ใน /var/log/dist-upgrade/ กับรายงานด้วย"
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "_ถามการยืนยันจากคุณก่อน"
-
-#~ msgid "Upgrading"
-#~ msgstr "กำลังปรับปรุง"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "ค้นหาซอฟแวร์ที่ล้าสมัย"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "ปรับปรุงระบบเสร็จแล้ว"
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "กรุณาใส่  '%s' เข้าไปในเครื่องเล่น  '%s'"
-
-#~ msgid "Fetching is complete"
-#~ msgstr "ดึงข้อมูลเสร็จสิ้นแล้ว"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "กำลังดึงไฟล์ %li จาก %li ที่ %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "เหลือประมาณ %s"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "กำลังดึงไฟล์ %li จาก %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "กำลังเปลี่ยนแปลง"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "ไม่สามารถติดตั้ง '%s'"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "การปรับปรุงรุ่นถูกยกเลิกแล้ว กรุณารายงานปัญหานี้ภายใต้แพ็กเกจ 'update-manager' และ "
-#~ "กรุณาแนบไฟล์ใน /var/log/dist-upgrade/ ในรายงานด้วย"
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "เปลี่ยนไฟล์ปรับแต่งที่แก้ไขเอง\n"
-#~ "'%s' หรือไม่?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr "คุณจะสูญเสียข้อมูลปรับแต่งที่ได้ทำไว้ในไฟล์ปรับแต่งถ้าคุณเลือกที่จะเปลี่ยนไปใช้ไฟล์รุ่นใหม่กว่านี้"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "ไม่เจอคำสั่ง  'diff'"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "เกิดข้อผิดพลาดอย่างร้ายแรง"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "กรุณารายงานปัญหานี้และแนบไฟล์ใน /var/log/dist-upgrade/main.log and  /var/log/"
-#~ "dist-upgrade/apt.log มาในรายงานของคุณด้วย การปรับปรุงถูกยกเลิก\n"
-#~ "ไฟล์ sources.list อันเดิมของคุณถูกเก็บไว้ที่ /etc/apt/sources.list.distUpgrade"
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d แพกเกจจะถูกลบออก"
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d แพกเกจใหม่จะถูกติดตั้ง"
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d แพกเกจจะถูกปรับปรุงรุ่น"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "คุณจะต้องดาวน์โหลดทั้งหมด  %s "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "ดาวน์โหลดและติดตั้งอาจจะใช้เวลานานหลายชั่วโมง และไม่สามารถที่จะยกเลิกได้หลังจากนี้ไป"
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr "เพื่อป้องกันข้อมูลสูญหายกรุณาออกจากทุกโปรแกรมและเอกสารที่เปิดอยู่"
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "ระบบของคุณทันสมัยแล้ว"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr "ไม่มีข้อมูลปรับปรุงรุ่นสำหรับระบบของคุณ การปรับปรุงรุ่นจึงถูกยกเลิก"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>ลบออก %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "ติดตั้ง  %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "ปรับปรุงรุ่น %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li วัน %li ชั่วโมง %li นาที"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li ชั่วโมง %li นาที"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li นาที"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li วินาที"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "ดาวน์โหลดนี้จะใช้เวลาประมาณ %s ด้วยการสื่อสารแบบ 1Mbit DSL และประมาณ %s ถ้าใช้ 56K "
-#~ "โมเดม"
-
-#~ msgid "Reboot required"
-#~ msgstr "ต้องเริ่มระบบใหม่"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr "การปรับปรุงเสร็จสิ้นแล้วและต้องการที่จะเริ่มระบบใหม่ คุณต้องการที่จะทำเดี๋ยวนี้หรือเปล่า?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>ต้องการยกเลิกการปรับปรุงที่กำลังทำอยู่หรือไม่?</big></b>\n"
-#~ "\n"
-#~ "ระบบอาจจะไม่มั่นคงถ้าคุณยกเลิกการปรับปรุง ขอแนะนำเป็นอย่างยิ่งให้คุณดำเนินการปรับปรุงต่อไป"
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>เริ่มระบบใหม่เพื่อที่จะให้การปรับปรุงเสร็จสิ้น</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>เริ่มการปรับปรุงหรือไม่?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>กำลังปรับปรุงอูบันตูขึ้นไปเป็นรุ่น 6.10</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "กำลังเก็บกวาด"
-
-#~ msgid "Details"
-#~ msgstr "รายละเอียด"
-
-#~ msgid "Difference between the files"
-#~ msgstr "ข้อแตกต่างระหว่างไฟล์"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "กำลังดาวน์โหลดและติดตั้งปรับปรุงรุ่น"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "แก้ไขช่องของซอฟแวร์"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "กำลังเตรียมปรับปรุงรุ่น"
-
-#~ msgid "Restarting the system"
-#~ msgstr "เริ่มระบบใหม่อีกครั้ง"
-
-#~ msgid "Terminal"
-#~ msgstr "เทอร์มินัล"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_ยกเลิกการปรับปรุงรุ่น"
-
-#~ msgid "_Continue"
-#~ msgstr "ดำเนินการ_ต่อไป"
-
-#~ msgid "_Keep"
-#~ msgstr "_คงไว้"
-
-#~ msgid "_Replace"
-#~ msgstr "แ_ทนที่"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_ส่งรายงานปัญหา"
-
-#~ msgid "_Restart Now"
-#~ msgstr "เ_ริ่มระบบใหม่เดี๋ยวนี้"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "เ_ริ่มการปรับปรุงรุ่น"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "ไม่สามารถหาบันทึกการปล่อย"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "เซิรฟ์เวอร์อาจจะทำงานเกินพิกัด "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "ไม่สามารถดาวน์โหลดบันทึกการปล่อย"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ"
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "ไม่สามารถเรียกใช้เครื่องมือปรับปรุง"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr "นี่น่าจะเป็นปัณหาของเครื่องปรับปรุง กรุณารายงานว่าเป็นปัญหา"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "กำลังดาวน์โหลดเครื่องมือปรับปรุง"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "เครื่องปรับปรุงจะนำคุณตลอดกระบวนการปรับปรุง"
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "รายเซ็นของเครื่องมือปรับปรุง"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "เครื่องมือปรับปรุงรุ่น"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "ไม่สามารถเอามาได้"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงได้ อาจจะเป็นปัญหาในเครือข่าย "
-
-#~ msgid "Failed to extract"
-#~ msgstr "ไม่สามารถเอาออกมาได้"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr "ไม่สามารถแกะข้อมูลปรับปรุงออกมาได้ อาจจะเป็นปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ "
-
-#~ msgid "Verfication failed"
-#~ msgstr "ไม่สามารถตรวจเช็คความถูกต้องได้"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr "ตรวจทานการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิร์ฟเวอร์ "
-
-#~ msgid "Authentication failed"
-#~ msgstr "ไม่สามารถยืนยันว่าเป็นของจริงได้"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr "ยืนยันการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ "
-
-#~ msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-#~ msgstr ""
-#~ "กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li ด้วยความเร็ว %(speed)s/s"
-
-#~ msgid "Downloading file %(current)li of %(total)li"
-#~ msgstr "กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li"
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้"
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "รายการของการเปลี่ยนแปลงยังไม่มีให้ \n"
-#~ "กรุณาตรวจอีกทีภายหลัง"
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง \n"
-#~ "กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ"
-
-#~ msgid "Backports"
-#~ msgstr "พอร์ตย้อนหลัง"
-
-#~ msgid "Distribution updates"
-#~ msgstr "ปรับปรุงชุดเผยแพร่"
-
-#~ msgid "Other updates"
-#~ msgstr "_ปรับปรุงอื่นๆ"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "รุ่น %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "กำลังดาวน์โหลดรายการของการเปลี่ยนแปลง..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "ไ_ม่เลือกทั้งหมด"
-
-#~ msgid "_Check All"
-#~ msgstr "เ_ลือกทั้งหมด"
-
-#~ msgid "Download size: %s"
-#~ msgstr "ขนาดดาวน์โหลด: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "คุณสามารถติดตั้ง %s รายการปรับปรุง"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "กรุณารอสักครู่ นี่อาจจะใช้เวลาสักหน่อย"
-
-#~ msgid "Update is complete"
-#~ msgstr "ปรับปรุงเสร็จสิ้นแล้ว"
-
-#~ msgid "Checking for updates"
-#~ msgstr "กำลังตรวจหาข้อมูลปรับปรุง"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "จากรุ่นเก่า: %(old_version)s ไปสู่รุ่นใหม่ %(new_version)s"
-
-#~ msgid "Version %s"
-#~ msgstr "รุ่น %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(ขนาด: %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "ชุดเผยแพร่(distribution)ของคุณไม่มีบริการสนับสนุนแล้ว"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "คุณจะไม่ได้รับการปรับปรุงต่างๆในด้านความปลอดภัยหรือที่จำเป็นอีกต่อไป "
-#~ "ปรับปรุงขึ้นไปรุ่นถัดไปของอูบันตูลีนุกซ์ กรุณาอ่าน http://www.ubuntu.com "
-#~ "สำหรับรายละเอียดเพิ่มเติมในการปรับปรุงรุ่น"
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "มี<b>ชุดแจกจ่ายใหม่ '%s' </b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "ดัชนีของซอฟแวร์เสียหาย"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "ไม่สามารถที่จะติดตั้งหรือลบออกซอฟแวร์ใดๆ กรุณาใช้โปรแกรมจัดการแพกเกจ \"Synaptic\" "
-#~ "หรือ คำสั่ง \"sudo apt-get install -f\" ในเทอร์มินัลเพื่อที่จะแก้ปัญหานี้ก่อน"
-
-#~ msgid "None"
-#~ msgstr "ไม่มี"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>คุณต้องตรวจหารายการปรับปรุงด้วยตนเอง</big></b>\n"
-#~ "\n"
-#~ "ระบบของคุณไม่ตรวจหารายการปรับปรุงโดยอัตโนมัตื คุณสามารถปรับแต่งใน<i>แหล่งข้อมูล</"
-#~ "i>ในแถบ<i>ปรับปรุงทางอินเทอร์เน็ต</i>"
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>รักษาระบบของคุณให้ทันสมัย</b></big>"
-
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr "<big><b>ไม่สามารถทำการติดตั้งปรับปรุงได้ทั้งหมด</b></big>"
-
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>เริ่มโปรแกรมจัดการปรับปรุง</big></b>"
-
-#~ msgid "Changes"
-#~ msgstr "เปลี่ยนแปลง"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "เปลี่ยนแปลงและคำอธิบายของการปรับปรุงรุ่น"
-
-#~ msgid "Chec_k"
-#~ msgstr "ต_รวจ"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "ตรวจช่องซอฟแวร์สำหรับรายการปรับปรุงใหม่"
-
-#~ msgid "Description"
-#~ msgstr "คำบรรยาย"
-
-#~ msgid "Release Notes"
-#~ msgstr "บันทึกรายการปรับปรุง"
-
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "ดำเนินการปรับปรุงชุดเผยแพร่ ทำการติดตั้งปรับปรุงมากที่สุดเท่าที่จะทำได้ \n"
-#~ "\n"
-#~ "นี่อาจจะมีเหตุมาจากการปรับปรุงที่ไม่เสร็จสิ้น ซอฟต์แวร์แพ็กเกจที่ไม่สนับสนุนอย่างเป็นทางการ "
-#~ "หรือใช้รุ่นที่ยังพัฒนาไม่เสร็จ"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "แสดงการคืบหน้าของแต่ละไฟล์"
-
-#~ msgid "Software Updates"
-#~ msgstr "ซอฟต์แวร์ปรับปรุง"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr "ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่"
-
-#~ msgid "U_pgrade"
-#~ msgstr "_ปรับปรุง"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "ปรับปรุงให้เป็นรุ่นล่าสุดของอูบันตู"
-
-#~ msgid "_Check"
-#~ msgstr "เ_ลือก"
-
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_ปรับปรุงชุดเผยแพร่"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_ซ่อนข้อมูลนี้ในคราวหน้า"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_ติดตั้งปรัยปรุง"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "_ปรับปรุง"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "เปลี่ยนแปลง"
-
-#~ msgid "updates"
-#~ msgstr "ปรับปรุง"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>ปรับปรุงอัตโนมัติ</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>ซีดีรอม/ดีวีดี</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>ปรับปรุงทางอินเทอร์เน็ต</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>อินเทอร์เน็ต</b>"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>เพื่อที่จะเพิ่มประสพการณ์ให้แก่ผู้ใช้อูบันตู กรุณาเข้าร่วนในการแข่งขันความนิยม ถ้าคุณร่วมด้วย "
-#~ "รายการของซอฟต์แวร์ที่ติดตั้งและความถี่ในการเรียกใช้งานจะถูกเก็บไว้ "
-#~ "และส่งโดยไม่ระบุชื่อไปที่โครงการอูบันตูอาทิตย์ละครั้ง\n"
-#~ "\n"
-#~ "ผลลัพท์ที่ได้จะใช้ในการเพิ่มการสนับสนุนสำหรับแอพพลิเคชันที่เป็นที่นิยม "
-#~ "และเรียงลำดับแอพพลิเคชันในการค้นหาข้อมูล</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "เพิ่ม ซีดีรอม"
-
-#~ msgid "Authentication"
-#~ msgstr "การยืนยันของจริง"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "_ลบซอฟแวร์ไฟล์ที่ดาวน์โหลด:"
-
-#~ msgid "Download from:"
-#~ msgstr "ดาวน์โหลดจาก:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "นำเข้ากุญแจสาธารณะจากผู้ให้ซอฟแวร์ที่น่าเชื่อถือ"
-
-#~ msgid "Internet Updates"
-#~ msgstr "ปรัปรุงทางอินเทอร์เน็ต"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr "การปรับปรุงด้านความปลอดภัยจะติดตั้งโดยอัตโนมัติจากเซิรฟ์เวอร์ทางการของอูบันตูเท่านั้น"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "_คืนค่าปริยาย"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "คืนกุญแจเดืมของชุดเผยแพร่ของคุณ"
-
-#~ msgid "Software Sources"
-#~ msgstr "แหล่งของซอฟแวร์"
-
-#~ msgid "Source code"
-#~ msgstr "ต้นฉบับโปรแกรม"
-
-#~ msgid "Statistics"
-#~ msgstr "สถิติ"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "ส่งข้อมูลสถิติ"
-
-#~ msgid "Third Party"
-#~ msgstr "บุคคลที่สาม"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_ตรวจหารายการปรับปรุงโดยอัตโนมัติ:"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "_ดาวน์โหลดปรับปรุงโดยอัตโนมัติแต่ยังไม่ต้องติดตั้ง"
-
-#~ msgid "_Import Key File"
-#~ msgstr "_นำเข้ากุญแจไฟล์"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_ติดตั้งการปรับปรุงด้านความปลอดภัยโดยไม่ต้องถามก่อน"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>ข้อมูลเกี่ยวกับซอฟต์แวร์ที่มีล้าสมัย</big></b>\n"
-#~ "\n"
-#~ "เพื่อที่จะติดตั้งซอฟต์แวร์และปรับปรุงจากแหล่งที่เพิ่มหรือเปลี่ยนใหม่ "
-#~ "คุณจะต้องโหลดข้อมูลเกี่ยวกับซอฟต์แวร์ใหม่\n"
-#~ "\n"
-#~ "คุณจะต้องมี่อินเทอร์เน็ตที่ใช้ได้เพื่อที่จะดำเนินการต่อไป"
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>หมายเหตุ:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>องค์ประกอบ:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>ชุดเผยแพร่(Distribution):</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>ชนิด:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>กรุณาเติมให้ครบบรรทัด APT ของแหล่งข้อมูลที่คุณต้องการจะเพิ่ม</b></big>\n"
-#~ "\n"
-#~ "บรรทัด APT ประกอบด้วย ชนิด,สถานที่,ส่วนประกอบของแหล่งข้อมูล เช่น <i>\"deb http://"
-#~ "ftp.debian.org sarge main\"</i>"
-
-#~ msgid "APT line:"
-#~ msgstr "APT line:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "ไบนารี\n"
-#~ "ซอร์ส"
-
-#~ msgid "Edit Source"
-#~ msgstr "แก้ไขต้นฉบับ"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "ตรวจสอบแผ่นซีดี"
-
-#~ msgid "_Add Source"
-#~ msgstr "เ_พิ่มต้นฉบับ"
-
-#~ msgid "_Reload"
-#~ msgstr "เ_รียกใหม่"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "แสดงและปรับปรุงทั้งหมดที่มี"
-
-#~ msgid "Update Manager"
-#~ msgstr "โปรแกรมจัดการปรับปรุง"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "ตรวจหาโดยอัตโนมัติว่ารุ่นใหม่ของชุดเผยแพร่นี้มีหรือยังและสามารถใช้ปรับปรุงรุ่นได้(ถ้าเป็นไปได้)"
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "ตรวจหาชุดเผยแพร่ใหม่"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "ถ้าการตรวจสอบสำหรับปรับปรุงโดยอัตโนมัติถูกปิดไว้ คุณจะต้องโหลดช่องรายการใหม่เอง "
-#~ "ตัวเลือกนี้ทำให้ซ่อนคำเตือนที่จะแสดงในกรณีนี้ได้"
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "เตือนให้โหลดรายการช่องทางใหม่"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+"กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li ด้วยความเร็ว %(speed)s/s"
 
-#~ msgid "Show details of an update"
-#~ msgstr "แสดงรายละเอียดของการปรับปรุง"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li"
 
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "บึนทึกขนาดของหน้าต่างของโปรแกรมจัดการปรับปรุง"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "รายละเอียด"
 
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changes and "
-#~ "the description"
-#~ msgstr "บันทึกสถานะของตัวขยายที่มีรายการของการเปลี่ยนแปลงและคำบรรยาย"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "The window size"
-#~ msgstr "ขนาดของหน้าต่าง"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "ปรับแต่งแหล่งสำหรับซอฟต์แวร์และปรับปรุงที่ติดตั้งได้"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้"
 
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "เดเบียน 3.1 \"Sarge\" ปรับปรุงด้านความปลอดภัย"
+#: ../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 ""
 
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง \n"
+"กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ"
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li โดยไม่ทราบความเร็ว"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Normal updates"
-#~ msgstr "_ปรับปรุงตามปกติ"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Cancel _Download"
-#~ msgstr "ยกเลิก_ดาวน์โหลด"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Could not find any upgrades"
-#~ msgstr "ไม่มีอะไรให้ปรับปรุง"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "ระบบของคุณได้ผ่านการปรับปรุงแล้ว"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">กำลังปรับปรุงอูบันตู  6.06 LTS</span>"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "อูบันตู 5.10 Security Updates"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "ไม่สามารถติดตั้ง  '%s'"
 
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "ปรับปรุงให้เป็นรุ่นล่าสุดของอูบันตู"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "ไม่สามารถปรับปรุงทั้งหมดที่มีได้"
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>ตรวจสอบระบบของคุณ</b></big>\n"
-#~ "\n"
-#~ "ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่"
+#: ../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 "Oficially supported"
-#~ msgstr "สนับสนุนอย่างเป็นทางการ"
+msgid "An essential package would be removed"
+msgstr "แพจเกจที่สำคัญจะถูกลบออก"
 
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "การปรับปรุงบางอันต้องการที่จะลบซอฟแวร์ออกอีก กรุณาใช้ตัวเลือก  \"Mark All Upgrades\" "
-#~ "ของโปรแกรมจัดการแพกเกจ \"Synaptic\" หรือใช้คำสั่ง  \"sudo apt-get dist-upgrade"
-#~ "\" ในเทอร์มินัล ในการปรับปรุงระบบของคุณให้เสร็จสิ้นสมบรูณ์"
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "การปรับปรุงต่อไปนี้จะถูกข้ามไป:"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "เหลือประมาณ %li วินาที"
-
-#~ msgid "Download is complete"
-#~ msgstr "ดาวน์โหลดเสร็จแล้ว"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "การปรัปรุงถูกยกเลิก กรุณารายงานปัญหานี้"
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "ปรับปรุงรุ่นอูบันตู"
-
-#~ msgid "Hide details"
-#~ msgstr "ซ่อนรายละเอียด"
-
-#~ msgid "Show details"
-#~ msgstr "แสดงรายละเอียด"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "มีเพียงเครื่องมือจัดการซอฟแวร์เดียวที่อนุญาตให้เรียกใช้พร้อมกันได้"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr "กรุณาออกจากโปรแกรมอื่นๆเช่น  'aptitude' หรือ 'Synaptic' ก่อน"
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>ช่อง</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>กุญแจ</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "การติดตั้งมีเดีย"
-
-#~ msgid "Software Preferences"
-#~ msgstr "กำหนดรายละเอียดปรับแต่งของซอฟแวร์"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>ช่อง</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>องค์ประกอบ</b>"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Add Channel"
-#~ msgstr "เพิ่มช่องทาง"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "แก้ไขช่องทาง"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "_เพิ่มช่องทาง"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "_กำหนดเอง"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "อูบันตู 6.06 LTS"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "อูบันตู 6.06 LTS Security Updates"
+#: ../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 ""
 
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "อูบันตู 6.06 LTS Updates"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "อูบันตู 6.06 LTS Backports"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space. Empty your "
-#~ "trash and remove temporary packages of former installations using 'sudo "
-#~ "apt-get clean'."
-#~ msgstr ""
-#~ "การปรับปรุงถูกยกเลิก กรุณาทำให้มีพื้นที่ว่างในดิสก์อย่างน้อย  %s "
-#~ "เทถังขยะทิ้งและลบทิ้งแพกเกจชั่วคราวจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo apt-get "
-#~ "clean'."
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "%s remaining"
-#~ msgstr "%s เหลืออีก"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/tl.po b/po/tl.po
index 4a523ff0..7ba4939b 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+0200\n"
 "PO-Revision-Date: 2006-09-16 15:44+0000\n"
 "Last-Translator: Ariel S. Betan <ariel.betan@up.edu.ph>\n"
 "Language-Team: Tagalog <tl@li.org>\n"
@@ -24,228 +24,253 @@ 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: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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Inaalagaan ng kumunidad (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Inaalagaan ng kumunidad (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Inaalagaan ng kumunidad (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Release Notes"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Mga updates mula sa Internet"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Opisyal na sinusuportahan"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Inaalagaan ng kumunidad (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Di-malaya (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Mahigpit na copyright"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -257,55 +282,68 @@ 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
 #, fuzzy
 msgid "Security updates"
 msgstr "Mga updates mula sa Internet"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (testing)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 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:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "Software na Di-DFSG-compatible"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -313,589 +351,159 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Araw-araw"
-
-#~ msgid "Every two days"
-#~ msgstr "Tuwing ikalawang araw"
-
-#~ msgid "Weekly"
-#~ msgstr "linggo-linggo"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Tuwing ikalawang linggo"
-
-#~ msgid "Every %s days"
-#~ msgstr "Tuwing %s days"
-
-#~ msgid "After one week"
-#~ msgstr "Makalipas ang isang linggo"
-
-#~ msgid "After two weeks"
-#~ msgstr "Makalipas ang dalawang linggo"
-
-#~ msgid "After one month"
-#~ msgstr "Makalipas ang isang buwan"
-
-#~ msgid "After %s days"
-#~ msgstr "Makalipas ang %s araw"
-
-#~ msgid "Import key"
-#~ msgstr "Import key"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Error sa pagkuha ng napiling file"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Ang napiling file ay maaaring hindi isang GPG key o kaya'y may sira."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Error sa pagtanggal ng key"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Ang napiling key ay hindi matanggal. Mangyari lamang na ipagbigay alam "
-#~ "ito bilang isang bug."
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Mangyari lamang na magpasok ng pangalan para sa disc"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Mangyari lamang na ipasok ang disc sa drive:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Sirang mga pakete"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Ang iyong sistema ay nagtataglay ng mga sirang pakete na hindi "
-#~ "maisasaayos ng software na ito. Mangyari lamang na ayusin muna ang mga "
-#~ "ito sa pamamagitan ng synaptic o apt-get bago magpatuloy."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Hindi ma-upgrade ang kinakailangang mga meta-pakete"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Isang esensiyal na pakete ang kailangang tanggalin"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Hindi matantiya ang laki ng upgrade"
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Error sa pagtiyak na tama ang ilang mga pakete"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Hindi posibleng matiyak ang ilang mga pakete. Baka dulot ito ng isang "
-#~ "pansamantalang problema sa network. Maari mong subukang muli mamaya. "
-#~ "Tingnan sa ibaba ang listahan ng hindi matiyak na mga pakete."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Hindi ma-install '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Hindi ma-install ang isang kinakailangang pakete. Mangyari lamang na "
-#~ "ipagbigay alam ito bilang isang bug. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Hindi malaman ang meta-pakete"
-
-#~ msgid "Reading cache"
-#~ msgstr "Nagbabasa ng cache"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Walang makitang tamang mirror"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Habang sinusuri ang iyong sisidlan ng impormasyon walang makitang mirror "
-#~ "entry para sa upgrade. Baka dulot ito ng isang pinatatakbong panloob na "
-#~ "mirror o lumang impormasyon sa mirror.\n"
-#~ "\n"
-#~ "Gusto mo pa rin bang masulat ang iyong 'sources.list' file? Kung pipiliin "
-#~ "mo ang 'Yes' dito ma-a-update ang lahat ng '%s' to '%s' entries.\n"
-#~ "Kung pipiliin mo ang 'no' makakansela naman ang update."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Lilikha ng default sources?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "Matapos suriin ang iyong 'sources.list' walang balidong entries para '%s' "
-#~ "ang nakita.\n"
-#~ "\n"
-#~ "Magdadagdag ba ng default entries para '%s'? Kung pipiliin mo ang 'No' "
-#~ "makakansela ang update."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Hindi balido ang impormasyon sa sisidlan"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Nagresulta ng hindi balidong file ang pag-upgrade ng impormasyon sa "
-#~ "sisidlan. Mangyari lamang na ipagbigay alam ito bilang isang bug."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Hindi muna pinagana ang third party sources"
-
-#~ msgid "Error during update"
-#~ msgstr "Error habang nag-a-update"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Nagka-problema habang nag-a-update. Malimit na dulot ito ng isang "
-#~ "problema sa network, mangyari lamang na suriin ang inyong network "
-#~ "connection at subukang muli."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Hindi sapat ang libreng disk space"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Titigil muna ang upgrade. Mangyari lamang na maglibre ng hindi bababa sa %"
-#~ "s ng disk space sa %s. Linisin ang inyong basurahan at tanggalin ang mga "
-#~ "pansamantalang mga pakete ng mga natapos na installations gamit ang 'sudo "
-#~ "apt-get clean'."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Gusto mo na bang simulan ang upgrade?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Hindi ma-install ang mga upgrades"
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Hindi ma-download ang mga upgrades"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Titigil muna ang upgrade. Mangyaring suriin ang iyong internet connection "
-#~ "o installation media at subukang muli. "
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Tanggalin ang mga luma at hindi na kailangang pakete?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "_Laktawan Itong Hakbang"
-
-#~ msgid "_Remove"
-#~ msgstr "_Tanggalin"
-
-#~ msgid "Error during commit"
-#~ msgstr "Error sa pagtakda"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Ilang problema ang naganap habang naglilinis. Mangyari lamang na basahin "
-#~ "ang mensahe sa ibaba para sa karagdagang impormasyon. "
-
-#~ msgid "Checking package manager"
-#~ msgstr "Sinusuri ang manager ng pakete"
-
-#~ msgid "Updating repository information"
-#~ msgstr "Ina-update ang impormasyon ng sisidlan"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Hindi balidong impormasyon ng pakete"
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Nanghihingi ng kumpirmasyon"
-
-#~ msgid "Upgrading"
-#~ msgstr "Nag-a-upgrade"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Naghahanap ng luma at hindi na kailangang software"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Kumpleto na ang pagupgrade sa sistema"
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Mangyari na ipasok ang '%s' sa drive '%s'"
-
-#~ msgid "Applying changes"
-#~ msgstr "Ina-aplay ang mga pagbabago"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Hindi ma-install ang '%s'"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Hindi makita ang 'diff' command"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "isang matinding error ang naganap"
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Upang maiwasan ang pagkawala ng data isara muna ang mga nakabukas na "
-#~ "applications at dokumento."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Up-to-date ang iyong sistema"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Tanggalin ang %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "I-install ang %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "I-upgrade ang %s"
-
-#~ msgid "Reboot required"
-#~ msgstr "Nangangailangan ng pag reboot"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Natapos na ang pag-upgrade at nangangailangan ng pag-reboot. Gusto mo "
-#~ "bang gawin na ito ngayon?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Kanselahin ang kasalukuyang pag-a-upgrade?</big></b>\n"
-#~ "\n"
-#~ "Maaaring hindi gumana ang sistema kung kakanselahin ang upgrade. Mariing "
-#~ "ipinapayo na ipagpatuloy ang upgrade."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>I-restart ang sistema upang makumpleto ang pag-upgrade</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Simulan ang upgrade?</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Naglilinis"
-
-#~ msgid "Details"
-#~ msgstr "Mga Detalye"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Pagkakaiba sa pagitan ng mga files"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Binabagoang mga software channels"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Ini-hahanda ang upgrade"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Ini-rerestart ang sistema"
-
-#~ msgid "Terminal"
-#~ msgstr "Terminal"
-
-#~ msgid "_Keep"
-#~ msgstr "_Itira"
-
-#~ msgid "_Replace"
-#~ msgstr "_Palitan"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Ipagbigay alam ang Bug"
-
-#~ msgid "_Restart Now"
-#~ msgstr "_I-restart Ngayon"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "_Ipagpatuloy ang Upgrade"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Hindi makita ang mga release notes"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Maaaring overloaded ang server. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Hindi ma-download ang mga release notes"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Mangyaring suriin ang inyong internet connection"
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Hindi mapatakbo ang upgrade tool"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Malaki ang posibilidad na ito ay isang bug sa upgrade tool. Mangyaring "
-#~ "ipagbigay alam bilang isang bug."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Nag-da-download ng upgrade tool"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Papatnubayan ka ng upgrade tool habang nasa proseso ng pag-upgrade"
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Signature ng upgrade tool"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Upgrade tool"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Bigo sa pag-fetch"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "Bigo sa pag-fetch ng upgrade. Maaaring may problema sa network. "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Bigo sa pag-extract"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Bigo sa pag-extract ng upgrade. Maaaring may problema sa network o sa "
-#~ "server. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Bigo sa beripikasyon"
-
-#~ msgid "Authentication failed"
-#~ msgstr "Bigo sa awtentikasyon."
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr "Bigo sa awtentikasyon. Maaaring may problema sa network o server. "
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Bersyon %s: \n"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Laki ng Download: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Maaari kang mag-install ng %s na update"
-#~ msgstr[1] "Maaari kang mag-install ng %s na mga updates"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Mangyaring maghintay, matatagalan pa."
-
-#~ msgid "Update is complete"
-#~ msgstr "Kumpleto na ang pag-update"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Ang iyong distribusyon ay hindi na suportado"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Hindi ka na makakakuha pa ng mga fixes na pangseguridad o kritikal na "
-#~ "updates. Mag-upgrade na sa isang mas bagong bersyon ng Ubuntu Linux. "
-#~ "Puntahan ang http://www.ubuntu.com para sa marami pang impormasyon "
-#~ "tungkol sa upgrading."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Available na ang bagong distribusyon release '%s'</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Sira ang software index"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Hindi maaaring mag-install o mag-tanggal ng kahit anong software. "
-#~ "Mangyaring gamitin ang manedyer pang-paketeng \"Synaptic\" o patakbuhin "
-#~ "ang \"sudo apt-get install -f\" sa isang terminal upang maisaayos muna."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Panatilihing napapanahon ang iyong sistema</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "Mga pagbabago"
-
-#~ msgid "Chec_k"
-#~ msgstr "Chec_k"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Suriin ang mga software channels para sa mga bagong updates"
-
-#~ msgid "Description"
-#~ msgstr "Deskripsiyon"
-
-#~ msgid "Show progress of single files"
-#~ msgstr "Ipakita ang progreso ng bawat files"
-
-#~ msgid "Software Updates"
-#~ msgstr "Software Updates"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Itinatama ng software updates ang mga error, tinatanggal ang mga "
-#~ "kahinaang pangseguridad at nagbibigay ng mga bagong features."
-
-#~ msgid "U_pgrade"
-#~ msgstr "U_pgrade"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Mag-upgrade sa pinakabagong bersiyon ng Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "_Check"
-
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Itago ang impormasyong ito sa hinaharap"
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Install ang mga Updates"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Mga updates mula sa Internet</b>"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Authentication"
-#~ msgstr "Awtentikasyon"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "Tanggalin ang mga na-download nang software files:"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Mga Detalye"
 
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Kunin ang public key mula sa pinagkakatiwalaang provider"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Pawang mga updates na pangseguridad mula sa mga opisyal na mga Ubuntu "
-#~ "servers lamang ang awtomatikong ma-i-install."
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Restore _Defaults"
-#~ msgstr "Ibalik_ang_mga_Defaults"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Ibalik ang default keys ng inyong distribusiyon"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "_Awtomatikong i-check para sa mga updates:"
+#: ../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 ""
 
-#~ msgid "_Import Key File"
-#~ msgstr "_Importahin ang Key File"
+#: ../apt/package.py:1053
+#, fuzzy
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr "Mangyaring suriin ang inyong internet connection"
 
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_I-install ang mga updates na pangseguridad ng walang kumpirmasyon"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Kumento:</b>"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Mga Components:</b>"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribusiyon:</b>"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipo:</b>"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "APT line:"
-#~ msgstr "Linyang APT:"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binaryo\n"
-#~ "Batis"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Hindi ma-install '%s'"
 
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Sinusuri ang CD-ROM"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#~ msgid "_Reload"
-#~ msgstr "_Reload"
+#: ../apt/debfile.py:494
+#, fuzzy
+msgid "An essential package would be removed"
+msgstr "Isang esensiyal na pakete ang kailangang tanggalin"
 
-#~ msgid "Show and install available updates"
-#~ msgstr "Ipakita at i-install ang mga available na updates"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Update Manager"
-#~ msgstr "Manedyer pang Update"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Awtomatikong tumitingin kung may bagong bersiyon na available ang "
-#~ "kasalukuyang distribusiyon at mag-mungkahing mag-upgrade (kung posible)."
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Suriin para sa bagong releases pang-distribusiyon"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Ipaalala na mag-reload ng listahan ng channel"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Show details of an update"
-#~ msgstr "Ipakita ang mga detalye ng isang pag-update"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Inilalagay ang sukat ng update-manager dialog"
+#: ../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 ""
 
-#~ msgid "The window size"
-#~ msgstr "Ang laki ng window"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Mga Updates Pang-seguridad sa Debian 3.1 \"Sarge\""
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 73c1d726..d3abf69a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -24,235 +24,266 @@ 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: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 "Ubuntu 4.10 'Warty Warthog' Cdrom'u"
+
+#. 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 "Ubuntu 4.10 'Warty Warthog' Cdrom'u"
+
+#. 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 "Ubuntu 5.04 'Hoary Hedgehog' Cdrom'u"
+
+#. 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 'Breezy Badger' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 'Breezy Badger' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Topluluk tarafından bakılan"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr "Aygıtlar için kapalı kaynak sürücüler"
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr "Kısıtlı yazılımlar"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../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:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Canonical Açık Kaynak yazılımı destekledi"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Topluluk tarafından bakılan (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Topluluk tarafından bakılan Açık Kaynak Kodlu yazılımlar"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr "Özgür olmayan sürücüler"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
-msgstr "Aygıtlar için lisanslı sürücüler "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
+msgstr "Aygıtlar için kapalı kaynak sürücüler"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr "Kısıtlı yazılımlar (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 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:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr "Önemli güvenlik güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "Önerilen güncellemeler"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Teklif edilmiş güncellemeler"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Geritaşınmış (backported) güncellemeler"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger' Cdrom'u"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 Geritaşınmış Yazılımlar (Backports)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog' Cdrom'u"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Resmi olarak desteklenenler"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04 Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Geritaşınmış Yazılımlar (Backports)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Topluluk tarafından bakılan (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Özgür olmayan (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr "Artık resmi olarak desteklenmiyor"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Sınırlı telif hakkı"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 Güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Geritaşınmış Yazılımlar (Backports)"
 
@@ -264,55 +295,68 @@ 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 "Teklif edilmiş güncellemeler"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Önemli güvenlik güncelleştirmeleri"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (test)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (kararsız)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 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:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG Uyumlu Olmayan Yazılım"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "%s sunucusu"
@@ -320,1070 +364,160 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "Ana sunucu"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "Özel sunucular"
 
-#~ msgid "Daily"
-#~ msgstr "Günlük"
-
-#~ msgid "Every two days"
-#~ msgstr "Her iki günde bir"
-
-#~ msgid "Weekly"
-#~ msgstr "Haftalık"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Her iki haftada bir"
-
-#~ msgid "Every %s days"
-#~ msgstr "Her %s günde bir"
-
-#~ msgid "After one week"
-#~ msgstr "Bir hafta sonra"
-
-#~ msgid "After two weeks"
-#~ msgstr "İki hafta sonra"
-
-#~ msgid "After one month"
-#~ msgstr "Bir ay sonra"
-
-#~ msgid "After %s days"
-#~ msgstr "%s gün sonra"
-
-#~ msgid "%s updates"
-#~ msgstr "%s güncellemeleri"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "En yakın sunucu"
-
-#~ msgid "Software Channel"
-#~ msgstr "Yazılım Kanalı"
-
-#~ msgid "Active"
-#~ msgstr "Etkin"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(Kaynak Kodu)"
-
-#~ msgid "Source Code"
-#~ msgstr "Kaynak Kodu"
-
-#~ msgid "Import key"
-#~ msgstr "Anahtar aktar"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Seçili dosyayı aktarmada hata"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Seçili dosya bir GPG anahtar dosyası olmayabilir veya bozuk olabilir."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Anahtar kaldırmada hata"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr ""
-#~ "Seçtiğiniz anahtar kaldırılamadı. Lütfen bunu bir hata olarak iletin."
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Error scanning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>CD taramada hata</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Lütfen disk için bir isim girin"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Lütfen sürücüye bir disk yerleştirin:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Bozuk paketler"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Sisteminiz bu yazılım ile düzeltilemeyen bozuk paketler içeriyor. Devam "
-#~ "etmeden önce lütfen bunları synaptic veya apt-get kullanarak düzeltin."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Gerekli bilgi-paketleri güncelleştirilemiyor"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Gerekli bir paketin kaldırılması gerekmekte"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Güncelleme hesaplanamadı"
-
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Yükseltmeyi hesaplarken çözümlenemeyen bir hata oluştu.\n"
-#~ "\n"
-#~ "Lütfen bu hatayı 'update-manager' için bildirin, hata raporuna /var/log/"
-#~ "dist-upgrade/ konumundaki dosyaları da ekleyin."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Bazı paketlerin doğrulamasında hata"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Bazı paketler doğrulanamadı. Bu geçici bir ağ sorunu olabilir. Daha sonra "
-#~ "tekrar deneyebilirsiniz. Doğrulanamamış paketlerin listesi için aşağıya "
-#~ "bakınız."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "'%s' yüklenemiyor"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Gerekli bir paket yüklenemedi. Lütfen bunu bir hata olarak bildirin. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Meta-paket kestirilemedi"
-
-#, fuzzy
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are running.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Sisteminiz bir ubuntu-masaüstü, kubuntu-masaüstü veya edubuntu-masaüstü "
-#~ "paketi içermiyor ve hangi ubuntu sürümünü kullandığınız tespit "
-#~ "edilemedi.\n"
-#~ " Lütfen devam etmeden önce, synaptic veya apt-get kullanarak yukarıdaki "
-#~ "paketlerden birini kurun."
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "CD eklemede hata"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "CD eklenirken bir hata oluştu, yükseltme durduruuyor. Eğer düzgün bir "
-#~ "Ubuntu CD'si kullanıyorsanız bu hatayı bildirin.\n"
-#~ "\n"
-#~ "Hata mesajı:\n"
-#~ "'%s'"
-
-#~ msgid "Reading cache"
-#~ msgstr "Önbellek okunuyor"
-
-#~ msgid "Fetch data from the network for the upgrade?"
-#~ msgstr "Yükseltme için veriler ağdan indirilsin mi?"
-
-#~ msgid ""
-#~ "The upgrade can use the network to check the latest updates and to fetch "
-#~ "packages that are not on the current CD.\n"
-#~ "If you have fast or inexpensive network access you should answer 'Yes' "
-#~ "here. If networking is expensive for you choose 'No'."
-#~ msgstr ""
-#~ "Yükseltme ağı kullanarak en sün güncellemeleri denetleyebilir ve mevcut "
-#~ "CD'de olmayan paketleri indirebilir.\n"
-#~ "Eğer ağa erişiminiz hızlıysa ya da pahalı değilse 'Evet'i seçmelisiniz. "
-#~ "Aksi halde 'Hayır'ı seçin."
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Geçerli yansı bulunamadı"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "Depo bilgileriniz taranırken güncelleme için yansı girdisi bulunamadı. Bu "
-#~ "dahili bir yansı çalıştırdığınız ya da yansı bilgisi güncel olmadığı için "
-#~ "gerçekleşmiş olabilir.\n"
-#~ "\n"
-#~ "'sources.list' dosyanızı tekrar oluşturmak istiyor musunuz? Eğer burada "
-#~ "'Evet'i seçersiniz '%s'den '%s'e kadar olan girdiler güncellenecek.\n"
-#~ "'Hayır'ı seçerseniz güncelleme iptal edilecek."
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Öntanımlı depolar kaydedilsin mi?"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "'sources.list' tarandıktan sonra '%s' için geçerli bir giriş bulunamadı.\n"
-#~ "\n"
-#~ "'%s' için varsayılan girişler eklensin mi? Eğer 'Hayır'ı seçerseniz, "
-#~ "güncelleştirme iptal edilecektir."
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Depo bilgisi geçersiz"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Depo bilgisini güncelleme işlemi geçersiz bir dosya oluşturdu. Lütfen bu "
-#~ "hatayı bildirin."
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "Üçüncü parti kaynaklar devredışı bırakıldı"
-
-#~ msgid ""
-#~ "Some third party entries in your sources.list were disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "sources.list dosyasındaki bazı üçüncü taraf girdiler etkisiz hale "
-#~ "getirildi. Yükseltmenin ardından bu girdileri 'software-properties' "
-#~ "aracını ya da synaptic'i kullanarak tekrar etkinleştirebilirsiniz."
-
-#~ msgid "Error during update"
-#~ msgstr "Güncelleştirme sırasında hata"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr ""
-#~ "Güncelleştirme sırasında bir hata oluştu. Bu genellikle bir ağ sorunudur, "
-#~ "lütfen ağ bağlantınızı kontrol edin ve yeniden deneyin."
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Yeterince boş disk alanı yok"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "Yükseltme sonlandırılıyor. Lütfen %s'de en az %s disk alanını boşaltın. "
-#~ "Çöpünüzü boşaltın ve 'sudo apt-get clean' kullanarak önceden kurulumların "
-#~ "geçici paketlerini kaldırın."
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Yükseltmeyi başlatmak istiyor musunuz?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Yükseltmeler kurulamadı"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system could be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr ""
-#~ "Yükseltmeden şimdi iptal ediliyor. Sisteminiz kararsız bir durumda "
-#~ "olabilir. Bir kurtarma işlemi gerçekleştirildi. (dpkg --configure -a).\n"
-#~ "\n"
-#~ "Lütfen 'update-manager' paketi için bu hatayı bildirin. Hata bildirimine /"
-#~ "var/log/dist-upgrade/ konumundaki dosyaları da ekleyin."
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Yükseltmeler indirilemedi"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Yükseltme şimdi iptal edilecek. Lütfen internet bağlantınızı veya kurulum "
-#~ "ortamınızı kontrol edin ve yeniden deneyin. "
-
-#~ msgid "Support for some applications ended"
-#~ msgstr "Bazı uygulamalar için destek sona erdi"
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Kullanılmayan paketler kaldırılsın mı?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "Bu Adımı _Atla"
-
-#~ msgid "_Remove"
-#~ msgstr "_Kaldır"
-
-#~ msgid "Error during commit"
-#~ msgstr "İşlem sırasında hata oluştu"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "Temizleme sırasında bazı sorunlar oluştu. Bilgi için lütfen aşağıdaki "
-#~ "mesaja bakın. "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "Orijinal sistem durumuna geri dönülüyor"
-
-#~ msgid "Checking package manager"
-#~ msgstr "Paket yöneticisi denetleniyor"
-
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Yükseltme işlemine hazırlanma başarısız oldu"
-
-#~ msgid "Updating repository information"
-#~ msgstr "Depo bilgileri güncelleniyor"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Geçersiz paket bilgisi"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this bug against the "
-#~ "'update-manager' package and include the files in /var/log/dist-upgrade/ "
-#~ "in the bugreport."
-#~ msgstr ""
-#~ "Paket bilgileriniz güncellendikten sonra temel bir paket olan '%s' artık "
-#~ "bulunamıyor.\n"
-#~ "Bu drum önemli bir hata olabilir, lütfen 'update-manager' paketi için bu "
-#~ "hatayı bildirin. Hata bildiriminize /var/log/dist-upgrade/ konumundaki "
-#~ "dosyaları da ekleyin."
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Onay isteniyor"
-
-#~ msgid "Upgrading"
-#~ msgstr "Yükseltiliyor"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Kullanılmayan yazılımlar aranıyor"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Sistem yükseltmesi tamamlandı."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Lütfen '%2s' sürücüsüne '%1s' takın"
-
-#, fuzzy
-#~ msgid "Fetching is complete"
-#~ msgstr "İndirme tamamlandı"
-
-#~ msgid "Fetching file %li of %li at %s/s"
-#~ msgstr "Dosyalar indiriliyor. İnen: %li  Toplam: %li  Hız: %s/s"
-
-#~ msgid "About %s remaining"
-#~ msgstr "Yaklaşık %s kaldı"
-
-#~ msgid "Fetching file %li of %li"
-#~ msgstr "Dosyalar inidiriliyor. İnen: %li  Toplam: %li"
-
-#~ msgid "Applying changes"
-#~ msgstr "Değişiklikler uygulanıyor"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "'%s' kurulamadı"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please report this bug against the 'update-"
-#~ "manager' package and include the files in /var/log/dist-upgrade/ in the "
-#~ "bugreport."
-#~ msgstr ""
-#~ "Yükseltme iptal ediliyor. Lütfen 'update-manager' paketi için bu hatayı "
-#~ "bildirin. Hata bildiriminize /var/log/dist-upgrade/ konumundaki dosyaları "
-#~ "da ekleyin."
-
-#~ msgid ""
-#~ "Replace the customized configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Özelleştirilmiş yapılandırma dosyası\n"
-#~ "'%s' değiştirilsin mi?"
-
-#~ msgid ""
-#~ "You will lose any changes you have made to this configuration file if you "
-#~ "choose to replace it with a newer version."
-#~ msgstr ""
-#~ "Eğer bu yapılandırma dosyasını yeni sürümüyle değiştirecekseniz bu "
-#~ "dosyaya yapmış olduğunuz değişiklikleri kaybedeceksiniz."
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "'diff' komutu bulunamadı"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Giderilemez bir hata oluştu"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade/"
-#~ "main.log and /var/log/dist-upgrade/apt.log in your report. The upgrade "
-#~ "aborts now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Lütfen bu hatayı bildirin. Hata bildiriminize /var/log/dist-upgrade/ "
-#~ "konumundaki dosyaları da ekleyin. Yükseltme şimdi iptal ediliyor.\n"
-#~ "Orijinal sources.list dosyanız /etc/apt/sources.list.distUpgrade olarak "
-#~ "kaydedildi."
-
-#~ msgid "%d package is going to be removed."
-#~ msgid_plural "%d packages are going to be removed."
-#~ msgstr[0] "%d paket kaldırılacak."
-
-#~ msgid "%d new package is going to be installed."
-#~ msgid_plural "%d new packages are going to be installed."
-#~ msgstr[0] "%d yeni paket kurulacak."
-
-#~ msgid "%d package is going to be upgraded."
-#~ msgid_plural "%d packages are going to be upgraded."
-#~ msgstr[0] "%d paket yükseltilecek."
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Toplam %s indirmeniz gerekmektedir. "
-
-#~ msgid ""
-#~ "Fetching and installing the upgrade can take several hours and cannot be "
-#~ "canceled at any time later."
-#~ msgstr ""
-#~ "Yükseltmeyi indirmek ve kurmak saatlerce sürebilir ve daha sonra iptal "
-#~ "edilemez."
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Veri kaybını önlemek için açık olan tüm uygulamaları ve belgeleri kapatın."
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Sisteminiz güncel"
-
-#~ msgid ""
-#~ "There are no upgrades available for your system. The upgrade will now be "
-#~ "canceled."
-#~ msgstr ""
-#~ "Sisteminiz için olası herhangi bir yükseltme yok. Yükseltme işlemi şimdi "
-#~ "iptal edilecek."
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Şunu kaldır: %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "%s'i kur"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "%s'i yükselt"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li gün %li saat %li dakika"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li saat %li dakika"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li dakika"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li saniye"
-
-#~ msgid ""
-#~ "This download will take about %s with a 1Mbit DSL connection and about %s "
-#~ "with a 56k modem"
-#~ msgstr ""
-#~ "Bu indirme işlemi 1Mbit DSL bağlantısıyla yaklaşık %s ve 56k modemle ise "
-#~ "yaklaşık %s sürecektir."
-
-#~ msgid "Reboot required"
-#~ msgstr "Yeniden başlatma gerekiyor"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Yükseltme tamamlandı ve yeniden başlatma gerekiyor. Bunu şimdi yapmak "
-#~ "istiyor musunuz?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Yükseltme iptal edilsin mi?</big></b>\n"
-#~ "\n"
-#~ "Yükseltmeyi iptal ederseniz, sistem, kullanılamaz bir konumda kalabilir. "
-#~ "Yükseltmeyi devam ettirmeniz şiddetle önerilir."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr ""
-#~ "<b><big>Yükseltmeyi tamamlamak için sistemi yeniden başlatın</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Yükseltme başlatılsın mı?</big></b>"
-
-#~ msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-#~ msgstr "<b><big>Ubuntu 6.10 sürümüne yükseltiliyor</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Temizliyor"
-
-#~ msgid "Details"
-#~ msgstr "Ayrıntılar"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Dosyalar arasındaki farklılık"
-
-#~ msgid "Fetching and installing the upgrades"
-#~ msgstr "Yükseltmeler indiriliyor ve kuruluyor"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "Yazılım kanalları değiştiriliyor"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Yükseltme hazırlanıyor"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Sistem tekrar başlatılıyor"
-
-#~ msgid "Terminal"
-#~ msgstr "Uçbirim"
-
-#~ msgid "_Cancel Upgrade"
-#~ msgstr "_Yükseltmeyi İptal Et"
-
-#~ msgid "_Continue"
-#~ msgstr "_Devam"
-
-#~ msgid "_Keep"
-#~ msgstr "_Koru"
-
-#~ msgid "_Replace"
-#~ msgstr "_Değiştir"
-
-#~ msgid "_Report Bug"
-#~ msgstr "_Hatayı Bildir"
-
-#~ msgid "_Restart Now"
-#~ msgstr "Şimdi _Tekrar Başlat"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "Yükseltmeye _Devam Et"
-
-#~ msgid "_Start Upgrade"
-#~ msgstr "_Yükseltmeye Başla"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr ""
-#~ "Suggestions: \t\t\r\n"
-#~ "Yayın notları bulunamadı"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Sunucu aşırı yüklenmiş olabilir. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Yayın notları indirilemedi"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "İnternet bağlantınızı kontrol ediniz."
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Yükseltme aracı çalıştırılamadı."
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr ""
-#~ "Bu muhtemelen yükseltme aracındaki bir hata. Lütfen bu hatayı bildirin."
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Yükseltme aracı indiriliyor"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Yükseltme aracı size yükseltme işlemi boyunca rehberlik edecek."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Yükseltme aracı imzası"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Yükseltme aracı"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Getirme başarısız"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "Yükseltmeyi getirme başarısız. Ağ sorunu olabilir "
-
-#~ msgid "Failed to extract"
-#~ msgstr "Çıkarılamadı"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr ""
-#~ "Yükseltme çıkarılamadı. Ağ veya sunucu ile ilgili bir sorun olabilir. "
-
-#~ msgid "Verfication failed"
-#~ msgstr "Doğrulama başarısız oldu"
-
-#~ msgid ""
-#~ "Verifying the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr "Yükseltmeyi onaylamada hata. Ağ ya da sunucuda bir sorun olabilir. "
-
-#~ msgid "Authentication failed"
-#~ msgstr "Kimlik denetimi başarısız oldu"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr ""
-#~ "Yükseltme için kimlik denetimi başarısız oldu. Ağ veya sunucu ile ilgili "
-#~ "bir sorun olabilir. "
-
-#~ msgid "The list of changes is not available"
-#~ msgstr "Değişiklikler listesi erişilebilir değil"
-
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "Değişiklik listesi henüz mevcut değil.\n"
-#~ "Lütfen daha sonra tekrar deneyiniz."
-
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ msgstr ""
-#~ "Değişiklik listesini indirme başarısız oldu. \n"
-#~ "Lütfen İnternet bağlantınızı kontrol edin."
-
-#~ msgid "Backports"
-#~ msgstr "Backport edilmiş yazılımlar"
-
-#~ msgid "Distribution updates"
-#~ msgstr "Dağıtım güncelleştirmeleri"
-
-#~ msgid "Other updates"
-#~ msgstr "Diğer güncellemeler"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Sürüm %s: \n"
-
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Değişiklik listesi indiriliyor..."
-
-#~ msgid "_Uncheck All"
-#~ msgstr "Hiç_birini Seçme"
-
-#~ msgid "_Check All"
-#~ msgstr "_Hepsini Seç"
-
-#~ msgid "Download size: %s"
-#~ msgstr "İndirme boyutu: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "%s güncelleme kurabilirsiniz"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Lütfen bekleyin, bu işlem biraz zaman alabilir."
-
-#~ msgid "Update is complete"
-#~ msgstr "Güncelleme tamamlandı"
-
-#~ msgid "Checking for updates"
-#~ msgstr "Güncellemeler denetleniyor"
-
-#~ msgid "From version %(old_version)s to %(new_version)s"
-#~ msgstr "%(old_version)s sürümünden %(new_version)s sürümüne"
-
-#~ msgid "Version %s"
-#~ msgstr "Sürüm %s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(Büyüklük:%s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Kullandığınız dağıtım artık desteklenmiyor"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Bundan sonra güvenlik düzeltmelerini ya da kritik güncellemeleri "
-#~ "alamayacaksınız. İşletim sisteminizi Ubuntu Linux'un son sürümüne "
-#~ "yükseltin. Daha fazla bilgi ve yükseltme için http://www.ubuntu.com "
-#~ "adresini ziyaret edin."
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>Yeni dağıtım yayını '%s' ulaşılabilir</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "Yazılım dizini bozulmuş"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "Herhangi bir yazılımı yüklemek ya da kaldırmak mümkün değil. Lütfen bu "
-#~ "durumu düzeltmek için öncelikle \"Synaptic\" paket yöneticisini kullanın "
-#~ "ya da uçbirim penceresine \"sudo apt-get install -f\" komutunu yazıp "
-#~ "çalıştırın."
-
-#~ msgid "None"
-#~ msgstr "Hiçbiri"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> "
-#~ "tab."
-#~ msgstr ""
-#~ "<b><big>Güncelleştirmeleri elle kontrol etmelisiniz</big></b>\n"
-#~ "\n"
-#~ "Sisteminiz güncelleştirmeleri otomatik olarak kontrol etmiyor. Bunu "
-#~ "<i>İnternet Güncelleştirmeleri</i> sekmesindeki <i>Yazılım Kaynakları</"
-#~ "i>ndan yapılandırabilirsiniz."
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>Sisteminizi güncel tutun</b></big>"
-
-#, fuzzy
-#~ msgid "<big><b>Not all updates can be installed</b></big>"
-#~ msgstr ""
-#~ "<big><b>CD taramada hata</b></big>\r\n"
-#~ "\r\n"
-#~ "%s"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "<big><b>Starting update manager</b></big>"
-#~ msgstr "<b><big>Güncelleştirme yöneticisi başlatılıyor</big></b>"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Changes"
-#~ msgstr "Değişiklikler"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Ayrıntılar"
 
-#~ msgid "Changes and description of the update"
-#~ msgstr "Değişiklikler ve güncelleme açıklaması"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Chec_k"
-#~ msgstr "_Denetle"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "Yeni güncellemeler için yazılım kanallarını denetle"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Description"
-#~ msgstr "Tanım"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr "Değişiklikler listesi erişilebilir değil"
 
-#~ msgid "Release Notes"
-#~ msgstr "Yayın Notları"
+#: ../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 ""
 
-#~ msgid ""
-#~ "Run a distribution upgrade, to install as many updates as possible. \n"
-#~ "\n"
-#~ "This can be caused by an uncompleted upgrade, unofficial software "
-#~ "packages or by running a development version."
-#~ msgstr ""
-#~ "Olası bütün güncellemeleri kurmak için dağıtım yükseltmesi "
-#~ "gerçekleştirin. \n"
-#~ "\n"
-#~ "Bu, tamamlanmamış yükseltme, resmi olmayan yazılım paketleri ya da "
-#~ "geliştirme sürümü kullanılmasından kaynaklanmış olabilir."
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"Değişiklik listesini indirme başarısız oldu. \n"
+"Lütfen İnternet bağlantınızı kontrol edin."
 
-#~ msgid "Show progress of single files"
-#~ msgstr "Tekil dosyaların ilerleyişini göster"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Software Updates"
-#~ msgstr "Yazılım Güncellemeleri"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Yazılım güncellemeleri hataları düzeltir, güvenlik açıklarını giderir ve "
-#~ "yeni özellikler sunar."
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "U_pgrade"
-#~ msgstr "_Yükselt"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "Ubuntu'nun son sürümüne yükselt"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "_Check"
-#~ msgstr "_Denetle"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "_Distribution Upgrade"
-#~ msgstr "_Dağıtım Yükseltimi"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "_Hide this information in the future"
-#~ msgstr "_Bu bilgiyi gelecekte sakla"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "'%s' yüklenemiyor"
 
-#~ msgid "_Install Updates"
-#~ msgstr "Güncelemeleri _Yükle"
+#: ../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 "_Upgrade"
-#~ msgstr "_Yükselt"
-
-#~ msgid "changes"
-#~ msgstr "değişiklikler"
-
-#~ msgid "updates"
-#~ msgstr "güncellemeler"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Otomatik güncelleme</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>CDROM/DVD</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "İnternet güncellemeleri"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Internet</b"
-
-#~ msgid ""
-#~ "<i>To improve the user experience of Ubuntu please take part in the "
-#~ "popularity contest. If you do so the list of installed software and how "
-#~ "often it was used will be collected and sent anonymously to the Ubuntu "
-#~ "project  on a weekly basis.\n"
-#~ "\n"
-#~ "The results are used to improve the support for popular applications and "
-#~ "to rank applications in the search results.</i>"
-#~ msgstr ""
-#~ "<i>Kullanıcıların Ubuntu deneyimini iyileştirmek için lütfen popülerlik "
-#~ "yarışmasına katılın. Eğer katılırsanız, herhangi kişisel bir bilgi "
-#~ "içermeyecek şekilde kurulu olan yazılımlar ve bunların kullanım sıklığı "
-#~ "haftalık olarak Ubuntu projesine bildirilecektir.\n"
-#~ "\n"
-#~ "Sonuçlar popüler olan uygulamalara verilen desteğin geliştirilmesinde ve "
-#~ "arama sonuçlarındaki sıralamanın belirlenmesinde kullanılacaktır.</i>"
-
-#~ msgid "Add Cdrom"
-#~ msgstr "Cdrom ekle"
-
-#~ msgid "Authentication"
-#~ msgstr "Kimlik Sınaması"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "İndirilmiş yazılım dosyalarını _sil:"
+msgid "An essential package would be removed"
+msgstr "Gerekli bir paketin kaldırılması gerekmekte"
 
-#~ msgid "Download from:"
-#~ msgstr "İndirme adresi:"
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Güvenilen bir yazılm sağlayıcısından açık anahtarı içe aktar"
-
-#~ msgid "Internet Updates"
-#~ msgstr "İnternet Güncellemeleri"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr ""
-#~ "Güvenlik güncellemeleri sadece resmi Ubuntu sunucularından otomatik "
-#~ "olarak kurulacaktır"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "_Öntanımlılara Dön"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Dağıtımınızın öntanımlı anahtarlarını geriye döndür"
-
-#~ msgid "Software Sources"
-#~ msgstr "Yazılım Kaynakları"
-
-#~ msgid "Source code"
-#~ msgstr "Kaynak kodu"
-
-#~ msgid "Statistics"
-#~ msgstr "İstatistikler"
-
-#~ msgid "Submit statistical information"
-#~ msgstr "İstatistiki Bilgileri Bildir"
-
-#~ msgid "Third Party"
-#~ msgstr "Üçüncü Taraf"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "Güncellemeleri _otomatik olarak denetle"
-
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "Güncellemeleri _otomatik olarak indir ancak kurma"
-
-#~ msgid "_Import Key File"
-#~ msgstr "İçe Anahtar Dosyası _Aktar"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "_Onaylatmadan güvenlik güncellemelerini kur"
-
-#~ msgid ""
-#~ "<b><big>The information about available software is out-of-date</big></"
-#~ "b>\n"
-#~ "\n"
-#~ "To install software and updates from newly added or changed sources, you "
-#~ "have to reload the information about available software.\n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>Mevcut yazılım bilgileri güncel değil</big></b>\n"
-#~ "\n"
-#~ "Yeni eklenmiş ya da değişmiş kaynaklardan yazılım ve güncellemeler kurmak "
-#~ "için mevcut yazılım bilgilerini tekrar yüklemeniz gerekmektedir.\n"
-#~ "\n"
-#~ "Devam etmek için çalışır durumda bir internet bağlantısı gerekmektedir."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Yorum:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Bileşenler:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Dağıtım:<b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tür:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:<b>"
-
-#~ msgid "APT line:"
-#~ msgstr "APT satırı"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "İkili\n"
-#~ "Kaynak"
-
-#~ msgid "Edit Source"
-#~ msgstr "Kaynak Düzenleme"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "CD-ROM taranıyor"
-
-#~ msgid "_Add Source"
-#~ msgstr "Kaynak _Ekle"
-
-#~ msgid "_Reload"
-#~ msgstr "_Yenile"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Bulunan güncelleştirmeleri göster ve kur"
-
-#~ msgid "Update Manager"
-#~ msgstr "Güncelleştirme Yöneticisi"
-
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr ""
-#~ "Mevcut dağıtımın yeni versiyonu bulunup bulunmadığını ve (eğer mümkünse) "
-#~ "yükseltme sunup sunmadığını otomatik olarak kontrol et."
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "Yeni dağıtım yayımları için kontrol et"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabled, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "Eğer otomatik güncelleştirme denetimi devre dışı bırakılmışsa, kanal "
-#~ "listesini elle tekrar yüklemelisiniz. Bu seçenek bu durumda gösterilen "
-#~ "anımsatıcıyı saklamanıza olanak sağlar."
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Kanal listesini tekrar yüklemeyi hatırlat."
-
-#~ msgid "Show details of an update"
-#~ msgstr "Bir güncelleştirmenin detaylarını göster"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "Güncelleme yöneticisi penceresinin boyutunu saklar"
-
-#~ msgid "The window size"
-#~ msgstr "Pencere boyutu"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "Kurulabilir yazılım ve güncellemeler için kaynakları yapılandır"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 \"Sarge\" Güvenlik Güncellemeleri"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Sisteminiz zaten yükseltilmiş."
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Ubuntu 6.10'a yükseltiliyor</span>"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu için önemli güvenlik güncellemeleri"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "Resmi olarak desteklenenler"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Yükseltme şimdi iptal edilecek. Lütfen bu hatayı bildirin."
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "     "
-#~ 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 ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "Kanal _ekle"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "_Özel"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 1171937c..aebb5d88 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uk(5)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -25,227 +25,252 @@ 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: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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Підтримується спільнотою (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Підтримується спільнотою (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Підтримується спільнотою (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "<b>Оновлення через Інтернет</b>"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "Офіційно підтримуються"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Підтримується спільнотою (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Не-вільний (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Обмежені авторські права"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -257,55 +282,68 @@ msgstr ""
 
 #. 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
 #, fuzzy
 msgid "Security updates"
 msgstr "<b>Оновлення через Інтернет</b>"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian \"Etch\" (тестовий)"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (нестабільний)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -313,692 +351,160 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Щодня"
-
-#~ msgid "Every two days"
-#~ msgstr "Кожні два дня"
-
-#~ msgid "Weekly"
-#~ msgstr "Щотижня"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Кожні два тижня"
-
-#~ msgid "Every %s days"
-#~ msgstr "Кожні %s днів"
-
-#~ msgid "After one week"
-#~ msgstr "Через тиждень"
-
-#~ msgid "After two weeks"
-#~ msgstr "Через два тижні"
-
-#~ msgid "After one month"
-#~ msgstr "Через місяць"
-
-#~ msgid "After %s days"
-#~ msgstr "Через %s днів"
-
-#~ msgid "Import key"
-#~ msgstr "Імпортувати ключ"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Помилка імпорту вибраного файлу"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "Вибраний файл, можливо, не є файлом GPG ключа або він пошкоджений."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Помилка видалення ключа"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Введіть назву диску"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Вставте диск в пристрій:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Пошкоджені пакунки"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Ваша система містить пошкоджені пакунки, котрі не можуть бути виправлені "
-#~ "цією програмою. Скористайтесь перш програмами synaptic чи apt-get."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Не можливо поновити необхідні meta-пакунки"
-
-#, fuzzy
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Це призведе до видалення !essential! пакунку системи"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Не можливо розрахувати поновлення"
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Помилка підписів в деяких пакунках"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Не вдалося перевірити деякі пакунки. Це може бути викликано проблемами в "
-#~ "мережі. Можливо, Вам захочеться спробувати пізніше. Список не перевірених "
-#~ "пакунків нижче."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Не можливо встановити '%s'"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr ""
-#~ "Неможливо встановити необхідний пакунок. Сповістіть про це як про "
-#~ "помилку. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Не можливо підібрати meta-пакунок"
-
-#~ msgid "Reading cache"
-#~ msgstr "Зчитування кешу"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "Не знайдено правильного зеркала"
-
-#~ msgid "Generate default sources?"
-#~ msgstr "Створити джерела за замовчуванням?"
-
-#~ msgid "Repository information invalid"
-#~ msgstr "Помилка в даних про репозиторій"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr ""
-#~ "Поновлення файлу сховищ призвело до пошкодження. Будь ласка, сповістіть "
-#~ "про це як про помилку."
-
-#, fuzzy
-#~ msgid "Error during update"
-#~ msgstr "Помилка підчас поновлення"
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "Недостатньо місця на диску"
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "Бажаєте почати оновлення системи?"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "Неможливо провести оновлення системи"
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "Неможливо завантажити пакунки для оновлення системи"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr ""
-#~ "Оновлення системи щойно перервано. Будь ласка, перевірте з'єднання з "
-#~ "Інтернетом або зовнішній носії та спробуйте знов. "
-
-#, fuzzy
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "Видалити непотрібні пакунки?"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "Пропустити цей крок"
-
-#~ msgid "_Remove"
-#~ msgstr "Видалити"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr ""
-#~ "При очищенні системи виникли проблеми. Прочитайте детальнішу інформацію "
-#~ "нижче. "
-
-#~ msgid "Checking package manager"
-#~ msgstr "Перевірка програми управління пакунками"
-
-#~ msgid "Updating repository information"
-#~ msgstr "Отримання інформації про репозиторій"
-
-#~ msgid "Invalid package information"
-#~ msgstr "Невірна інформація про пакунок"
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "Запит підтвердження"
-
-#~ msgid "Upgrading"
-#~ msgstr "Процес оновлення"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "Пошук програм, що не використовуються"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "Оновлення системи завершено."
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "Вставте '%s' в привід '%s'"
-
-#, fuzzy
-#~ msgid "Applying changes"
-#~ msgstr "Завантаження змін..."
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "Не можливо встановити '%s'"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "Команда 'diff' не знайдена"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "Виникла невиправна помилка"
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr ""
-#~ "Для запобігання втраті інформації закрийте усі програми та документи."
-
-#, fuzzy
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Ваша система оновлена!"
-
-#, fuzzy
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>Видалити %s</b>"
-
-#, fuzzy
-#~ msgid "Install %s"
-#~ msgstr "Встановити %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "Оновити %s"
-
-#~ msgid "Reboot required"
-#~ msgstr "Необхідно перезавантажити систему"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr ""
-#~ "Виконання оновлення завершено. Необхідно перезавантажити систему. "
-#~ "Перезавантажити зара?"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>Відмінити оновлення системи?</big></b>\n"
-#~ "\n"
-#~ "Зауважте, що якщо Ви скасуєте оновлення, це може призвести до "
-#~ "нестабільного стану системи. Дуже рекомендується продовжити оновлення."
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>Перезавантажте систему для завершення оновлення</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>Почати оновлення?</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "Очищення"
-
-#~ msgid "Details"
-#~ msgstr "Деталі"
-
-#~ msgid "Difference between the files"
-#~ msgstr "Різниця між файлами"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "Підготовка до апгрейду системи"
-
-#~ msgid "Restarting the system"
-#~ msgstr "Перезавантаження системи"
-
-#~ msgid "Terminal"
-#~ msgstr "Термінал"
-
-#~ msgid "_Keep"
-#~ msgstr "Затримати"
+#: ../apt/progress/gtk2.py:259
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr "Завантажується файл %li of %li at %s/s"
 
-#, fuzzy
-#~ msgid "_Replace"
-#~ msgstr "Перезавантажити"
-
-#~ msgid "_Report Bug"
-#~ msgstr "Повідомити про помилку"
-
-#~ msgid "_Restart Now"
-#~ msgstr "Перезапустити зараз"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "Продовжити оновлення"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "Не вдалося знайти примітки випуску."
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "Сервер може бути перенавантажений. "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "Не вдалося завантажити примітки випуску."
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "Будь ласка, перевірте ваше з'єднання з Інтернетом."
-
-#, fuzzy
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "Неможливо провести апргрейд системи"
-
-#, fuzzy
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
-
-#, fuzzy
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Завантаження та встановлення пакунків для апгрейду"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "Інструмент оновлення проведе Вас через процес оновлення."
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "Підпис інструменту оновлення"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "Інструмент оновлення"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "Не вдалося отримати"
-
-#~ msgid "Verfication failed"
-#~ msgstr "Перевірка зазнала краху"
-
-#, fuzzy
-#~ msgid "Authentication failed"
-#~ msgstr "Аутентифікація"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Версія %s: \n"
-
-#~ msgid "Download size: %s"
-#~ msgstr "Розмір завантаження: %s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "Ви можете встановити %s оновлення"
-#~ msgstr[1] "Ви можете встановити %s оновлення"
-#~ msgstr[2] "Ви можете встановити %s оновлень"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "Будь ласка, зачекайте, це може зайняти деякий час."
-
-#~ msgid "Update is complete"
-#~ msgstr "Оновлення завершено"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Ваш дистрибутив більше не підтримується"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "Ви більше не будете отримувати оновлень критичних оновлень та оновлень "
-#~ "безпеки. Оновіться до новішої версії Ubuntu Linux. Зайдіть на http://www."
-#~ "ubuntu.com для подальшої інформації про оновлення."
+#: ../apt/progress/gtk2.py:265
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "Завантажується файл %li of %li at %s/s"
 
-#~ msgid "Changes"
-#~ msgstr "Зміни"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "Деталі"
 
-#~ msgid "Description"
-#~ msgstr "Опис"
-
-#~ msgid "Software Updates"
-#~ msgstr "Оновлення програм"
-
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "Оновлення програм виправляють помилки, проблеми безпеки та додають нові "
-#~ "можливості."
-
-#~ msgid "U_pgrade"
-#~ msgstr "Оновити"
-
-#, fuzzy
-#~ msgid "_Install Updates"
-#~ msgstr "Встановлення оновлень..."
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "Оновити"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Оновлення через Інтернет</b>"
-
-#~ msgid "Authentication"
-#~ msgstr "Аутентифікація"
-
-#, fuzzy
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Видалити виділений ключ з в'язки довірених ключів."
-
-#, fuzzy
-#~ msgid "Restore _Defaults"
-#~ msgstr "Відновити початкові параметри"
-
-#, fuzzy
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Відновити початкові ключі"
-
-#, fuzzy
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "Перевіряти оновлення кожні"
-
-#~ msgid "_Import Key File"
-#~ msgstr "Імпортувати файл ключа"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "Встановлювати оновлення безпеки без підтвердження"
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Коментар:</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Компоненти:</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Дистрибутив:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Тип:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "APT line:"
-#~ msgstr "Рядок APT:"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Двійкові\n"
-#~ "Вихідні коди"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "Сканування компакт-диску"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Reload"
-#~ msgstr "Перезавантажити"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "Показати та встановити наявні оновлення"
-
-#~ msgid "Update Manager"
-#~ msgstr "Менеджер оновлення"
-
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "Нагадувати про поновлення списку каналів"
-
-#~ msgid "The window size"
-#~ msgstr "Розмір вікна"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Оновлення безпеки Debian 3.1 \"Sarge\""
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid ""
-#~ "<big><b>Error scaning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>Помилка сканування КД</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "A unresolvable problem occured while calculating the upgrade. Please "
-#~ "report this as a bug. "
-#~ msgstr ""
-#~ "Під час розрахунку оновлення виникла невиправна помилка. Будь ласка, "
-#~ "повідомте про це як про помилку програми. "
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are runing.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "Ваша система не містить пакунків ubuntu-desktop, kubuntu-desktop або "
-#~ "edubuntu-desktop, через що не вдалося встановити, яку версію ubuntu Ви "
-#~ "використовуєте.\n"
-#~ " Будь ласка, спочатку встановіть один з цих пакетів, використовуючи "
-#~ "synaptic або apt-get."
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system can be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a)."
-#~ msgstr ""
-#~ "Оновлення системи щойно зупинено. Внаслідок цього система може працювати "
-#~ "нестабільно. Виконайте команду 'sudo apt-get install -f', або "
-#~ "скористайтесь програмою Synaptic для налаштування системи."
-
-#~ msgid "Some software no longer officially supported"
-#~ 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
 #, fuzzy
-#~ msgid "Restoring originale system state"
-#~ msgstr "Перезавантаження системи"
-
-#~ msgid "About %li minutes remaining"
-#~ msgstr "Залишилось близько %li хвилин"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+"не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет."
 
-#~ msgid "Download is complete"
-#~ msgstr "Завантадення пакунків завершено"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Downloading file %li of %li at %s/s"
-#~ msgstr "Завантажується файл %li of %li at %s/s"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid ""
-#~ "Replace configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "Замінити файл налаштування\n"
-#~ "'%s'?"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade."
-#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts "
-#~ "now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "Будь ласка, повідмте це я помилку, включивши в повідомлення файли ~/dist-"
-#~ "upgrade.log and ~/dist-upgrade-apt.log . Апргрейд щойно перервано."
-
-#~ msgid "%s package is going to be removed."
-#~ msgid_plural "%s packages are going to be removed."
-#~ msgstr[0] "%s пакунків буде видалено."
-#~ msgstr[1] ""
-#~ msgstr[2] ""
-
-#~ msgid "%s new package is going to be installed."
-#~ msgid_plural "%s new packages are going to be installed."
-#~ msgstr[0] "%s пакунків буде встановлено."
-#~ msgstr[1] ""
-#~ msgstr[2] ""
-
-#~ msgid "%s package is going to be upgraded."
-#~ msgid_plural "%s packages are going to be upgraded."
-#~ msgstr[0] "буде проведено оновлення %s пакунка."
-#~ msgstr[1] "буде проведено оновлення %s пакунків."
-#~ msgstr[2] "буде проведено оновлення %s пакунків."
-
-#~ msgid "You have to download a total of %s."
-#~ msgstr "Потрібно завантажити всього %s пакунків."
-
-#~ msgid ""
-#~ "The upgrade can take several hours and cannot be canceled at any time "
-#~ "later."
-#~ msgstr ""
-#~ "Оновлення може тривати декілька годин; зауважте, що цей процес не може "
-#~ "бути перервано протягом усього часу."
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Не знайдено пакунків для оновлення"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "Оновлення вашої системи вже проведено."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Оновлення до Ubuntu 6.06 LTS</span>"
-
-#~ msgid "Downloading and installing the upgrades"
-#~ msgstr "Завантаження та встановлення пакунків для апгрейду"
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Оновлення системи Ubuntu"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Downloading file %li of %li with %s/s"
-#~ msgstr "Завантажується файл %li of %li at %s/s"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Завантажується файл %li of %li на невизначенії швидкості"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Failed to download the list of changes. Please check your Internet "
-#~ "connection."
-#~ msgstr ""
-#~ "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет."
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Не можливо встановити '%s'"
 
-#, fuzzy
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Пошук пакунків для апгрейду"
+#: ../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 "Downloading the list of changes..."
-#~ msgstr "Завантаження змін"
+msgid "An essential package would be removed"
+msgstr "Це призведе до видалення !essential! пакунку системи"
 
-#~ msgid "Hide details"
-#~ msgstr "Сховати деталі"
-
-#~ msgid "Show details"
-#~ msgstr "Показати деталі"
-
-#~ msgid "New version: %s   (Size: %s)"
-#~ msgstr "Нова версія: %s   (Розмір: %s)"
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Скасувати Завантаження"
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Канали</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Ключі</b>"
-
-#~ msgid "Add _Cdrom"
-#~ msgstr "Додати компакт-диск"
-
-#~ msgid "Installation Media"
-#~ msgstr "Носій встановлення"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Параметри програм"
-
-#~ msgid "_Download updates in the background, but do not install them"
-#~ msgstr "Завантажувати оновлення у фоні, але не встановлювати їх"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Канал</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Компоненти</b>"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a channel, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Введіть повний рядок сховища APT, який ви бажаєте додати</b></"
-#~ "big>\n"
-#~ "\n"
-#~ "Рядок APT містить тип, адресу та вміст сховища, наприклад <i>\"deb http://"
-#~ "ftp.debian.org sarge main\"</i>. Докладні приклади можна знайти у "
-#~ "документації."
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Add Channel"
-#~ msgstr "Додати канал"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "Редагувати канал"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "Додати канал"
-#~ msgstr[1] "Додати канали"
-#~ msgstr[2] "Додати канали"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "Власний"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Software Properties"
-#~ 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 ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Оновлення безпеки Ubuntu 6.06 LTS"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Оновлення Ubuntu 6.06 LTS"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Зворотні порти Ubuntu 6.06 LTS"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/ur.po b/po/ur.po
index b92e1658..5dc339e8 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,51 +276,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../data/templates/Debian.info.in:83
 msgid "Debian 3.1 'Sarge'"
 msgstr ""
 
 #. 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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -303,52 +338,158 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "روز"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Every two days"
-#~ msgstr "ھر دو دن"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Weekly"
-#~ msgstr "ھفتھ وار"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+#, fuzzy
+msgid "Details"
+msgstr "روز"
 
-#~ msgid "Every two weeks"
-#~ msgstr "ھر دو ھفتے"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Every %s days"
-#~ msgstr "ھر %s دن"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "After one week"
-#~ msgstr "ایک ھفتھ"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "After two weeks"
-#~ msgstr "دو ھفتھ باد"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "After one month"
-#~ 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 ""
 
-#~ msgid "After %s days"
-#~ msgstr "بعد %s دن"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Import key"
-#~ msgstr "امپورٹ کی"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "    "
-#~ msgstr "    "
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Import Key File"
-#~ 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 ""
 
-#~ msgid "     "
-#~ 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/urd.po b/po/urd.po
index c4a7fd02..fc492682 100644
--- a/po/urd.po
+++ b/po/urd.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+0200\n"
 "PO-Revision-Date: 2006-05-07 01:53+0000\n"
 "Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n"
 "Language-Team: Urdu <urd@li.org>\n"
@@ -24,222 +24,247 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 msgid "Pre-released updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 msgid "Unsupported updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -251,51 +276,61 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 6.0 'Squeeze' "
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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: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 ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -303,46 +338,158 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "روز"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "Every two days"
-#~ msgstr "ھر دو دن"
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#~ msgid "Weekly"
-#~ msgstr "ھفتھ وار"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+#, fuzzy
+msgid "Details"
+msgstr "روز"
 
-#~ msgid "Every two weeks"
-#~ msgstr "ھر دو ھفتے"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "Every %s days"
-#~ msgstr "ھر %s دن"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "After one week"
-#~ msgstr "ایک ھفتھ"
+#: ../apt/package.py:301
+#, python-format
+msgid "Invalid unicode in description for '%s' (%s). Please report."
+msgstr ""
 
-#~ msgid "After two weeks"
-#~ msgstr "دو ھفتھ باد"
+#: ../apt/package.py:937 ../apt/package.py:1043
+msgid "The list of changes is not available"
+msgstr ""
 
-#~ msgid "After one month"
-#~ 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 ""
 
-#~ msgid "After %s days"
-#~ msgstr "بعد %s دن"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Import key"
-#~ msgstr "امپورٹ کی"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid "_Import Key File"
-#~ 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 4c528fbe..ed7892cd 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager Gnome HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -23,255 +23,286 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../data/templates/Ubuntu.info.in:13
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
 #, 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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, 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:60
+#: ../data/templates/Ubuntu.info.in:252
 #, 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:77
+#: ../data/templates/Ubuntu.info.in:270
 #, 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:112
+#: ../data/templates/Ubuntu.info.in:305
 #, 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:129
+#: ../data/templates/Ubuntu.info.in:323
 #, 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:163
+#: ../data/templates/Ubuntu.info.in:357
 #, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "Do cộng đồng bảo quản (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 #, fuzzy
 msgid "Restricted software"
 msgstr "Phần mềm đã đóng góp"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 #, 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:214
+#: ../data/templates/Ubuntu.info.in:409
 #, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Bản cập nhật Ubuntu 5.04"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 #, fuzzy
 msgid "Canonical-supported Open Source software"
 msgstr "Do cộng đồng bảo quản (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "Do cộng đồng bảo quản (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "Do cộng đồng bảo quản (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 #, fuzzy
 msgid "Non-free drivers"
 msgstr "Không tự do (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 #, fuzzy
 msgid "Restricted software (Multiverse)"
 msgstr "Không tự do (Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 #, 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:243
+#: ../data/templates/Ubuntu.info.in:439
 #, 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:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Đang cài đặt bản cập nhật..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Đang cài đặt bản cập nhật..."
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 #, 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:278
+#: ../data/templates/Ubuntu.info.in:475
 #, 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:290
+#: ../data/templates/Ubuntu.info.in:487
 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:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 #, fuzzy
 msgid "Ubuntu 5.10 Backports"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 #, 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:320
+#: ../data/templates/Ubuntu.info.in:518
 #, 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:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 #, fuzzy
 msgid "Officially supported"
 msgstr "Được hỗ trợ một cách chính thức"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 #, 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:337
+#: ../data/templates/Ubuntu.info.in:535
 #, fuzzy
 msgid "Ubuntu 5.04 Updates"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
 msgstr "Bản cập nhật Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 #, 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:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "Do cộng đồng bảo quản (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "Không tự do (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 #, 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:364
+#: ../data/templates/Ubuntu.info.in:563
 #, fuzzy
 msgid "No longer officially supported"
 msgstr "Được hỗ trợ một cách chính thức"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "Bản quyền bị giới hạn"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 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:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Bản cập nhật Ubuntu 4.10"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
 msgstr "Bản cập nhật Ubuntu 5.10"
@@ -284,57 +315,70 @@ msgstr ""
 
 #. 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
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Đang cài đặt bản cập nhật..."
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 #, fuzzy
 msgid "Debian current stable release"
 msgstr "Bất định Debian « Sid »"
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Thử ra Debian"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Không Mỹ Debian (Bất định)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -342,652 +386,164 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "Hằng ngày"
-
-#~ msgid "Every two days"
-#~ msgstr "Hằng hai ngày"
-
-#~ msgid "Weekly"
-#~ msgstr "Hằng tuần"
-
-#~ msgid "Every two weeks"
-#~ msgstr "Hằng hai tuần"
-
-#~ msgid "Every %s days"
-#~ msgstr "Hằng %s ngày"
-
-#~ msgid "After one week"
-#~ msgstr "Sau một tuần"
-
-#~ msgid "After two weeks"
-#~ msgstr "Sau hai tuần"
-
-#~ msgid "After one month"
-#~ msgstr "Sau một tháng"
-
-#~ msgid "After %s days"
-#~ msgstr "Sau %s ngày"
-
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "Bản cập nhật phần mềm"
-
-#, fuzzy
-#~ msgid "(Source Code)"
-#~ msgstr "Nguồn"
-
-#, fuzzy
-#~ msgid "Source Code"
-#~ msgstr "Nguồn"
-
-#~ msgid "Import key"
-#~ msgstr "Nhập mã khóa"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "Gặp lỗi khi nhập tâp tin đã chọn"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr ""
-#~ "Có lẽ tập tin đã chọn không phai là tập tin khóa GPG, hoặc nó bị hỏng."
-
-#~ msgid "Error removing the key"
-#~ msgstr "Gặp lỗi khi gỡ bỏ khóa"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này."
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "Nhập tên của đĩa"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "Hãy đút đĩa vào trong ổ:"
-
-#~ msgid "Broken packages"
-#~ msgstr "Gói bị lỗi"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "Hệ thống của bạn chứa các gói tin bị lỗi và không thể sửa được bằng phần "
-#~ "mềm này. Hãy sửa chúng dùng các gói synaptic hoặc apt-get trước khi tiếp "
-#~ "tục."
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "Không thể nâng cấp các gói gốc được yêu cầu"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "Một gói quan trọng cần phải bị gỡ bỏ"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "Không thể tính được dung lượng cần nâng cấp"
-
-#, fuzzy
-#~ msgid ""
-#~ "A unresolvable problem occurred while calculating the upgrade.\n"
-#~ "\n"
-#~ "Please report this bug against the 'update-manager' package and include "
-#~ "the files in /var/log/dist-upgrade/ in the bugreport."
-#~ msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này."
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "Gặp lỗi khi đang xác thực một số gói"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "Không thể xác thực một số gói, có thể do lỗi tạm thời của hệ thống mạng. "
-#~ "Bạn vui lòng thử lại sau. Bên dưới là danh sách các gói chưa được xác "
-#~ "thực đầy đủ."
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "Không thể cài đặt '%s'"
-
-#, fuzzy
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr "Không thể cài đặt được gói yêu cầu. Vui lòng thông báo lỗi này. "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "Không thể đoán được gói gốc"
-
-#~ msgid "Reading cache"
-#~ msgstr "Đang đọc bộ nhớ đệm"
-
-#, fuzzy
-#~ msgid "Error during update"
-#~ msgstr "Gặp lỗi khi gỡ bỏ khóa"
-
-#, fuzzy
-#~ msgid "Checking package manager"
-#~ msgstr "Một bộ quản lý gói khác đang chạy"
-
-#, fuzzy
-#~ msgid "Preparing the upgrade failed"
-#~ msgstr "Đang tải các thay đổi"
-
-#, fuzzy
-#~ msgid ""
-#~ "Preparing the system for the upgrade failed. Please report this as a bug "
-#~ "against the 'update-manager' package and include the files in /var/log/"
-#~ "dist-upgrade/ in the bugreport."
-#~ msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này."
-
-#, fuzzy
-#~ msgid "Upgrading"
-#~ msgstr "Nâng cấp xong"
-
-#, fuzzy
-#~ msgid "Applying changes"
-#~ msgstr "Đang tài về các thay đổi..."
-
-#, fuzzy
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Hệ thống bạn toàn mới nhất."
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#, fuzzy
-#~ msgid "Details"
-#~ msgstr "<b>Chi tiết</b>"
-
-#, fuzzy
-#~ msgid "_Replace"
-#~ msgstr "Tải lại"
-
-#, fuzzy
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này."
-
-#, fuzzy
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "Đang tải các thay đổi"
-
-#, fuzzy
-#~ msgid "Authentication failed"
-#~ msgstr "Xác thực"
-
-#, 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ố."
-
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "Có một bản phát hành Ubuntu mới công bố."
-
-#, fuzzy
-#~ msgid ""
-#~ "Failed to download the list of changes. \n"
-#~ "Please check your Internet connection."
-#~ 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."
-
-#, fuzzy
-#~ msgid "Backports"
-#~ msgstr "Bản cập nhật Ubuntu 5.10"
-
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "Đang cài đặt bản cập nhật..."
-
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "Đang cài đặt bản cập nhật..."
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Phiên bản %s: \n"
-
-#, fuzzy
-#~ msgid "Downloading list of changes..."
-#~ msgstr "Đang tải các thay đổi"
-
-#, fuzzy
-#~ msgid "Checking for updates"
-#~ msgstr "Đang cài đặt bản cập nhật..."
-
-#, fuzzy
-#~ msgid "Version %s"
-#~ msgstr "Phiên bản %s:"
-
-#, fuzzy
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "Không còn hỗ trợ lại bản phát hành của bạn."
-
-#~ msgid "Changes"
-#~ msgstr "Đổi"
-
-#~ msgid "Description"
-#~ msgstr "Mô tả"
-
-#~ msgid "Software Updates"
-#~ msgstr "Bản cập nhật phần mềm"
-
-#, fuzzy
-#~ msgid "_Install Updates"
-#~ msgstr "Đang cài đặt bản cập nhật..."
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "Nâng cấp xong"
-
-#, fuzzy
-#~ msgid "changes"
-#~ msgstr "Đổi"
-
-#, fuzzy
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>Cập nhật dùng Mạng</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>Cập nhật dùng Mạng</b>"
-
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>Cập nhật dùng Mạng</b>"
-
-#~ msgid "Authentication"
-#~ msgstr "Xác thực"
-
-#, fuzzy
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "Gỡ bỏ khóa được chọn ra vòng khóa tin cây."
-
-#, fuzzy
-#~ msgid "Internet Updates"
-#~ msgstr "<b>Cập nhật dùng Mạng</b>"
-
-#, fuzzy
-#~ msgid "Restore _Defaults"
-#~ msgstr "Phục hồi mặc định"
-
-#, fuzzy
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "Phục hồi các khóa mặc định"
-
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "Thuộc tính phần mềm"
-
-#, fuzzy
-#~ msgid "Source code"
-#~ msgstr "Nguồn"
-
-#, fuzzy
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "Kiểm tra có cập nhật sau mỗi"
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Ghi chú :</b>"
-
-#, fuzzy
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>Thành phần</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Bản phát hành:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Kiểu:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>Địa chỉ định vị:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add as source</b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a repository, "
-#~ "for example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>Hãy nhập toàn dòng APT của kho cần thêm</b></big>\n"
-#~ "\n"
-#~ "Dòng APT chứa kiểu, địa điểm và nội dung của kho. Lấy thí dụ, <i>\"deb "
-#~ "http://ftp.debian.org sarge main\"</i>. Bạn có thể tìm mô tả chi tiết của "
-#~ "cú pháp này trong tài liệu hướng dẫn."
-
-#~ msgid "APT line:"
-#~ msgstr "Dòng APTL"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Nhị phân\n"
-#~ "Nguồn"
-
-#, fuzzy
-#~ msgid "Edit Source"
-#~ msgstr "Nguồn"
-
-#, fuzzy
-#~ msgid "_Add Source"
-#~ msgstr "Nguồn"
-
-#, fuzzy
-#~ msgid "_Reload"
-#~ msgstr "Tải lại"
-
-#~ msgid "Update Manager"
-#~ msgstr "Bộ Quản lý Cập nhật"
-
-#, fuzzy
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Bản cập nhật bảo mặt ổn định Debian"
-
-#, fuzzy
-#~ msgid "By copyright or legal issues restricted software"
-#~ msgstr "Phần mềm bị giới hạn xuất Mỹ"
-
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "Đang cài đặt bản cập nhật..."
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
+#: ../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 "Cannot install all available updates"
-#~ msgstr "Đang kiểm tra có cập nhật..."
+msgid "Details"
+msgstr "<b>Chi tiết</b>"
 
+#: ../apt/progress/gtk2.py:367
 #, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "Được hỗ trợ một cách chính thức"
+msgid "Starting..."
+msgstr "Thiết lập"
 
-#, fuzzy
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này."
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Hide details"
-#~ msgstr "<b>Chi tiết</b>"
+#: ../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 "<b>Channels</b>"
-#~ msgstr "<b>Khóa</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Khóa</b>"
-
-#~ msgid "Installation Media"
-#~ msgstr "Phương tiên cài đặt"
-
-#~ msgid "Software Preferences"
-#~ msgstr "Sở thích phần mềm"
+msgid "The list of changes is not available"
+msgstr "Có một bản phát hành Ubuntu mới công bố."
 
-#~ msgid "     "
-#~ msgstr "     "
-
-#, fuzzy
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Khóa</b>"
+#: ../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 "<b>Components</b>"
-#~ msgstr "<b>Thành phần</b>"
-
-#~ msgid "_Custom"
-#~ msgstr "Tự _chọn"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+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."
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Bản cập nhật Ubuntu 5.10"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Bản cập nhật bảo mặt Ubuntu 5.04"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Bản cập nhật Ubuntu 5.10"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Bản cập nhật Ubuntu 5.10"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Phần:</b>"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Phần:</b>"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Tải lại thông tin gói từ máy phục vụ."
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Đang tải các thay đổi về</span>\n"
-#~ "\n"
-#~ "Cần phải lấy thay đổi xuống máy phục vụ trung tâm"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "Không thể cài đặt '%s'"
 
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Hiện các bản cập nhật công bố và chọn bản nào cần cài đặt."
+#: ../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 "Error fetching the packages"
-#~ msgstr "Gặp lỗi khi gỡ bỏ khóa"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Sửa đổi thiết lập và nguồn phần mềm"
-
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Nguồn</b>"
-
-#~ msgid "day(s)"
-#~ msgstr "ngày"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Kho</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Tập tin tạm</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Giao diện người dùng</b>"
-
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Khóa xác thực</b></big>\n"
-#~ "\n"
-#~ "Bạn có thể thêm và gỡ bỏ khóa xác thực dùng hộp thoại này. Khóa cho phép "
-#~ "bạn thẩm tra toàn vẹn của phần mềm đã tải về."
-
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Thêm tập tin khóa mới vào vòng khóa tin cây. Hãy đảm bảo bạn đã nhận khóa "
-#~ "này qua kênh bảo mật, và bạn tin cây người sở hữu khóa này. "
-
-#~ msgid "Add repository..."
-#~ msgstr "Thêm kho..."
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Tự động kiểm tra có _cập nhật phần mềm."
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Tự động xóa tập tin gói _tạm thời"
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Thời gian giữa hai lần xóa, theo ngày: "
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Xóa bỏ gói _cũ ra bộ nhớ tạm"
-
-#~ msgid "Edit Repository..."
-#~ msgstr "Sửa đổi kho..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Số ngày giữ tối đa:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Cỡ tối đa, theo MB:"
-
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Phục hồi các khóa mặc định có sẵn trong bản phát hành. Tuy nhiên, hành "
-#~ "động này sẽ không sửa đổi khóa nào tự cài đặt."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Đặt cỡ tối _đa cho bộ nhớ tạm gói"
-
-#~ msgid "Settings"
-#~ msgstr "Thiết lập"
-
-#~ msgid "Show detailed package versions"
-#~ msgstr "Hiện phiên bản gói chi tiết"
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "Hiện nguồn phần mềm bị tắt"
-
-#~ msgid "Update interval in days: "
-#~ msgstr "Khoảng cập nhật, theo giây: "
-
-#~ msgid "_Add Repository"
-#~ msgstr "Th_êm kho"
+msgid "An essential package would be removed"
+msgstr "Một gói quan trọng cần phải bị gỡ bỏ"
 
-#~ msgid "_Download upgradable packages"
-#~ msgstr "Tài về gói có khả năng nâng cấp"
-
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>Trạng thái:</b>"
-
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Bản nâng cấp công bố</b></big>\n"
-#~ "\n"
-#~ "Tìm thấy có thể nâng cấp những gói theo đây. Để nâng cấp gói, chỉ đơn "
-#~ "giản hãy sử dụng nút « Cài đặt »."
-
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "Thôi tải về Bản ghi đổi..."
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Phải là người chủ để chạy chương trình này."
-
-#~ msgid "Binary"
-#~ msgstr "Nhị phân"
-
-#~ msgid "Non-free software"
-#~ msgstr "Phần mềm không tự do"
-
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian 3.0 « Woody »"
-
-#~ msgid "Debian Stable"
-#~ msgstr "Ổn định Debian"
-
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Không Mỹ Debian (Ổn định)"
-
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Không Mỹ Debian (Thử ra)"
-
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Khóa ký tự động kho Ubuntu <ftpmaster@ubuntu.com>"
-
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "Khóa ký tự động ảnh đĩa CD Ubuntu <cdimage@ubuntu.com>"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "Chọn tập tin khóa"
-
-#~ msgid "There is one package available for updating."
-#~ msgstr "Có một gói công bố đề cập nhật."
-
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "Có %s gói công bố đề cập nhật."
-
-#~ msgid "There are no updated packages"
-#~ msgstr "Không có gói nào đã cập nhật."
-
-#~ msgid "You did not select any of the %s updated package"
-#~ msgid_plural "You did not select any of the %s updated packages"
-#~ msgstr[0] "Bạn chưa chọn gì trong %s gói đã cập nhật."
-
-#~ msgid "You have selected %s updated package, size %s"
-#~ msgid_plural "You have selected all %s updated packages, total size %s"
-#~ msgstr[0] "Bạn đã chọn tất cả %s gói đã cập nhật: cỡ tổng là %s"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "You have selected %s out of %s updated package, size %s"
-#~ msgid_plural ""
-#~ "You have selected %s out of %s updated packages, total size %s"
-#~ msgstr[0] "Bạn đã chọn %s trong %s gói đã cập nhật: cỡ tổng là %s"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "The updates are being applied."
-#~ msgstr "Đang áp dụng những bản cập nhật."
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Bạn có thể chạy chỉ một ứng dụng quản lý gói trong một thời gian thôi. "
-#~ "Vui lòng đóng ứng dụng khác trước khi tiếp tục."
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "Updating package list..."
-#~ msgstr "Đạng cập nhật danh sách gói..."
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "There are no updates available."
-#~ msgstr "Không có bản cập nhật công bố."
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "New version:"
-#~ msgstr "Phiên bản mới :"
+#: ../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 ""
 
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Xin hãy nâng cấp đến một phiên bản Linux Ubuntu mới hơn, vì phiên bản "
-#~ "hiện thời của bạn sẽ không còn nhận lại bản cập nhật bảo mật. Hãy xem "
-#~ "<http://www.ubuntulinux.org> để tìm thông tin nâng cấp."
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "Có một bản phát hành mới có tên mã « %s ». Hãy xem <http://www.ubuntulinux."
-#~ "org> để tìm hướng dẫn nâng cấp."
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Never show this message again"
-#~ msgstr "Đừng hiện thông điệp này lần nữa."
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "Không tìm thấy thay đổi nào. Có lẽ máy phục vụ chưa được cập nhật."
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/xh.po b/po/xh.po
index 0a969f24..bdf2a903 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\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"
@@ -24,225 +24,250 @@ msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:8
+#: ../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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 msgid "Community-maintained"
 msgstr ""
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 msgid "Community-maintained (universe)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 msgid "Community-maintained Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 #, fuzzy
 msgid "Important security updates"
 msgstr "Bonisa izihlaziyo"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "Bonisa izihlaziyo"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "Bonisa izihlaziyo"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 msgid "Community-maintained (Universe)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -254,53 +279,63 @@ msgstr ""
 
 #. Description
 #: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+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:31
+#: ../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:42
+#: ../data/templates/Debian.info.in:94
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Bonisa izihlaziyo"
 
 #. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:101
 #, fuzzy
 msgid "Security updates"
 msgstr "Bonisa izihlaziyo"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 msgid "Debian testing"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 msgid "Debian 'Sid' (unstable)"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -308,141 +343,158 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Software Channel"
-#~ msgstr "Bonisa izihlaziyo"
+#: ../apt/progress/gtk2.py:259
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
 
-#~ msgid "    "
-#~ msgstr "    "
+#: ../apt/progress/gtk2.py:265
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
 
-#, fuzzy
-#~ msgid "The list of changes is not available"
-#~ msgstr "Kukho i-%i yohlaziyo ekhoyo"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "The list of changes is not available yet.\n"
-#~ "Please try again later."
-#~ msgstr "Kukho i-%i yohlaziyo ekhoyo"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Distribution updates"
-#~ msgstr "Bonisa izihlaziyo"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Other updates"
-#~ msgstr "Bonisa izihlaziyo"
+#: ../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 "Checking for updates"
-#~ msgstr "Bonisa izihlaziyo"
+msgid "The list of changes is not available"
+msgstr "Kukho i-%i yohlaziyo ekhoyo"
 
-#, fuzzy
-#~ msgid "Software Updates"
-#~ msgstr "Bonisa izihlaziyo"
+#: ../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 ""
 
-#, fuzzy
-#~ msgid "_Install Updates"
-#~ msgstr "Bonisa izihlaziyo"
+#: ../apt/package.py:1053
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Internet</b>"
-#~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Internet Updates"
-#~ msgstr "Bonisa izihlaziyo"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Software Sources"
-#~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Components:</b>"
-#~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Update Manager"
-#~ msgstr "UMlawuli woMqulu weNkqubo"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "Bonisa izihlaziyo"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Bonisa izihlaziyo"
+#: ../apt/debfile.py:376
+#, python-format
+msgid "Cannot install '%s'"
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Channels</b>"
-#~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+#: ../apt/debfile.py:484
+#, python-format
+msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Installation Media"
-#~ msgstr "Seka zonke izihlaziyo"
+#: ../apt/debfile.py:494
+msgid "An essential package would be removed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Software Preferences"
-#~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "     "
-#~ msgstr "     "
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Components</b>"
-#~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#, fuzzy
-#~ msgid "<b>Sections</b>"
-#~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#, fuzzy
-#~ msgid "Updating package list..."
-#~ msgstr "Hlaziya uluhlu lomqulu wenkqubo ngoku"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#, fuzzy
-#~ msgid "There are no updates available."
-#~ msgstr "Kukho i-%i yohlaziyo ekhoyo"
-
-#~ msgid ""
-#~ "Please enter your password to run:\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Nceda faka i-password yakho ukuqhuba:\n"
-#~ " %s"
-
-#~ msgid "Press this icon to show the updates."
-#~ msgstr "Cofa lo mfanekiso ungumqondiso ukubonisa izihlaziyo."
-
-#~ msgid "There are %i post-update informations available!"
-#~ msgstr "Kukho i-%i yolwazi lwasemva kohlaziyo olukhoyo!"
-
-#~ msgid "Press this icon to show the information."
-#~ msgstr "Cofa lo mfanekiso ungumqondiso ukubonisa ulwazi."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Update information</span>\n"
-#~ "\n"
-#~ "There is some post software update information available. Please read the "
-#~ "following information carefully."
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Ulwazi oluhlaziyiweyo</span>\n"
-#~ "\n"
-#~ "Kukho iinkqubo zekhompyutha zasemva kohlaziyo zolwazi olukhoyo. Nceda "
-#~ "funda olu lwazi lulandelayo ngocoselelo."
-
-#~ msgid "Run now"
-#~ msgstr "Phumeza inkqubo ngoku"
+#: ../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_HK.po b/po/zh_HK.po
index 6eb25f43..1b5891ec 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.42.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -22,228 +22,253 @@ 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: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:25
+#: ../data/templates/Ubuntu.info.in:215
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "協力維護軟件 (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:214
+#: ../data/templates/Ubuntu.info.in:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "協力維護軟件 (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "協力維護軟件 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:243
+#: ../data/templates/Ubuntu.info.in:439
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "發行通告"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "網絡更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:290
+#: ../data/templates/Ubuntu.info.in:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:323 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "正式支援"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "協力維護軟件 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "非自由軟件 (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:364
+#: ../data/templates/Ubuntu.info.in:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "版權受限"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -255,55 +280,68 @@ 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
 #, fuzzy
 msgid "Security updates"
 msgstr "網絡更新"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian 「Etch」（測試版）"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian 「Sid」（不穩定版）"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "符合 DFSG 的軟件，但依賴於非自由軟件"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "和 DFSG 不相容的軟件"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr ""
@@ -311,585 +349,160 @@ 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:213 ../aptsources/distro.py:218
-#: ../aptsources/distro.py:232
+#: ../aptsources/distro.py:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr ""
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr ""
 
-#~ msgid "Daily"
-#~ msgstr "每天"
-
-#~ msgid "Every two days"
-#~ msgstr "每兩天"
-
-#~ msgid "Weekly"
-#~ msgstr "每週"
-
-#~ msgid "Every two weeks"
-#~ msgstr "每兩週"
-
-#~ msgid "Every %s days"
-#~ msgstr "每 %s 天"
-
-#~ msgid "After one week"
-#~ msgstr "一週後"
-
-#~ msgid "After two weeks"
-#~ msgstr "兩週後"
-
-#~ msgid "After one month"
-#~ msgstr "一個月後"
-
-#~ msgid "After %s days"
-#~ msgstr "%s 日後"
-
-#~ msgid "Import key"
-#~ msgstr "匯入密碼匙"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "匯入指定檔案時發生錯誤"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "選定的檔案可能不是 GPG 密碼匙，或者內容已損壞。"
-
-#~ msgid "Error removing the key"
-#~ msgstr "移除密碼匙時發生錯誤"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "你選定的密碼匙無法移除，請匯報問題。"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "請輸入光碟的名稱"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "請將光碟放入光碟機："
-
-#~ msgid "Broken packages"
-#~ msgstr "不完整套件"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "系統裝了不完整的套件，本程式無法將它們修復。請先用 synaptic 或 apt-get 來"
-#~ "修復套件。"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "無法計算升級過程"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "有些套件不能認證，這可能是短暫的網絡問題；你可以稍後再試。以下為沒有認證的"
-#~ "套件。"
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "無法安裝「%s」"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr "有必須的套件無法安裝，請匯報問題。 "
-
-#~ msgid "Reading cache"
-#~ msgstr "正在讀取快取資料"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "找不到有效的 mirror 網站"
-
-#~ msgid "Repository information invalid"
-#~ msgstr "套件庫資料無效"
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "停用外來的軟件來源"
-
-#~ msgid "Error during update"
-#~ msgstr "更新時發生錯誤"
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "磁碟空間不足"
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "是否要開始升級？"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "無法安裝升級"
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "無法下載升級所需的套件"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr "升級現正中止。請檢查網路連線是否正常，然後再試一次。 "
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "是否移除過時的套件？"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "略過這步驟(_S)"
-
-#~ msgid "_Remove"
-#~ msgstr "移除(_R)"
-
-#~ msgid "Checking package manager"
-#~ msgstr "正在檢查套件管理程式"
-
-#~ msgid "Updating repository information"
-#~ msgstr "正在更新套件庫資料"
-
-#~ msgid "Invalid package information"
-#~ msgstr "套件資料無效"
-
-#~ msgid "Upgrading"
-#~ msgstr "升級中"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "正在搜尋過時的軟件"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "已完成系統升級。"
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "請將「%s」放入光碟機「%s」中"
-
-#, fuzzy
-#~ msgid "Applying changes"
-#~ msgstr "正在下載更改紀錄..."
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "無法安裝「%s」"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "找不到「diff」指令"
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "系統已經在最新狀態"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid "Cleaning up"
-#~ msgstr "清理"
-
-#~ msgid "Details"
-#~ msgstr "詳細資料"
-
-#~ msgid "Difference between the files"
-#~ msgstr "檔案間的差別"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "更改軟件來源"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "正準備升級"
-
-#~ msgid "Restarting the system"
-#~ msgstr "重新啟動系統"
-
-#~ msgid "Terminal"
-#~ msgstr "終端機"
-
-#~ msgid "_Keep"
-#~ msgstr "保留(_K)"
-
-#~ msgid "_Replace"
-#~ msgstr "取代(_R)"
-
-#~ msgid "_Report Bug"
-#~ msgstr "報告錯誤(_R)"
-
-#~ msgid "_Restart Now"
-#~ msgstr "現在重新啟動(_R)"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "繼續升級(_R)"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "找不到發行通告"
-
-#~ msgid "The server may be overloaded. "
-#~ msgstr "伺服器可能負荷過重。 "
+#: ../apt/progress/gtk2.py:259
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒"
 
-#~ msgid "Could not download the release notes"
-#~ msgstr "無法下載發行通告"
+#: ../apt/progress/gtk2.py:265
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "正在下載檔案 %li/%li"
 
-#~ msgid "Please check your internet connection."
-#~ msgstr "請檢查網絡連線是否正常。"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "詳細資料"
 
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "無法執行升級工具"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr "這可能是升級工具的錯誤，請匯報問題"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "正在下載升級工具"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "升級工具會引導你進行整個升級的過程。"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "升級工具"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "下載失敗"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "下載升級工具失敗，可能是網絡上的問題。 "
-
-#~ msgid "Failed to extract"
-#~ msgstr "解壓失敗"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr "升級套件解壓失敗。可能是因為網路或伺服器出現問題。 "
-
-#~ msgid "Verfication failed"
-#~ msgstr "檢驗失敗"
-
-#~ msgid "Authentication failed"
-#~ msgstr "認證失敗"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr "認證升級套件失敗。可能是因為網路或伺服器出現問題。 "
-
-#~ msgid "Version %s: \n"
-#~ msgstr "版本 %s: \n"
-
-#~ msgid "Download size: %s"
-#~ msgstr "下載大小：%s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "你可以安裝 %s 個更新套件"
-
-#~ msgid "Update is complete"
-#~ msgstr "完成更新"
-
-#, fuzzy
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "已經不再支援你用的發行版本"
-
-#~ msgid "Changes"
-#~ msgstr "更改紀錄"
-
-#~ msgid "Chec_k"
-#~ msgstr "檢查(_K)"
-
-#~ msgid "Description"
-#~ msgstr "詳細說明"
-
-#~ msgid "Software Updates"
-#~ msgstr "軟件更新"
-
-#~ msgid "U_pgrade"
-#~ msgstr "升級(_P)"
-
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "升級至最新版本的 Ubuntu"
-
-#~ msgid "_Check"
-#~ msgstr "檢查(_C)"
-
-#~ msgid "_Install Updates"
-#~ msgstr "安裝軟件更新(_I)"
-
-#, fuzzy
-#~ msgid "_Upgrade"
-#~ msgstr "升級(_P)"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>網絡更新</b>"
-
-#~ msgid "Authentication"
-#~ msgstr "認證"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "由你信任的密碼匙圈中移除指定的密碼匙。"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "Restore _Defaults"
-#~ msgstr "還原為預設值(_D)"
+#: ../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 "Restore the default keys of your distribution"
-#~ msgstr "還原為預設密碼匙"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "檢查軟件更新間隔(_C)："
+msgid "The list of changes is not available"
+msgstr "修改紀錄不存在，請稍後再試。"
 
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>備註:</b>"
+#: ../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 "<b>Components:</b>"
-#~ msgstr "<b>元件</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>發行版本:</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>類型:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>網址:</b>"
-
-#~ msgid "APT line:"
-#~ msgstr "APT 軟件庫:"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "可執行檔\n"
-#~ "源程式碼"
-
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "正在掃描光碟"
-
-#~ msgid "_Reload"
-#~ msgstr "重新載入(_R)"
-
-#~ msgid "Show and install available updates"
-#~ msgstr "顯示及安裝現有的更新套件"
-
-#~ msgid "Update Manager"
-#~ msgstr "更新管理員"
-
-#~ msgid "Check for new distribution releases"
-#~ msgstr "檢查有沒有新的發行版本"
-
-#~ msgid "Show details of an update"
-#~ msgstr "顯示更新套件的詳細資料"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "儲存 update-manager 對話窗的大小"
-
-#~ msgid "The window size"
-#~ msgstr "視窗大小"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1「Sarge」安全性更新"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "ftp://ftp.hk.debian.org/debian/"
-
-#~ msgid ""
-#~ "<big><b>Error scaning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>掃描光碟時發生錯誤</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "A unresolvable problem occured while calculating the upgrade. Please "
-#~ "report this as a bug. "
-#~ msgstr "計算升級時發生無法解決的問題，請匯報問題。 "
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are runing.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "系統沒有安裝 ubuntu-desktop、kubuntu-desktop 或 edubuntu-desktop 套件，因"
-#~ "此無法偵測正在執行哪一個版本的 ubuntu。\n"
-#~ "請先使用 synaptic 或 apt-get 安裝上述其中一個套件。"
-
-#~ msgid ""
-#~ "Some third party entries in your souces.list where disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "sources.list 中部份外來的套件來源已經被停用。系統升級後，你可以使用"
-#~ "「software-properties」工具或 synaptic 重新啟用這些來源。"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system can be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a)."
-#~ msgstr ""
-#~ "升級中止。你的系統現在可能在一個不穩定的狀態。正在進行復原 (dpkg --"
-#~ "configure -a)。"
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "某些軟件不會再有正式支援"
-
-#~ msgid "Restoring originale system state"
-#~ msgstr "恢復原來的系統狀態"
-
-#~ msgid "About %li days %li hours %li minutes remaining"
-#~ msgstr "大約還剩下 %li 天 %li 小時 %li 分鐘"
-
-#~ msgid "About %li hours %li minutes remaining"
-#~ msgstr "大約還剩下 %li 小時 %li 分鐘"
-
-#~ msgid "About %li minutes remaining"
-#~ msgstr "大約還剩下 %li 分鐘"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "大約還剩下 %li 秒鐘"
-
-#~ msgid "Download is complete"
-#~ msgstr "下載完成"
-
-#~ msgid "Downloading file %li of %li"
-#~ msgstr "正在下載檔案 %li/%li"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "升級現正中止，請匯報問題。"
-
-#~ msgid ""
-#~ "Replace configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "取代設定檔\n"
-#~ "「%s」？"
-
-#~ msgid "%s package is going to be removed."
-#~ msgid_plural "%s packages are going to be removed."
-#~ msgstr[0] "準備移除 %s 個套件。"
-
-#~ msgid "%s new package is going to be installed."
-#~ msgid_plural "%s new packages are going to be installed."
-#~ msgstr[0] "準備安裝 %s 個新套件。"
-
-#~ msgid "%s package is going to be upgraded."
-#~ msgid_plural "%s packages are going to be upgraded."
-#~ msgstr[0] "準備升級 %s 個套件。"
-
-#~ msgid "Downloading and installing the upgrades"
-#~ msgstr "正在下載及安裝升級套件"
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "正在升級 Ubuntu"
-
-#~ msgid ""
-#~ "Verfing the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr "檢驗升級套件失敗。可能是因為網路或伺服器出現問題。 "
-
-#~ msgid "Downloading file %li of %li with %s/s"
-#~ msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "正在下載檔案 %li/%li，下載速度不明"
-
-#~ msgid "The list of changes is not available yet. Please try again later."
-#~ msgstr "修改紀錄不存在，請稍後再試。"
-
-#~ msgid ""
-#~ "Failed to download the list of changes. Please check your Internet "
-#~ "connection."
-#~ msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "無法安裝所有更新套件"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "有一些更新套件需要移除其它套件才可以安裝。請使用「Synaptic 套件管理程式」"
-#~ "的「標記所有升級」功能或在終端機中執行「sudo apt-get dist-upgrade」來更新"
-#~ "整個系統。"
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "會略過更新以下套件："
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。"
 
-#~ msgid "Downloading the list of changes..."
-#~ msgstr "正在下載更改紀錄…"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Hide details"
-#~ msgstr "<b>細節</b>"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Cancel _Download"
-#~ msgstr "取消下載(_D)"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>套件來源</b>"
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>密碼匙</b>"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Add _Cdrom"
-#~ msgstr "加入光碟機(_C)"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "Installation Media"
-#~ msgstr "安裝媒體"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "Software Preferences"
-#~ msgstr "軟件偏好設定"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "無法安裝「%s」"
 
-#~ msgid "     "
-#~ msgstr "     "
+#: ../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 "<b>Channel</b>"
-#~ msgstr "<b>密碼匙</b>"
+msgid "An essential package would be removed"
+msgstr "準備移除 %s 個套件。"
 
-#, fuzzy
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>元件</b>"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a channel, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>請輸入整行你想加入的 APT 軟件庫位置</b></big>\n"
-#~ "\n"
-#~ "該行的內容包括 APT 軟件庫的類型、位置和內容，例如： <i>\"deb http://ftp."
-#~ "debian.org sarge main\"</i>。你可以在文件中尋找有關該行的格式的詳細描述。"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Edit Channel"
-#~ msgstr "修改套件來源"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "_Add Channel"
-#~ msgid_plural "_Add Channels"
-#~ msgstr[0] "加入套件來源(_A)"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "_Custom"
-#~ msgstr "自選(_C)"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Configure software channels and internet updates"
-#~ msgstr "設定套件來源及網絡更新"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Software Properties"
-#~ 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 ""
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS 安全性更新"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS 更新"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 5.10 更新"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index abfcba0c..b71f291b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.41.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-18 16:50+0100\n"
+"POT-Creation-Date: 2009-07-19 15:59+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"
@@ -18,234 +18,265 @@ 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: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 "含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 "含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 "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:25
+#: ../data/templates/Ubuntu.info.in:215
 #, fuzzy
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'的光碟"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:60
+#: ../data/templates/Ubuntu.info.in:252
 #, fuzzy
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.04安全性更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:77
+#: ../data/templates/Ubuntu.info.in:270
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 5.10 'Breezy Badger'的光碟"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:112
+#: ../data/templates/Ubuntu.info.in:305
 #, fuzzy
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.04安全性更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:129
+#: ../data/templates/Ubuntu.info.in:323
 #, fuzzy
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 5.10 'Breezy Badger'的光碟"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:163
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:168
+#: ../data/templates/Ubuntu.info.in:362
 #, fuzzy
 msgid "Community-maintained"
 msgstr "協力維護軟體 (Universe)"
 
-#. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:172
-msgid "Proprietary drivers for devices"
-msgstr ""
-
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:174
+#: ../data/templates/Ubuntu.info.in:368
 msgid "Restricted software"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:180
+#: ../data/templates/Ubuntu.info.in:375
 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:409
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:217
+#: ../data/templates/Ubuntu.info.in:412
 msgid "Canonical-supported Open Source software"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:219
+#: ../data/templates/Ubuntu.info.in:414
 #, fuzzy
 msgid "Community-maintained (universe)"
 msgstr "協力維護軟體 (Universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:220
+#: ../data/templates/Ubuntu.info.in:415
 #, fuzzy
 msgid "Community-maintained Open Source software"
 msgstr "協力維護軟體 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:222
+#: ../data/templates/Ubuntu.info.in:417
 msgid "Non-free drivers"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:223
-msgid "Proprietary drivers for devices "
+#: ../data/templates/Ubuntu.info.in:418
+msgid "Proprietary drivers for devices"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:225
+#: ../data/templates/Ubuntu.info.in:420
 msgid "Restricted software (Multiverse)"
 msgstr ""
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:226
+#: ../data/templates/Ubuntu.info.in:421
 msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:231
+#: ../data/templates/Ubuntu.info.in:427
 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:439
 msgid "Important security updates"
 msgstr "重要的安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:248
+#: ../data/templates/Ubuntu.info.in:444
 msgid "Recommended updates"
 msgstr "建議的安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:253
+#: ../data/templates/Ubuntu.info.in:449
 #, fuzzy
 msgid "Pre-released updates"
 msgstr "建議的安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:258
+#: ../data/templates/Ubuntu.info.in:454
 #, fuzzy
 msgid "Unsupported updates"
 msgstr "重要的安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:265
+#: ../data/templates/Ubuntu.info.in:461
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:278
+#: ../data/templates/Ubuntu.info.in:475
 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:487
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10安全性更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:295
+#: ../data/templates/Ubuntu.info.in:492
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:300
+#: ../data/templates/Ubuntu.info.in:497
 msgid "Ubuntu 5.10 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:307
+#: ../data/templates/Ubuntu.info.in:504
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:320
+#: ../data/templates/Ubuntu.info.in:518
 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:521 ../data/templates/Debian.info.in:148
 msgid "Officially supported"
 msgstr "官方支援"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:332
+#: ../data/templates/Ubuntu.info.in:530
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04安全性更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:337
+#: ../data/templates/Ubuntu.info.in:535
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.04更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:342
+#: ../data/templates/Ubuntu.info.in:540
 msgid "Ubuntu 5.04 Backports"
 msgstr ""
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:348
+#: ../data/templates/Ubuntu.info.in:546
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:354
+#: ../data/templates/Ubuntu.info.in:552
 #, fuzzy
 msgid "Community-maintained (Universe)"
 msgstr "協力維護軟體 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:356
+#: ../data/templates/Ubuntu.info.in:554
 msgid "Non-free (Multiverse)"
 msgstr "非自由軟體 (Multiverse)"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:361
+#: ../data/templates/Ubuntu.info.in:560
 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:563
 msgid "No longer officially supported"
 msgstr ""
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:366
+#: ../data/templates/Ubuntu.info.in:565
 msgid "Restricted copyright"
 msgstr "版權受限制"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:373
+#: ../data/templates/Ubuntu.info.in:572
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10安全性更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:378
+#: ../data/templates/Ubuntu.info.in:577
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:383
+#: ../data/templates/Ubuntu.info.in:582
 msgid "Ubuntu 4.10 Backports"
 msgstr ""
 
@@ -257,55 +288,68 @@ 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:58
+#, fuzzy
+msgid "Debian 4.0 'Etch'"
+msgstr "Debian 3.1 “Sarge”"
 
 #. Description
-#: ../data/templates/Debian.info.in:31
+#: ../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
 #, fuzzy
 msgid "Security updates"
 msgstr "重要的安全更新"
 
 #. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:108
 msgid "Debian current stable release"
 msgstr ""
 
 #. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:121
 #, fuzzy
 msgid "Debian testing"
 msgstr "Debian “Etch”（測試版）"
 
 #. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:146
 #, fuzzy
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian “Sid”（不穩定版）"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:150
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "符合 DFSG 的軟體，但有依賴於非自由軟體"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:152
 msgid "Non-DFSG-compatible Software"
 msgstr "不符合 DFSG 的軟體"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:194 ../aptsources/distro.py:401
+#: ../aptsources/distro.py:208 ../aptsources/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "位於%s的伺服器"
@@ -313,996 +357,160 @@ 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:226 ../aptsources/distro.py:232
+#: ../aptsources/distro.py:248
 msgid "Main server"
 msgstr "主要伺服器"
 
-#: ../aptsources/distro.py:235
+#: ../aptsources/distro.py:252
 msgid "Custom servers"
 msgstr "個人伺服器"
 
-#~ msgid "Daily"
-#~ msgstr "每天"
-
-#~ msgid "Every two days"
-#~ msgstr "每兩天"
-
-#~ msgid "Weekly"
-#~ msgstr "每周"
-
-#~ msgid "Every two weeks"
-#~ msgstr "每隔兩周"
+#: ../apt/progress/gtk2.py:259
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒"
 
-#~ msgid "Every %s days"
-#~ msgstr "每隔 %s 天"
+#: ../apt/progress/gtk2.py:265
+#, fuzzy, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr "正在下載檔案 %li/%li"
 
-#~ msgid "After one week"
-#~ msgstr "一週後"
+#. Setup some child widgets
+#: ../apt/progress/gtk2.py:285
+msgid "Details"
+msgstr "詳細資料"
 
-#~ msgid "After two weeks"
-#~ msgstr "兩週後"
-
-#~ msgid "After one month"
-#~ msgstr "一個月後"
+#: ../apt/progress/gtk2.py:367
+msgid "Starting..."
+msgstr ""
 
-#~ msgid "After %s days"
-#~ msgstr "%s 天過後"
+#: ../apt/progress/gtk2.py:373
+msgid "Complete"
+msgstr ""
 
-#~ msgid "%s updates"
-#~ msgstr "%s 更新"
+#: ../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 "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Nearest server"
-#~ msgstr "最近的伺服器"
-
-#~ msgid "Software Channel"
-#~ msgstr "軟體頻道"
-
-#~ msgid "Active"
-#~ msgstr "動作中"
-
-#~ msgid "(Source Code)"
-#~ msgstr "(原始碼)"
-
-#~ msgid "Source Code"
-#~ msgstr "原始碼"
-
-#~ msgid "Import key"
-#~ msgstr "匯入金鑰"
-
-#~ msgid "Error importing selected file"
-#~ msgstr "匯入指定檔案時發生錯誤"
-
-#~ msgid "The selected file may not be a GPG key file or it might be corrupt."
-#~ msgstr "選定的檔案可能不是 GPG 金鑰，或者內容已損壞。"
-
-#~ msgid "Error removing the key"
-#~ msgstr "移除金鑰時發生錯誤"
-
-#~ msgid ""
-#~ "The key you selected could not be removed. Please report this as a bug."
-#~ msgstr "您選定的金鑰無法移除，請匯報問題。"
-
-#~ msgid "Please enter a name for the disc"
-#~ msgstr "請輸入光碟的名稱"
-
-#~ msgid "Please insert a disc in the drive:"
-#~ msgstr "請將光碟放入光碟機："
-
-#~ msgid "Broken packages"
-#~ msgstr "不完整套件"
-
-#~ msgid ""
-#~ "Your system contains broken packages that couldn't be fixed with this "
-#~ "software. Please fix them first using synaptic or apt-get before "
-#~ "proceeding."
-#~ msgstr ""
-#~ "您的系統有安裝不完整的套件，而本程式無法將它們修正。在進行前請先使用 "
-#~ "synaptic 或 apt-get 來修恢它們。"
-
-#~ msgid "Can't upgrade required meta-packages"
-#~ msgstr "無法升級須要的元套件 (meta-package)"
-
-#~ msgid "A essential package would have to be removed"
-#~ msgstr "將會移除的核心套件"
-
-#~ msgid "Could not calculate the upgrade"
-#~ msgstr "無法計算升級"
-
-#~ msgid "Error authenticating some packages"
-#~ msgstr "認證一些套件時發生錯誤"
-
-#~ msgid ""
-#~ "It was not possible to authenticate some packages. This may be a "
-#~ "transient network problem. You may want to try again later. See below for "
-#~ "a list of unauthenticated packages."
-#~ msgstr ""
-#~ "一些套件不能認證，這可能是由於短暫的網路問題；您可以稍後再試。以下為沒有認"
-#~ "證的套件。"
-
-#~ msgid "Can't install '%s'"
-#~ msgstr "無法安裝‘%s’"
-
-#~ msgid ""
-#~ "It was impossible to install a required package. Please report this as a "
-#~ "bug. "
-#~ msgstr "無法安裝須要的套件，請匯報問題。 "
-
-#~ msgid "Can't guess meta-package"
-#~ msgstr "無法估計元套件 (meta-package)"
-
-#~ msgid "Failed to add the CD"
-#~ msgstr "無法加入光碟"
-
-#~ msgid ""
-#~ "There was a error adding the CD, the upgrade will abort. Please report "
-#~ "this as a bug if this is a valid Ubuntu CD.\n"
-#~ "\n"
-#~ "The error message was:\n"
-#~ "'%s'"
-#~ msgstr ""
-#~ "在加入光碟時有錯誤產升，升級將終止。若此光碟為一個有效的ubuntu光碟，請將此"
-#~ "舉報為臭蟲。\n"
-#~ "\n"
-#~ "錯誤訊息為：\n"
-#~ "「%s」"
-
-#~ msgid "Reading cache"
-#~ msgstr "正在讀取快取"
-
-#~ msgid "No valid mirror found"
-#~ msgstr "找不到有效的 mirror"
-
-#~ msgid ""
-#~ "While scaning your repository information no mirror entry for the upgrade "
-#~ "was found.This cam happen if you run a internal mirror or if the mirror "
-#~ "information is out of date.\n"
-#~ "\n"
-#~ "Do you want to rewrite your 'sources.list' file anyway? If you choose "
-#~ "'Yes' here it will update all '%s' to '%s' entries.\n"
-#~ "If you select 'no' the update will cancel."
-#~ msgstr ""
-#~ "掃描你的套件庫資訊時，找不到任何 mirror。這可能在你使用內部 mirror 或 "
-#~ "mirror 資訊已經過時的時候發生。\n"
-#~ "\n"
-#~ "是否無論如何都要重新寫入 'sources.list'？ 如果選擇「是」，將會更新所有 '%"
-#~ "s' 到 '%s'。\n"
-#~ "如果選擇「否」，則更新會被取消。"
-
-#~ msgid "Generate default sources?"
-#~ msgstr "產生預設的來源？"
-
-#~ msgid ""
-#~ "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
-#~ "\n"
-#~ "Should default entries for '%s' be added? If you select 'No' the update "
-#~ "will cancel."
-#~ msgstr ""
-#~ "掃描你的 'sources.list' 後，沒有找到任何有效的 '%s' 項目。\n"
-#~ "\n"
-#~ "需要加入預設的 '%s' 項目嗎？如果你選擇「否」，更新將會被取消。"
-
-#~ msgid "Repository information invalid"
-#~ msgstr "無效的套件庫資料"
-
-#~ msgid ""
-#~ "Upgrading the repository information resulted in a invalid file. Please "
-#~ "report this as a bug."
-#~ msgstr "升級套件庫時導致無效的檔案。請匯報問題。"
-
-#~ msgid "Third party sources disabled"
-#~ msgstr "停用第三方來源"
-
-#~ msgid "Error during update"
-#~ msgstr "更新時發生錯誤"
-
-#~ msgid ""
-#~ "A problem occured during the update. This is usually some sort of network "
-#~ "problem, please check your network connection and retry."
-#~ msgstr "更新時發生錯誤。這可能是某些網路問題，試檢查網路連線及再試。"
-
-#~ msgid "Not enough free disk space"
-#~ msgstr "磁碟空間不足"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please free at least %s of disk space on %s. "
-#~ "Empty your trash and remove temporary packages of former installations "
-#~ "using 'sudo apt-get clean'."
-#~ msgstr ""
-#~ "升級中止。請至少空出 %s 的磁碟空間 (從%s上)。 清空垃圾桶及使用 'sudo apt-"
-#~ "get clean'來移除先前安裝套件時的暫存檔。"
-
-#~ msgid "Do you want to start the upgrade?"
-#~ msgstr "是否要開始升級？"
-
-#~ msgid "Could not install the upgrades"
-#~ msgstr "無法安裝升級"
-
-#~ msgid "Could not download the upgrades"
-#~ msgstr "無法下載升級套件"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Please check your internet connection or "
-#~ "installation media and try again. "
-#~ msgstr "升級現正中止。請檢查網路連線是否正常及再試 "
-
-#~ msgid "Remove obsolete packages?"
-#~ msgstr "移除不再使用的套件"
-
-#~ msgid "_Skip This Step"
-#~ msgstr "略過這步驟(_S)"
-
-#~ msgid "_Remove"
-#~ msgstr "移除(_R)"
-
-#~ msgid "Error during commit"
-#~ msgstr "提交時發生錯誤"
-
-#~ msgid ""
-#~ "Some problem occured during the clean-up. Please see the below message "
-#~ "for more information. "
-#~ msgstr "在清理時發生一些問題。請參閱以下訊息以取得更多資訊。 "
-
-#~ msgid "Restoring original system state"
-#~ msgstr "回覆原有系統狀態"
-
-#~ msgid "Checking package manager"
-#~ msgstr "正在檢查套件管理程式"
-
-#~ msgid "Updating repository information"
-#~ msgstr "正在更新套件庫資料"
-
-#~ msgid "Invalid package information"
-#~ msgstr "無效的套件資訊"
-
-#~ msgid "Asking for confirmation"
-#~ msgstr "詢問以確認"
-
-#~ msgid "Upgrading"
-#~ msgstr "升級中"
-
-#~ msgid "Searching for obsolete software"
-#~ msgstr "尋搜不再使用的套件"
-
-#~ msgid "System upgrade is complete."
-#~ msgstr "系統升級完成。"
-
-#~ msgid "Please insert '%s' into the drive '%s'"
-#~ msgstr "請將‘%s’放入光碟機‘%s’中"
-
-#~ msgid "Applying changes"
-#~ msgstr "正在套用變更"
-
-#~ msgid "Could not install '%s'"
-#~ msgstr "無法安裝‘%s’"
-
-#~ msgid "The 'diff' command was not found"
-#~ msgstr "找不到‘diff’指令"
-
-#~ msgid "A fatal error occured"
-#~ msgstr "發生嚴重錯誤"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "You have to download a total of %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "你必須下載全部的%s。 "
-
-#~ msgid "To prevent data loss close all open applications and documents."
-#~ msgstr "避免遺失請關閉所有已開啟的程式及文件。"
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "系統已經在最新狀態"
-
-#~ msgid "<b>Remove %s</b>"
-#~ msgstr "<b>移除 %s</b>"
-
-#~ msgid "Install %s"
-#~ msgstr "安裝 %s"
-
-#~ msgid "Upgrade %s"
-#~ msgstr "升級 %s"
-
-#~ msgid "%li days %li hours %li minutes"
-#~ msgstr "%li日%li小時%li分鐘"
-
-#~ msgid "%li hours %li minutes"
-#~ msgstr "%li小時%li分鐘"
-
-#~ msgid "%li minutes"
-#~ msgstr "%li分鐘"
-
-#~ msgid "%li seconds"
-#~ msgstr "%li秒"
-
-#~ msgid "Reboot required"
-#~ msgstr "須要重新開機"
-
-#~ msgid ""
-#~ "The upgrade is finished and a reboot is required. Do you want to do this "
-#~ "now?"
-#~ msgstr "升級已經完成及須要重新啟動。現在要重新啟動嗎？"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid ""
-#~ "<b><big>Cancel the running upgrade?</big></b>\n"
-#~ "\n"
-#~ "The system could be in an unusable state if you cancel the upgrade. You "
-#~ "are strongly adviced to resume the upgrade."
-#~ msgstr ""
-#~ "<b><big>取消正在執行的升級？</big></b>\n"
-#~ "\n"
-#~ "如果您取消升級可能會導致系統不穩定。強烈建議您繼續升級。"
-
-#~ msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-#~ msgstr "<b><big>重新啟動系統以完成更新</big></b>"
-
-#~ msgid "<b><big>Start the upgrade?</big></b>"
-#~ msgstr "<b><big>開始升級？</big></b>"
-
-#~ msgid "Cleaning up"
-#~ msgstr "清理"
-
-#~ msgid "Details"
-#~ msgstr "詳細資料"
-
-#~ msgid "Difference between the files"
-#~ msgstr "檔案間的差別"
-
-#~ msgid "Modifying the software channels"
-#~ msgstr "更改軟體來源"
-
-#~ msgid "Preparing the upgrade"
-#~ msgstr "正準備升級"
-
-#~ msgid "Restarting the system"
-#~ msgstr "重新啟動系統"
-
-#~ msgid "Terminal"
-#~ msgstr "終端"
-
-#~ msgid "_Keep"
-#~ msgstr "保留(_K)"
-
-#~ msgid "_Replace"
-#~ msgstr "取代(_R)"
-
-#~ msgid "_Report Bug"
-#~ msgstr "報告錯誤(_R)"
-
-#~ msgid "_Restart Now"
-#~ msgstr "現在重新啟動(_R)"
-
-#~ msgid "_Resume Upgrade"
-#~ msgstr "繼續升級(_R)"
-
-#~ msgid "Could not find the release notes"
-#~ msgstr "無法找到發行說明"
+msgid "The list of changes is not available"
+msgstr "修改紀錄不存在，請稍後再試。"
 
-#~ msgid "The server may be overloaded. "
-#~ msgstr "伺服器可能負荷過重。 "
-
-#~ msgid "Could not download the release notes"
-#~ msgstr "無法下載發行說明"
-
-#~ msgid "Please check your internet connection."
-#~ msgstr "請檢查您的網路連線。"
-
-#~ msgid "Could not run the upgrade tool"
-#~ msgstr "無法執行升級工具"
-
-#~ msgid ""
-#~ "This is most likely a bug in the upgrade tool. Please report it as a bug"
-#~ msgstr "這可能是升級工具的錯誤，請匯報問題"
-
-#~ msgid "Downloading the upgrade tool"
-#~ msgstr "正在下載升級工具"
-
-#~ msgid "The upgrade tool will guide you through the upgrade process."
-#~ msgstr "升級工具會引導您整個升級過程。"
-
-#~ msgid "Upgrade tool signature"
-#~ msgstr "升級工具簽署"
-
-#~ msgid "Upgrade tool"
-#~ msgstr "升級工具"
-
-#~ msgid "Failed to fetch"
-#~ msgstr "下載失敗"
-
-#~ msgid "Fetching the upgrade failed. There may be a network problem. "
-#~ msgstr "下載升級套件失敗。可能是網路問題。 "
-
-#~ msgid "Failed to extract"
-#~ msgstr "解壓失敗"
-
-#~ msgid ""
-#~ "Extracting the upgrade failed. There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr "升級套件解壓失敗。可能是因為跟伺服器的網路連線出現問題。 "
-
-#~ msgid "Verfication failed"
-#~ msgstr "檢驗失敗"
-
-#~ msgid "Authentication failed"
-#~ msgstr "認證失敗"
-
-#~ msgid ""
-#~ "Authenticating the upgrade failed. There may be a problem with the "
-#~ "network or with the server. "
-#~ msgstr "認證升級套件失敗。可能是因為跟伺服器的網路連線出現問題。 "
-
-#~ msgid "Other updates"
-#~ msgstr "其他更新"
-
-#~ msgid "Version %s: \n"
-#~ msgstr "版本 %s： \n"
-
-#~ msgid "Download size: %s"
-#~ msgstr "下載大小：%s"
-
-#~ msgid "You can install %s update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "您可以安裝 %s 個更新"
-
-#~ msgid "Please wait, this can take some time."
-#~ msgstr "請稍候，這可能需要一點時間。"
-
-#~ msgid "Update is complete"
-#~ msgstr "更新完成"
-
-#~ msgid "Version %s"
-#~ msgstr "版本%s"
-
-#~ msgid "(Size: %s)"
-#~ msgstr "(大小： %s)"
-
-#~ msgid "Your distribution is not supported anymore"
-#~ msgstr "您正使用的發行版本已不再支援"
-
-#~ msgid ""
-#~ "You will not get any further security fixes or critical updates. Upgrade "
-#~ "to a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
-#~ "information on upgrading."
-#~ msgstr ""
-#~ "您不會再取得任何安全或重大更新，請升級到最新版本的 Ubuntu Linux。請參閱 "
-#~ "http://www.ubuntu.com以取得更多升級資訊。"
-
-#~ msgid "<b>New distribution release '%s' is available</b>"
-#~ msgstr "<b>有新的 distribution 發行版 '%s'</b>"
-
-#~ msgid "Software index is broken"
-#~ msgstr "軟體索引損壞"
-
-#~ msgid ""
-#~ "It is impossible to install or remove any software. Please use the "
-#~ "package manager \"Synaptic\" or run \"sudo apt-get install -f\" in a "
-#~ "terminal to fix this issue at first."
-#~ msgstr ""
-#~ "不能安裝或移除任何套件。請先使用套件管理程式“Synaptic”或在終端機中執"
-#~ "行“sudo apt-get install -f”來修正問題。"
+#: ../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 "None"
-#~ msgstr "無下載"
-
-#~ msgid "1 KB"
-#~ msgstr "1 KB"
-
-#~ msgid "%.0f KB"
-#~ msgstr "%.0f KB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid "<big><b>Keep your system up-to-date</b></big>"
-#~ msgstr "<big><b>將您的系統維持在最新狀態</b></big>"
-
-#~ msgid "Changes"
-#~ msgstr "修改紀錄"
-
-#~ msgid "Changes and description of the update"
-#~ msgstr "在更新中的更動及其敘述"
-
-#~ msgid "Chec_k"
-#~ msgstr "檢查(_K)"
-
-#~ msgid "Check the software channels for new updates"
-#~ msgstr "檢查軟體來源有沒有更新套件"
-
-#~ msgid "Description"
-#~ msgstr "詳細說明"
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr "無法下載更動列表。請檢查網路連線是否正常。"
 
-#~ msgid "Release Notes"
-#~ msgstr "發行說明"
+#: ../apt/debfile.py:56
+#, python-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr ""
 
-#~ msgid "Show progress of single files"
-#~ msgstr "顯示單一檔案的進度"
+#: ../apt/debfile.py:81
+#, python-format
+msgid "List of files for '%s'could not be read"
+msgstr ""
 
-#~ msgid "Software Updates"
-#~ msgstr "軟體更新"
+#: ../apt/debfile.py:149
+#, python-format
+msgid "Dependency is not satisfiable: %s\n"
+msgstr ""
 
-#~ msgid ""
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr "軟體更新會更正錯誤, 排除安全弱點, 並提供新功能."
+#: ../apt/debfile.py:173
+#, python-format
+msgid "Conflicts with the installed package '%s'"
+msgstr ""
 
-#~ msgid "U_pgrade"
-#~ msgstr "升級(_P)"
+#: ../apt/debfile.py:319
+#, python-format
+msgid "Wrong architecture '%s'"
+msgstr ""
 
-#~ msgid "Upgrade to the latest version of Ubuntu"
-#~ msgstr "升級到最新版本的 Ubuntu"
+#. the deb is older than the installed
+#: ../apt/debfile.py:325
+msgid "A later version is already installed"
+msgstr ""
 
-#~ msgid "_Check"
-#~ msgstr "檢查(_C)"
+#: ../apt/debfile.py:345
+msgid "Failed to satisfy all dependencies (broken cache)"
+msgstr ""
 
-#~ msgid "_Hide this information in the future"
-#~ msgstr "以後不要再顯示此訊息(_H)"
+#: ../apt/debfile.py:376
+#, fuzzy, python-format
+msgid "Cannot install '%s'"
+msgstr "無法安裝‘%s’"
 
-#~ msgid "_Install Updates"
-#~ msgstr "安裝更新套件(_I)"
+#: ../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 "_Upgrade"
-#~ msgstr "升級(_P)"
-
-#~ msgid "changes"
-#~ msgstr "更動"
-
-#~ msgid "updates"
-#~ msgstr "更新"
-
-#~ msgid "<b>Automatic updates</b>"
-#~ msgstr "<b>自動更新</b>"
-
-#~ msgid "<b>CDROM/DVD</b>"
-#~ msgstr "<b>光碟/DVD光碟</b>"
-
-#~ msgid "<b>Internet updates</b>"
-#~ msgstr "<b>線上更新</b>"
-
-#~ msgid "<b>Internet</b>"
-#~ msgstr "<b>網際網路</b>"
-
-#~ msgid "Authentication"
-#~ msgstr "認證"
-
-#~ msgid "D_elete downloaded software files:"
-#~ msgstr "刪除已下載的軟體檔案(_E)："
-
-#~ msgid "Download from:"
-#~ msgstr "下載於："
-
-#~ msgid "Import the public key from a trusted software provider"
-#~ msgstr "匯入您信任的軟體供應商的公鑰"
-
-#~ msgid "Internet Updates"
-#~ msgstr "線上更新"
-
-#~ msgid ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically"
-#~ msgstr "只有來自 Ubuntu 官方伺服器的安全性更新會自動安裝"
-
-#~ msgid "Restore _Defaults"
-#~ msgstr "還原為預設值(_D)"
-
-#~ msgid "Restore the default keys of your distribution"
-#~ msgstr "還原為發行版本預設的金鑰"
-
-#~ msgid "Software Sources"
-#~ msgstr "軟體原始碼"
-
-#~ msgid "Third Party"
-#~ msgstr "第三方"
-
-#~ msgid "_Check for updates automatically:"
-#~ msgstr "自動檢查更新(_C)："
+msgid "An essential package would be removed"
+msgstr "將會移除的核心套件"
 
-#~ msgid "_Download updates automatically, but do not install them"
-#~ msgstr "自動下載更新部份但不進行安裝(_D)"
-
-#~ msgid "_Import Key File"
-#~ msgstr "匯入金鑰"
-
-#~ msgid "_Install security updates without confirmation"
-#~ msgstr "無須確認便安裝安全性更新(_I)"
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>備註：</b>"
-
-#~ msgid "<b>Components:</b>"
-#~ msgstr "<b>元件：</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>發行版本：</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>類型：</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI：</b>"
-
-#~ msgid "APT line:"
-#~ msgstr "APT 套件庫位置："
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "可執行檔\n"
-#~ "源程式碼"
+#: ../apt/progress/text.py:81
+#, python-format
+msgid "%c%s... Done"
+msgstr ""
 
-#~ msgid "Edit Source"
-#~ msgstr "編輯來源"
+#: ../apt/progress/text.py:118
+msgid "Hit "
+msgstr ""
 
-#~ msgid "Scanning CD-ROM"
-#~ msgstr "正在掃描光碟"
+#: ../apt/progress/text.py:126
+msgid "Ign "
+msgstr ""
 
-#~ msgid "_Add Source"
-#~ msgstr "增加來源(_A)"
+#: ../apt/progress/text.py:128
+msgid "Err "
+msgstr ""
 
-#~ msgid "_Reload"
-#~ msgstr "重新載入(_R)"
+#: ../apt/progress/text.py:138
+msgid "Get:"
+msgstr ""
 
-#~ msgid "Show and install available updates"
-#~ msgstr "顯示及安裝現有的更新套件"
+#: ../apt/progress/text.py:198
+msgid " [Working]"
+msgstr ""
 
-#~ msgid "Update Manager"
-#~ 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 ""
 
-#~ msgid ""
-#~ "Check automatically if a new version of the current distribution is "
-#~ "available and offer to upgrade (if possible)."
-#~ msgstr "自動檢查目前的發行版本是否有新的版本及升級到該版本（若果可以）。"
+#. Trick for getting a translation from apt
+#: ../apt/progress/text.py:216
+#, python-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr ""
 
-#~ msgid "Check for new distribution releases"
-#~ msgstr "檢查有沒有新的發行版本"
+#: ../apt/progress/text.py:229
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
 
-#~ msgid "Remind to reload the channel list"
-#~ msgstr "提示重新載入套件來源"
+#: ../apt/progress/text.py:241
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
 
-#~ msgid "Show details of an update"
-#~ msgstr "顯示更新套件的詳細資料"
-
-#~ msgid "Stores the size of the update-manager dialog"
-#~ msgstr "儲存 update-manager 對話視窗的大小"
-
-#~ msgid "The window size"
-#~ msgstr "視窗大小"
-
-#~ msgid "Configure the sources for installable software and updates"
-#~ msgstr "設置可安裝的軟體及更新部份之來源。"
-
-#~ msgid "http://security.debian.org/"
-#~ msgstr "http://security.debian.org/"
-
-#~ msgid "Debian 3.1 \"Sarge\" Security Updates"
-#~ msgstr "Debian 3.1 “Sarge” 安全性更新"
-
-#~ msgid "http://http.us.debian.org/debian/"
-#~ msgstr "http://http.us.debian.org/debian/"
-
-#~ msgid "     "
-#~ msgstr "     "
-
-#~ msgid "%s new package is going to be installed."
-#~ msgid_plural "%s new packages are going to be installed."
-#~ msgstr[0] "%s 個新套件將會安裝。"
-
-#~ msgid "%s package is going to be removed."
-#~ msgid_plural "%s packages are going to be removed."
-#~ msgstr[0] "%s 個套件將會移除。"
-
-#~ msgid "%s package is going to be upgraded."
-#~ msgid_plural "%s packages are going to be upgraded."
-#~ msgstr[0] "%s 個套件將會升級。"
-
-#~ msgid ""
-#~ "<b><big>The channel information is out-of-date</big></b>\n"
-#~ "\n"
-#~ "You have to reload the channel information to install software and "
-#~ "updates from newly added or changed channels. \n"
-#~ "\n"
-#~ "You need a working internet connection to continue."
-#~ msgstr ""
-#~ "<b><big>套件來源的資料已經過期</big></b>\n"
-#~ "\n"
-#~ "您需要重新載入套件來源的資料以安裝軟體，及更新套件來源新加入或修改了的套"
-#~ "件。\n"
-#~ "\n"
-#~ "您須要連線到網際網路繼續。"
-
-#~ msgid ""
-#~ "<b><big>You must check for updates manually</big></b>\n"
-#~ "\n"
-#~ "Your system does not check for updates automatically. You can configure "
-#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties"
-#~ "\"."
-#~ msgstr ""
-#~ "<b><big>您必須自行檢查更新</big></b>\n"
-#~ "\n"
-#~ "您的系統不會自動檢查更新。您可以在「系統」→「管理的→「軟體偏好設定」中設"
-#~ "定。"
-
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>套件來源</b>"
-
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>套件來源</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>元件</b>"
-
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>金鑰</b>"
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "The APT line includes the type, location and components of a channel, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>."
-#~ msgstr ""
-#~ "<big><b>請輸入您想加入的完整的 APT 來源列</b></big>\n"
-#~ "\n"
-#~ "\n"
-#~ "APT 來源列包括了來源的類型、位置及 components，例如 <i>\"deb http://ftp."
-#~ "debian.org sarge main\"</i>。"
-
-#~ msgid ""
-#~ "<big><b>Error scaning the CD</b></big>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<big><b>掃描光碟時發生錯誤</b></big>\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
-#~ msgstr ""
-#~ "<big><b>正在檢測您的系統</b></big>\n"
-#~ "\n"
-#~ "軟體更新會更正錯誤，排除安全弱點，並提供新功能."
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">升級至 Ubuntu  6.06 LTS</span>"
-
-#~ msgid ""
-#~ "A unresolvable problem occured while calculating the upgrade. Please "
-#~ "report this as a bug. "
-#~ msgstr "計算升級時發生無法解決的問題，請匯報問題。 "
-
-#~ msgid "About %li days %li hours %li minutes remaining"
-#~ msgstr "大約還剩下 %li 天 %li 小時 %li 分鐘"
-
-#~ msgid "About %li hours %li minutes remaining"
-#~ msgstr "大約還剩下 %li 小時 %li 分鐘"
-
-#~ msgid "About %li minutes remaining"
-#~ msgstr "大約還剩下 %li 分鐘"
-
-#~ msgid "About %li seconds remaining"
-#~ msgstr "大約還剩下 %li 秒鐘"
-
-#~ msgid "Add Channel"
-#~ msgstr "加入套件來源"
-
-#~ msgid "Add _Cdrom"
-#~ msgstr "加入光碟(_C)"
-
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore.\n"
-#~ "This indicates a serious error, please report this as a bug."
-#~ msgstr ""
-#~ "在更新套件資訊之後，無法找到必要的套件 '%s'。\n"
-#~ "這表示有嚴重的錯誤，請回報這個 bug。"
-
-#~ msgid "Cancel _Download"
-#~ msgstr "取消下載(_D)"
-
-#~ msgid "Cannot install all available updates"
-#~ msgstr "無法安裝所有更新套件"
-
-#~ msgid "Configure software channels and internet updates"
-#~ msgstr "設定套件來源及網路更新"
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "無法找到任何升級"
-
-#~ msgid "Download is complete"
-#~ msgstr "下載完成"
-
-#~ msgid "Downloading and installing the upgrades"
-#~ msgstr "正在下載及安裝升級"
-
-#~ msgid "Downloading file %li of %li"
-#~ msgstr "正在下載檔案 %li/%li"
-
-#~ msgid "Downloading file %li of %li at %s/s"
-#~ msgstr "正在下載檔案 %li/%li，速度在 %s/秒"
-
-#~ msgid "Downloading file %li of %li with %s/s"
-#~ msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "正在下載檔案 %li/%li，下載速度不明"
-
-#~ msgid "Downloading the list of changes..."
-#~ msgstr "正在下載修改紀錄..."
-
-#~ msgid "Edit Channel"
-#~ msgstr "編輯套件來源"
-
-#~ msgid ""
-#~ "Failed to download the list of changes. Please check your Internet "
-#~ "connection."
-#~ msgstr "無法下載更動列表。請檢查網路連線是否正常。"
-
-#~ msgid "Hide details"
-#~ msgstr "隱藏詳細資料"
-
-#~ msgid ""
-#~ "If automatic checking for updates is disabeld, you have to reload the "
-#~ "channel list manually. This option allows to hide the reminder shown in "
-#~ "this case."
-#~ msgstr ""
-#~ "如果停用自動更新檢查，您需要自行重新載入套件來源清單。在此情況下本選項允許"
-#~ "關閉更新提示"
-
-#~ msgid "Installation Media"
-#~ msgstr "安裝媒體"
-
-#~ msgid "New version: %s   (Size: %s)"
-#~ msgstr "新版本：%s   （大小：%s）"
-
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "同時間只允許執行一個套件管理程式"
-
-#~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr "請先關閉其它程式，如‘aptitude’ 或‘Synaptic’。"
-
-#~ msgid ""
-#~ "Please report this as a bug and include the files /var/log/dist-upgrade."
-#~ "log and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts "
-#~ "now.\n"
-#~ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
-#~ msgstr ""
-#~ "請將此視為 bug 來回報，並於報告中包含 /var/log/dist-upgrade.log 及 /var/"
-#~ "log/dist-upgrade-apt.log 這兩個檔案。 現在取消更新。\n"
-#~ "您的原始 sources.list 已被存到 /etc/apt/sources.list.distUpgrade。"
-
-#~ msgid ""
-#~ "Replace configuration file\n"
-#~ "'%s'?"
-#~ msgstr ""
-#~ "取代設定檔\n"
-#~ "‘%s‘？"
-
-#~ msgid "Restoring originale system state"
-#~ msgstr "恢復原先的系統狀態"
-
-#~ msgid "Show details"
-#~ msgstr "顯示詳細資料"
-
-#~ msgid "Software Preferences"
-#~ msgstr "軟體偏好設定"
-
-#~ msgid "Software Properties"
-#~ msgstr "軟體屬性"
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "有些軟體不再有官方支援"
-
-#~ msgid ""
-#~ "Some third party entries in your souces.list where disabled. You can re-"
-#~ "enable them after the upgrade with the 'software-properties' tool or with "
-#~ "synaptic."
-#~ msgstr ""
-#~ "你的 sources.list 中，部份第三方的項目已經被停用。在使用 'software-"
-#~ "properties' 工具或 synaptic升級後，你可以重新啟用它。"
-
-#~ msgid ""
-#~ "Some updates require the removal of further software. Use the function "
-#~ "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo "
-#~ "apt-get dist-upgrade\" in a terminal to update your system completely."
-#~ msgstr ""
-#~ "有一些更新須要移除其它套件。使用“Synaptic 套件管理程式”的「標記所有升級」"
-#~ "功能或在終端機中執行“sudo apt-get dist-upgrade”來完整地更新您的系統。"
-
-#~ msgid ""
-#~ "Stores the state of the expander that contains the list of changs and the "
-#~ "description"
-#~ msgstr "儲存包含修改紀錄及描述的 expander 的狀態"
-
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "會略過更新以下套件："
-
-#~ msgid "The list of changes is not available yet. Please try again later."
-#~ msgstr "修改紀錄不存在，請稍後再試。"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "升級現正中止，請匯報問題。"
-
-#~ msgid ""
-#~ "The upgrade aborts now. Your system can be in an unusable state. A "
-#~ "recovery was run (dpkg --configure -a)."
-#~ msgstr ""
-#~ "升級中止。 你的系統現在可能在一個不穩定的狀態。 正在進行復原 (dpkg --"
-#~ "configure -a)。"
-
-#~ msgid ""
-#~ "The upgrade can take several hours and cannot be canceled at any time "
-#~ "later."
-#~ msgstr "升級可能需要數小時及無法在稍後任何時間取消。"
-
-#~ msgid ""
-#~ "These installed packages are no longer officially supported, and are now "
-#~ "only community-supported ('universe').\n"
-#~ "\n"
-#~ "If you don't have 'universe' enabled these packages will be suggested for "
-#~ "removal in the next step. "
-#~ msgstr ""
-#~ "這些已安裝的套件官方不再支援，現在將只會由社群維護 ('universe')\n"
-#~ "\n"
-#~ "如果你沒有啟用 'universe'，這些套件將會在下一步驟被移除。 "
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 更新"
-
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS 回移套件"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS 安全性更新"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS 更新"
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "正在升級 Ubuntu"
-
-#~ msgid ""
-#~ "Verfing the upgrade failed.  There may be a problem with the network or "
-#~ "with the server. "
-#~ msgstr "檢驗升級套件失敗。可能是因為跟伺服器的網路連接出現問題。 "
-
-#~ msgid "You have to download a total of %s."
-#~ msgstr "您總共需要下載 %s。"
-
-#~ msgid ""
-#~ "Your system does not contain a ubuntu-desktop, kubuntu-desktop or "
-#~ "edubuntu-desktop package and it was not possible to detect which version "
-#~ "of ubuntu you are runing.\n"
-#~ " Please install one of the packages above first using synaptic or apt-get "
-#~ "before proceeding."
-#~ msgstr ""
-#~ "您的系統沒有安裝 ubuntu-desktop，kubuntu-desktop 或 edubuntu-desktop 套"
-#~ "件，因此無法偵測正在執行那個版本的 ubuntu。\n"
-#~ " 請進行操作前使用 synaptic 或 apt-get安裝上述其中一個套件"
-
-#~ msgid "Your system has already been upgraded."
-#~ msgstr "系統升級已經完成。"
-
-#~ msgid "_Custom"
-#~ msgstr "自訂(_C)"
-
-#~ msgid "_Download updates in the background, but do not install them"
-#~ msgstr "在背景下載更新套件，但無須安裝(_D)"
+#: ../apt/cache.py:96
+msgid "Building data structures"
+msgstr ""
diff --git a/pre-build.sh b/pre-build.sh
index 29effc13..026a491e 100755
--- a/pre-build.sh
+++ b/pre-build.sh
@@ -1,8 +1,11 @@
 #!/bin/sh
 
-echo "updating mirror list from launchpad"
+echo "updating Ubuntu mirror list from launchpad"
 if [ -n "$https_proxy" ]; then
     echo "disabling https_proxy as Python's urllib doesn't support it; see #94130"
     unset https_proxy
 fi
 utils/get_ubuntu_mirrors_from_lp.py > data/templates/Ubuntu.mirrors
+
+echo "updating Debian mirror list"
+utils/get_debian_mirrors.py > data/templates/Debian.mirrors
diff --git a/pre-build.sh.moved b/pre-build.sh.moved
new file mode 100755
index 00000000..29effc13
--- /dev/null
+++ b/pre-build.sh.moved
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo "updating mirror list from launchpad"
+if [ -n "$https_proxy" ]; then
+    echo "disabling https_proxy as Python's urllib doesn't support it; see #94130"
+    unset https_proxy
+fi
+utils/get_ubuntu_mirrors_from_lp.py > data/templates/Ubuntu.mirrors
diff --git a/python/acquire-item.cc b/python/acquire-item.cc
new file mode 100644
index 00000000..cdb4a4bc
--- /dev/null
+++ b/python/acquire-item.cc
@@ -0,0 +1,314 @@
+/*
+ * acquire-item.cc - Wrapper around pkgAcquire::Item and pkgAcqFile.
+ *
+ * Copyright 2004-2009 Canonical Ltd.
+ * Copyright 2009 Julian Andres Klode <jak@debian.org>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "generic.h"
+#include "apt_pkgmodule.h"
+
+#include <apt-pkg/acquire-item.h>
+#include <map>
+
+using namespace std;
+
+inline pkgAcquire::Item *acquireitem_tocpp(PyObject *self)
+{
+    pkgAcquire::Item *itm = GetCpp<pkgAcquire::Item*>(self);
+    if (itm == 0)
+        PyErr_SetString(PyExc_ValueError, "Acquire() has been shut down or "
+                        "the AcquireFile() object has been deallocated.");
+    return itm;
+}
+
+static PyObject *acquireitem_get_complete(PyObject *self, void *closure)
+{
+    pkgAcquire::Item *item = acquireitem_tocpp(self);
+    return item ? PyBool_FromLong(item->Complete) : 0;
+}
+
+static PyObject *acquireitem_get_desc_uri(PyObject *self, void *closure)
+{
+    pkgAcquire::Item *item = acquireitem_tocpp(self);
+    return item ? CppPyString(item->DescURI()) : 0;
+}
+
+static PyObject *acquireitem_get_destfile(PyObject *self, void *closure)
+{
+    pkgAcquire::Item *item = acquireitem_tocpp(self);
+    return item ? CppPyString(item->DestFile) : 0;
+}
+
+
+static PyObject *acquireitem_get_error_text(PyObject *self, void *closure)
+{
+    pkgAcquire::Item *item = acquireitem_tocpp(self);
+    return item ? CppPyString(item->ErrorText) : 0;
+}
+
+static PyObject *acquireitem_get_filesize(PyObject *self, void *closure)
+{
+    pkgAcquire::Item *item = acquireitem_tocpp(self);
+    return item ? Py_BuildValue("i", item->FileSize) : 0;
+}
+
+static PyObject *acquireitem_get_id(PyObject *self, void *closure)
+{
+    pkgAcquire::Item *item = acquireitem_tocpp(self);
+    return item ? Py_BuildValue("k", item->ID) : 0;
+}
+
+static PyObject *acquireitem_get_mode(PyObject *self, void *closure)
+{
+    pkgAcquire::Item *item = acquireitem_tocpp(self);
+    return item ? Py_BuildValue("s", item->Mode) : 0;
+}
+
+static PyObject *acquireitem_get_is_trusted(PyObject *self, void *closure)
+{
+    pkgAcquire::Item *item = acquireitem_tocpp(self);
+    return item ? PyBool_FromLong(item->IsTrusted()) : 0;
+}
+
+static PyObject *acquireitem_get_local(PyObject *self, void *closure)
+{
+    pkgAcquire::Item *item = acquireitem_tocpp(self);
+    return item ? PyBool_FromLong(item->Local) : 0;
+}
+
+static PyObject *acquireitem_get_partialsize(PyObject *self, void *closure)
+{
+    pkgAcquire::Item *item = acquireitem_tocpp(self);
+    return item ? Py_BuildValue("i", item->PartialSize) : 0;
+}
+
+static PyObject *acquireitem_get_status(PyObject *self, void *closure)
+{
+    pkgAcquire::Item *item = acquireitem_tocpp(self);
+    return item ? Py_BuildValue("i", item->Status) : 0;
+}
+
+static int acquireitem_set_id(PyObject *self, PyObject *value, void *closure)
+{
+    pkgAcquire::Item *Itm = acquireitem_tocpp(self);
+    if (Itm == 0)
+        return -1;
+    if (PyLong_Check(value)) {
+        Itm->ID = PyLong_AsLong(value);
+    }
+    else if (PyInt_Check(value)) {
+        Itm->ID = PyInt_AsLong(value);
+    }
+    else {
+        PyErr_SetString(PyExc_TypeError, "value must be integer.");
+        return -1;
+    }
+    return 0;
+}
+
+
+static PyGetSetDef acquireitem_getset[] = {
+    {"complete",acquireitem_get_complete},
+    {"desc_uri",acquireitem_get_desc_uri},
+    {"destfile",acquireitem_get_destfile},
+    {"error_text",acquireitem_get_error_text},
+    {"filesize",acquireitem_get_filesize},
+    {"id",acquireitem_get_id,acquireitem_set_id},
+    {"mode",acquireitem_get_mode},
+    {"is_trusted",acquireitem_get_is_trusted},
+    {"local",acquireitem_get_local},
+    {"partialsize",acquireitem_get_partialsize},
+    {"status",acquireitem_get_status},
+    {}
+};
+
+static PyObject *acquireitem_repr(PyObject *Self)
+{
+    pkgAcquire::Item *Itm = acquireitem_tocpp(Self);
+    if (Itm == 0)
+        return 0;
+    return PyString_FromFormat("<%s object: "
+                               "Status: %i Complete: %i Local: %i IsTrusted: %i "
+                               "FileSize: %lu DestFile:'%s' "
+                               "DescURI: '%s' ID:%lu ErrorText: '%s'>",
+                               Self->ob_type->tp_name,
+                               Itm->Status, Itm->Complete, Itm->Local, Itm->IsTrusted(),
+                               Itm->FileSize, Itm->DestFile.c_str(),  Itm->DescURI().c_str(),
+                               Itm->ID,Itm->ErrorText.c_str());
+}
+
+static void acquireitem_dealloc(PyObject *self)
+{
+    CppDeallocPtr<pkgAcquire::Item*>(self);
+}
+
+PyTypeObject PyAcquireItem_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.AcquireItem",         // tp_name
+    sizeof(CppPyObject<pkgAcquire::Item*>),   // tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    acquireitem_dealloc,                  // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    acquireitem_repr,                     // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                   // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    _PyAptObject_getattro,               // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    Py_TPFLAGS_DEFAULT |
+    Py_TPFLAGS_HAVE_GC,                  // tp_flags
+    "AcquireItem Object",                // tp_doc
+    CppTraverse<pkgAcquire::Item*>, // tp_traverse
+    CppClear<pkgAcquire::Item*>,    // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    0,                                   // tp_methods
+    0,                                   // tp_members
+    acquireitem_getset,                   // tp_getset
+};
+
+static PyObject *acquirefile_new(PyTypeObject *type, PyObject *Args, PyObject * kwds)
+{
+    PyObject *pyfetcher;
+    char *uri, *md5, *descr, *shortDescr, *destDir, *destFile;
+    int size = 0;
+    uri = md5 = descr = shortDescr = destDir = destFile = "";
+
+    char *kwlist[] = {"owner","uri", "md5", "size", "descr", "short_descr",
+                      "destdir", "destfile", NULL
+                     };
+
+    if (PyArg_ParseTupleAndKeywords(Args, kwds, "O!s|sissss", kwlist,
+                                    &PyAcquire_Type, &pyfetcher, &uri, &md5,
+                                    &size, &descr, &shortDescr, &destDir, &destFile) == 0)
+        return 0;
+
+    pkgAcquire *fetcher = GetCpp<pkgAcquire*>(pyfetcher);
+    pkgAcqFile *af = new pkgAcqFile(fetcher,  // owner
+                                    uri, // uri
+                                    md5,  // md5
+                                    size,   // size
+                                    descr, // descr
+                                    shortDescr,
+                                    destDir,
+                                    destFile); // short-desc
+    CppPyObject<pkgAcqFile*> *AcqFileObj = CppPyObject_NEW<pkgAcqFile*>(pyfetcher, type);
+    AcqFileObj->Object = af;
+    return AcqFileObj;
+}
+
+
+static char *acquirefile_doc =
+    "AcquireFile(owner, uri[, md5, size, descr, short_descr, destdir,"
+    "destfile]) -> New AcquireFile() object\n\n"
+    "The parameter *owner* refers to an apt_pkg.Acquire() object. You can use\n"
+    "*destdir* OR *destfile* to specify the destination directory/file.";
+
+PyTypeObject PyAcquireFile_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.AcquireFile",                // tp_name
+    sizeof(CppPyObject<pkgAcqFile*>),// tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    acquireitem_dealloc,                 // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    0,                                   // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,	                                 // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    Py_TPFLAGS_DEFAULT |                 // tp_flags
+    Py_TPFLAGS_BASETYPE |
+    Py_TPFLAGS_HAVE_GC,
+    acquirefile_doc,                     // tp_doc
+    CppTraverse<pkgAcqFile*>,       // tp_traverse
+    CppClear<pkgAcqFile*>,          // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    0,                                   // tp_methods
+    0,                                   // tp_members
+    0,                                   // tp_getset
+    &PyAcquireItem_Type,                 // tp_base
+    0,                                   // tp_dict
+    0,                                   // tp_descr_get
+    0,                                   // tp_descr_set
+    0,                                   // tp_dictoffset
+    0,                                   // tp_init
+    0,                                   // tp_alloc
+    acquirefile_new,                     // tp_new
+};
+
+#ifdef COMPAT_0_7
+char *doc_GetPkgAcqFile =
+    "GetPkgAcqFile(pkgAquire, uri[, md5, size, descr, shortDescr, destDir, destFile]) -> PkgAcqFile\n";
+PyObject *GetPkgAcqFile(PyObject *Self, PyObject *Args, PyObject * kwds)
+{
+    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgAcqFile() is "
+                 "deprecated. Please see apt_pkg.AcquireFile() for the "
+                 "replacement", 1);
+    PyObject *pyfetcher;
+    char *uri, *md5, *descr, *shortDescr, *destDir, *destFile;
+    int size = 0;
+    uri = md5 = descr = shortDescr = destDir = destFile = "";
+
+    char * kwlist[] = {"owner","uri", "md5", "size", "descr", "shortDescr",
+                       "destDir", "destFile", NULL
+                      };
+
+    if (PyArg_ParseTupleAndKeywords(Args, kwds, "O!s|sissss", kwlist,
+                                    &PyAcquire_Type, &pyfetcher, &uri, &md5,
+                                    &size, &descr, &shortDescr, &destDir, &destFile) == 0)
+        return 0;
+
+    pkgAcquire *fetcher = GetCpp<pkgAcquire*>(pyfetcher);
+    pkgAcqFile *af = new pkgAcqFile(fetcher,  // owner
+                                    uri, // uri
+                                    md5,  // md5
+                                    size,   // size
+                                    descr, // descr
+                                    shortDescr,
+                                    destDir,
+                                    destFile); // short-desc
+    CppPyObject<pkgAcqFile*> *AcqFileObj = CppPyObject_NEW<pkgAcqFile*>(NULL, &PyAcquireFile_Type);
+    AcqFileObj->Object = af;
+    AcqFileObj->NoDelete = true;
+
+    return AcqFileObj;
+}
+#endif
diff --git a/python/acquire.cc b/python/acquire.cc
index 1ecf55a5..cc9ee310 100644
--- a/python/acquire.cc
+++ b/python/acquire.cc
@@ -1,278 +1,380 @@
-// Description								/*{{{*/
-// $Id: acquire.cc,v 1.1 2003/06/03 03:03:23 mvo Exp $
-/* ######################################################################
-
-   Acquire - Wrapper for the acquire code
-
-   ##################################################################### */
+/* acquire.cc - Wrapper for pkgAcquire.
+ *
+ * Copyright 2004-2009 Canonical Ltd
+ * Copyright 2009 Julian Andres Klode <jak@debian.org>
+ *
+ * Authors: Michael Vogt
+ *          Julian Andres Klode
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
 
 #include "generic.h"
 #include "apt_pkgmodule.h"
 #include "progress.h"
 
 #include <apt-pkg/acquire-item.h>
+#include <apt-pkg/acquire-worker.h>
 
-// pkgAcquire::Item
-static PyObject *AcquireItemAttr(PyObject *Self,char *Name)
+
+static PyObject *acquireworker_get_current_item(PyObject *self, void *closure)
 {
-   pkgAcquire::ItemIterator &I = GetCpp<pkgAcquire::ItemIterator>(Self);
-
-   if (strcmp("ID",Name) == 0)
-      return Py_BuildValue("i",(*I)->ID);
-   else if (strcmp("Status",Name) == 0)
-      return Py_BuildValue("i",(*I)->Status);
-   else if (strcmp("Complete",Name) == 0)
-      return Py_BuildValue("i",(*I)->Complete);
-   else if (strcmp("Local",Name) == 0)
-      return Py_BuildValue("i",(*I)->Local);
-   else if (strcmp("IsTrusted",Name) == 0)
-      return Py_BuildValue("i",(*I)->IsTrusted());
-   else if (strcmp("FileSize",Name) == 0)
-      return Py_BuildValue("i",(*I)->FileSize);
-   else if (strcmp("ErrorText",Name) == 0)
-      return Safe_FromString((*I)->ErrorText.c_str());
-   else if (strcmp("DestFile",Name) == 0)
-      return Safe_FromString((*I)->DestFile.c_str());
-   else if (strcmp("DescURI",Name) == 0)
-      return Safe_FromString((*I)->DescURI().c_str());
-   // constants
-   else if (strcmp("StatIdle",Name) == 0)
-      return Py_BuildValue("i", pkgAcquire::Item::StatIdle);
-   else if (strcmp("StatFetching",Name) == 0)
-      return Py_BuildValue("i", pkgAcquire::Item::StatFetching);
-   else if (strcmp("StatDone",Name) == 0)
-      return Py_BuildValue("i", pkgAcquire::Item::StatDone);
-   else if (strcmp("StatError",Name) == 0)
-      return Py_BuildValue("i", pkgAcquire::Item::StatError);
-   else if (strcmp("StatAuthError",Name) == 0)
-      return Py_BuildValue("i", pkgAcquire::Item::StatAuthError);
-
-
-   PyErr_SetString(PyExc_AttributeError,Name);
-   return 0;
+    pkgAcquire::Worker *worker = GetCpp<pkgAcquire::Worker*>(self);
+    pkgAcquire::ItemDesc *desc = worker->CurrentItem;
+    if (desc == NULL) {
+        Py_RETURN_NONE;
+    }
+    PyObject *PyAcq  = GetOwner<pkgAcquire::Worker*>(self);
+    PyObject *PyItem = PyAcquireItem_FromCpp(desc->Owner, false, PyAcq);
+    PyObject *PyDesc = PyAcquireItemDesc_FromCpp(desc, false, PyItem);
+    Py_XDECREF(PyItem);
+    return PyDesc;
 }
 
+static PyObject *acquireworker_get_status(PyObject *self, void *closure)
+{
+    return CppPyString(GetCpp<pkgAcquire::Worker*>(self)->Status);
+}
 
-static PyObject *AcquireItemRepr(PyObject *Self)
+static PyObject *acquireworker_get_current_size(PyObject *self, void *closure)
 {
-   pkgAcquire::ItemIterator &I = GetCpp<pkgAcquire::ItemIterator>(Self);
-
-   char S[300];
-   snprintf(S,sizeof(S),"<pkgAcquire::ItemIterator object: "
-			"Status: %i Complete: %i Local: %i IsTrusted: %i "
-	                "FileSize: %i DestFile:'%s' "
-                        "DescURI: '%s' ID:%i ErrorText: '%s'>",
-	    (*I)->Status, (*I)->Complete, (*I)->Local, (*I)->IsTrusted(),
-	    (*I)->FileSize, (*I)->DestFile.c_str(), (*I)->DescURI().c_str(),
-	    (*I)->ID,(*I)->ErrorText.c_str());
-   return PyString_FromString(S);
+    return Py_BuildValue("k",GetCpp<pkgAcquire::Worker*>(self)->CurrentSize);
 }
 
+static PyObject *acquireworker_get_total_size(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k",GetCpp<pkgAcquire::Worker*>(self)->TotalSize);
+}
 
-PyTypeObject AcquireItemType =
+static PyObject *acquireworker_get_resumepoint(PyObject *self, void *closure)
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgAcquire::ItemIterator",         // tp_name
-   sizeof(CppOwnedPyObject<pkgAcquire::ItemIterator>),   // tp_basicsize
-   0,                                   // tp_itemsize
-   // Methods
-   CppOwnedDealloc<pkgAcquire::ItemIterator>,          // tp_dealloc
-   0,                                   // tp_print
-   AcquireItemAttr,                     // tp_getattr
-   0,                                   // tp_setattr
-   0,                                   // tp_compare
-   AcquireItemRepr,                     // tp_repr
-   0,                                   // tp_as_number
-   0,		                        // tp_as_sequence
-   0,			                // tp_as_mapping
-   0,                                   // tp_hash
-};
+    return Py_BuildValue("k",GetCpp<pkgAcquire::Worker*>(self)->ResumePoint);
+}
 
+static PyGetSetDef acquireworker_getset[] = {
+    {"current_item",acquireworker_get_current_item},
+    {"status",acquireworker_get_status},
+    {"current_size",acquireworker_get_current_size},
+    {"total_size",acquireworker_get_total_size},
+    {"resumepoint",acquireworker_get_resumepoint},
+    {NULL}
+};
 
-static PyObject *PkgAcquireRun(PyObject *Self,PyObject *Args)
-{
-   pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
 
-   int pulseInterval = 500000;
-   if (PyArg_ParseTuple(Args, "|i", &pulseInterval) == 0)
-      return 0;
+PyTypeObject PyAcquireWorker_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.AcquireWorker",                // tp_name
+    sizeof(CppPyObject<pkgAcquire::Worker*>),// tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    CppDealloc<pkgAcquire::Worker*>, // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    0,                                   // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                   // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    Py_TPFLAGS_DEFAULT|                  // tp_flags
+    Py_TPFLAGS_HAVE_GC,
+    0,                 // tp_doc
+    CppTraverse<pkgAcquire::Worker*>, // tp_traverse
+    CppClear<pkgAcquire::Worker*>,   // tp_clear
+    0,                                    // tp_richcompare
+    0,                                    // tp_weaklistoffset
+    0,                                    // tp_iter
+    0,                                    // tp_iternext
+    0,                                    // tp_methods
+    0,                                    // tp_members
+    acquireworker_getset,                 // tp_getset
+};
 
-   pkgAcquire::RunResult run = fetcher->Run(pulseInterval);
 
-   return HandleErrors(Py_BuildValue("i",run));
+static pkgAcquire::ItemDesc* acquireitemdesc_tocpp(PyObject *self) {
+    pkgAcquire::ItemDesc *item = GetCpp<pkgAcquire::ItemDesc*>(self);
+    if (item == NULL)
+        PyErr_SetString(PyExc_ValueError, "Acquire has been shutdown");
+    return item;
 }
 
-static PyObject *PkgAcquireShutdown(PyObject *Self,PyObject *Args)
+static PyObject *acquireitemdesc_get_uri(PyObject *self, void *closure)
 {
-   pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
-
-   if (PyArg_ParseTuple(Args, "") == 0)
-      return 0;
-
-   fetcher->Shutdown();
-
-   Py_INCREF(Py_None);
-   return HandleErrors(Py_None);
+    pkgAcquire::ItemDesc *item = acquireitemdesc_tocpp(self);
+    return item ? CppPyString(item->URI) : NULL;
 }
-
-static PyMethodDef PkgAcquireMethods[] =
+static PyObject *acquireitemdesc_get_description(PyObject *self, void *closure)
 {
-   {"Run",PkgAcquireRun,METH_VARARGS,"Run the fetcher"},
-   {"Shutdown",PkgAcquireShutdown, METH_VARARGS,"Shutdown the fetcher"},
-   {}
-};
-
-
-static PyObject *AcquireAttr(PyObject *Self,char *Name)
+    pkgAcquire::ItemDesc *item = acquireitemdesc_tocpp(self);
+    return item ? CppPyString(item->Description) : NULL;
+}
+static PyObject *acquireitemdesc_get_shortdesc(PyObject *self, void *closure)
 {
-   pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
-
-   if(strcmp("TotalNeeded",Name) == 0)
-      return Py_BuildValue("d", fetcher->TotalNeeded());
-   if(strcmp("FetchNeeded",Name) == 0)
-      return Py_BuildValue("d", fetcher->FetchNeeded());
-   if(strcmp("PartialPresent",Name) == 0)
-      return Py_BuildValue("d", fetcher->PartialPresent());
-   if(strcmp("Items",Name) == 0)
-   {
-      PyObject *List = PyList_New(0);
-      for (pkgAcquire::ItemIterator I = fetcher->ItemsBegin();
-	   I != fetcher->ItemsEnd(); I++)
-      {
-	 PyObject *Obj;
-	 Obj = CppOwnedPyObject_NEW<pkgAcquire::ItemIterator>(Self,&AcquireItemType,I);
-	 PyList_Append(List,Obj);
-	 Py_DECREF(Obj);
-
-      }
-      return List;
-   }
-   // some constants
-   if(strcmp("ResultContinue",Name) == 0)
-      return Py_BuildValue("i", pkgAcquire::Continue);
-   if(strcmp("ResultFailed",Name) == 0)
-      return Py_BuildValue("i", pkgAcquire::Failed);
-   if(strcmp("ResultCancelled",Name) == 0)
-      return Py_BuildValue("i", pkgAcquire::Cancelled);
-
-   return Py_FindMethod(PkgAcquireMethods,Self,Name);
+    pkgAcquire::ItemDesc *item = acquireitemdesc_tocpp(self);
+    return item ? CppPyString(item->ShortDesc) : NULL;
+}
+static PyObject *acquireitemdesc_get_owner(CppPyObject<pkgAcquire::ItemDesc*> *self, void *closure)
+{
+    if (self->Owner != NULL) {
+        Py_INCREF(self->Owner);
+        return self->Owner;
+    }
+    else if (self->Object) {
+        self->Owner = PyAcquireItem_FromCpp(self->Object->Owner, false, NULL);
+        Py_INCREF(self->Owner);
+        return self->Owner;
+    }
+    Py_RETURN_NONE;
 }
 
+static PyGetSetDef acquireitemdesc_getset[] = {
+    {"uri",acquireitemdesc_get_uri,0,"The URI from which to download this item."},
+    {"description",acquireitemdesc_get_description},
+    {"shortdesc",acquireitemdesc_get_shortdesc},
+    {"owner",(getter)acquireitemdesc_get_owner},
+    {NULL}
+};
 
-
-
-PyTypeObject PkgAcquireType =
-{
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "Acquire",                          // tp_name
-   sizeof(CppPyObject<pkgAcquire*>),   // tp_basicsize
-   0,                                   // tp_itemsize
-   // Methods
-   CppDealloc<pkgAcquire*>,        // tp_dealloc
-   0,                                   // tp_print
-   AcquireAttr,                           // tp_getattr
-   0,                                   // tp_setattr
-   0,                                   // tp_compare
-   0,                                   // tp_repr
-   0,                                   // tp_as_number
-   0,                                   // tp_as_sequence
-   0,	                                // tp_as_mapping
-   0,                                   // tp_hash
+static char *acquireitemdesc_doc =
+    "Represent an AcquireItemDesc";
+
+PyTypeObject PyAcquireItemDesc_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.AcquireItemDesc",                // tp_name
+    sizeof(CppPyObject<pkgAcquire::ItemDesc*>),// tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    CppDealloc<pkgAcquire::ItemDesc*>, // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    0,                                   // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                 // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    (Py_TPFLAGS_DEFAULT |                // tp_flags
+    Py_TPFLAGS_HAVE_GC),
+    acquireitemdesc_doc,                 // tp_doc
+    CppTraverse<pkgAcquire::ItemDesc*>,// tp_traverse
+    CppClear<pkgAcquire::ItemDesc*>, // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    0,                                   // tp_methods
+    0,                                   // tp_members
+    acquireitemdesc_getset,              // tp_getset
+    0,                                   // tp_base
+    0,                                   // tp_dict
+    0,                                   // tp_descr_get
+    0,                                   // tp_descr_set
+    0,                                   // tp_dictoffset
+    0,                                   // tp_init
+    0,                                   // tp_alloc
+    0,                                   // tp_new
 };
 
-PyObject *GetAcquire(PyObject *Self,PyObject *Args)
+static PyObject *PkgAcquireRun(PyObject *Self,PyObject *Args)
 {
-   pkgAcquire *fetcher;
-
-   PyObject *pyFetchProgressInst = NULL;
-   if (PyArg_ParseTuple(Args,"|O",&pyFetchProgressInst) == 0)
-      return 0;
+    pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
 
-   if (pyFetchProgressInst != NULL) {
-      // FIXME: memleak?
-      PyFetchProgress *progress = new PyFetchProgress();
-      progress->setCallbackInst(pyFetchProgressInst);
-      fetcher = new pkgAcquire(progress);
-   } else {
-      fetcher = new pkgAcquire();
-   }
+    int pulseInterval = 500000;
+    if (PyArg_ParseTuple(Args, "|i", &pulseInterval) == 0)
+        return 0;
 
-   CppPyObject<pkgAcquire*> *FetcherObj =
-	   CppPyObject_NEW<pkgAcquire*>(&PkgAcquireType, fetcher);
+    pkgAcquire::RunResult run = fetcher->Run(pulseInterval);
 
-   return FetcherObj;
+    return HandleErrors(Py_BuildValue("i",run));
 }
 
 
+static PyObject *PkgAcquireShutdown(PyObject *Self,PyObject *Args)
+{
+    pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
+    if (PyArg_ParseTuple(Args, "") == 0)
+        return 0;
+    fetcher->Shutdown();
+    Py_INCREF(Py_None);
+    return HandleErrors(Py_None);
+}
 
 
 
-// pkgAcquireFile
+static PyMethodDef PkgAcquireMethods[] = {
+    {"run",PkgAcquireRun,METH_VARARGS,"Run the fetcher"},
+    {"shutdown",PkgAcquireShutdown, METH_VARARGS,"Shutdown the fetcher"},
+    {}
+};
 
-static PyObject *AcquireFileAttr(PyObject *Self,char *Name)
+#define fetcher (GetCpp<pkgAcquire*>(Self))
+static PyObject *PkgAcquireGetTotalNeeded(PyObject *Self,void*)
 {
-   pkgAcqFile *acqFile = GetCpp<pkgAcqFile*>(Self);
+    return Py_BuildValue("d", fetcher->TotalNeeded());
+}
+static PyObject *PkgAcquireGetFetchNeeded(PyObject *Self,void*)
+{
+    return Py_BuildValue("d", fetcher->FetchNeeded());
+}
+static PyObject *PkgAcquireGetPartialPresent(PyObject *Self,void*)
+{
+    return Py_BuildValue("d", fetcher->PartialPresent());
+}
+#undef fetcher
 
-   PyErr_SetString(PyExc_AttributeError,Name);
-   return 0;
+static PyObject *PkgAcquireGetWorkers(PyObject *self, void *closure)
+{
+    PyObject *List = PyList_New(0);
+    pkgAcquire *Owner = GetCpp<pkgAcquire*>(self);
+    PyObject *PyWorker = NULL;
+    for (pkgAcquire::Worker *Worker = Owner->WorkersBegin();
+            Worker != 0; Worker = Owner->WorkerStep(Worker)) {
+        PyWorker = PyAcquireWorker_FromCpp(Worker, false, self);
+        PyList_Append(List, PyWorker);
+        Py_DECREF(PyWorker);
+    }
+    return List;
+}
+static PyObject *PkgAcquireGetItems(PyObject *Self,void*)
+{
+    pkgAcquire *fetcher = GetCpp<pkgAcquire*>(Self);
+    PyObject *List = PyList_New(0);
+    PyObject *Obj;
+    for (pkgAcquire::ItemIterator I = fetcher->ItemsBegin();
+            I != fetcher->ItemsEnd(); I++) {
+        Obj = PyAcquireItem_FromCpp(*I, false, Self);
+        PyList_Append(List,Obj);
+        Py_DECREF(Obj);
+    }
+    return List;
 }
 
+static PyGetSetDef PkgAcquireGetSet[] = {
+    {"fetch_needed",PkgAcquireGetFetchNeeded},
+    {"items",PkgAcquireGetItems},
+    {"workers",PkgAcquireGetWorkers},
+    {"partial_present",PkgAcquireGetPartialPresent},
+    {"total_needed",PkgAcquireGetTotalNeeded},
+    {}
+};
 
+static PyObject *PkgAcquireNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
+{
+    pkgAcquire *fetcher;
+
+    PyObject *pyFetchProgressInst = NULL;
+    char *kwlist[] = {"progress", 0};
+    if (PyArg_ParseTupleAndKeywords(Args,kwds,"|O",kwlist,&pyFetchProgressInst) == 0)
+        return 0;
+
+    PyFetchProgress *progress = 0;
+    if (pyFetchProgressInst != NULL) {
+        // FIXME: memleak?
+        progress = new PyFetchProgress();
+        progress->setCallbackInst(pyFetchProgressInst);
+        fetcher = new pkgAcquire(progress);
+    }
+    else {
+        fetcher = new pkgAcquire();
+    }
+
+    PyObject *FetcherObj = CppPyObject_NEW<pkgAcquire*>(NULL, type, fetcher);
+
+    if (progress != 0)
+        progress->setPyAcquire(FetcherObj);
+    // prepare our map of items.
+    return FetcherObj;
+}
 
+/**
+ * Create a new apt_pkg.Acquire Python object from the pkgAcquire object.
+ */
+PyObject *PyAcquire_FromCpp(pkgAcquire *fetcher, bool Delete, PyObject *owner) {
+    CppPyObject<pkgAcquire*> *obj = CppPyObject_NEW<pkgAcquire*>(owner, &PyAcquire_Type, fetcher);
+    obj->NoDelete = (!Delete);
+    return obj;
+}
 
-PyTypeObject PkgAcquireFileType =
-{
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgAcquireFile",                   // tp_name
-   sizeof(CppPyObject<pkgAcqFile*>),// tp_basicsize
-   0,                                   // tp_itemsize
-   // Methods
-   CppDealloc<pkgAcqFile*>,        // tp_dealloc
-   0,                                   // tp_print
-   AcquireFileAttr,                           // tp_getattr
-   0,                                   // tp_setattr
-   0,                                   // tp_compare
-   0,                                   // tp_repr
-   0,                                   // tp_as_number
-   0,                                   // tp_as_sequence
-   0,	                                // tp_as_mapping
-   0,                                   // tp_hash
+static char *doc_PkgAcquire =
+    "Acquire(progress: apt_pkg.AcquireProgress) -> Acquire() object.\n\n"
+    "Create a new acquire object. The parameter *progress* can be used to\n"
+    "specify an apt_pkg.AcquireProgress() object, which will display the\n"
+    "progress of the fetching.";
+
+PyTypeObject PyAcquire_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.Acquire",                   // tp_name
+    sizeof(CppPyObject<pkgAcquire*>),    // tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    CppDeallocPtr<pkgAcquire*>,          // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    0,                                   // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                   // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    _PyAptObject_getattro,               // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    (Py_TPFLAGS_DEFAULT |                // tp_flags
+    Py_TPFLAGS_BASETYPE),
+    doc_PkgAcquire,                      // tp_doc
+    0,                                   // tp_traverse
+    0,                                   // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    PkgAcquireMethods,                   // tp_methods
+    0,                                   // tp_members
+    PkgAcquireGetSet,                    // tp_getset
+    0,                                   // tp_base
+    0,                                   // tp_dict
+    0,                                   // tp_descr_get
+    0,                                   // tp_descr_set
+    0,                                   // tp_dictoffset
+    0,                                   // tp_init
+    0,                                   // tp_alloc
+    PkgAcquireNew,                       // tp_new
 };
 
-char *doc_GetPkgAcqFile =
-"GetPkgAcqFile(pkgAquire, uri[, md5, size, descr, shortDescr, destDir, destFile]) -> PkgAcqFile\n";
-PyObject *GetPkgAcqFile(PyObject *Self, PyObject *Args, PyObject * kwds)
+#ifdef COMPAT_0_7
+PyObject *GetAcquire(PyObject *Self,PyObject *Args)
 {
-   PyObject *pyfetcher;
-   char *uri, *md5, *descr, *shortDescr, *destDir, *destFile;
-   int size = 0;
-   uri = md5 = descr = shortDescr = destDir = destFile = "";
-
-   char * kwlist[] = {"owner","uri", "md5", "size", "descr", "shortDescr",
-                      "destDir", "destFile", NULL};
-
-   if (PyArg_ParseTupleAndKeywords(Args, kwds, "O!s|sissss", kwlist,
-				   &PkgAcquireType, &pyfetcher, &uri, &md5,
-				   &size, &descr, &shortDescr, &destDir, &destFile) == 0)
-      return 0;
-
-   pkgAcquire *fetcher = GetCpp<pkgAcquire*>(pyfetcher);
-   pkgAcqFile *af = new pkgAcqFile(fetcher,  // owner
-				   uri, // uri
-				   md5,  // md5
-				   size,   // size
-				   descr, // descr
-				   shortDescr,
-				   destDir,
-				   destFile); // short-desc
-   CppPyObject<pkgAcqFile*> *AcqFileObj =   CppPyObject_NEW<pkgAcqFile*>(&PkgAcquireFileType);
-   AcqFileObj->Object = af;
-
-   return AcqFileObj;
+    PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetAcquire() is deprecated."
+                 " Please see apt_pkg.Acquire() for the replacement.", 1);
+    return PkgAcquireNew(&PyAcquire_Type,Args,0);
 }
+#endif
 
-
-									/*}}}*/
diff --git a/python/apt_instmodule.cc b/python/apt_instmodule.cc
index 48868d86..2721509e 100644
--- a/python/apt_instmodule.cc
+++ b/python/apt_instmodule.cc
@@ -23,26 +23,31 @@
 #include <Python.h>
 									/*}}}*/
 
+#ifdef COMPAT_0_7
+
 // debExtractControl - Exctract an arbitary control member		/*{{{*/
 // ---------------------------------------------------------------------
 /* This is a common operation so this function will stay, but others that
    expose the full range of the apt-inst .deb processing will join it some
    day. */
 static char *doc_debExtractControl =
-"debExtractControl(File[,Member]) -> String\n"
+"deb_extract_control(file[,member]) -> String\n"
 "Returns the indicated file from the control tar. The default is 'control'\n";
 static PyObject *debExtractControl(PyObject *Self,PyObject *Args)
 {
    char *Member = "control";
    PyObject *File;
-   if (PyArg_ParseTuple(Args,"O!|s",&PyFile_Type,&File,&Member) == 0)
+   if (PyArg_ParseTuple(Args,"O|s",&File,&Member) == 0)
       return 0;
 
    // Subscope makes sure any clean up errors are properly handled.
    PyObject *Res = 0;
    {
       // Open the file and associate the .deb
-      FileFd Fd(fileno(PyFile_AsFile(File)),false);
+      int fileno = PyObject_AsFileDescriptor(File);
+      if (fileno == -1)
+         return 0;
+      FileFd Fd(fileno,false);
       debDebFile Deb(Fd);
       if (_error->PendingError() == true)
 	 return HandleErrors();
@@ -69,14 +74,14 @@ static PyObject *debExtractControl(PyObject *Self,PyObject *Args)
 // debExtractArchive - Exctract the archive		/*{{{*/
 // ---------------------------------------------------------------------
 static char *doc_debExtractArchive =
-"debExtractArchve(File,rootdir) -> Bool\n"
+"deb_extract_archive(File,rootdir) -> Bool\n"
 "Extracts the Archive into the given root dir";
 static PyObject *debExtractArchive(PyObject *Self,PyObject *Args)
 {
    char *Rootdir = NULL;
    char cwd[512];
    PyObject *File;
-   if (PyArg_ParseTuple(Args,"O!|s",&PyFile_Type,&File,&Rootdir) == 0)
+   if (PyArg_ParseTuple(Args,"O|s",&File,&Rootdir) == 0)
       return 0;
 
    // Subscope makes sure any clean up errors are properly handled.
@@ -89,7 +94,10 @@ static PyObject *debExtractArchive(PyObject *Self,PyObject *Args)
       }
 
       // Open the file and associate the .deb
-      FileFd Fd(fileno(PyFile_AsFile(File)),false);
+      int fileno = PyObject_AsFileDescriptor(File);
+      if (fileno == -1)
+         return 0;
+      FileFd Fd(fileno,false);
       debDebFile Deb(Fd);
       if (_error->PendingError() == true) {
 	 if (Rootdir != NULL)
@@ -112,17 +120,20 @@ static PyObject *debExtractArchive(PyObject *Self,PyObject *Args)
 // arFindMember - Find member in AR archive              		/*{{{*/
 // ---------------------------------------------------------------------
 static char *doc_arCheckMember =
-"arCheckMember(File, membername) -> Bool\n";
+"ar_check_member(file, membername) -> Bool\n";
 static PyObject *arCheckMember(PyObject *Self,PyObject *Args)
 {
    char *Member = NULL;
    bool res = false;
    PyObject *File;
-   if (PyArg_ParseTuple(Args,"O!s",&PyFile_Type,&File,&Member) == 0)
+   if (PyArg_ParseTuple(Args,"Os",&File,&Member) == 0)
       return 0;
 
    // Open the file and associate the .deb
-   FileFd Fd(fileno(PyFile_AsFile(File)),false);
+   int fileno = PyObject_AsFileDescriptor(File);
+   if (fileno == -1)
+      return 0;
+   FileFd Fd(fileno,false);
    ARArchive AR(Fd);
    if (_error->PendingError() == true)
       return HandleErrors(Py_BuildValue("b",res));
@@ -145,16 +156,56 @@ static PyMethodDef methods[] =
    // access to deb files
    {"debExtractControl",debExtractControl,METH_VARARGS,doc_debExtractControl},
    {"debExtractArchive",debExtractArchive,METH_VARARGS,doc_debExtractArchive},
-
+   
    // access to tar streams
    {"tarExtract",tarExtract,METH_VARARGS,doc_tarExtract},
    {"debExtract",debExtract,METH_VARARGS,doc_debExtract},
-
    {}
 };
-
+#else
+static PyMethodDef *methods = 0;
+#endif // defined(COMPAT_0_7)
+
+
+static const char *apt_inst_doc =
+    "Functions for working with AR,tar archives and .deb packages.\n\n"
+    "This module provides useful classes and functions to work with\n"
+    "archives, modelled after the 'TarFile' class in the 'tarfile' module.";
+#define ADDTYPE(mod,name,type) { \
+    if (PyType_Ready(type) == -1) RETURN(0); \
+    Py_INCREF(type); \
+    PyModule_AddObject(mod,name,(PyObject *)type); }
+
+
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef moduledef = {
+        PyModuleDef_HEAD_INIT,
+        "apt_inst",
+        apt_inst_doc,
+        -1,
+        methods,
+        0,
+        0,
+        0,
+        0
+};
+#define RETURN(x) return x
+extern "C" PyObject * PyInit_apt_inst()
+#else
 extern "C" void initapt_inst()
+#define RETURN(x)
+#endif
 {
-   Py_InitModule("apt_inst",methods);
+#if PY_MAJOR_VERSION >= 3
+   PyObject *module = PyModule_Create(&moduledef);
+#else
+   PyObject *module = Py_InitModule3("apt_inst",methods, apt_inst_doc);
+#endif
+
+   ADDTYPE(module,"ArMember",&PyArMember_Type);
+   ADDTYPE(module,"ArArchive",&PyArArchive_Type);
+   ADDTYPE(module,"DebFile",&PyDebFile_Type);
+   ADDTYPE(module,"TarFile",&PyTarFile_Type);
+   ADDTYPE(module,"TarMember",&PyTarMember_Type);
+   RETURN(module);
 }
-									/*}}}*/
diff --git a/python/apt_instmodule.h b/python/apt_instmodule.h
index 45ba5f85..f6b337f4 100644
--- a/python/apt_instmodule.h
+++ b/python/apt_instmodule.h
@@ -11,10 +11,25 @@
 #define APT_INSTMODULE_H
 
 #include <Python.h>
+#include "generic.h"
+#include <apt-pkg/extracttar.h>
 
+#ifdef COMPAT_0_7
 PyObject *debExtract(PyObject *Self,PyObject *Args);
 extern char *doc_debExtract;
 PyObject *tarExtract(PyObject *Self,PyObject *Args);
 extern char *doc_tarExtract;
+#endif
+
+extern PyTypeObject PyArMember_Type;
+extern PyTypeObject PyArArchive_Type;
+extern PyTypeObject PyDebFile_Type;
+extern PyTypeObject PyTarFile_Type;
+extern PyTypeObject PyTarMember_Type;
+
+struct PyTarFileObject : public CppPyObject<ExtractTar*> {
+    int min;
+    FileFd Fd;
+};
 
 #endif
diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index bfa1227e..3d40832b 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -13,6 +13,8 @@
 #include "generic.h"
 
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/packagemanager.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/pkgcache.h>
@@ -24,17 +26,39 @@
 #include <apt-pkg/pkgsystem.h>
 
 #include <sys/stat.h>
+#include <libintl.h>
 #include <unistd.h>
 #include <Python.h>
 									/*}}}*/
 
+/**
+ * A Python->C->Python gettext() function.
+ *
+ * Python's gettext() ignores setlocale() which causes a strange behavior
+ * because the values received from apt-pkg respect setlocale(). We circumvent
+ * this problem by calling the C version of gettext(). This is also much
+ * faster.
+ */
+static PyObject *py_gettext(PyObject *self, PyObject *Args) {
+    const char *msg;
+    char *domain = "python-apt";
+    if (PyArg_ParseTuple(Args,"s|s:gettext",&msg, &domain) == 0)
+        return 0;
+
+    return PyString_FromString(dgettext(domain, msg));
+}
+
 // newConfiguration - Build a new configuration class			/*{{{*/
 // ---------------------------------------------------------------------
+#ifdef COMPAT_0_7
 static char *doc_newConfiguration = "Construct a configuration instance";
 static PyObject *newConfiguration(PyObject *self,PyObject *args)
 {
-   return CppPyObject_NEW<Configuration>(&ConfigurationType);
+   PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.newConfiguration() is "
+                "deprecated. Use apt_pkg.Configuration() instead.", 1);
+   return CppPyObject_NEW<Configuration*>(NULL, &PyConfiguration_Type, new Configuration());
 }
+#endif
 									/*}}}*/
 
 // Version Wrappers							/*{{{*/
@@ -59,7 +83,14 @@ static PyObject *VersionCompare(PyObject *Self,PyObject *Args)
    return Py_BuildValue("i",_system->VS->DoCmpVersion(A,A+LenA,B,B+LenB));
 }
 
-static char *doc_CheckDep = "CheckDep(PkgVer,DepOp,DepVer) -> int";
+static char *doc_CheckDep =
+    "check_dep(pkg_ver: str, dep_op: str, dep_ver: str) -> bool\n\n"
+    "Check that the given requirement is fulfilled; i.e. that the version\n"
+    "string given by 'pkg_ver' matches the version string 'dep_ver' under\n"
+    "the condition specified by the operator 'dep_op' (<,<=,=,>=,>).\n\n"
+    "This functions returns True if 'pkg_ver' matches 'dep_ver' under the\n"
+    "condition 'dep_op'; e.g. this returns True:\n\n"
+    "    apt_pkg.check_dep('1', '<=', '2')";
 static PyObject *CheckDep(PyObject *Self,PyObject *Args)
 {
    char *A;
@@ -69,6 +100,9 @@ static PyObject *CheckDep(PyObject *Self,PyObject *Args)
 
    if (PyArg_ParseTuple(Args,"sss",&A,&OpStr,&B) == 0)
       return 0;
+
+   if (strcmp(OpStr, ">") == 0) OpStr = ">>";
+   if (strcmp(OpStr, "<") == 0) OpStr = "<<";
    if (*debListParser::ConvertRelation(OpStr,Op) != 0)
    {
       PyErr_SetString(PyExc_ValueError,"Bad comparision operation");
@@ -81,10 +115,36 @@ static PyObject *CheckDep(PyObject *Self,PyObject *Args)
       return 0;
    }
 
-   return Py_BuildValue("i",_system->VS->CheckDep(A,Op,B));
-//   return Py_BuildValue("i",pkgCheckDep(B,A,Op));
+   return PyBool_FromLong(_system->VS->CheckDep(A,Op,B));
 }
 
+#ifdef COMPAT_0_7
+static char *doc_CheckDepOld = "CheckDep(PkgVer,DepOp,DepVer) -> bool";
+static PyObject *CheckDepOld(PyObject *Self,PyObject *Args)
+{
+   char *A;
+   char *B;
+   char *OpStr;
+   unsigned int Op = 0;
+
+   if (PyArg_ParseTuple(Args,"sss",&A,&OpStr,&B) == 0)
+      return 0;
+   if (*debListParser::ConvertRelation(OpStr,Op) != 0)
+   {
+      PyErr_SetString(PyExc_ValueError,"Bad comparision operation");
+      return 0;
+   }
+
+   if (_system == 0)
+   {
+      PyErr_SetString(PyExc_ValueError,"_system not initialized");
+      return 0;
+   }
+
+   return PyBool_FromLong(_system->VS->CheckDep(A,Op,B));
+}
+#endif
+
 static char *doc_UpstreamVersion = "UpstreamVersion(a) -> string";
 static PyObject *UpstreamVersion(PyObject *Self,PyObject *Args)
 {
@@ -100,9 +160,11 @@ static char *doc_ParseDepends =
 "The resulting tuples are (Pkg,Ver,Operation). Each anded dependency is a\n"
 "list of or'd dependencies\n"
 "Source depends are evaluated against the curernt arch and only those that\n"
-"Match are returned.";
+"Match are returned.\n\n"
+"apt_pkg.Parse{,Src}Depends() are old forms which return >>,<< instead of >,<";
 static PyObject *RealParseDepends(PyObject *Self,PyObject *Args,
-				  bool ParseArchFlags)
+                                  bool ParseArchFlags, string name,
+                                  bool debStyle=false)
 {
    string Package;
    string Version;
@@ -112,7 +174,7 @@ static PyObject *RealParseDepends(PyObject *Self,PyObject *Args,
    const char *Stop;
    int Len;
 
-   if (PyArg_ParseTuple(Args,"s#",&Start,&Len) == 0)
+   if (PyArg_ParseTuple(Args,(char *)("s#:" + name).c_str(),&Start,&Len) == 0)
       return 0;
    Stop = Start + Len;
    PyObject *List = PyList_New(0);
@@ -139,7 +201,7 @@ static PyObject *RealParseDepends(PyObject *Self,PyObject *Args,
 	 PyObject *Obj;
 	 PyList_Append(LastRow,Obj = Py_BuildValue("sss",Package.c_str(),
 						   Version.c_str(),
-						pkgCache::CompTypeDeb(Op)));
+						debStyle ? pkgCache::CompTypeDeb(Op) : pkgCache::CompType(Op)));
 	 Py_DECREF(Obj);
       }
 
@@ -156,12 +218,22 @@ static PyObject *RealParseDepends(PyObject *Self,PyObject *Args,
 }
 static PyObject *ParseDepends(PyObject *Self,PyObject *Args)
 {
-   return RealParseDepends(Self,Args,false);
+   return RealParseDepends(Self, Args, false, "parse_depends");
 }
 static PyObject *ParseSrcDepends(PyObject *Self,PyObject *Args)
 {
-   return RealParseDepends(Self,Args,true);
+   return RealParseDepends(Self, Args, true, "parse_src_depends");
+}
+#ifdef COMPAT_0_7
+static PyObject *ParseDepends_old(PyObject *Self,PyObject *Args)
+{
+   return RealParseDepends(Self, Args, false, "ParseDepends", true);
+}
+static PyObject *ParseSrcDepends_old(PyObject *Self,PyObject *Args)
+{
+   return RealParseDepends(Self, Args, true, "ParseSrcDepends", true);
 }
+#endif
 									/*}}}*/
 // md5sum - Compute the md5sum of a file or string			/*{{{*/
 // ---------------------------------------------------------------------
@@ -173,21 +245,21 @@ static PyObject *md5sum(PyObject *Self,PyObject *Args)
       return 0;
 
    // Digest of a string.
-   if (PyString_Check(Obj) != 0)
+   if (PyBytes_Check(Obj) != 0)
    {
       char *s;
       Py_ssize_t len;
       MD5Summation Sum;
-      PyString_AsStringAndSize(Obj, &s, &len);
+      PyBytes_AsStringAndSize(Obj, &s, &len);
       Sum.Add((const unsigned char*)s, len);
       return CppPyString(Sum.Result().Value());
    }
 
    // Digest of a file
-   if (PyFile_Check(Obj) != 0)
+   int Fd = PyObject_AsFileDescriptor(Obj);
+   if (Fd != -1)
    {
       MD5Summation Sum;
-      int Fd = fileno(PyFile_AsFile(Obj));
       struct stat St;
       if (fstat(Fd,&St) != 0 ||
 	  Sum.AddFD(Fd,St.st_size) == false)
@@ -213,21 +285,21 @@ static PyObject *sha1sum(PyObject *Self,PyObject *Args)
       return 0;
 
    // Digest of a string.
-   if (PyString_Check(Obj) != 0)
+   if (PyBytes_Check(Obj) != 0)
    {
       char *s;
       Py_ssize_t len;
       SHA1Summation Sum;
-      PyString_AsStringAndSize(Obj, &s, &len);
+      PyBytes_AsStringAndSize(Obj, &s, &len);
       Sum.Add((const unsigned char*)s, len);
       return CppPyString(Sum.Result().Value());
    }
 
    // Digest of a file
-   if (PyFile_Check(Obj) != 0)
+   int Fd = PyObject_AsFileDescriptor(Obj);
+   if (Fd != -1)
    {
       SHA1Summation Sum;
-      int Fd = fileno(PyFile_AsFile(Obj));
       struct stat St;
       if (fstat(Fd,&St) != 0 ||
 	  Sum.AddFD(Fd,St.st_size) == false)
@@ -253,21 +325,21 @@ static PyObject *sha256sum(PyObject *Self,PyObject *Args)
       return 0;
 
    // Digest of a string.
-   if (PyString_Check(Obj) != 0)
+   if (PyBytes_Check(Obj) != 0)
    {
       char *s;
       Py_ssize_t len;
       SHA256Summation Sum;
-      PyString_AsStringAndSize(Obj, &s, &len);
+      PyBytes_AsStringAndSize(Obj, &s, &len);
       Sum.Add((const unsigned char*)s, len);
       return CppPyString(Sum.Result().Value());
    }
 
    // Digest of a file
-   if (PyFile_Check(Obj) != 0)
+   int Fd = PyObject_AsFileDescriptor(Obj);
+   if (Fd != -1)
    {
       SHA256Summation Sum;
-      int Fd = fileno(PyFile_AsFile(Obj));
       struct stat St;
       if (fstat(Fd,&St) != 0 ||
 	  Sum.AddFD(Fd,St.st_size) == false)
@@ -385,42 +457,82 @@ static PyObject *PkgSystemUnLock(PyObject *Self,PyObject *Args)
 static PyMethodDef methods[] =
 {
    // Constructors
-   {"newConfiguration",newConfiguration,METH_VARARGS,doc_newConfiguration},
    {"init",Init,METH_VARARGS,doc_Init},
+   {"init_config",InitConfig,METH_VARARGS,doc_InitConfig},
+   {"init_system",InitSystem,METH_VARARGS,doc_InitSystem},
+
+   // Internationalization.
+   {"gettext",py_gettext,METH_VARARGS,
+    "gettext(msg: str[, domain: str = 'python-apt']) -> str\n\n"
+    "Translate the given string. Much Faster than Python's version and only\n"
+    "does translations after setlocale() has been called."},
+
+   // Tag File
+   {"rewrite_section",RewriteSection,METH_VARARGS,doc_RewriteSection},
+
+   // Locking
+   {"get_lock",GetLock,METH_VARARGS,doc_GetLock},
+   {"pkgsystem_lock",PkgSystemLock,METH_VARARGS,doc_PkgSystemLock},
+   {"pkgsystem_unlock",PkgSystemUnLock,METH_VARARGS,doc_PkgSystemUnLock},
+
+   // Command line
+   {"read_config_file",LoadConfig,METH_VARARGS,doc_LoadConfig},
+   {"read_config_dir",LoadConfigDir,METH_VARARGS,doc_LoadConfigDir},
+   {"read_config_file_isc",LoadConfigISC,METH_VARARGS,doc_LoadConfig},
+   {"parse_commandline",ParseCommandLine,METH_VARARGS,doc_ParseCommandLine},
+
+   // Versioning
+   {"version_compare",VersionCompare,METH_VARARGS,doc_VersionCompare},
+   {"check_dep",CheckDep,METH_VARARGS,doc_CheckDep},
+   {"upstream_version",UpstreamVersion,METH_VARARGS,doc_UpstreamVersion},
+
+   // Depends
+   {"parse_depends",ParseDepends,METH_VARARGS,doc_ParseDepends},
+   {"parse_src_depends",ParseSrcDepends,METH_VARARGS,doc_ParseDepends},
+
+   // Stuff
+   {"md5sum",md5sum,METH_VARARGS,doc_md5sum},
+   {"sha1sum",sha1sum,METH_VARARGS,doc_sha1sum},
+   {"sha256sum",sha256sum,METH_VARARGS,doc_sha256sum},
+
+   // Strings
+   {"check_domain_list",StrCheckDomainList,METH_VARARGS,"CheckDomainList(String,String) -> Bool"},
+   {"quote_string",StrQuoteString,METH_VARARGS,"QuoteString(String,String) -> String"},
+   {"dequote_string",StrDeQuote,METH_VARARGS,"DeQuoteString(String) -> String"},
+   {"size_to_str",StrSizeToStr,METH_VARARGS,"SizeToStr(int) -> String"},
+   {"time_to_str",StrTimeToStr,METH_VARARGS,"TimeToStr(int) -> String"},
+   {"uri_to_filename",StrURItoFileName,METH_VARARGS,"URItoFileName(String) -> String"},
+   {"base64_encode",StrBase64Encode,METH_VARARGS,"Base64Encode(String) -> String"},
+   {"string_to_bool",StrStringToBool,METH_VARARGS,"StringToBool(String) -> int"},
+   {"time_rfc1123",StrTimeRFC1123,METH_VARARGS,"TimeRFC1123(int) -> String"},
+   {"str_to_time",StrStrToTime,METH_VARARGS,"StrToTime(String) -> Int"},
+
+   // DEPRECATED
+   #ifdef COMPAT_0_7
+   {"CheckDep",CheckDepOld,METH_VARARGS,doc_CheckDepOld},
+   {"newConfiguration",newConfiguration,METH_VARARGS,doc_newConfiguration},
    {"InitConfig",InitConfig,METH_VARARGS,doc_InitConfig},
    {"InitSystem",InitSystem,METH_VARARGS,doc_InitSystem},
 
-   // Tag File
    {"ParseSection",ParseSection,METH_VARARGS,doc_ParseSection},
    {"ParseTagFile",ParseTagFile,METH_VARARGS,doc_ParseTagFile},
    {"RewriteSection",RewriteSection,METH_VARARGS,doc_RewriteSection},
 
-   // Locking
    {"GetLock",GetLock,METH_VARARGS,doc_GetLock},
    {"PkgSystemLock",PkgSystemLock,METH_VARARGS,doc_PkgSystemLock},
    {"PkgSystemUnLock",PkgSystemUnLock,METH_VARARGS,doc_PkgSystemUnLock},
 
-   // Command line
    {"ReadConfigFile",LoadConfig,METH_VARARGS,doc_LoadConfig},
    {"ReadConfigDir",LoadConfigDir,METH_VARARGS,doc_LoadConfigDir},
    {"ReadConfigFileISC",LoadConfigISC,METH_VARARGS,doc_LoadConfig},
    {"ParseCommandLine",ParseCommandLine,METH_VARARGS,doc_ParseCommandLine},
 
-   // Versioning
    {"VersionCompare",VersionCompare,METH_VARARGS,doc_VersionCompare},
-   {"CheckDep",CheckDep,METH_VARARGS,doc_CheckDep},
    {"UpstreamVersion",UpstreamVersion,METH_VARARGS,doc_UpstreamVersion},
 
-   // Depends
-   {"ParseDepends",ParseDepends,METH_VARARGS,doc_ParseDepends},
-   {"ParseSrcDepends",ParseSrcDepends,METH_VARARGS,doc_ParseDepends},
+   {"ParseDepends",ParseDepends_old,METH_VARARGS,doc_ParseDepends},
+   {"ParseSrcDepends",ParseSrcDepends_old,METH_VARARGS,doc_ParseDepends},
 
-   // Stuff
-   {"md5sum",md5sum,METH_VARARGS,doc_md5sum},
-   {"sha1sum",sha1sum,METH_VARARGS,doc_sha1sum},
-   {"sha256sum",sha256sum,METH_VARARGS,doc_sha256sum},
-
-   // Strings
    {"CheckDomainList",StrCheckDomainList,METH_VARARGS,"CheckDomainList(String,String) -> Bool"},
    {"QuoteString",StrQuoteString,METH_VARARGS,"QuoteString(String,String) -> String"},
    {"DeQuoteString",StrDeQuote,METH_VARARGS,"DeQuoteString(String) -> String"},
@@ -432,104 +544,376 @@ static PyMethodDef methods[] =
    {"TimeRFC1123",StrTimeRFC1123,METH_VARARGS,"TimeRFC1123(int) -> String"},
    {"StrToTime",StrStrToTime,METH_VARARGS,"StrToTime(String) -> Int"},
 
-   // Cache
    {"GetCache",TmpGetCache,METH_VARARGS,"GetCache() -> PkgCache"},
    {"GetDepCache",GetDepCache,METH_VARARGS,"GetDepCache(Cache) -> DepCache"},
    {"GetPkgRecords",GetPkgRecords,METH_VARARGS,"GetPkgRecords(Cache) -> PkgRecords"},
    {"GetPkgSrcRecords",GetPkgSrcRecords,METH_VARARGS,"GetPkgSrcRecords() -> PkgSrcRecords"},
    {"GetPkgSourceList",GetPkgSourceList,METH_VARARGS,"GetPkgSourceList() -> PkgSourceList"},
-
-   // misc
    {"GetPkgProblemResolver",GetPkgProblemResolver,METH_VARARGS,"GetDepProblemResolver(DepCache) -> PkgProblemResolver"},
    {"GetPkgActionGroup",GetPkgActionGroup,METH_VARARGS,"GetPkgActionGroup(DepCache) -> PkgActionGroup"},
-
-   // Cdrom
    {"GetCdrom",GetCdrom,METH_VARARGS,"GetCdrom() -> Cdrom"},
-
-   // Acquire
    {"GetAcquire",GetAcquire,METH_VARARGS,"GetAcquire() -> Acquire"},
    {"GetPkgAcqFile",(PyCFunction)GetPkgAcqFile,METH_KEYWORDS|METH_VARARGS, doc_GetPkgAcqFile},
-
-   // PkgManager
    {"GetPackageManager",GetPkgManager,METH_VARARGS,"GetPackageManager(DepCache) -> PackageManager"},
+   #endif
 
    {}
 };
 
-static void AddStr(PyObject *Dict,const char *Itm,const char *Str)
-{
-   PyObject *Obj = PyString_FromString(Str);
-   PyDict_SetItemString(Dict,(char *)Itm,Obj);
-   Py_DECREF(Obj);
-}
+static struct _PyAptPkgAPIStruct API = {
+   &PyAcquire_Type,           // acquire_type
+   &PyAcquire_FromCpp,        // acquire_fromcpp
+   &PyAcquire_ToCpp,          // acquire_tocpp
+   &PyAcquireFile_Type,       // acquirefile_type
+   &PyAcquireFile_FromCpp,    // acquirefile_fromcpp
+   &PyAcquireFile_ToCpp,      // acquirefile_tocpp
+   &PyAcquireItem_Type,       // acquireitem_type
+   &PyAcquireItem_FromCpp,    // acquireitem_fromcpp
+   &PyAcquireItem_ToCpp,      // acquireitem_type
+   &PyAcquireItemDesc_Type,   // acquireitemdesc_type
+   &PyAcquireItemDesc_FromCpp,// acquireitemdesc_fromcpp
+   &PyAcquireItemDesc_ToCpp,  // acquireitemdesc_tocpp
+   &PyAcquireWorker_Type,     // acquireworker_type
+   &PyAcquireWorker_FromCpp,  // acquireworker_fromcpp
+   &PyAcquireWorker_ToCpp,    // acquireworker_tocpp
+   &PyActionGroup_Type,       // actiongroup_type
+   &PyActionGroup_FromCpp,    // actiongroup_fromcpp
+   &PyActionGroup_ToCpp,      // actiongroup_tocpp
+   &PyCache_Type,             // cache_type
+   &PyCache_FromCpp,          // cache_fromcpp
+   &PyCache_ToCpp,            // cache_tocpp
+   &PyCacheFile_Type,         // cachefile_type
+   &PyCacheFile_FromCpp,      // cachefile_fromcpp
+   &PyCacheFile_ToCpp,        // cachefile_tocpp
+   &PyCdrom_Type,             // cdrom_type
+   &PyCdrom_FromCpp,          // cdrom_fromcpp
+   &PyCdrom_ToCpp,            // cdrom_tocpp
+   &PyConfiguration_Type,     // configuration_type
+   &PyConfiguration_FromCpp,  // configuration_fromcpp
+   &PyConfiguration_ToCpp,    // configuration_tocpp
+   &PyDepCache_Type,          // depcache_type
+   &PyDepCache_FromCpp,       // depcache_fromcpp
+   &PyDepCache_ToCpp,         // depcache_tocpp
+   &PyDependency_Type,        // dependency_type
+   &PyDependency_FromCpp,     // dependency_fromcpp
+   &PyDependency_ToCpp,       // dependency_tocpp
+   &PyDependencyList_Type,    // dependencylist_type
+   0,                         // FIXME: dependencylist_fromcpp
+   0,                         // FIXME: dependencylist_tocpp
+   &PyDescription_Type,       // description_type
+   &PyDescription_FromCpp,    // description_fromcpp
+   &PyDescription_ToCpp,      // description_tocpp
+   &PyHashes_Type,            // hashes_type
+   &PyHashes_FromCpp,         // hashes_fromcpp
+   &PyHashes_ToCpp,           // hashes_tocpp
+   &PyHashString_Type,        // hashstring_type
+   &PyHashString_FromCpp,     // hashstring_fromcpp
+   &PyHashString_ToCpp,       // hashstring_tocpp
+   &PyIndexRecords_Type,      // indexrecords_type
+   &PyIndexRecords_FromCpp,     // indexrecords_tocpp
+   &PyIndexRecords_ToCpp,     // indexrecords_tocpp
+   &PyMetaIndex_Type,         // metaindex_type
+   &PyMetaIndex_FromCpp,        // metaindex_tocpp
+   &PyMetaIndex_ToCpp,        // metaindex_tocpp
+   &PyPackage_Type,           // package_type
+   &PyPackage_FromCpp,          // package_tocpp
+   &PyPackage_ToCpp,          // package_tocpp
+   &PyPackageFile_Type,       // packagefile_type
+   &PyPackageFile_FromCpp,      // packagefile_tocpp
+   &PyPackageFile_ToCpp,      // packagefile_tocpp
+   &PyIndexFile_Type,         // packageindexfile_type
+   &PyIndexFile_FromCpp,        // packageindexfile_tocpp
+   &PyIndexFile_ToCpp,        // packageindexfile_tocpp
+   &PyPackageList_Type,       // packagelist_type
+   0,                         // FIXME: packagelist_fromcpp
+   0,                         // FIXME: packagelist_tocpp
+   &PyPackageManager_Type,    // packagemanager_type
+   &PyPackageManager_FromCpp,   // packagemanager_type
+   &PyPackageManager_ToCpp,   // packagemanager_type
+   &PyPackageRecords_Type,    // packagerecords_type
+   0,                         // FIXME: packagerecords_fromcpp
+   0,                         // FIXME: packagerecords_tocpp
+   &PyPolicy_Type,            // policy_type
+   &PyPolicy_FromCpp,           // policy_tocpp
+   &PyPolicy_ToCpp,           // policy_tocpp
+   &PyProblemResolver_Type,   // problemresolver_type
+   &PyProblemResolver_FromCpp,  // problemresolver_tocpp
+   &PyProblemResolver_ToCpp,  // problemresolver_tocpp
+   &PySourceList_Type,        // sourcelist_type
+   &PySourceList_FromCpp,       // sourcelist_tocpp
+   &PySourceList_ToCpp,       // sourcelist_tocpp
+   &PySourceRecords_Type,     // sourcerecords_type
+   0,                         // FIXME: sourcerecords_fromcpp
+   0,                         // FIXME: sourcerecords_tocpp
+   &PyTagFile_Type,           // tagfile_type
+   &PyTagFile_FromCpp,          // tagfile_tocpp
+   &PyTagFile_ToCpp,          // tagfile_tocpp
+   &PyTagSection_Type,        // tagsection_type
+   &PyTagSection_FromCpp,       // tagsection_tocpp
+   &PyTagSection_ToCpp,       // tagsection_tocpp
+   &PyVersion_Type,           // version_type
+   &PyVersion_FromCpp,          // version_tocpp
+   &PyVersion_ToCpp,          // version_tocpp
+};
 
-static void AddInt(PyObject *Dict,const char *Itm,unsigned long I)
-{
-   PyObject *Obj = Py_BuildValue("i",I);
-   PyDict_SetItemString(Dict,(char *)Itm,Obj);
-   Py_DECREF(Obj);
-}
 
+#define ADDTYPE(mod,name,type) { \
+    if (PyType_Ready(type) == -1) INIT_ERROR; \
+    Py_INCREF(type); \
+    PyModule_AddObject(mod,name,(PyObject *)type); }
+
+
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef moduledef = {
+        PyModuleDef_HEAD_INIT,
+        "apt_pkg",
+        "Classes and functions wrapping the apt-pkg library.\n\n"
+        "The apt_pkg module provides...",
+        -1,
+        methods,
+        0,
+        0,
+        0,
+        0,
+};
+
+#define INIT_ERROR return 0
+extern "C" PyObject * PyInit_apt_pkg()
+#else
+#define INIT_ERROR return
 extern "C" void initapt_pkg()
+#endif
 {
+   // Finalize our types to add slots, etc.
+   if (PyType_Ready(&PyConfiguration_Type) == -1) INIT_ERROR;
+   if (PyType_Ready(&PyCacheFile_Type) == -1) INIT_ERROR;
+
+   // Initialize the module
+   #if PY_MAJOR_VERSION >= 3
+   PyObject *Module = PyModule_Create(&moduledef);
+   #else
    PyObject *Module = Py_InitModule("apt_pkg",methods);
-   PyObject *Dict = PyModule_GetDict(Module);
+   #endif
 
    // Global variable linked to the global configuration class
-   CppPyObject<Configuration *> *Config = CppPyObject_NEW<Configuration *>(&ConfigurationPtrType);
+   CppPyObject<Configuration*> *Config = CppPyObject_NEW<Configuration*>(NULL, &PyConfiguration_Type);
    Config->Object = _config;
-   PyDict_SetItemString(Dict,"Config",Config);
-   Py_DECREF(Config);
-
+   // Global configuration, should never be deleted.
+   Config->NoDelete = true;
+   PyModule_AddObject(Module,"config",Config);
+   #ifdef COMPAT_0_7
+   Py_INCREF(Config);
+   PyModule_AddObject(Module,"Config",Config);
+   #endif
+
+
+
+
+   // Add our classes.
+   /* ============================ tag.cc ============================ */
+   ADDTYPE(Module,"TagSection",&PyTagSection_Type);
+   ADDTYPE(Module,"TagFile",&PyTagFile_Type);
+   /* ============================ acquire.cc ============================ */
+   ADDTYPE(Module,"Acquire",&PyAcquire_Type);
+   ADDTYPE(Module,"AcquireFile",&PyAcquireFile_Type);
+   ADDTYPE(Module,"AcquireItem",&PyAcquireItem_Type); // NO __new__()
+   ADDTYPE(Module,"AcquireWorker",&PyAcquireWorker_Type); // NO __new__()
+   /* ============================ cache.cc ============================ */
+   ADDTYPE(Module,"Cache",&PyCache_Type);
+   ADDTYPE(Module,"Dependency",&PyDependency_Type); // NO __new__()
+   ADDTYPE(Module,"Description",&PyDescription_Type); // NO __new__()
+   ADDTYPE(Module,"PackageFile",&PyPackageFile_Type); // NO __new__()
+   ADDTYPE(Module,"PackageList",&PyPackageList_Type);  // NO __new__(), internal
+   ADDTYPE(Module,"DependencyList",&PyDependencyList_Type); // NO __new__(), internal
+   ADDTYPE(Module,"Package",&PyPackage_Type); // NO __new__()
+   ADDTYPE(Module,"Version",&PyVersion_Type); // NO __new__()
+   /* ============================ cdrom.cc ============================ */
+   ADDTYPE(Module,"Cdrom",&PyCdrom_Type);
+   /* ========================= configuration.cc ========================= */
+   ADDTYPE(Module,"Configuration",&PyConfiguration_Type);
+   /* ========================= depcache.cc ========================= */
+   ADDTYPE(Module,"ActionGroup",&PyActionGroup_Type);
+   ADDTYPE(Module,"DepCache",&PyDepCache_Type);
+   ADDTYPE(Module,"ProblemResolver",&PyProblemResolver_Type);
+   /* ========================= indexfile.cc ========================= */
+   ADDTYPE(Module,"IndexFile",&PyIndexFile_Type); // NO __new__()
+   /* ========================= metaindex.cc ========================= */
+   ADDTYPE(Module,"MetaIndex",&PyMetaIndex_Type); // NO __new__()
+   /* ========================= pkgmanager.cc ========================= */
+   ADDTYPE(Module,"PackageManager",&PyPackageManager_Type);
+   /* ========================= pkgrecords.cc ========================= */
+   ADDTYPE(Module,"PackageRecords",&PyPackageRecords_Type);
+   /* ========================= pkgsrcrecords.cc ========================= */
+   ADDTYPE(Module,"SourceRecords",&PySourceRecords_Type);
+   /* ========================= sourcelist.cc ========================= */
+   ADDTYPE(Module,"SourceList",&PySourceList_Type);
+   ADDTYPE(Module,"IndexRecords",&PyIndexRecords_Type);
+   ADDTYPE(Module,"HashString",&PyHashString_Type);
+   ADDTYPE(Module,"Policy",&PyPolicy_Type);
+   ADDTYPE(Module,"Hashes",&PyHashes_Type);
+   ADDTYPE(Module,"AcquireItemDesc",&PyAcquireItemDesc_Type);
+   ADDTYPE(Module,"SystemLock",&PySystemLock_Type);
+   ADDTYPE(Module,"FileLock",&PyFileLock_Type);
    // Tag file constants
-   PyObject *Obj;
-   PyDict_SetItemString(Dict,"RewritePackageOrder",
-			Obj = CharCharToList(TFRewritePackageOrder));
-   Py_DECREF(Obj);
-   PyDict_SetItemString(Dict,"RewriteSourceOrder",
-			Obj = CharCharToList(TFRewriteSourceOrder));
-   Py_DECREF(Obj);
-
+   PyModule_AddObject(Module,"REWRITE_PACKAGE_ORDER",
+                      CharCharToList(TFRewritePackageOrder));
+
+   PyModule_AddObject(Module,"REWRITE_SOURCE_ORDER",
+                      CharCharToList(TFRewriteSourceOrder));
+
+
+   // Acquire constants.
+   // some constants
+   PyDict_SetItemString(PyAcquire_Type.tp_dict, "RESULT_CANCELLED",
+                        Py_BuildValue("i", pkgAcquire::Cancelled));
+   PyDict_SetItemString(PyAcquire_Type.tp_dict, "RESULT_CONTINUE",
+                        Py_BuildValue("i", pkgAcquire::Continue));
+   PyDict_SetItemString(PyAcquire_Type.tp_dict, "RESULT_FAILED",
+                        Py_BuildValue("i", pkgAcquire::Failed));
+#ifdef COMPAT_0_7
+   PyDict_SetItemString(PyAcquire_Type.tp_dict, "ResultCancelled",
+                        Py_BuildValue("i", pkgAcquire::Cancelled));
+   PyDict_SetItemString(PyAcquire_Type.tp_dict, "ResultContinue",
+                        Py_BuildValue("i", pkgAcquire::Continue));
+   PyDict_SetItemString(PyAcquire_Type.tp_dict, "ResultFailed",
+                        Py_BuildValue("i", pkgAcquire::Failed));
+#endif
+    // Dependency constants
+   PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_DEPENDS",
+                        Py_BuildValue("i", pkgCache::Dep::Depends));
+   PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_PREDEPENDS",
+                        Py_BuildValue("i", pkgCache::Dep::PreDepends));
+   PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_SUGGESTS",
+                        Py_BuildValue("i", pkgCache::Dep::Suggests));
+   PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_RECOMMENDS",
+                        Py_BuildValue("i", pkgCache::Dep::Suggests));
+   PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_CONFLICTS",
+                        Py_BuildValue("i", pkgCache::Dep::Conflicts));
+   PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_REPLACES",
+                        Py_BuildValue("i", pkgCache::Dep::Replaces));
+   PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_OBSOLETES",
+                        Py_BuildValue("i", pkgCache::Dep::Obsoletes));
+   PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_DPKG_BREAKS",
+                        Py_BuildValue("i", pkgCache::Dep::DpkgBreaks));
+   PyDict_SetItemString(PyDependency_Type.tp_dict, "TYPE_ENHANCES",
+                        Py_BuildValue("i", pkgCache::Dep::Enhances));
+
+
+   // PackageManager constants
+   PyDict_SetItemString(PyPackageManager_Type.tp_dict, "RESULT_COMPLETED",
+                        Py_BuildValue("i", pkgPackageManager::Completed));
+   PyDict_SetItemString(PyPackageManager_Type.tp_dict, "RESULT_FAILED",
+                        Py_BuildValue("i", pkgPackageManager::Failed));
+   PyDict_SetItemString(PyPackageManager_Type.tp_dict, "RESULT_INCOMPLETE",
+                        Py_BuildValue("i", pkgPackageManager::Incomplete));
+
+#ifdef COMPAT_0_7
+   PyDict_SetItemString(PyPackageManager_Type.tp_dict, "ResultCompleted",
+                        Py_BuildValue("i", pkgPackageManager::Completed));
+   PyDict_SetItemString(PyPackageManager_Type.tp_dict, "ResultFailed",
+                        Py_BuildValue("i", pkgPackageManager::Failed));
+   PyDict_SetItemString(PyPackageManager_Type.tp_dict, "ResultIncomplete",
+                        Py_BuildValue("i", pkgPackageManager::Incomplete));
+#endif
+
+   // AcquireItem Constants.
+   PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "STAT_IDLE",
+                        Py_BuildValue("i", pkgAcquire::Item::StatIdle));
+   PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "STAT_FETCHING",
+                        Py_BuildValue("i", pkgAcquire::Item::StatFetching));
+   PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "STAT_DONE",
+                        Py_BuildValue("i", pkgAcquire::Item::StatDone));
+   PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "STAT_ERROR",
+                        Py_BuildValue("i", pkgAcquire::Item::StatError));
+   PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "STAT_AUTH_ERROR",
+                        Py_BuildValue("i", pkgAcquire::Item::StatAuthError));
+
+#ifdef COMPAT_0_7
+   PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "StatIdle",
+                        Py_BuildValue("i", pkgAcquire::Item::StatIdle));
+   PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "StatFetching",
+                        Py_BuildValue("i", pkgAcquire::Item::StatFetching));
+   PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "StatDone",
+                        Py_BuildValue("i", pkgAcquire::Item::StatDone));
+   PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "StatError",
+                        Py_BuildValue("i", pkgAcquire::Item::StatError));
+   PyDict_SetItemString(PyAcquireItem_Type.tp_dict, "StatAuthError",
+                        Py_BuildValue("i", pkgAcquire::Item::StatAuthError));
+#endif
+
+#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 1
+   PyObject *PyCapsule = PyCapsule_New(&API, "apt_pkg._C_API", NULL);
+#else
+   PyObject *PyCapsule = PyCObject_FromVoidPtr(&API, NULL);
+#endif
+   PyModule_AddObject(Module, "_C_API", PyCapsule);
    // Version..
-   AddStr(Dict,"Version",pkgVersion);
-   AddStr(Dict,"LibVersion",pkgLibVersion);
-   AddStr(Dict,"Date",__DATE__);
-   AddStr(Dict,"Time",__TIME__);
+   PyModule_AddStringConstant(Module,"VERSION",(char *)pkgVersion);
+   PyModule_AddStringConstant(Module,"LIB_VERSION",(char *)pkgLibVersion);
+   PyModule_AddStringConstant(Module,"DATE",__DATE__);
+   PyModule_AddStringConstant(Module,"TIME",__TIME__);
 
    // My constants
-   AddInt(Dict,"DepDepends",pkgCache::Dep::Depends);
-   AddInt(Dict,"DepPreDepends",pkgCache::Dep::PreDepends);
-   AddInt(Dict,"DepSuggests",pkgCache::Dep::Suggests);
-   AddInt(Dict,"DepRecommends",pkgCache::Dep::Recommends);
-   AddInt(Dict,"DepConflicts",pkgCache::Dep::Conflicts);
-   AddInt(Dict,"DepReplaces",pkgCache::Dep::Replaces);
-   AddInt(Dict,"DepObsoletes",pkgCache::Dep::Obsoletes);
-   AddInt(Dict,"DepDpkgBreaks",pkgCache::Dep::DpkgBreaks);
-   AddInt(Dict,"DepEnhances",pkgCache::Dep::Enhances);
-
-   AddInt(Dict,"PriImportant",pkgCache::State::Important);
-   AddInt(Dict,"PriRequired",pkgCache::State::Required);
-   AddInt(Dict,"PriStandard",pkgCache::State::Standard);
-   AddInt(Dict,"PriOptional",pkgCache::State::Optional);
-   AddInt(Dict,"PriExtra",pkgCache::State::Extra);
-
-   AddInt(Dict,"CurStateNotInstalled",pkgCache::State::NotInstalled);
-   AddInt(Dict,"CurStateUnPacked",pkgCache::State::UnPacked);
-   AddInt(Dict,"CurStateHalfConfigured",pkgCache::State::HalfConfigured);
-   AddInt(Dict,"CurStateHalfInstalled",pkgCache::State::HalfInstalled);
-   AddInt(Dict,"CurStateConfigFiles",pkgCache::State::ConfigFiles);
-   AddInt(Dict,"CurStateInstalled",pkgCache::State::Installed);
-
-   AddInt(Dict,"SelStateUnknown",pkgCache::State::Unknown);
-   AddInt(Dict,"SelStateInstall",pkgCache::State::Install);
-   AddInt(Dict,"SelStateHold",pkgCache::State::Hold);
-   AddInt(Dict,"SelStateDeInstall",pkgCache::State::DeInstall);
-   AddInt(Dict,"SelStatePurge",pkgCache::State::Purge);
-
-   AddInt(Dict,"InstStateOk",pkgCache::State::Ok);
-   AddInt(Dict,"InstStateReInstReq",pkgCache::State::ReInstReq);
-   AddInt(Dict,"InstStateHold",pkgCache::State::Hold);
-   AddInt(Dict,"InstStateHoldReInstReq",pkgCache::State::HoldReInstReq);
+   PyModule_AddIntConstant(Module,"PRI_IMPORTANT",pkgCache::State::Important);
+   PyModule_AddIntConstant(Module,"PRI_REQUIRED",pkgCache::State::Required);
+   PyModule_AddIntConstant(Module,"PRI_STANDARD",pkgCache::State::Standard);
+   PyModule_AddIntConstant(Module,"PRI_OPTIONAL",pkgCache::State::Optional);
+   PyModule_AddIntConstant(Module,"PRI_EXTRA",pkgCache::State::Extra);
+   // CurState
+   PyModule_AddIntConstant(Module,"CURSTATE_NOT_INSTALLED",pkgCache::State::NotInstalled);
+   PyModule_AddIntConstant(Module,"CURSTATE_UNPACKED",pkgCache::State::UnPacked);
+   PyModule_AddIntConstant(Module,"CURSTATE_HALF_CONFIGURED",pkgCache::State::HalfConfigured);
+   PyModule_AddIntConstant(Module,"CURSTATE_HALF_INSTALLED",pkgCache::State::HalfInstalled);
+   PyModule_AddIntConstant(Module,"CURSTATE_CONFIG_FILES",pkgCache::State::ConfigFiles);
+   PyModule_AddIntConstant(Module,"CURSTATE_INSTALLED",pkgCache::State::Installed);
+   // SelState
+   PyModule_AddIntConstant(Module,"SELSTATE_UNKNOWN",pkgCache::State::Unknown);
+   PyModule_AddIntConstant(Module,"SELSTATE_INSTALL",pkgCache::State::Install);
+   PyModule_AddIntConstant(Module,"SELSTATE_HOLD",pkgCache::State::Hold);
+   PyModule_AddIntConstant(Module,"SELSTATE_DEINSTALL",pkgCache::State::DeInstall);
+   PyModule_AddIntConstant(Module,"SELSTATE_PURGE",pkgCache::State::Purge);
+   // InstState
+   PyModule_AddIntConstant(Module,"INSTSTATE_OK",pkgCache::State::Ok);
+   PyModule_AddIntConstant(Module,"INSTSTATE_REINSTREQ",pkgCache::State::ReInstReq);
+   PyModule_AddIntConstant(Module,"INSTSTATE_HOLD",pkgCache::State::Hold);
+   PyModule_AddIntConstant(Module,"INSTSTATE_HOLD_REINSTREQ",pkgCache::State::HoldReInstReq);
+
+   // DEPRECATED API
+   #ifdef COMPAT_0_7
+   PyModule_AddObject(Module,"RewritePackageOrder",
+                      CharCharToList(TFRewritePackageOrder));
+   PyModule_AddObject(Module,"RewriteSourceOrder",
+                      CharCharToList(TFRewriteSourceOrder));
+   PyModule_AddStringConstant(Module,"LibVersion",(char *)pkgLibVersion);
+   PyModule_AddStringConstant(Module,"Date",__DATE__);
+   PyModule_AddStringConstant(Module,"Time",__TIME__);
+   PyModule_AddIntConstant(Module,"PriImportant",pkgCache::State::Important);
+   PyModule_AddIntConstant(Module,"PriRequired",pkgCache::State::Required);
+   PyModule_AddIntConstant(Module,"PriStandard",pkgCache::State::Standard);
+   PyModule_AddIntConstant(Module,"PriOptional",pkgCache::State::Optional);
+   PyModule_AddIntConstant(Module,"PriExtra",pkgCache::State::Extra);
+   PyModule_AddIntConstant(Module,"CurStateNotInstalled",pkgCache::State::NotInstalled);
+   PyModule_AddIntConstant(Module,"CurStateUnPacked",pkgCache::State::UnPacked);
+   PyModule_AddIntConstant(Module,"CurStateHalfConfigured",pkgCache::State::HalfConfigured);
+   PyModule_AddIntConstant(Module,"CurStateHalfInstalled",pkgCache::State::HalfInstalled);
+   PyModule_AddIntConstant(Module,"CurStateConfigFiles",pkgCache::State::ConfigFiles);
+   PyModule_AddIntConstant(Module,"CurStateInstalled",pkgCache::State::Installed);
+   PyModule_AddIntConstant(Module,"SelStateUnknown",pkgCache::State::Unknown);
+   PyModule_AddIntConstant(Module,"SelStateInstall",pkgCache::State::Install);
+   PyModule_AddIntConstant(Module,"SelStateHold",pkgCache::State::Hold);
+   PyModule_AddIntConstant(Module,"SelStateDeInstall",pkgCache::State::DeInstall);
+   PyModule_AddIntConstant(Module,"SelStatePurge",pkgCache::State::Purge);
+   PyModule_AddIntConstant(Module,"InstStateOk",pkgCache::State::Ok);
+   PyModule_AddIntConstant(Module,"InstStateReInstReq",pkgCache::State::ReInstReq);
+   PyModule_AddIntConstant(Module,"InstStateHold",pkgCache::State::Hold);
+   PyModule_AddIntConstant(Module,"InstStateHoldReInstReq",pkgCache::State::HoldReInstReq);
+   PyModule_AddIntConstant(Module,"_COMPAT_0_7",1);
+   #else
+   PyModule_AddIntConstant(Module,"_COMPAT_0_7",0);
+   #endif
+   #if PY_MAJOR_VERSION >= 3
+   return Module;
+   #endif
 }
 									/*}}}*/
 
diff --git a/python/apt_pkgmodule.h b/python/apt_pkgmodule.h
index e047bcd8..da647c3f 100644
--- a/python/apt_pkgmodule.h
+++ b/python/apt_pkgmodule.h
@@ -11,15 +11,24 @@
 #define APT_PKGMODULE_H
 
 #include <Python.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/packagemanager.h>
+#include <apt-pkg/version.h>
+#include <apt-pkg/deblistparser.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cachefile.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/cdrom.h>
+#include <apt-pkg/algorithms.h>
+#include "generic.h"
 
 // Configuration Stuff
-#define Configuration_Check(op) ((op)->ob_type == &ConfigurationType || \
-                                 (op)->ob_type == &ConfigurationPtrType || \
-                                 (op)->ob_type == &ConfigurationSubType)
-extern PyTypeObject ConfigurationType;
-extern PyTypeObject ConfigurationPtrType;
-extern PyTypeObject ConfigurationSubType;
-extern PyTypeObject VersionType;
+extern PyTypeObject PyConfiguration_Type;
+extern PyTypeObject PyVersion_Type;
 
 extern char *doc_LoadConfig;
 extern char *doc_LoadConfigISC;
@@ -31,8 +40,8 @@ PyObject *LoadConfigDir(PyObject *Self,PyObject *Args);
 PyObject *ParseCommandLine(PyObject *Self,PyObject *Args);
 
 // Tag File Stuff
-extern PyTypeObject TagSecType;
-extern PyTypeObject TagFileType;
+extern PyTypeObject PyTagSection_Type;
+extern PyTypeObject PyTagFile_Type;
 extern char *doc_ParseSection;
 extern char *doc_ParseTagFile;
 extern char *doc_RewriteSection;
@@ -52,54 +61,144 @@ PyObject *StrTimeRFC1123(PyObject *self,PyObject *Args);
 PyObject *StrStrToTime(PyObject *self,PyObject *Args);
 PyObject *StrCheckDomainList(PyObject *Self,PyObject *Args);
 
+PyObject *PyAcquire_GetItem(PyObject *self, pkgAcquire::Item *item);
+PyObject *PyAcquire_GetItemDesc(PyObject *self, pkgAcquire::ItemDesc *item);
+bool     PyAcquire_DropItem(PyObject *self, pkgAcquire::Item *item);
+
 // Cache Stuff
-extern PyTypeObject PkgCacheType;
-extern PyTypeObject PkgCacheFileType;
-extern PyTypeObject PkgListType;
-extern PyTypeObject PackageType;
-extern PyTypeObject PackageFileType;
-extern PyTypeObject DependencyType;
-extern PyTypeObject RDepListType;
+extern PyTypeObject PyCache_Type;
+extern PyTypeObject PyCacheFile_Type;
+extern PyTypeObject PyPackageList_Type;
+extern PyTypeObject PyDescription_Type;
+extern PyTypeObject PyPackage_Type;
+extern PyTypeObject PyPackageFile_Type;
+extern PyTypeObject PyDependency_Type;
+extern PyTypeObject PyDependencyList_Type;
 PyObject *TmpGetCache(PyObject *Self,PyObject *Args);
 
 // DepCache
-extern PyTypeObject PkgDepCacheType;
+extern PyTypeObject PyDepCache_Type;
 PyObject *GetDepCache(PyObject *Self,PyObject *Args);
 
 // pkgProblemResolver
-extern PyTypeObject PkgProblemResolverType;
+extern PyTypeObject PyProblemResolver_Type;
 PyObject *GetPkgProblemResolver(PyObject *Self, PyObject *Args);
 PyObject *GetPkgActionGroup(PyObject *Self, PyObject *Args);
 
+extern PyTypeObject PyActionGroup_Type;
 // cdrom
-extern PyTypeObject PkgCdromType;
+extern PyTypeObject PyCdrom_Type;
 PyObject *GetCdrom(PyObject *Self,PyObject *Args);
 
 // acquire
-extern PyTypeObject PkgAcquireType;
+extern PyTypeObject PyAcquireItem_Type;
+extern PyTypeObject PyAcquire_Type;
+extern PyTypeObject PyAcquireFile_Type;
 extern char *doc_GetPkgAcqFile;
 PyObject *GetAcquire(PyObject *Self,PyObject *Args);
 PyObject *GetPkgAcqFile(PyObject *Self, PyObject *Args, PyObject *kwds);
 
 // packagemanager
-extern PyTypeObject PkgManagerType;
+extern PyTypeObject PyPackageManager_Type;
 PyObject *GetPkgManager(PyObject *Self,PyObject *Args);
 
 
 // PkgRecords Stuff
-extern PyTypeObject PkgRecordsType;
+extern PyTypeObject PyPackageRecords_Type;
+extern PyTypeObject PySourceRecords_Type;
 PyObject *GetPkgRecords(PyObject *Self,PyObject *Args);
 PyObject *GetPkgSrcRecords(PyObject *Self,PyObject *Args);
 
 // pkgSourceList
-extern PyTypeObject PkgSourceListType;
+extern PyTypeObject PySourceList_Type;
 PyObject *GetPkgSourceList(PyObject *Self,PyObject *Args);
 
 // pkgSourceList
-extern PyTypeObject PackageIndexFileType;
+extern PyTypeObject PyIndexFile_Type;
 
 // metaIndex
-extern PyTypeObject MetaIndexType;
-
-
+extern PyTypeObject PyMetaIndex_Type;
+
+// HashString
+extern PyTypeObject PyHashString_Type;
+
+// IndexRecord
+extern PyTypeObject PyIndexRecords_Type;
+
+// Policy
+extern PyTypeObject PyPolicy_Type;
+extern PyTypeObject PyHashes_Type;
+extern PyTypeObject PyAcquireItemDesc_Type;
+extern PyTypeObject PyAcquireWorker_Type;
+extern PyTypeObject PySystemLock_Type;
+extern PyTypeObject PyFileLock_Type;
+
+// Functions to be exported in the public API.
+
+# define PyAcquire_ToCpp           GetCpp<pkgAcquire*>
+# define PyAcquireFile_ToCpp       GetCpp<pkgAcqFile*>
+# define PyAcquireItem_ToCpp       GetCpp<pkgAcquire::Item*>
+# define PyAcquireItemDesc_ToCpp   GetCpp<pkgAcquire::ItemDesc*>
+# define PyAcquireWorker_ToCpp     GetCpp<pkgAcquire::Worker*>
+# define PyActionGroup_ToCpp       GetCpp<pkgDepCache::ActionGroup*>
+# define PyCache_ToCpp             GetCpp<pkgCache*>
+# define PyCacheFile_ToCpp         GetCpp<pkgCacheFile*>
+# define PyCdrom_ToCpp             GetCpp<pkgCdrom>
+# define PyConfiguration_ToCpp     GetCpp<Configuration*>
+# define PyDepCache_ToCpp          GetCpp<pkgDepCache*>
+# define PyDependency_ToCpp        GetCpp<pkgCache::DepIterator>
+# define PyDependencyList_ToCpp    GetCpp<RDepListStruct> // TODO
+# define PyDescription_ToCpp       GetCpp<pkgCache::DescIterator>
+# define PyHashes_ToCpp            GetCpp<Hashes>
+# define PyHashString_ToCpp        GetCpp<HashString*>
+# define PyIndexRecords_ToCpp      GetCpp<indexRecords*>
+# define PyMetaIndex_ToCpp         GetCpp<metaIndex*>
+# define PyPackage_ToCpp           GetCpp<pkgCache::PkgIterator>
+# define PyPackageFile_ToCpp       GetCpp<pkgCache::PkgFileIterator>
+# define PyIndexFile_ToCpp         GetCpp<pkgIndexFile*>
+# define PyPackageList_ToCpp       GetCpp<PkgListStruct> // TODO
+# define PyPackageManager_ToCpp    GetCpp<pkgPackageManager*>
+# define PyPackageRecords_ToCpp    GetCpp<PkgRecordsStruct> // TODO
+# define PyPolicy_ToCpp            GetCpp<pkgPolicy*>
+# define PyProblemResolver_ToCpp   GetCpp<pkgProblemResolver*>
+# define PySourceList_ToCpp        GetCpp<pkgSourceList*>
+# define PySourceRecords_ToCpp     GetCpp<PkgSrcRecordsStruct> // TODO
+# define PyTagFile_ToCpp           GetCpp<pkgTagFile>
+# define PyTagSection_ToCpp        GetCpp<pkgTagSection>
+# define PyVersion_ToCpp           GetCpp<pkgCache::VerIterator>
+
+PyObject* PyAcquire_FromCpp(pkgAcquire *fetcher, bool Delete, PyObject *Owner);
+PyObject* PyAcquireFile_FromCpp(pkgAcqFile* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyAcquireItem_FromCpp(pkgAcquire::Item* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyAcquireItemDesc_FromCpp(pkgAcquire::ItemDesc* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyAcquireWorker_FromCpp(pkgAcquire::Worker* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyActionGroup_FromCpp(pkgDepCache::ActionGroup* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyCache_FromCpp(pkgCache* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyCacheFile_FromCpp(pkgCacheFile* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyCdrom_FromCpp(pkgCdrom const &obj, bool Delete, PyObject *Owner);
+PyObject* PyConfiguration_FromCpp(Configuration* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyDepCache_FromCpp(pkgDepCache* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyDependency_FromCpp(pkgCache::DepIterator const &obj, bool Delete, PyObject *Owner);
+//PyObject* PyDependencyList_FromCpp(RDepListStruct const &obj, bool Delete, PyObject *Owner);
+PyObject* PyDescription_FromCpp(pkgCache::DescIterator const &obj, bool Delete, PyObject *Owner);
+PyObject* PyHashes_FromCpp(Hashes const &obj, bool Delete, PyObject *Owner);
+PyObject* PyHashString_FromCpp(HashString* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyIndexRecords_FromCpp(indexRecords* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyMetaIndex_FromCpp(metaIndex* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyPackage_FromCpp(pkgCache::PkgIterator const &obj, bool Delete, PyObject *Owner);
+PyObject* PyIndexFile_FromCpp(pkgIndexFile* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyPackageFile_FromCpp(pkgCache::PkgFileIterator const &obj, bool Delete, PyObject *Owner);
+//PyObject* PyPackageList_FromCpp(PkgListStruct const &obj, bool Delete, PyObject *Owner);
+PyObject* PyPackageManager_FromCpp(pkgPackageManager* const &obj, bool Delete, PyObject *Owner);
+//PyObject* PyPackageRecords_FromCpp(PkgRecordsStruct const &obj, bool Delete, PyObject *Owner);
+PyObject* PyPolicy_FromCpp(pkgPolicy* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyProblemResolver_FromCpp(pkgProblemResolver* const &obj, bool Delete, PyObject *Owner);
+PyObject* PySourceList_FromCpp(pkgSourceList* const &obj, bool Delete, PyObject *Owner);
+//PyObject* PySourceRecords_FromCpp(PkgSrcRecordsStruct const &obj, bool Delete, PyObject *Owner);
+PyObject* PyTagFile_FromCpp(pkgTagFile const &obj, bool Delete, PyObject *Owner);
+PyObject* PyTagSection_FromCpp(pkgTagSection const &obj, bool Delete, PyObject *Owner);
+PyObject* PyVersion_FromCpp(pkgCache::VerIterator const &obj, bool Delete, PyObject *Owner);
+
+#include "python-apt.h"
 #endif
+
diff --git a/python/arfile.cc b/python/arfile.cc
new file mode 100644
index 00000000..4f3b4ad7
--- /dev/null
+++ b/python/arfile.cc
@@ -0,0 +1,648 @@
+/*
+ * arfile.cc - Wrapper around ARArchive and ARArchive::Member.
+ *
+ * Copyright 2009 Julian Andres Klode <jak@debian.org>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <Python.h>
+#include "generic.h"
+#include "apt_instmodule.h"
+#include <apt-pkg/arfile.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/sptr.h>
+#include <utime.h>
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+static PyObject *armember_get_name(PyObject *self, void *closure)
+{
+    return CppPyString(GetCpp<ARArchive::Member*>(self)->Name);
+}
+
+static PyObject *armember_get_mtime(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k", GetCpp<ARArchive::Member*>(self)->MTime);
+}
+
+static PyObject *armember_get_uid(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k", GetCpp<ARArchive::Member*>(self)->UID);
+}
+
+static PyObject *armember_get_gid(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k", GetCpp<ARArchive::Member*>(self)->GID);
+}
+
+static PyObject *armember_get_mode(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k", GetCpp<ARArchive::Member*>(self)->Mode);
+}
+
+static PyObject *armember_get_size(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k", GetCpp<ARArchive::Member*>(self)->Size);
+}
+
+static PyObject *armember_get_start(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k", GetCpp<ARArchive::Member*>(self)->Start);
+}
+
+static PyObject *armember_repr(PyObject *self)
+{
+    return PyString_FromFormat("<%s object: name:'%s'>",
+                               self->ob_type->tp_name,
+                               GetCpp<ARArchive::Member*>(self)->Name.c_str());
+}
+
+static PyGetSetDef armember_getset[] = {
+    {"gid",armember_get_gid,0,"The group id of the owner."},
+    {"mode",armember_get_mode,0,"The mode of the file."},
+    {"mtime",armember_get_mtime,0,"Last time of modification."},
+    {"name",armember_get_name,0,"The name of the file."},
+    {"size",armember_get_size,0,"The size of the files."},
+    {"start",armember_get_start,0,
+     "The offset in the archive where the file starts."},
+    {"uid",armember_get_uid,0,"The user id of the owner."},
+    {NULL}
+};
+
+static const char *armember_doc =
+    "An ArMember object represents a single file within an AR archive. For\n"
+    "Debian packages this can be e.g. control.tar.gz. This class provides\n"
+    "information about this file, such as the mode and size.";
+PyTypeObject PyArMember_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_inst.ArMember",                 // tp_name
+    sizeof(CppPyObject<ARArchive::Member*>),  // tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    CppDeallocPtr<ARArchive::Member*>, // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    armember_repr,                       // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                   // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    Py_TPFLAGS_DEFAULT |                 // tp_flags
+    Py_TPFLAGS_HAVE_GC,
+    armember_doc,                        // tp_doc
+    CppTraverse<ARArchive::Member*>,// tp_traverse
+    CppClear<ARArchive::Member*>,   // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    0,                                   // tp_methods
+    0,                                   // tp_members
+    armember_getset,                     // tp_getset
+};
+
+// We just add an inline method and should thus be ABI compatible in a way that
+// we can simply cast ARArchive instances to PyARArchiveHack.
+class PyARArchiveHack : public ARArchive
+{
+public:
+    inline Member *Members() {
+        return List;
+    }
+};
+
+struct PyArArchiveObject : public CppPyObject<PyARArchiveHack*> {
+    FileFd Fd;
+};
+
+static const char *ararchive_getmember_doc =
+    "getmember(name: str) -> ArMember\n\n"
+    "Return a ArMember object for the member given by name. Raise\n"
+    "LookupError if there is no ArMember with the given name.";
+static PyObject *ararchive_getmember(PyArArchiveObject *self, PyObject *arg)
+{
+    const char *name;
+    CppPyObject<ARArchive::Member*> *ret;
+    if (! (name = PyObject_AsString(arg)))
+        return 0;
+
+    const ARArchive::Member *member = self->Object->FindMember(name);
+    if (!member) {
+        PyErr_Format(PyExc_LookupError,"No member named '%s'",name);
+        return 0;
+    }
+
+    // Create our object.
+    ret = CppPyObject_NEW<ARArchive::Member*>(self,&PyArMember_Type);
+    ret->Object = const_cast<ARArchive::Member*>(member);
+    ret->NoDelete = true;
+    return ret;
+}
+
+static const char *ararchive_extractdata_doc =
+    "extractdata(name: str) -> bytes\n\n"
+    "Return the contents of the member, as a bytes object. Raise\n"
+    "LookupError if there is no ArMember with the given name.";
+static PyObject *ararchive_extractdata(PyArArchiveObject *self, PyObject *args)
+{
+    char *name = 0;
+    if (PyArg_ParseTuple(args, "s:extractdata", &name) == 0)
+        return 0;
+    const ARArchive::Member *member = self->Object->FindMember(name);
+    if (!member) {
+        PyErr_Format(PyExc_LookupError,"No member named '%s'",name);
+        return 0;
+    }
+    if (!self->Fd.Seek(member->Start))
+        return HandleErrors();
+
+    char* value = new char[member->Size];
+    self->Fd.Read(value, member->Size, true);
+    PyObject *result = PyBytes_FromStringAndSize(value, member->Size);
+    delete[] value;
+    return result;
+}
+
+// Helper class to close the FD automatically.
+class IntFD {
+    public:
+    int fd;
+    inline operator int() { return fd; };
+    inline IntFD(int fd): fd(fd) { };
+    inline ~IntFD() { close(fd); };
+};
+
+static PyObject *_extract(FileFd &Fd, const ARArchive::Member *member,
+                          const char *dir)
+{
+    if (!Fd.Seek(member->Start))
+        return HandleErrors();
+
+    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
+    // the correct errno and filename. IntFD's are closed automatically.
+    IntFD outfd(open(outfile, O_NDELAY|O_WRONLY|O_CREAT|O_TRUNC|O_APPEND,
+		             member->Mode));
+    if (outfd == -1)
+        return PyErr_SetFromErrnoWithFilename(PyExc_OSError, outfile);
+    if (fchmod(outfd, member->Mode) == -1)
+        return PyErr_SetFromErrnoWithFilename(PyExc_OSError, outfile);
+    if (fchown(outfd, member->UID, member->GID) != 0 && errno != EPERM)
+        return PyErr_SetFromErrnoWithFilename(PyExc_OSError, outfile);
+
+    // Read 4 KiB from the file, until all of the file is read. Deallocated
+    // automatically when the function returns.
+    SPtrArray<char> value = new char[4096];
+    unsigned long size = member->Size;
+    unsigned long read = 4096;
+    while (size > 0) {
+        if (size < read)
+            read = size;
+        if (!Fd.Read(value, read, true))
+            return HandleErrors();
+        if (write(outfd, value, read) != (signed)read)
+            return PyErr_SetFromErrnoWithFilename(PyExc_OSError, outfile);
+        size -= read;
+    }
+    utimbuf time = {member->MTime, member->MTime};
+    if (utime(outfile,&time) == -1)
+        return PyErr_SetFromErrnoWithFilename(PyExc_OSError, outfile);
+    Py_RETURN_TRUE;
+}
+
+static const char *ararchive_extract_doc =
+    "extract(name: str[, target: str]) -> bool\n\n"
+    "Extract the member given by name into the directory given by target.\n"
+    "If the extraction failed, an error is raised. Otherwise, the method\n"
+    "returns True if the owner could be set or False if the owner could not\n"
+    "be changed. It may also raise LookupError if there is member with\n"
+    "the given name.";
+static PyObject *ararchive_extract(PyArArchiveObject *self, PyObject *args)
+{
+    char *name = 0;
+    char *target = "";
+    if (PyArg_ParseTuple(args, "s|s:extract", &name, &target) == 0)
+        return 0;
+
+    const ARArchive::Member *member = self->Object->FindMember(name);
+
+    if (!member) {
+        PyErr_Format(PyExc_LookupError,"No member named '%s'",name);
+        return 0;
+    }
+    return _extract(self->Fd, member, target);
+}
+
+static const char *ararchive_extractall_doc =
+    "extract([target: str]) -> bool\n\n"
+    "Extract all into the directory given by target.\n"
+    "If the extraction failed, an error is raised. Otherwise, the method\n"
+    "returns True if the owner could be set or False if the owner could not\n"
+    "be changed.";
+
+static PyObject *ararchive_extractall(PyArArchiveObject *self, PyObject *args)
+{
+    char *target = "";
+    if (PyArg_ParseTuple(args, "|s:extractall", &target) == 0)
+        return 0;
+
+    const ARArchive::Member *member = self->Object->Members();
+
+    do {
+        if (_extract(self->Fd, member, target) == 0)
+            return 0;
+    } while ((member = member->Next));
+    Py_RETURN_TRUE;
+}
+
+static const char *ararchive_gettar_doc =
+    "gettar(name: str, comp: str) -> TarFile\n\n"
+    "Return a TarFile object for the member given by 'name' which will be\n"
+    "decompressed using the compression algorithm given by 'comp'.\n"
+    "This is almost equal to:\n\n"
+    "   member = arfile.getmember(name)\n"
+    "   tarfile = TarFile(file, member.start, member.size, 'gzip')'\n\n"
+    "It just opens a new TarFile on the given position in the stream.";
+static PyObject *ararchive_gettar(PyArArchiveObject *self, PyObject *args)
+{
+    const char *name;
+    const char *comp;
+    if (PyArg_ParseTuple(args, "ss:gettar", &name, &comp) == 0)
+        return 0;
+
+    const ARArchive::Member *member = self->Object->FindMember(name);
+    if (!member) {
+        PyErr_Format(PyExc_LookupError,"No member named '%s'",name);
+        return 0;
+    }
+
+    PyTarFileObject *tarfile = (PyTarFileObject*)CppPyObject_NEW<ExtractTar*>(self,&PyTarFile_Type);
+    new (&tarfile->Fd) FileFd(self->Fd);
+    tarfile->min = member->Start;
+    tarfile->Object = new ExtractTar(self->Fd, member->Size, comp);
+    return HandleErrors(tarfile);
+}
+
+static const char *ararchive_getmembers_doc =
+    "getmembers() -> list\n\n"
+    "Return a list of all members in the AR archive.";
+static PyObject *ararchive_getmembers(PyArArchiveObject *self)
+{
+    PyObject *list = PyList_New(0);
+    ARArchive::Member *member = self->Object->Members();
+    do {
+        CppPyObject<ARArchive::Member*> *ret;
+        ret = CppPyObject_NEW<ARArchive::Member*>(self,&PyArMember_Type);
+        ret->Object = member;
+        ret->NoDelete = true;
+        PyList_Append(list, ret);
+        Py_DECREF(ret);
+    } while ((member = member->Next));
+    return list;
+}
+
+static const char *ararchive_getnames_doc =
+    "getnames() -> list\n\n"
+    "Return a list of the names of all members in the AR archive.";
+static PyObject *ararchive_getnames(PyArArchiveObject *self)
+{
+    PyObject *list = PyList_New(0);
+    ARArchive::Member *member = self->Object->Members();
+    do {
+        PyObject *item = CppPyString(member->Name);
+        PyList_Append(list, item);
+        Py_DECREF(item);
+    } while ((member = member->Next));
+    return list;
+}
+
+// Just run getmembers() and return an iterator over the list.
+static PyObject *ararchive_iter(PyArArchiveObject *self) {
+    PyObject *members = ararchive_getmembers(self);
+    PyObject *iter = PyObject_GetIter(members);
+    Py_DECREF(members);
+    return iter;
+}
+
+static PyMethodDef ararchive_methods[] = {
+    {"getmember",(PyCFunction)ararchive_getmember,METH_O,
+     ararchive_getmember_doc},
+    {"gettar",(PyCFunction)ararchive_gettar,METH_VARARGS,
+     ararchive_gettar_doc},
+    {"extractdata",(PyCFunction)ararchive_extractdata,METH_VARARGS,
+     ararchive_extractdata_doc},
+    {"extract",(PyCFunction)ararchive_extract,METH_VARARGS,
+     ararchive_extract_doc},
+    {"extractall",(PyCFunction)ararchive_extractall,METH_VARARGS,
+     ararchive_extractall_doc},
+    {"getmembers",(PyCFunction)ararchive_getmembers,METH_NOARGS,
+     ararchive_getmembers_doc},
+    {"getnames",(PyCFunction)ararchive_getnames,METH_NOARGS,
+     ararchive_getnames_doc},
+    {NULL}
+};
+
+static PyObject *ararchive_new(PyTypeObject *type, PyObject *args,
+                               PyObject *kwds)
+{
+    PyObject *file;
+    PyArArchiveObject *self;
+    char *filename = 0;
+    int fileno;
+    if (PyArg_ParseTuple(args,"O:__new__",&file) == 0)
+        return 0;
+
+    // We receive a filename.
+    if ((filename = (char*)PyObject_AsString(file))) {
+        self = (PyArArchiveObject *)CppPyObject_NEW<ARArchive*>(0,type);
+        new (&self->Fd) FileFd(filename,FileFd::ReadOnly);
+    }
+    // We receive a file object.
+    else if ((fileno = PyObject_AsFileDescriptor(file)) != -1) {
+        // Clear the error set by PyObject_AsString().
+        PyErr_Clear();
+        self = (PyArArchiveObject *)CppPyObject_NEW<ARArchive*>(file,type);
+        new (&self->Fd) FileFd(fileno,false);
+    }
+    else {
+        return 0;
+    }
+    self->Object = (PyARArchiveHack*)new ARArchive(self->Fd);
+    if (_error->PendingError() == true)
+        return HandleErrors();
+    return self;
+}
+
+static void ararchive_dealloc(PyObject *self)
+{
+    ((PyArArchiveObject *)(self))->Fd.~FileFd();
+    CppDeallocPtr<ARArchive*>(self);
+}
+
+// Return bool or -1 (exception).
+static int ararchive_contains(PyObject *self, PyObject *arg)
+{
+    const char *name = PyObject_AsString(arg);
+    if (!name)
+        return -1;
+    return (GetCpp<ARArchive*>(self)->FindMember(name) != 0);
+}
+
+static PySequenceMethods ararchive_as_sequence = {
+    0,0,0,0,0,0,0,ararchive_contains,0,0
+};
+
+static PyMappingMethods ararchive_as_mapping = {
+    0,(PyCFunction)ararchive_getmember,0
+};
+
+static const char *ararchive_doc =
+    "ArArchive(file: str/int/file)\n\n"
+    "An ArArchive object represents an archive in the 4.4 BSD AR format, \n"
+    "which is used for e.g. deb packages.\n\n"
+    "The parameter 'file' may be a string specifying the path of a file, or\n"
+    "a file-like object providing the fileno() method. It may also be an int\n"
+    "specifying a file descriptor (returned by e.g. os.open()).\n"
+    "The recommended way is to pass in the path to the file.";
+
+PyTypeObject PyArArchive_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_inst.ArArchive",                // tp_name
+    sizeof(PyArArchiveObject),           // tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    ararchive_dealloc,                   // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    0,                                   // tp_repr
+    0,                                   // tp_as_number
+    &ararchive_as_sequence,              // tp_as_sequence
+    &ararchive_as_mapping,               // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    Py_TPFLAGS_DEFAULT |                 // tp_flags
+    Py_TPFLAGS_HAVE_GC,
+    ararchive_doc,                       // tp_doc
+    CppTraverse<ARArchive*>,        // tp_traverse
+    CppClear<ARArchive*>,           // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    (getiterfunc)ararchive_iter,         // tp_iter
+    0,                                   // tp_iternext
+    ararchive_methods,                   // tp_methods
+    0,                                   // tp_members
+    0,                                   // tp_getset
+    0,                                   // tp_base
+    0,                                   // tp_dict
+    0,                                   // tp_descr_get
+    0,                                   // tp_descr_set
+    0,                                   // tp_dictoffset
+    0,                                   // tp_init
+    0,                                   // tp_alloc
+    ararchive_new                        // tp_new
+};
+
+/**
+ * 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.{lzma,bz2,gz} and
+ * data.tar.{lzma,bz2,gz} 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
+ * kind of AR archive as an AR archive with some extras.
+ */
+struct PyDebFileObject : PyArArchiveObject {
+    PyObject *data;
+    PyObject *control;
+    PyObject *debian_binary;
+};
+
+static PyObject *debfile_get_data(PyDebFileObject *self)
+{
+    return Py_INCREF(self->data), self->data;
+}
+
+static PyObject *debfile_get_control(PyDebFileObject *self)
+{
+    return Py_INCREF(self->control), self->control;
+}
+
+static PyObject *debfile_get_debian_binary(PyDebFileObject *self)
+{
+    return Py_INCREF(self->debian_binary), self->debian_binary;
+}
+
+static PyObject *_gettar(PyDebFileObject *self, const ARArchive::Member *m,
+                         const char *comp)
+{
+    if (!m)
+        return 0;
+    PyTarFileObject *tarfile = (PyTarFileObject*)CppPyObject_NEW<ExtractTar*>(self,&PyTarFile_Type);
+    new (&tarfile->Fd) FileFd(self->Fd);
+    tarfile->min = m->Start;
+    tarfile->Object = new ExtractTar(self->Fd, m->Size, comp);
+    return tarfile;
+}
+
+
+
+static PyObject *debfile_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    PyDebFileObject *self = (PyDebFileObject*)ararchive_new(type, args, kwds);
+    if (self == NULL)
+        return NULL;
+
+    // DebFile
+    self->control = _gettar(self, self->Object->FindMember("control.tar.gz"),
+                            "gzip");
+    if (!self->control)
+        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)
+        return PyErr_Format(PyExc_SystemError, "No debian archive, missing %s",
+                            "data.tar.gz or data.tar.bz2 or data.tar.lzma");
+
+
+    const ARArchive::Member *member = self->Object->FindMember("debian-binary");
+    if (!member)
+        return PyErr_Format(PyExc_SystemError, "No debian archive, missing %s",
+                            "debian-binary");
+
+    if (!self->Fd.Seek(member->Start))
+        return HandleErrors();
+
+    char* value = new char[member->Size];
+    self->Fd.Read(value, member->Size, true);
+    self->debian_binary = PyBytes_FromStringAndSize(value, member->Size);
+    delete[] value;
+    return self;
+}
+
+static int debfile_traverse(PyObject *_self, visitproc visit, void* arg)
+{
+    PyDebFileObject *self = (PyDebFileObject*)_self;
+    Py_VISIT(self->data);
+    Py_VISIT(self->control);
+    Py_VISIT(self->debian_binary);
+    return PyArArchive_Type.tp_traverse(self, visit, arg);
+}
+
+static int debfile_clear(PyObject *_self) {
+    PyDebFileObject *self = (PyDebFileObject*)_self;
+    Py_CLEAR(self->data);
+    Py_CLEAR(self->control);
+    Py_CLEAR(self->debian_binary);
+    return PyArArchive_Type.tp_clear(self);
+}
+
+static void debfile_dealloc(PyObject *self) {
+    debfile_clear((PyDebFileObject *)self);
+    PyArArchive_Type.tp_dealloc(self);
+}
+
+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} member."},
+    {"debian_binary",(getter)debfile_get_debian_binary,0,
+     "The package version, as contained in debian-binary."},
+    {NULL}
+};
+
+static const char *debfile_doc =
+    "DebFile(file: str/int/file)\n\n"
+    "A DebFile object represents a file in the .deb package format.\n\n"
+    "The parameter 'file' may be a string specifying the path of a file, or\n"
+    "a file-like object providing the fileno() method. It may also be an int\n"
+    "specifying a file descriptor (returned by e.g. os.open()).\n"
+    "The recommended way 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}\n"
+    ",debian-binary members in the archive.";
+
+PyTypeObject PyDebFile_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_inst.DebFile",                // tp_name
+    sizeof(PyDebFileObject),           // tp_basicsize
+    0,                                 // tp_itemsize
+    // Methods
+    debfile_dealloc,                   // tp_dealloc
+    0,                                 // tp_print
+    0,                                 // tp_getattr
+    0,                                 // tp_setattr
+    0,                                 // tp_compare
+    0,                                 // tp_repr
+    0,                                 // tp_as_number
+    0,                                 // tp_as_sequence
+    0,                                 // tp_as_mapping
+    0,                                 // tp_hash
+    0,                                 // tp_call
+    0,                                 // tp_str
+    0,                                 // tp_getattro
+    0,                                 // tp_setattro
+    0,                                 // tp_as_buffer
+    Py_TPFLAGS_DEFAULT |               // tp_flags
+    Py_TPFLAGS_HAVE_GC,
+    debfile_doc,                       // tp_doc
+    debfile_traverse,                  // tp_traverse
+    debfile_clear,                     // tp_clear
+    0,                                 // tp_richcompare
+    0,                                 // tp_weaklistoffset
+    0,                                 // tp_iter
+    0,                                 // tp_iternext
+    0,                                 // tp_methods
+    0,                                 // tp_members
+    debfile_getset,                    // tp_getset
+    &PyArArchive_Type,                 // tp_base
+    0,                                 // tp_dict
+    0,                                 // tp_descr_get
+    0,                                 // tp_descr_set
+    0,                                 // tp_dictoffset
+    0,                                 // tp_init
+    0,                                 // tp_alloc
+    debfile_new                        // tp_new
+};
diff --git a/python/cache.cc b/python/cache.cc
index 023cf041..3c9bc785 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -73,7 +73,7 @@ static PyObject *CreateProvides(PyObject *Owner,pkgCache::PrvIterator I)
    {
       PyObject *Obj;
       PyObject *Ver;
-      Ver = CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&VersionType,
+      Ver = CppPyObject_NEW<pkgCache::VerIterator>(Owner,&PyVersion_Type,
 							I.OwnerVer());
       Obj = Py_BuildValue("ssN",I.ParentPkg().Name(),I.ProvideVersion(),
 			  Ver);
@@ -87,9 +87,6 @@ static PyObject *CreateProvides(PyObject *Owner,pkgCache::PrvIterator I)
 // ---------------------------------------------------------------------
 static PyObject *PkgCacheUpdate(PyObject *Self,PyObject *Args)
 {
-   PyObject *CacheFilePy = GetOwner<pkgCache*>(Self);
-   pkgCacheFile *Cache = GetCpp<pkgCacheFile*>(CacheFilePy);
-
    PyObject *pyFetchProgressInst = 0;
    PyObject *pySourcesList = 0;
    int pulseInterval = 0;
@@ -105,8 +102,11 @@ static PyObject *PkgCacheUpdate(PyObject *Self,PyObject *Args)
    return HandleErrors(PyRes);
 }
 
+#ifdef COMPAT_0_7
 static PyObject *PkgCacheClose(PyObject *Self,PyObject *Args)
 {
+   PyErr_WarnEx(PyExc_DeprecationWarning, "Cache.Close() is deprecated, "
+                "because it causes segfaults. Delete the Cache instead.", 1);
    PyObject *CacheFilePy = GetOwner<pkgCache*>(Self);
    pkgCacheFile *Cache = GetCpp<pkgCacheFile*>(CacheFilePy);
    Cache->Close();
@@ -117,6 +117,9 @@ static PyObject *PkgCacheClose(PyObject *Self,PyObject *Args)
 
 static PyObject *PkgCacheOpen(PyObject *Self,PyObject *Args)
 {
+   PyErr_WarnEx(PyExc_DeprecationWarning, "Cache.Open() is deprecated, "
+                "because it causes memory leaks. Create a new Cache instead.",
+                1);
    PyObject *CacheFilePy = GetOwner<pkgCache*>(Self);
    pkgCacheFile *Cache = GetCpp<pkgCacheFile*>(CacheFilePy);
 
@@ -144,63 +147,91 @@ static PyObject *PkgCacheOpen(PyObject *Self,PyObject *Args)
    Py_INCREF(Py_None);
    return HandleErrors(Py_None);
 }
-
+#endif
 
 static PyMethodDef PkgCacheMethods[] =
 {
-   {"Update",PkgCacheUpdate,METH_VARARGS,"Update the cache"},
+   {"update",PkgCacheUpdate,METH_VARARGS,"Update the cache"},
+#ifdef COMPAT_0_7
    {"Open", PkgCacheOpen, METH_VARARGS,"Open the cache"},
    {"Close", PkgCacheClose, METH_VARARGS,"Close the cache"},
+#endif
    {}
 };
 
-static PyObject *CacheAttr(PyObject *Self,char *Name)
-{
+static PyObject *PkgCacheGetPackages(PyObject *Self, void*) {
+   pkgCache *Cache = GetCpp<pkgCache *>(Self);
+   return CppPyObject_NEW<PkgListStruct>(Self,&PyPackageList_Type,Cache->PkgBegin());
+}
+
+static PyObject *PkgCacheGetPackageCount(PyObject *Self, void*) {
    pkgCache *Cache = GetCpp<pkgCache *>(Self);
+   return Py_BuildValue("i",Cache->HeaderP->PackageCount);
+}
+
+static PyObject *PkgCacheGetVersionCount(PyObject *Self, void*) {
+   pkgCache *Cache = GetCpp<pkgCache *>(Self);
+   return Py_BuildValue("i",Cache->HeaderP->VersionCount);
+}
+static PyObject *PkgCacheGetDependsCount(PyObject *Self, void*) {
+   pkgCache *Cache = GetCpp<pkgCache *>(Self);
+   return Py_BuildValue("i",Cache->HeaderP->DependsCount);
+}
 
-   if (strcmp("Packages",Name) == 0)
-      return CppOwnedPyObject_NEW<PkgListStruct>(Self,&PkgListType,Cache->PkgBegin());
-   else if (strcmp("PackageCount",Name) == 0)
-      return Py_BuildValue("i",Cache->HeaderP->PackageCount);
-   else if (strcmp("VersionCount",Name) == 0)
-      return Py_BuildValue("i",Cache->HeaderP->VersionCount);
-   else if (strcmp("DependsCount",Name) == 0)
-      return Py_BuildValue("i",Cache->HeaderP->DependsCount);
-   else if (strcmp("PackageFileCount",Name) == 0)
-      return Py_BuildValue("i",Cache->HeaderP->PackageFileCount);
-   else if (strcmp("VerFileCount",Name) == 0)
-      return Py_BuildValue("i",Cache->HeaderP->VerFileCount);
-   else if (strcmp("ProvidesCount",Name) == 0)
-      return Py_BuildValue("i",Cache->HeaderP->ProvidesCount);
-   else if (strcmp("FileList",Name) == 0)
+static PyObject *PkgCacheGetPackageFileCount(PyObject *Self, void*) {
+   pkgCache *Cache = GetCpp<pkgCache *>(Self);
+   return Py_BuildValue("i",Cache->HeaderP->PackageFileCount);
+}
+
+static PyObject *PkgCacheGetVerFileCount(PyObject *Self, void*) {
+   pkgCache *Cache = GetCpp<pkgCache *>(Self);
+   return Py_BuildValue("i",Cache->HeaderP->VerFileCount);
+}
+
+static PyObject *PkgCacheGetProvidesCount(PyObject *Self, void*) {
+   pkgCache *Cache = GetCpp<pkgCache *>(Self);
+   return Py_BuildValue("i",Cache->HeaderP->ProvidesCount);
+}
+
+static PyObject *PkgCacheGetFileList(PyObject *Self, void*) {
+   pkgCache *Cache = GetCpp<pkgCache *>(Self);
+   PyObject *List = PyList_New(0);
+   for (pkgCache::PkgFileIterator I = Cache->FileBegin(); I.end() == false; I++)
    {
-      PyObject *List = PyList_New(0);
-      for (pkgCache::PkgFileIterator I = Cache->FileBegin(); I.end() == false; I++)
-      {
-	 PyObject *Obj;
-	 Obj = CppOwnedPyObject_NEW<pkgCache::PkgFileIterator>(Self,&PackageFileType,I);
-	 PyList_Append(List,Obj);
-	 Py_DECREF(Obj);
-      }
-      return List;
+      PyObject *Obj;
+      Obj = CppPyObject_NEW<pkgCache::PkgFileIterator>(Self,&PyPackageFile_Type,I);
+      PyList_Append(List,Obj);
+      Py_DECREF(Obj);
    }
-
-   return Py_FindMethod(PkgCacheMethods,Self,Name);
+   return List;
 }
 
+static PyGetSetDef PkgCacheGetSet[] = {
+   {"depends_count",PkgCacheGetDependsCount},
+   {"file_list",PkgCacheGetFileList},
+   {"package_count",PkgCacheGetPackageCount},
+   {"package_file_count",PkgCacheGetPackageFileCount},
+   {"packages",PkgCacheGetPackages},
+   {"provides_count",PkgCacheGetProvidesCount},
+   {"ver_file_count",PkgCacheGetVerFileCount},
+   {"version_count",PkgCacheGetVersionCount},
+   {}
+};
+
+
+
 // Map access, operator []
 static PyObject *CacheMapOp(PyObject *Self,PyObject *Arg)
 {
    pkgCache *Cache = GetCpp<pkgCache *>(Self);
 
-   if (PyString_Check(Arg) == 0)
-   {
-      PyErr_SetNone(PyExc_TypeError);
+   // Get the name of the package, unicode and normal strings.
+   const char *Name = PyObject_AsString(Arg);
+   if (Name == NULL)
       return 0;
-   }
+
 
    // Search for the package
-   const char *Name = PyString_AsString(Arg);
    pkgCache::PkgIterator Pkg = Cache->FindPkg(Name);
    if (Pkg.end() == true)
    {
@@ -208,52 +239,141 @@ static PyObject *CacheMapOp(PyObject *Self,PyObject *Arg)
       return 0;
    }
 
-   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Self,&PackageType,Pkg);
+   return CppPyObject_NEW<pkgCache::PkgIterator>(Self,&PyPackage_Type,Pkg);
 }
 
-// we need a special dealloc here to make sure that the CacheFile
-// is closed before deallocation the cache (otherwise we have a bad)
-// memory leak
-void PkgCacheFileDealloc(PyObject *Self)
+// Check whether the cache contains a package with a given name.
+static int CacheContains(PyObject *Self,PyObject *Arg)
 {
-   PyObject *CacheFilePy = GetOwner<pkgCache*>(Self);
-   pkgCacheFile *CacheF = GetCpp<pkgCacheFile*>(CacheFilePy);
-   CacheF->Close();
-   CppOwnedDealloc<pkgCache *>(Self);
+   // Get the name of the package, unicode and normal strings.
+   const char *Name = PyObject_AsString(Arg);
+   if (Name == NULL)
+      return 0;
+   return (GetCpp<pkgCache *>(Self)->FindPkg(Name).end() == false);
 }
 
-static PyMappingMethods CacheMap = {0,CacheMapOp,0};
-PyTypeObject PkgCacheType =
+static PyObject *PkgCacheNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgCache",                          // tp_name
-   sizeof(CppOwnedPyObject<pkgCache *>),   // tp_basicsize
+   PyObject *pyCallbackInst = 0;
+   char *kwlist[] = {"progress", 0};
+
+   if (PyArg_ParseTupleAndKeywords(Args, kwds, "|O", kwlist,
+                                   &pyCallbackInst) == 0)
+      return 0;
+
+    if (_system == 0) {
+        PyErr_SetString(PyExc_ValueError,"_system not initialized");
+        return 0;
+    }
+
+   pkgCacheFile *Cache = new pkgCacheFile();
+
+   if(pyCallbackInst != 0) {
+      // sanity check for the progress object, see #497049
+      if (PyObject_HasAttrString(pyCallbackInst, "done") != true) {
+        PyErr_SetString(PyExc_ValueError,
+                        "OpProgress object must implement done()");
+        return 0;
+      }
+      if (PyObject_HasAttrString(pyCallbackInst, "update") != true) {
+        PyErr_SetString(PyExc_ValueError,
+                        "OpProgress object must implement update()");
+        return 0;
+      }
+      PyOpProgress progress;
+      progress.setCallbackInst(pyCallbackInst);
+      if (Cache->Open(progress,false) == false)
+         return HandleErrors();
+   }
+   else {
+      OpTextProgress Prog;
+      if (Cache->Open(Prog,false) == false)
+	     return HandleErrors();
+   }
+
+   CppPyObject<pkgCacheFile*> *CacheFileObj =
+	   CppPyObject_NEW<pkgCacheFile*>(0,&PyCacheFile_Type, Cache);
+
+   CppPyObject<pkgCache *> *CacheObj =
+	   CppPyObject_NEW<pkgCache *>(CacheFileObj,type,
+					    (pkgCache *)(*Cache));
+
+   // Do not delete the pointer to the pkgCache, it is managed by pkgCacheFile.
+   CacheObj->NoDelete = true;
+   Py_DECREF(CacheFileObj);
+   return CacheObj;
+}
+
+static Py_ssize_t CacheMapLen(PyObject *Self)
+{
+    return GetCpp<pkgCache*>(Self)->HeaderP->PackageCount;
+}
+
+static char *doc_PkgCache = "Cache([progress]) -> Cache() object.\n\n"
+    "The cache provides access to the packages and other stuff.\n\n"
+    "The optional parameter *progress* can be used to specify an \n"
+    "apt.progress.OpProgress() object (or similar) which displays\n"
+    "the opening progress. If not specified, the progress is\n"
+    "displayed in simple text form.\n\n"
+    "The cache can be used like a mapping of package names to Package\n"
+    "objects.";
+static PySequenceMethods CacheSeq = {0,0,0,0,0,0,0,CacheContains,0,0};
+static PyMappingMethods CacheMap = {CacheMapLen,CacheMapOp,0};
+PyTypeObject PyCache_Type =
+{
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.Cache",                     // tp_name
+   sizeof(CppPyObject<pkgCache *>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   PkgCacheFileDealloc,                  // tp_dealloc
+   CppDeallocPtr<pkgCache *>,      // tp_dealloc
    0,                                   // tp_print
-   CacheAttr,                           // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    0,                                   // tp_repr
    0,                                   // tp_as_number
-   0,                                   // tp_as_sequence
+   &CacheSeq,                           // tp_as_sequence
    &CacheMap,		                // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   (Py_TPFLAGS_DEFAULT |                // tp_flags
+    Py_TPFLAGS_BASETYPE |
+    Py_TPFLAGS_HAVE_GC),
+   doc_PkgCache,                        // tp_doc
+   CppTraverse<pkgCache *>,        // tp_traverse
+   CppClear<pkgCache *>,           // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   PkgCacheMethods,                     // tp_methods
+   0,                                   // tp_members
+   PkgCacheGetSet,                      // tp_getset
+   0,                                   // tp_base
+   0,                                   // tp_dict
+   0,                                   // tp_descr_get
+   0,                                   // tp_descr_set
+   0,                                   // tp_dictoffset
+   0,                                   // tp_init
+   0,                                   // tp_alloc
+   PkgCacheNew,                         // tp_new
 };
 									/*}}}*/
 // PkgCacheFile Class							/*{{{*/
 // ---------------------------------------------------------------------
-PyTypeObject PkgCacheFileType =
+PyTypeObject PyCacheFile_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
    "pkgCacheFile",                      // tp_name
-   sizeof(CppOwnedPyObject<pkgCacheFile*>),   // tp_basicsize
+   sizeof(CppPyObject<pkgCacheFile*>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<pkgCacheFile*>,       // tp_dealloc
+   CppDeallocPtr<pkgCacheFile*>,       // tp_dealloc
    0,                                   // tp_print
    0,                                   // tp_getattr
    0,                                   // tp_setattr
@@ -263,6 +383,12 @@ PyTypeObject PkgCacheFileType =
    0,                                   // tp_as_sequence
    0,                                   // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   0,                                   // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   Py_TPFLAGS_DEFAULT,                  // tp_flags
 };
 									/*}}}*/
 // Package List Class							/*{{{*/
@@ -298,7 +424,7 @@ static PyObject *PkgListItem(PyObject *iSelf,Py_ssize_t Index)
       }
    }
 
-   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(GetOwner<PkgListStruct>(iSelf),&PackageType,
+   return CppPyObject_NEW<pkgCache::PkgIterator>(GetOwner<PkgListStruct>(iSelf),&PyPackage_Type,
 						      Self.Iter);
 }
 
@@ -313,15 +439,14 @@ static PySequenceMethods PkgListSeq =
    0                 // assign slice
 };
 
-PyTypeObject PkgListType =
+PyTypeObject PyPackageList_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgCache::PkgIterator",             // tp_name
-   sizeof(CppOwnedPyObject<PkgListStruct>),   // tp_basicsize
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.PackageList",               // tp_name
+   sizeof(CppPyObject<PkgListStruct>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<PkgListStruct>,      // tp_dealloc
+   CppDealloc<PkgListStruct>,      // tp_dealloc
    0,                                   // tp_print
    0,                                   // tp_getattr
    0,                                   // tp_setattr
@@ -331,89 +456,105 @@ PyTypeObject PkgListType =
    &PkgListSeq,                         // tp_as_sequence
    0,			                // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   0,                                   // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, // tp_flags
+   0,                                   // tp_doc
+   CppTraverse<PkgListStruct>,     // tp_traverse
+   CppClear<PkgListStruct>,        // tp_clear
 };
 
-									/*}}}*/
-// Package Class							/*{{{*/
-// ---------------------------------------------------------------------
-static PyObject *PackageAttr(PyObject *Self,char *Name)
+#define Owner (GetOwner<pkgCache::PkgIterator>(Self))
+#define MkGet(PyFunc,Ret) static PyObject *PyFunc(PyObject *Self,void*) \
+{ \
+    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(Self); \
+    return Ret; \
+}
+
+MkGet(PackageGetName,PyString_FromString(Pkg.Name()))
+MkGet(PackageGetSection,Safe_FromString(Pkg.Section()))
+MkGet(PackageGetRevDependsList,CppPyObject_NEW<RDepListStruct>(Owner,
+                               &PyDependencyList_Type, Pkg.RevDependsList()))
+MkGet(PackageGetProvidesList,CreateProvides(Owner,Pkg.ProvidesList()))
+MkGet(PackageGetSelectedState,Py_BuildValue("i",Pkg->SelectedState))
+MkGet(PackageGetInstState,Py_BuildValue("i",Pkg->InstState))
+MkGet(PackageGetCurrentState,Py_BuildValue("i",Pkg->CurrentState))
+MkGet(PackageGetID,Py_BuildValue("i",Pkg->ID))
+#
+MkGet(PackageGetAuto,Py_BuildValue("i",(Pkg->Flags & pkgCache::Flag::Auto) != 0))
+MkGet(PackageGetEssential,Py_BuildValue("i",(Pkg->Flags & pkgCache::Flag::Essential) != 0))
+MkGet(PackageGetImportant,Py_BuildValue("i",(Pkg->Flags & pkgCache::Flag::Important) != 0))
+#undef MkGet
+#undef Owner
+
+static PyObject *PackageGetVersionList(PyObject *Self,void*)
 {
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(Self);
    PyObject *Owner = GetOwner<pkgCache::PkgIterator>(Self);
 
-   if (strcmp("Name",Name) == 0)
-      return PyString_FromString(Pkg.Name());
-   else if (strcmp("VersionList",Name) == 0)
+   PyObject *List = PyList_New(0);
+   for (pkgCache::VerIterator I = Pkg.VersionList(); I.end() == false; I++)
    {
-      PyObject *List = PyList_New(0);
-      for (pkgCache::VerIterator I = Pkg.VersionList(); I.end() == false; I++)
-      {
-	 PyObject *Obj;
-	 Obj = CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&VersionType,I);
-	 PyList_Append(List,Obj);
-	 Py_DECREF(Obj);
-      }
-      return List;
+      PyObject *Obj;
+      Obj = CppPyObject_NEW<pkgCache::VerIterator>(Owner,&PyVersion_Type,I);
+      PyList_Append(List,Obj);
+      Py_DECREF(Obj);
    }
-   else if (strcmp("CurrentVer",Name) == 0)
+   return List;
+}
+static PyObject *PackageGetCurrentVer(PyObject *Self,void*)
+{
+   pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(Self);
+   PyObject *Owner = GetOwner<pkgCache::PkgIterator>(Self);
+   if (Pkg->CurrentVer == 0)
    {
-      if (Pkg->CurrentVer == 0)
-      {
-	 Py_INCREF(Py_None);
-	 return Py_None;
-      }
-
-      return CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&VersionType,
-							 Pkg.CurrentVer());
+      Py_INCREF(Py_None);
+      return Py_None;
    }
-   else if (strcmp("Section",Name) == 0)
-      return Safe_FromString(Pkg.Section());
-   else if (strcmp("RevDependsList",Name) == 0)
-      return CppOwnedPyObject_NEW<RDepListStruct>(Owner,&RDepListType,
-							 Pkg.RevDependsList());
-   else if (strcmp("ProvidesList",Name) == 0)
-      return CreateProvides(Owner,Pkg.ProvidesList());
-   else if (strcmp("SelectedState",Name) == 0)
-      return Py_BuildValue("i",Pkg->SelectedState);
-   else if (strcmp("InstState",Name) == 0)
-      return Py_BuildValue("i",Pkg->InstState);
-   else if (strcmp("CurrentState",Name) == 0)
-      return Py_BuildValue("i",Pkg->CurrentState);
-   else if (strcmp("ID",Name) == 0)
-      return Py_BuildValue("i",Pkg->ID);
-   else if (strcmp("Auto",Name) == 0)
-      return Py_BuildValue("i",(Pkg->Flags & pkgCache::Flag::Auto) != 0);
-   else if (strcmp("Essential",Name) == 0)
-      return Py_BuildValue("i",(Pkg->Flags & pkgCache::Flag::Essential) != 0);
-   else if (strcmp("Important",Name) == 0)
-      return Py_BuildValue("i",(Pkg->Flags & pkgCache::Flag::Important) != 0);
-
-   PyErr_SetString(PyExc_AttributeError,Name);
-   return 0;
+   return CppPyObject_NEW<pkgCache::VerIterator>(Owner,&PyVersion_Type,
+							 Pkg.CurrentVer());
 }
 
+static PyGetSetDef PackageGetSet[] = {
+    {"name",PackageGetName},
+    {"section",PackageGetSection},
+    {"rev_depends_list",PackageGetRevDependsList},
+    {"provides_list",PackageGetProvidesList},
+    {"selected_state",PackageGetSelectedState},
+    {"inst_state",PackageGetInstState},
+    {"current_state",PackageGetCurrentState},
+    {"id",PackageGetID},
+    {"auto",PackageGetAuto},
+    {"essential",PackageGetEssential},
+    {"important",PackageGetImportant},
+    {"version_list",PackageGetVersionList},
+    {"current_ver",PackageGetCurrentVer},
+    {}
+};
+
 static PyObject *PackageRepr(PyObject *Self)
 {
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(Self);
 
-   char S[300];
-   snprintf(S,sizeof(S),"<pkgCache::Package object: Name:'%s' Section: '%s'"
-	                " ID:%u Flags:0x%lX>",
-	    Pkg.Name(),Pkg.Section(),Pkg->ID,Pkg->Flags);
-   return PyString_FromString(S);
+   return PyString_FromFormat("<%s object: name:'%s' section: "
+                              "'%s' id:%u>", Self->ob_type->tp_name,
+                              Pkg.Name(), (Pkg.Section() ? Pkg.Section() : ""),
+                              Pkg->ID);
 }
 
-PyTypeObject PackageType =
+PyTypeObject PyPackage_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgCache::Package",                 // tp_name
-   sizeof(CppOwnedPyObject<pkgCache::PkgIterator>),   // tp_basicsize
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.Package",                 // tp_name
+   sizeof(CppPyObject<pkgCache::PkgIterator>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<pkgCache::PkgIterator>,  // tp_dealloc
+   CppDealloc<pkgCache::PkgIterator>,  // tp_dealloc
    0,                                   // tp_print
-   PackageAttr,                         // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    PackageRepr,                         // tp_repr
@@ -421,62 +562,80 @@ PyTypeObject PackageType =
    0,                                   // tp_as_sequence
    0,			                // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, // tp_flags
+   "Package Object",                    // tp_doc
+   CppTraverse<pkgCache::PkgIterator>, // tp_traverse
+   CppClear<pkgCache::PkgIterator>,// tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   0,                                   // tp_methods
+   0,                                   // tp_members
+   PackageGetSet,                       // tp_getset
 };
-									/*}}}*/
-// Description Class							/*{{{*/
-// ---------------------------------------------------------------------
-static PyObject *DescriptionAttr(PyObject *Self,char *Name)
+
+#define Description_MkGet(PyFunc,Ret) static PyObject \
+   *PyFunc(PyObject *Self,void*) { \
+       pkgCache::DescIterator &Desc = GetCpp<pkgCache::DescIterator>(Self); \
+       return Ret; }
+
+Description_MkGet(DescriptionGetLanguageCode,
+                  PyString_FromString(Desc.LanguageCode()))
+Description_MkGet(DescriptionGetMd5,Safe_FromString(Desc.md5()))
+#undef Description_MkGet
+
+static PyObject *DescriptionGetFileList(PyObject *Self,void*)
 {
    pkgCache::DescIterator &Desc = GetCpp<pkgCache::DescIterator>(Self);
    PyObject *Owner = GetOwner<pkgCache::DescIterator>(Self);
 
-   if (strcmp("LanguageCode",Name) == 0)
-      return PyString_FromString(Desc.LanguageCode());
-   else if (strcmp("md5",Name) == 0)
-      return Safe_FromString(Desc.md5());
-   else if (strcmp("FileList",Name) == 0)
+   /* The second value in the tuple is the index of the VF item. If the
+      user wants to request a lookup then that number will be used.
+      Maybe later it can become an object. */
+   PyObject *List = PyList_New(0);
+   for (pkgCache::DescFileIterator I = Desc.FileList(); I.end() == false; I++)
    {
-      /* The second value in the tuple is the index of the VF item. If the
-         user wants to request a lookup then that number will be used.
-         Maybe later it can become an object. */
-      PyObject *List = PyList_New(0);
-      for (pkgCache::DescFileIterator I = Desc.FileList(); I.end() == false; I++)
-      {
-	 PyObject *DescFile;
-	 PyObject *Obj;
-	 DescFile = CppOwnedPyObject_NEW<pkgCache::PkgFileIterator>(Owner,&PackageFileType,I.File());
-	 Obj = Py_BuildValue("Nl",DescFile,I.Index());
-	 PyList_Append(List,Obj);
-	 Py_DECREF(Obj);
-      }
-      return List;
+      PyObject *DescFile;
+      PyObject *Obj;
+      DescFile = CppPyObject_NEW<pkgCache::PkgFileIterator>(Owner,&PyPackageFile_Type,I.File());
+      Obj = Py_BuildValue("Nl",DescFile,I.Index());
+      PyList_Append(List,Obj);
+      Py_DECREF(Obj);
    }
-   PyErr_SetString(PyExc_AttributeError,Name);
-   return 0;
+   return List;
 }
 
+static PyGetSetDef DescriptionGetSet[] = {
+    {"language_code",DescriptionGetLanguageCode},
+    {"md5",DescriptionGetMd5},
+    {"file_list",DescriptionGetFileList},
+    {}
+};
+
 static PyObject *DescriptionRepr(PyObject *Self)
 {
    pkgCache::DescIterator &Desc = GetCpp<pkgCache::DescIterator>(Self);
-
-   char S[300];
-   snprintf(S,sizeof(S),
-	    "<pkgCache::Description object: language_code:'%s' md5:'%s' ",
-	    Desc.LanguageCode(), Desc.md5());
-   return PyString_FromString(S);
+   return PyString_FromFormat("<%s object: language_code:'%s' md5:'%s' ",
+                              Self->ob_type->tp_name, Desc.LanguageCode(),
+                              Desc.md5());
 }
 
-PyTypeObject DescriptionType =
+PyTypeObject PyDescription_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgCache::DescIterator",             // tp_name
-   sizeof(CppOwnedPyObject<pkgCache::DescIterator>),   // tp_basicsize
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.Description",               // tp_name
+   sizeof(CppPyObject<pkgCache::DescIterator>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<pkgCache::DescIterator>,          // tp_dealloc
+   CppDealloc<pkgCache::DescIterator>,          // tp_dealloc
    0,                                   // tp_print
-   DescriptionAttr,                         // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    DescriptionRepr,                         // tp_repr
@@ -484,6 +643,22 @@ PyTypeObject DescriptionType =
    0,		                        // tp_as_sequence
    0,			                // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, // tp_flags
+   "apt_pkg.Description Object",        // tp_doc
+   CppTraverse<pkgCache::DescIterator>, // tp_traverse
+   CppClear<pkgCache::DescIterator>,// tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   0,                                   // tp_methods
+   0,                                   // tp_members
+   DescriptionGetSet,                   // tp_getset
 };
 									/*}}}*/
 // Version Class							/*{{{*/
@@ -523,7 +698,7 @@ static PyObject *MakeDepends(PyObject *Owner,pkgCache::VerIterator &Ver,
       {
 	 PyObject *Obj;
 	 if (AsObj == true)
-	    Obj = CppOwnedPyObject_NEW<pkgCache::DepIterator>(Owner,&DependencyType,
+	    Obj = CppPyObject_NEW<pkgCache::DepIterator>(Owner,&PyDependency_Type,
 							 Start);
 	 else
 	 {
@@ -553,63 +728,86 @@ static PyObject *MakeDepends(PyObject *Owner,pkgCache::VerIterator &Ver,
    return Dict;
 }
 
-static PyObject *VersionAttr(PyObject *Self,char *Name)
-{
+static inline pkgCache::VerIterator Version_GetVer(PyObject *Self) {
+   return GetCpp<pkgCache::VerIterator>(Self);
+}
+
+// Version attributes.
+static PyObject *VersionGetVerStr(PyObject *Self, void*) {
+   return PyString_FromString(Version_GetVer(Self).VerStr());
+}
+static PyObject *VersionGetSection(PyObject *Self, void*) {
+   return Safe_FromString(Version_GetVer(Self).Section());
+}
+static PyObject *VersionGetArch(PyObject *Self, void*) {
+   return Safe_FromString(Version_GetVer(Self).Arch());
+}
+static PyObject *VersionGetFileList(PyObject *Self, void*) {
    pkgCache::VerIterator &Ver = GetCpp<pkgCache::VerIterator>(Self);
    PyObject *Owner = GetOwner<pkgCache::VerIterator>(Self);
-
-   if (strcmp("VerStr",Name) == 0)
-      return PyString_FromString(Ver.VerStr());
-   else if (strcmp("Section",Name) == 0)
-      return Safe_FromString(Ver.Section());
-   else if (strcmp("Arch",Name) == 0)
-      return Safe_FromString(Ver.Arch());
-   else if (strcmp("FileList",Name) == 0)
+   PyObject *List = PyList_New(0);
+   for (pkgCache::VerFileIterator I = Ver.FileList(); I.end() == false; I++)
    {
-      /* The second value in the tuple is the index of the VF item. If the
-         user wants to request a lookup then that number will be used.
-         Maybe later it can become an object. */
-      PyObject *List = PyList_New(0);
-      for (pkgCache::VerFileIterator I = Ver.FileList(); I.end() == false; I++)
-      {
-	 PyObject *PkgFile;
-	 PyObject *Obj;
-	 PkgFile = CppOwnedPyObject_NEW<pkgCache::PkgFileIterator>(Owner,&PackageFileType,I.File());
-	 Obj = Py_BuildValue("Nl",PkgFile,I.Index());
-	 PyList_Append(List,Obj);
-	 Py_DECREF(Obj);
-      }
-      return List;
-   }
-   else if (strcmp("DependsListStr",Name) == 0)
-      return MakeDepends(Owner,Ver,false);
-   else if (strcmp("DependsList",Name) == 0)
-      return MakeDepends(Owner,Ver,true);
-   else if (strcmp("ParentPkg",Name) == 0)
-      return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Owner,&PackageType,
-							 Ver.ParentPkg());
-   else if (strcmp("ProvidesList",Name) == 0)
-      return CreateProvides(Owner,Ver.ProvidesList());
-   else if (strcmp("Size",Name) == 0)
-      return Py_BuildValue("i",Ver->Size);
-   else if (strcmp("InstalledSize",Name) == 0)
-      return Py_BuildValue("i",Ver->InstalledSize);
-   else if (strcmp("Hash",Name) == 0)
-      return Py_BuildValue("i",Ver->Hash);
-   else if (strcmp("ID",Name) == 0)
-      return Py_BuildValue("i",Ver->ID);
-   else if (strcmp("Priority",Name) == 0)
-      return Py_BuildValue("i",Ver->Priority);
-   else if (strcmp("PriorityStr",Name) == 0)
-      return Safe_FromString(Ver.PriorityType());
-   else if (strcmp("Downloadable", Name) == 0)
-      return Py_BuildValue("b", Ver.Downloadable());
-   else if (strcmp("TranslatedDescription", Name) == 0) {
-      return CppOwnedPyObject_NEW<pkgCache::DescIterator>(Owner,
-							  &DescriptionType,
-							  Ver.TranslatedDescription());
+      PyObject *PkgFile;
+      PyObject *Obj;
+      PkgFile = CppPyObject_NEW<pkgCache::PkgFileIterator>(Owner,&PyPackageFile_Type,I.File());
+      Obj = Py_BuildValue("Nl",PkgFile,I.Index());
+      PyList_Append(List,Obj);
+      Py_DECREF(Obj);
    }
+   return List;
+}
+
+static PyObject *VersionGetDependsListStr(PyObject *Self, void*) {
+   pkgCache::VerIterator &Ver = GetCpp<pkgCache::VerIterator>(Self);
+   PyObject *Owner = GetOwner<pkgCache::VerIterator>(Self);
+   return MakeDepends(Owner,Ver,false);
+}
+static PyObject *VersionGetDependsList(PyObject *Self, void*) {
+   pkgCache::VerIterator &Ver = GetCpp<pkgCache::VerIterator>(Self);
+   PyObject *Owner = GetOwner<pkgCache::VerIterator>(Self);
+   return MakeDepends(Owner,Ver,true);
+}
+static PyObject *VersionGetParentPkg(PyObject *Self, void*) {
+   PyObject *Owner = GetOwner<pkgCache::VerIterator>(Self);
+   return CppPyObject_NEW<pkgCache::PkgIterator>(Owner,&PyPackage_Type,
+                                                      Version_GetVer(Self).ParentPkg());
+}
+static PyObject *VersionGetProvidesList(PyObject *Self, void*) {
+   PyObject *Owner = GetOwner<pkgCache::VerIterator>(Self);
+   return CreateProvides(Owner,Version_GetVer(Self).ProvidesList());
+}
+static PyObject *VersionGetSize(PyObject *Self, void*) {
+   return Py_BuildValue("i", Version_GetVer(Self)->Size);
+}
+static PyObject *VersionGetInstalledSize(PyObject *Self, void*) {
+   return Py_BuildValue("i", Version_GetVer(Self)->InstalledSize);
+}
+static PyObject *VersionGetHash(PyObject *Self, void*) {
+   return Py_BuildValue("i", Version_GetVer(Self)->Hash);
+}
+static PyObject *VersionGetID(PyObject *Self, void*) {
+   return Py_BuildValue("i", Version_GetVer(Self)->ID);
+}
+static PyObject *VersionGetPriority(PyObject *Self, void*) {
+   return Py_BuildValue("i",Version_GetVer(Self)->Priority);
+}
+static PyObject *VersionGetPriorityStr(PyObject *Self, void*) {
+   return Safe_FromString(Version_GetVer(Self).PriorityType());
+}
+static PyObject *VersionGetDownloadable(PyObject *Self, void*) {
+   return Py_BuildValue("b",Version_GetVer(Self).Downloadable());
+}
+static PyObject *VersionGetTranslatedDescription(PyObject *Self, void*) {
+   pkgCache::VerIterator &Ver = GetCpp<pkgCache::VerIterator>(Self);
+   PyObject *Owner = GetOwner<pkgCache::VerIterator>(Self);
+   return CppPyObject_NEW<pkgCache::DescIterator>(Owner,
+                    &PyDescription_Type,
+                    Ver.TranslatedDescription());
+}
+
 #if 0 // FIXME: enable once pkgSourceList is stored somewhere
+static PyObject *VersionGetIsTrusted(PyObject *Self, void*) {
    else if (strcmp("IsTrusted", Name) == 0)
    {
       pkgSourceList Sources;
@@ -622,37 +820,55 @@ static PyObject *VersionAttr(PyObject *Self,char *Name)
       }
       return Py_BuildValue("b", true);
    }
+}
 #endif
 
-   PyErr_SetString(PyExc_AttributeError,Name);
-   return 0;
-}
+#define NOTNULL(x) (x ? x : "")
 
 static PyObject *VersionRepr(PyObject *Self)
 {
    pkgCache::VerIterator &Ver = GetCpp<pkgCache::VerIterator>(Self);
-
-   char S[300];
-   snprintf(S,sizeof(S),"<pkgCache::Version object: Pkg:'%s' Ver:'%s' "
-	                "Section:'%s' Arch:'%s' Size:%lu ISize:%lu Hash:%u "
-	                "ID:%u Priority:%u>",
-	    Ver.ParentPkg().Name(),Ver.VerStr(),Ver.Section(),Ver.Arch(),
-	    (unsigned long)Ver->Size,(unsigned long)Ver->InstalledSize,
-	    Ver->Hash,Ver->ID,Ver->Priority);
-   return PyString_FromString(S);
+   return PyString_FromFormat("<%s object: Pkg:'%s' Ver:'%s' Section:'%s' "
+                              " Arch:'%s' Size:%lu ISize:%lu Hash:%u ID:%u "
+                              "Priority:%u>", Self->ob_type->tp_name,
+                              Ver.ParentPkg().Name(), Ver.VerStr(),
+                              NOTNULL(Ver.Section()), NOTNULL(Ver.Arch()),
+                              (unsigned long)Ver->Size,
+                              (unsigned long)Ver->InstalledSize,
+	                          Ver->Hash, Ver->ID, Ver->Priority);
 }
+#undef NOTNULL
+
+static PyGetSetDef VersionGetSet[] = {
+   {"arch",VersionGetArch},
+   {"depends_list",VersionGetDependsList},
+   {"depends_list_str",VersionGetDependsListStr},
+   {"downloadable",VersionGetDownloadable},
+   {"file_list",VersionGetFileList},
+   {"hash",VersionGetHash},
+   {"id",VersionGetID},
+   {"installed_size",VersionGetInstalledSize},
+   {"parent_pkg",VersionGetParentPkg},
+   {"priority",VersionGetPriority},
+   {"priority_str",VersionGetPriorityStr},
+   {"provides_list",VersionGetProvidesList},
+   {"section",VersionGetSection},
+   {"size",VersionGetSize},
+   {"translated_description",VersionGetTranslatedDescription},
+   {"ver_str",VersionGetVerStr},
+   {}
+};
 
-PyTypeObject VersionType =
+PyTypeObject PyVersion_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgCache::VerIterator",             // tp_name
-   sizeof(CppOwnedPyObject<pkgCache::VerIterator>),   // tp_basicsize
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.Version",                   // tp_name
+   sizeof(CppPyObject<pkgCache::VerIterator>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<pkgCache::VerIterator>,          // tp_dealloc
+   CppDealloc<pkgCache::VerIterator>,          // tp_dealloc
    0,                                   // tp_print
-   VersionAttr,                         // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    VersionRepr,                         // tp_repr
@@ -660,96 +876,180 @@ PyTypeObject VersionType =
    0,		                        // tp_as_sequence
    0,			                // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,                  // tp_flags
+   "Version Object",                    // tp_doc
+   CppTraverse<pkgCache::VerIterator>, // tp_traverse
+   CppClear<pkgCache::VerIterator>,// tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   0,                                   // tp_methods
+   0,                                   // tp_members
+   VersionGetSet,                       // tp_getset
 };
 
 									/*}}}*/
 
 // PackageFile Class							/*{{{*/
 // ---------------------------------------------------------------------
-static PyObject *PackageFileAttr(PyObject *Self,char *Name)
-{
-   pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
-//   PyObject *Owner = GetOwner<pkgCache::PkgFileIterator>(Self);
-
-   if (strcmp("FileName",Name) == 0)
-      return Safe_FromString(File.FileName());
-   else if (strcmp("Archive",Name) == 0)
-      return Safe_FromString(File.Archive());
-   else if (strcmp("Component",Name) == 0)
-      return Safe_FromString(File.Component());
-   else if (strcmp("Version",Name) == 0)
-      return Safe_FromString(File.Version());
-   else if (strcmp("Origin",Name) == 0)
-      return Safe_FromString(File.Origin());
-   else if (strcmp("Label",Name) == 0)
-      return Safe_FromString(File.Label());
-   else if (strcmp("Architecture",Name) == 0)
-      return Safe_FromString(File.Architecture());
-   else if (strcmp("Site",Name) == 0)
-      return Safe_FromString(File.Site());
-   else if (strcmp("IndexType",Name) == 0)
-      return Safe_FromString(File.IndexType());
-   else if (strcmp("Size",Name) == 0)
-      return Py_BuildValue("i",File->Size);
-   else if (strcmp("NotSource",Name) == 0)
-      return Py_BuildValue("i",(File->Flags & pkgCache::Flag::NotSource) != 0);
-   else if (strcmp("NotAutomatic",Name) == 0)
-      return Py_BuildValue("i",(File->Flags & pkgCache::Flag::NotAutomatic) != 0);
-   else if (strcmp("ID",Name) == 0)
-      return Py_BuildValue("i",File->ID);
-
-   PyErr_SetString(PyExc_AttributeError,Name);
-   return 0;
+static PyObject *PackageFile_GetFileName(PyObject *Self,void*)
+{
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Safe_FromString(File.FileName());
 }
 
-static PyObject *PackageFileRepr(PyObject *Self)
+static PyObject *PackageFile_GetArchive(PyObject *Self,void*)
 {
-   pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Safe_FromString(File.Archive());
+}
 
-   char S[300];
-   snprintf(S,sizeof(S),"<pkgCache::PackageFile object: "
-			"File:'%s' a=%s,c=%s,v=%s,o=%s,l=%s "
-	                "Arch='%s' Site='%s' IndexType='%s' Size=%lu "
-	                "Flags=0x%lX ID:%u>",
-	    File.FileName(),File.Archive(),File.Component(),File.Version(),
-	    File.Origin(),File.Label(),File.Architecture(),File.Site(),
-	    File.IndexType(),File->Size,File->Flags,File->ID);
-   return PyString_FromString(S);
+static PyObject *PackageFile_GetComponent(PyObject *Self,void*)
+{
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Safe_FromString(File.Component());
 }
 
-PyTypeObject PackageFileType =
+static PyObject *PackageFile_GetVersion(PyObject *Self,void*)
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgCache::PkgFileIterator",         // tp_name
-   sizeof(CppOwnedPyObject<pkgCache::PkgFileIterator>),   // tp_basicsize
-   0,                                   // tp_itemsize
-   // Methods
-   CppOwnedDealloc<pkgCache::PkgFileIterator>,          // tp_dealloc
-   0,                                   // tp_print
-   PackageFileAttr,                     // tp_getattr
-   0,                                   // tp_setattr
-   0,                                   // tp_compare
-   PackageFileRepr,                     // tp_repr
-   0,                                   // tp_as_number
-   0,		                        // tp_as_sequence
-   0,			                // tp_as_mapping
-   0,                                   // tp_hash
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Safe_FromString(File.Version());
+}
+
+static PyObject *PackageFile_GetOrigin(PyObject *Self,void*)
+{
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Safe_FromString(File.Origin());
+}
+
+static PyObject *PackageFile_GetLabel(PyObject *Self,void*)
+{
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Safe_FromString(File.Label());
+}
+
+static PyObject *PackageFile_GetArchitecture(PyObject *Self,void*)
+{
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Safe_FromString(File.Architecture());
+}
+
+static PyObject *PackageFile_GetSite(PyObject *Self,void*)
+{
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Safe_FromString(File.Site());
+}
+
+static PyObject *PackageFile_GetIndexType(PyObject *Self,void*)
+{
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Safe_FromString(File.IndexType());
+}
+static PyObject *PackageFile_GetSize(PyObject *Self,void*)
+{
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Py_BuildValue("i",File->Size);
+}
+
+static PyObject *PackageFile_GetNotSource(PyObject *Self,void*)
+{
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Py_BuildValue("i",(File->Flags & pkgCache::Flag::NotSource) != 0);
+}
+static PyObject *PackageFile_GetNotAutomatic(PyObject *Self,void*)
+{
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Py_BuildValue("i",(File->Flags & pkgCache::Flag::NotSource) != 0);
+}
+
+static PyObject *PackageFile_GetID(PyObject *Self,void*)
+{
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Py_BuildValue("i",File->ID);
+}
+
+#define S(s) (s == NULL ? "" : s)
+static PyObject *PackageFileRepr(PyObject *Self)
+{
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+
+    return PyString_FromFormat("<%s object: filename:'%s'"
+                               "  a=%s,c=%s,v=%s,o=%s,l=%s arch='%s' site='%s'"
+                               " IndexType='%s' Size=%lu ID:%u>",
+                               Self->ob_type->tp_name, File.FileName(),
+                               S(File.Archive()),
+                               S(File.Component()),S(File.Version()),
+                               S(File.Origin()),S(File.Label()),
+                               S(File.Architecture()),S(File.Site()),
+                               S(File.IndexType()),File->Size,File->ID);
+}
+#undef S
+
+static PyGetSetDef PackageFileGetSet[] = {
+  {(char*)"architecture",PackageFile_GetArchitecture},
+  {(char*)"archive",PackageFile_GetArchive},
+  {(char*)"component",PackageFile_GetComponent},
+  {(char*)"filename",PackageFile_GetFileName},
+  {(char*)"id",PackageFile_GetID},
+  {(char*)"index_type",PackageFile_GetIndexType},
+  {(char*)"label",PackageFile_GetLabel},
+  {(char*)"not_automatic",PackageFile_GetNotAutomatic},
+  {(char*)"not_source",PackageFile_GetNotSource},
+  {(char*)"origin",PackageFile_GetOrigin},
+  {(char*)"site",PackageFile_GetSite},
+  {(char*)"size",PackageFile_GetSize},
+  {(char*)"version",PackageFile_GetVersion},
+  {}
 };
 
+PyTypeObject PyPackageFile_Type = {
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.PackageFile",                                // tp_name
+   sizeof(CppPyObject<pkgCache::PkgFileIterator>),  // tp_basicsize
+   0,                                                    // tp_itemsize
+   CppDealloc<pkgCache::PkgFileIterator>,           // tp_dealloc
+   0,                                                    // tp_print
+   0,                                                    // tp_getattr
+   0,                                                    // tp_setattr
+   0,                                                    // tp_compare
+   PackageFileRepr,                                      // tp_repr
+   0,                                                    // tp_as_number
+   0,                                                    // tp_as_sequence
+   0,                                                    // tp_as_mapping
+   0,                                                    // tp_hash
+   0,                                                    // tp_call
+   0,                                                    // tp_str
+   _PyAptObject_getattro,                                // tp_getattro
+   0,                                                    // tp_setattro
+   0,                                                    // tp_as_buffer
+   Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,              // tp_flags
+   "apt_pkg.PackageFile Object",                         // tp_doc
+   CppTraverse<pkgCache::PkgFileIterator>,          // tp_traverse
+   CppClear<pkgCache::PkgFileIterator>,             // tp_clear
+   0,                                                    // tp_richcompare
+   0,                                                    // tp_weaklistoffset
+   0,                                                    // tp_iter
+   0,                                                    // tp_iternext
+   0,                                                    // tp_methods
+   0,                                                    // tp_members
+   PackageFileGetSet,                                    // tp_getset
+};
 
 // depends class
 static PyObject *DependencyRepr(PyObject *Self)
 {
    pkgCache::DepIterator &Dep = GetCpp<pkgCache::DepIterator>(Self);
 
-   char S[300];
-   snprintf(S,sizeof(S),"<pkgCache::Dependency object: "
-	                "Pkg:'%s' Ver:'%s' Comp:'%s'>",
-	    Dep.TargetPkg().Name(),
-	    (Dep.TargetVer() == 0?"":Dep.TargetVer()),
-	    Dep.CompType());
-   return PyString_FromString(S);
+   return PyString_FromFormat("<%s object: pkg:'%s' ver:'%s' comp:'%s'>",
+	                          Self->ob_type->tp_name, Dep.TargetPkg().Name(),
+	                          (Dep.TargetVer() == 0 ? "" : Dep.TargetVer()),
+	                          Dep.CompType());
 }
 
 static PyObject *DepSmartTargetPkg(PyObject *Self,PyObject *Args)
@@ -767,7 +1067,7 @@ static PyObject *DepSmartTargetPkg(PyObject *Self,PyObject *Args)
       return Py_None;
    }
 
-   return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Owner,&PackageType,P);
+   return CppPyObject_NEW<pkgCache::PkgIterator>(Owner,&PyPackage_Type,P);
 }
 
 static PyObject *DepAllTargets(PyObject *Self,PyObject *Args)
@@ -783,7 +1083,7 @@ static PyObject *DepAllTargets(PyObject *Self,PyObject *Args)
    for (pkgCache::Version **I = Vers; *I != 0; I++)
    {
       PyObject *Obj;
-      Obj = CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&VersionType,
+      Obj = CppPyObject_NEW<pkgCache::VerIterator>(Owner,&PyVersion_Type,
 							pkgCache::VerIterator(*Dep.Cache(),*I));
       PyList_Append(List,Obj);
       Py_DECREF(Obj);
@@ -793,65 +1093,123 @@ static PyObject *DepAllTargets(PyObject *Self,PyObject *Args)
 
 static PyMethodDef DependencyMethods[] =
 {
-   {"SmartTargetPkg",DepSmartTargetPkg,METH_VARARGS,"Returns the natural Target or None"},
-   {"AllTargets",DepAllTargets,METH_VARARGS,"Returns all possible Versions that match this dependency"},
+   {"smart_target_pkg",DepSmartTargetPkg,METH_VARARGS,"Returns the natural Target or None"},
+   {"all_targets",DepAllTargets,METH_VARARGS,"Returns all possible Versions that match this dependency"},
    {}
 };
 
 // Dependency Class							/*{{{*/
 // ---------------------------------------------------------------------
 
-static PyObject *DependencyAttr(PyObject *Self,char *Name)
+static PyObject *DependencyGetTargetVer(PyObject *Self,void*)
+{
+   pkgCache::DepIterator &Dep = GetCpp<pkgCache::DepIterator>(Self);
+   if (Dep->Version == 0)
+      return PyString_FromString("");
+   return PyString_FromString(Dep.TargetVer());
+}
+
+static PyObject *DependencyGetTargetPkg(PyObject *Self,void*)
+{
+   pkgCache::DepIterator &Dep = GetCpp<pkgCache::DepIterator>(Self);
+   PyObject *Owner = GetOwner<pkgCache::DepIterator>(Self);
+   return CppPyObject_NEW<pkgCache::PkgIterator>(Owner,&PyPackage_Type,
+                                                      Dep.TargetPkg());
+}
+
+static PyObject *DependencyGetParentVer(PyObject *Self,void*)
 {
    pkgCache::DepIterator &Dep = GetCpp<pkgCache::DepIterator>(Self);
    PyObject *Owner = GetOwner<pkgCache::DepIterator>(Self);
+   return CppPyObject_NEW<pkgCache::VerIterator>(Owner,&PyVersion_Type,
+                                                      Dep.ParentVer());
+}
 
-   if (strcmp("TargetVer",Name) == 0)
-   {
-      if (Dep->Version == 0)
-	 return PyString_FromString("");
-      return PyString_FromString(Dep.TargetVer());
-   }
-   else if (strcmp("TargetPkg",Name) == 0)
-      return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Owner,&PackageType,
-							 Dep.TargetPkg());
-   else if (strcmp("ParentVer",Name) == 0)
-      return CppOwnedPyObject_NEW<pkgCache::VerIterator>(Owner,&VersionType,
-							 Dep.ParentVer());
-   else if (strcmp("ParentPkg",Name) == 0)
-      return CppOwnedPyObject_NEW<pkgCache::PkgIterator>(Owner,&PackageType,							 Dep.ParentPkg());
-   else if (strcmp("CompType",Name) == 0)
-      return PyString_FromString(Dep.CompType());
-   else if (strcmp("DepType",Name) == 0)
-      return PyString_FromString(Dep.DepType());
-   else if (strcmp("UntranslatedDepType",Name) == 0)
-      return PyString_FromString(UntranslatedDepTypes[Dep->Type]);
-   else if (strcmp("DepTypeEnum",Name) == 0)
-      return Py_BuildValue("i", Dep->Type);
-   else if (strcmp("ID",Name) == 0)
-      return Py_BuildValue("i",Dep->ID);
-
-   return Py_FindMethod(DependencyMethods,Self,Name);
-}
-
-PyTypeObject DependencyType =
-{
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgCache::DepIterator",             // tp_name
-   sizeof(CppOwnedPyObject<pkgCache::DepIterator>),   // tp_basicsize
+static PyObject *DependencyGetParentPkg(PyObject *Self,void*)
+{
+   pkgCache::DepIterator &Dep = GetCpp<pkgCache::DepIterator>(Self);
+   PyObject *Owner = GetOwner<pkgCache::DepIterator>(Self);
+   return CppPyObject_NEW<pkgCache::PkgIterator>(Owner,&PyPackage_Type,
+                                                      Dep.ParentPkg());
+}
+
+static PyObject *DependencyGetCompType(PyObject *Self,void*)
+{
+   pkgCache::DepIterator &Dep = GetCpp<pkgCache::DepIterator>(Self);
+   return PyString_FromString(Dep.CompType());
+}
+
+static PyObject *DependencyGetDepType(PyObject *Self,void*)
+{
+   pkgCache::DepIterator &Dep = GetCpp<pkgCache::DepIterator>(Self);
+   return PyString_FromString(Dep.DepType());
+}
+
+static PyObject *DependencyGetDepTypeUntranslated(PyObject *Self,void*)
+{
+   pkgCache::DepIterator &Dep = GetCpp<pkgCache::DepIterator>(Self);
+   return PyString_FromString(UntranslatedDepTypes[Dep->Type]);
+}
+
+static PyObject *DependencyGetDepTypeEnum(PyObject *Self,void*)
+{
+   pkgCache::DepIterator &Dep = GetCpp<pkgCache::DepIterator>(Self);
+   return Py_BuildValue("i", Dep->Type);
+}
+
+static PyObject *DependencyGetID(PyObject *Self,void*)
+{
+   pkgCache::DepIterator &Dep = GetCpp<pkgCache::DepIterator>(Self);
+   return Py_BuildValue("i",Dep->ID);
+}
+
+static PyGetSetDef DependencyGetSet[] = {
+   {"comp_type",DependencyGetCompType},
+   {"dep_type",DependencyGetDepType},
+   {"dep_type_untranslated",DependencyGetDepTypeUntranslated},
+   {"dep_type_enum",DependencyGetDepTypeEnum},
+   {"id",DependencyGetID},
+   {"parent_pkg",DependencyGetParentPkg},
+   {"parent_ver",DependencyGetParentVer},
+   {"target_pkg",DependencyGetTargetPkg},
+   {"target_ver",DependencyGetTargetVer},
+   {}
+};
+
+
+PyTypeObject PyDependency_Type =
+{
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.Dependency",                // tp_name
+   sizeof(CppPyObject<pkgCache::DepIterator>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<pkgCache::DepIterator>,          // tp_dealloc
+   CppDealloc<pkgCache::DepIterator>,          // tp_dealloc
    0,                                   // tp_print
-   DependencyAttr,                       // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
-   DependencyRepr,                       // tp_repr
+   DependencyRepr,                      // tp_repr
    0,                                   // tp_as_number
    0,		                        // tp_as_sequence
    0,			                // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, // tp_flags
+   "Dependency Object",                 // tp_doc
+   CppTraverse<pkgCache::DepIterator>, // tp_traverse
+   CppClear<pkgCache::DepIterator>, // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   DependencyMethods,                   // tp_methods
+   0,                                   // tp_members
+   DependencyGetSet,                    // tp_getset
 };
 
 									/*}}}*/
@@ -889,8 +1247,8 @@ static PyObject *RDepListItem(PyObject *iSelf,Py_ssize_t Index)
       }
    }
 
-   return CppOwnedPyObject_NEW<pkgCache::DepIterator>(GetOwner<RDepListStruct>(iSelf),
-						      &DependencyType,Self.Iter);
+   return CppPyObject_NEW<pkgCache::DepIterator>(GetOwner<RDepListStruct>(iSelf),
+						      &PyDependency_Type,Self.Iter);
 }
 
 static PySequenceMethods RDepListSeq =
@@ -904,15 +1262,14 @@ static PySequenceMethods RDepListSeq =
    0                 // assign slice
 };
 
-PyTypeObject RDepListType =
+PyTypeObject PyDependencyList_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgCache::DepIterator",             // tp_name
-   sizeof(CppOwnedPyObject<RDepListStruct>),   // tp_basicsize
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.DependencyList",             // tp_name
+   sizeof(CppPyObject<RDepListStruct>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<RDepListStruct>,      // tp_dealloc
+   CppDealloc<RDepListStruct>,      // tp_dealloc
    0,                                   // tp_print
    0,                                   // tp_getattr
    0,                                   // tp_setattr
@@ -922,55 +1279,25 @@ PyTypeObject RDepListType =
    &RDepListSeq,                         // tp_as_sequence
    0,			                // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   0,                                   // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, // tp_flags
+   "DependencyList Object",             // tp_doc
+   CppTraverse<RDepListStruct>,    // tp_traverse
+   CppClear<RDepListStruct>,       // tp_clear
 };
 
 									/*}}}*/
 
 
-
+#ifdef COMPAT_0_7
 PyObject *TmpGetCache(PyObject *Self,PyObject *Args)
 {
-   PyObject *pyCallbackInst = 0;
-   if (PyArg_ParseTuple(Args, "|O", &pyCallbackInst) == 0)
-      return 0;
-
-    if (_system == 0) {
-        PyErr_SetString(PyExc_ValueError,"_system not initialized");
-        return 0;
-    }
-
-   pkgCacheFile *Cache = new pkgCacheFile();
-
-   if(pyCallbackInst != 0) {
-      // sanity check for the progress object, see #497049
-      if (PyObject_HasAttrString(pyCallbackInst, "done") != true) {
-        PyErr_SetString(PyExc_ValueError,
-                        "OpProgress object must implement done()");
-        return 0;
-      }
-      if (PyObject_HasAttrString(pyCallbackInst, "update") != true) {
-        PyErr_SetString(PyExc_ValueError,
-                        "OpProgress object must implement update()");
-        return 0;
-      }
-      PyOpProgress progress;
-      progress.setCallbackInst(pyCallbackInst);
-      if (Cache->Open(progress,false) == false)
-         return HandleErrors();
-   }  
-   else {
-      OpTextProgress Prog;
-      if (Cache->Open(Prog,false) == false)
-	     return HandleErrors();
-   }
-
-   CppOwnedPyObject<pkgCacheFile*> *CacheFileObj =
-	   CppOwnedPyObject_NEW<pkgCacheFile*>(0,&PkgCacheFileType, Cache);
-
-   CppOwnedPyObject<pkgCache *> *CacheObj =
-	   CppOwnedPyObject_NEW<pkgCache *>(CacheFileObj,&PkgCacheType,
-					    (pkgCache *)(*Cache));
-
-   //Py_DECREF(CacheFileObj);
-   return CacheObj;
+    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCache() is deprecated. "
+                 "Please see apt_pkg.Cache() for the replacement.", 1);
+    return PkgCacheNew(&PyCache_Type,Args,0);
 }
+#endif
diff --git a/python/cdrom.cc b/python/cdrom.cc
index 0831548e..9eae49dc 100644
--- a/python/cdrom.cc
+++ b/python/cdrom.cc
@@ -1,10 +1,26 @@
-// Description								/*{{{*/
-// $Id: cdrom.cc,v 1.1 2003/06/03 03:03:23 mvo Exp $
-/* ######################################################################
-
-   Cdrom - Wrapper for the apt-cdrom support
-
-   ##################################################################### */
+/* cdrom.cc - Wrapper for pkgCdrom.
+ *
+ * Copyright 2004-2009 Canonical Ltd.
+ * Copyright 2009 Julian Andres Klode <jak@debian.org>
+ *
+ * Authors: Michael Vogt
+ *          Julian Andres Klode
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
 
 #include "generic.h"
 #include "apt_pkgmodule.h"
@@ -12,99 +28,144 @@
 
 #include <apt-pkg/cdrom.h>
 
-
-struct PkgCdromStruct
+static char *cdrom_add_doc =
+    "add(progress: apt_pkg.CdromProgress) -> bool\n\n"
+    "Add the given CD-ROM to the sources.list. Returns True on success, may\n"
+    "raise an error on failure or return False.";
+static PyObject *cdrom_add(PyObject *Self,PyObject *Args)
 {
-   pkgCdrom cdrom;
-};
+    pkgCdrom &Cdrom = GetCpp<pkgCdrom>(Self);
 
-static PyObject *PkgCdromAdd(PyObject *Self,PyObject *Args)
-{
-   PkgCdromStruct &Struct = GetCpp<PkgCdromStruct>(Self);
+    PyObject *pyCdromProgressInst = 0;
+    if (PyArg_ParseTuple(Args, "O", &pyCdromProgressInst) == 0) {
+        return 0;
+    }
 
-   PyObject *pyCdromProgressInst = 0;
-   if (PyArg_ParseTuple(Args, "O", &pyCdromProgressInst) == 0) {
-      return 0;
-   }
+    PyCdromProgress progress;
+    progress.setCallbackInst(pyCdromProgressInst);
 
-   PyCdromProgress progress;
-   progress.setCallbackInst(pyCdromProgressInst);
+    bool res = Cdrom.Add(&progress);
 
-   bool res = Struct.cdrom.Add(&progress);
+    return HandleErrors(PyBool_FromLong(res));
+}
 
-   return HandleErrors(Py_BuildValue("b", res));
+static char *cdrom_ident_doc =
+    "ident(progress: apt_pkg.CdromProgress) -> str\n\n"
+    "Try to identify the CD-ROM and if successful return the identity as a\n"
+    "string. Otherwise, return None or raise an error.";
+static PyObject *cdrom_ident(PyObject *Self,PyObject *Args)
+{
+    pkgCdrom &Cdrom = GetCpp<pkgCdrom>(Self);
+    PyObject *pyCdromProgressInst = 0;
+    if (PyArg_ParseTuple(Args, "O", &pyCdromProgressInst) == 0) {
+        return 0;
+    }
+
+    PyCdromProgress progress;
+    progress.setCallbackInst(pyCdromProgressInst);
+
+    string ident;
+    bool res = Cdrom.Ident(ident, &progress);
+
+    if (res)
+        return CppPyString(ident);
+    else {
+        Py_INCREF(Py_None);
+        return HandleErrors(Py_None);
+    }
 }
 
-static PyObject *PkgCdromIdent(PyObject *Self,PyObject *Args)
+#ifdef COMPAT_0_7
+static PyObject *cdrom_ident_old(PyObject *Self,PyObject *Args)
 {
-   PkgCdromStruct &Struct = GetCpp<PkgCdromStruct>(Self);
+    PyErr_WarnEx(PyExc_DeprecationWarning, "Method 'Ident' of the "
+                 "'apt_pkg.Cdrom' object is deprecated, use 'ident' instead.",
+                 1);
+    pkgCdrom &Cdrom = GetCpp<pkgCdrom>(Self);
 
-   PyObject *pyCdromProgressInst = 0;
-   if (PyArg_ParseTuple(Args, "O", &pyCdromProgressInst) == 0) {
-      return 0;
-   }
+    PyObject *pyCdromProgressInst = 0;
+    if (PyArg_ParseTuple(Args, "O", &pyCdromProgressInst) == 0) {
+        return 0;
+    }
 
-   PyCdromProgress progress;
-   progress.setCallbackInst(pyCdromProgressInst);
+    PyCdromProgress progress;
+    progress.setCallbackInst(pyCdromProgressInst);
 
-   string ident;
-   bool res = Struct.cdrom.Ident(ident, &progress);
+    string ident;
+    bool res = Cdrom.Ident(ident, &progress);
 
-   PyObject *result = Py_BuildValue("(bs)", res, ident.c_str());
+    PyObject *result = Py_BuildValue("(bs)", res, ident.c_str());
 
-   return HandleErrors(result);
+    return HandleErrors(result);
 }
-
-
-static PyMethodDef PkgCdromMethods[] =
-{
-   {"Add",PkgCdromAdd,METH_VARARGS,"Add a cdrom"},
-   {"Ident",PkgCdromIdent,METH_VARARGS,"Ident a cdrom"},
-   {}
+#endif
+
+static PyMethodDef cdrom_methods[] = {
+    {"add",cdrom_add,METH_VARARGS,cdrom_add_doc},
+    {"ident",cdrom_ident,METH_VARARGS,cdrom_ident_doc},
+#ifdef COMPAT_0_7
+    {"Ident",cdrom_ident_old,METH_VARARGS,"DEPRECATED. DO NOT USE"},
+#endif
+    {}
 };
 
-
-static PyObject *CdromAttr(PyObject *Self,char *Name)
+static PyObject *cdrom_new(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 {
-   PkgCdromStruct &Struct = GetCpp<PkgCdromStruct>(Self);
-
-   return Py_FindMethod(PkgCdromMethods,Self,Name);
+    return CppPyObject_NEW<pkgCdrom>(NULL, type);
 }
 
-
-
-
-PyTypeObject PkgCdromType =
-{
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "Cdrom",                          // tp_name
-   sizeof(CppOwnedPyObject<PkgCdromStruct>),   // tp_basicsize
-   0,                                   // tp_itemsize
-   // Methods
-   CppOwnedDealloc<PkgCdromStruct>,        // tp_dealloc
-   0,                                   // tp_print
-   CdromAttr,                           // tp_getattr
-   0,                                   // tp_setattr
-   0,                                   // tp_compare
-   0,                                   // tp_repr
-   0,                                   // tp_as_number
-   0,                                   // tp_as_sequence
-   0,	                                // tp_as_mapping
-   0,                                   // tp_hash
+static char *cdrom_doc =
+    "Cdrom()\n\n"
+    "Cdrom objects can be used to identify Debian installation media and to\n"
+    "add them to /etc/apt/sources.list.";
+PyTypeObject PyCdrom_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.Cdrom",                     // tp_name
+    sizeof(CppPyObject<pkgCdrom>),       // tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    CppDealloc<pkgCdrom>,                // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    0,                                   // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                 // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    _PyAptObject_getattro,               // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    Py_TPFLAGS_DEFAULT |                 // tp_flags
+    Py_TPFLAGS_BASETYPE,
+    cdrom_doc,                           // tp_doc
+    0,                                   // tp_traverse
+    0,                                   // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    cdrom_methods,                       // tp_methods
+    0,                                   // tp_members
+    0,                                   // tp_getset
+    0,                                   // tp_base
+    0,                                   // tp_dict
+    0,                                   // tp_descr_get
+    0,                                   // tp_descr_set
+    0,                                   // tp_dictoffset
+    0,                                   // tp_init
+    0,                                   // tp_alloc
+    cdrom_new,                           // tp_new
 };
 
+#ifdef COMPAT_0_7
 PyObject *GetCdrom(PyObject *Self,PyObject *Args)
 {
-   pkgCdrom *cdrom = new pkgCdrom();
-
-   CppOwnedPyObject<pkgCdrom> *CdromObj =
-	   CppOwnedPyObject_NEW<pkgCdrom>(0,&PkgCdromType, *cdrom);
-
-   return CdromObj;
+    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCdrom() is deprecated. "
+                 "Please see apt_pkg.Cdrom() for the replacement.", 1);
+    return cdrom_new(&PyCdrom_Type,Args,0);
 }
-
-
-
-
-									/*}}}*/
+#endif
diff --git a/python/configuration.cc b/python/configuration.cc
index 21f70bc1..299e06ec 100644
--- a/python/configuration.cc
+++ b/python/configuration.cc
@@ -5,11 +5,8 @@
 
    Configuration - Binding for the configuration object.
 
-   There are three seperate classes..
-     Configuration - A stand alone configuration instance
-     ConfigurationPtr - A pointer to a configuration instance, used only
-                        for the global instance (_config)
-     ConfigurationSub - A subtree - has a reference to its owner.
+   The Configuration object can have an owner (a parent Configuration object),
+   and it always uses a pointer.
 
    The wrapping is mostly 1:1 with the C++ code, but there are additions to
    wrap the linked tree walking into nice flat sequence walking.
@@ -25,33 +22,13 @@
 
 #include <Python.h>
 									/*}}}*/
-/* If we create a sub tree then it is of this type, the Owner is used
-   to manage reference counting. */
-struct SubConfiguration : public CppPyObject<Configuration>
-{
-   PyObject *Owner;
-};
-
-									/*}}}*/
-// CnfSubFree - Free a sub configuration				/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void CnfSubFree(PyObject *Obj)
-{
-   SubConfiguration *Self = (SubConfiguration *)Obj;
-   Py_DECREF(Self->Owner);
-   CppDealloc<Configuration>(Obj);
-}
-									/*}}}*/
 
 // GetSelf - Convert PyObject to Configuration				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 static inline Configuration &GetSelf(PyObject *Obj)
 {
-   if (Obj->ob_type == &ConfigurationPtrType)
-      return *GetCpp<Configuration *>(Obj);
-   return GetCpp<Configuration>(Obj);
+   return *GetCpp<Configuration*>(Obj);
 }
 									/*}}}*/
 
@@ -128,6 +105,11 @@ static PyObject *CnfExists(PyObject *Self,PyObject *Args)
    return Py_BuildValue("i",(int)GetSelf(Self).Exists(Name));
 }
 
+static int CnfContains(PyObject *Self,PyObject *Arg)
+{
+   return (int)GetSelf(Self).Exists(PyString_AsString(Arg));
+}
+
 static char *doc_Clear = "Clear(Name) -> None";
 static PyObject *CnfClear(PyObject *Self,PyObject *Args)
 {
@@ -155,12 +137,8 @@ static PyObject *CnfSubTree(PyObject *Self,PyObject *Args)
       return 0;
    }
 
-   // Create a new sub configuration.
-   SubConfiguration *New = PyObject_NEW(SubConfiguration,&ConfigurationSubType);
-   new (&New->Object) Configuration(Itm);
-   New->Owner = Self;
-   Py_INCREF(Self);
-   return New;
+   return CppPyObject_NEW<Configuration*>(Self,&PyConfiguration_Type,
+                                               new Configuration(Itm));
 }
 
 // Return a list of items at a specific level
@@ -174,6 +152,8 @@ static PyObject *CnfList(PyObject *Self,PyObject *Args)
    // Convert the whole configuration space into a list
    PyObject *List = PyList_New(0);
    const Configuration::Item *Top = GetSelf(Self).Tree(RootName);
+   if (!GetSelf(Self).Tree(0))
+    return List;
    const Configuration::Item *Root = GetSelf(Self).Tree(0)->Parent;
    if (Top != 0 && RootName != 0)
       Top = Top->Child;
@@ -238,7 +218,7 @@ static PyObject *CnfKeys(PyObject *Self,PyObject *Args)
    const Configuration::Item *Root = 0;
    if (RootName == 0)
       Stop = 0;
-   if (Top != 0)
+   if (Top != 0 && GetSelf(Self).Tree(0))
       Root = GetSelf(Self).Tree(0)->Parent;
    for (; Top != 0;)
    {
@@ -300,7 +280,7 @@ PyObject *LoadConfig(PyObject *Self,PyObject *Args)
    char *Name = 0;
    if (PyArg_ParseTuple(Args,"Os",&Self,&Name) == 0)
       return 0;
-   if (Configuration_Check(Self)== 0)
+   if (PyConfiguration_Check(Self)== 0)
    {
       PyErr_SetString(PyExc_TypeError,"argument 1: expected Configuration.");
       return 0;
@@ -318,7 +298,7 @@ PyObject *LoadConfigISC(PyObject *Self,PyObject *Args)
    char *Name = 0;
    if (PyArg_ParseTuple(Args,"Os",&Self,&Name) == 0)
       return 0;
-   if (Configuration_Check(Self)== 0)
+   if (PyConfiguration_Check(Self)== 0)
    {
       PyErr_SetString(PyExc_TypeError,"argument 1: expected Configuration.");
       return 0;
@@ -336,7 +316,7 @@ PyObject *LoadConfigDir(PyObject *Self,PyObject *Args)
    char *Name = 0;
    if (PyArg_ParseTuple(Args,"Os",&Self,&Name) == 0)
       return 0;
-   if (Configuration_Check(Self)== 0)
+   if (PyConfiguration_Check(Self)== 0)
    {
       PyErr_SetString(PyExc_TypeError,"argument 1: expected Configuration.");
       return 0;
@@ -368,7 +348,7 @@ PyObject *ParseCommandLine(PyObject *Self,PyObject *Args)
    if (PyArg_ParseTuple(Args,"OO!O!",&Self,
 			&PyList_Type,&POList,&PyList_Type,&Pargv) == 0)
       return 0;
-   if (Configuration_Check(Self)== 0)
+   if (PyConfiguration_Check(Self)== 0)
    {
       PyErr_SetString(PyExc_TypeError,"argument 1: expected Configuration.");
       return 0;
@@ -383,7 +363,11 @@ PyObject *ParseCommandLine(PyObject *Self,PyObject *Args)
    for (int I = 0; I != Length; I++)
    {
       char *Type = 0;
+      #if PY_MAJOR_VERSION >= 3
+      if (PyArg_ParseTuple(PySequence_GetItem(POList,I),"Czs|s",
+      #else
       if (PyArg_ParseTuple(PySequence_GetItem(POList,I),"czs|s",
+      #endif
 			   &OList[I].ShortOpt,&OList[I].LongOpt,
 			   &OList[I].ConfName,&Type) == 0)
       {
@@ -448,95 +432,80 @@ PyObject *ParseCommandLine(PyObject *Self,PyObject *Args)
 static PyMethodDef CnfMethods[] =
 {
    // Query
-   {"Find",CnfFind,METH_VARARGS,doc_Find},
-   {"FindFile",CnfFindFile,METH_VARARGS,doc_FindFile},
-   {"FindDir",CnfFindDir,METH_VARARGS,doc_FindDir},
-   {"FindI",CnfFindI,METH_VARARGS,doc_FindI},
-   {"FindB",CnfFindB,METH_VARARGS,doc_FindB},
+   {"find",CnfFind,METH_VARARGS,doc_Find},
+   {"find_file",CnfFindFile,METH_VARARGS,doc_FindFile},
+   {"find_dir",CnfFindDir,METH_VARARGS,doc_FindDir},
+   {"find_i",CnfFindI,METH_VARARGS,doc_FindI},
+   {"find_b",CnfFindB,METH_VARARGS,doc_FindB},
 
    // Others
-   {"Set",CnfSet,METH_VARARGS,doc_Set},
-   {"Exists",CnfExists,METH_VARARGS,doc_Exists},
-   {"SubTree",CnfSubTree,METH_VARARGS,doc_SubTree},
-   {"List",CnfList,METH_VARARGS,doc_List},
-   {"ValueList",CnfValueList,METH_VARARGS,doc_ValueList},
-   {"MyTag",CnfMyTag,METH_VARARGS,doc_MyTag},
-   {"Clear",CnfClear,METH_VARARGS,doc_Clear},
-
+   {"set",CnfSet,METH_VARARGS,doc_Set},
+   {"exists",CnfExists,METH_VARARGS,doc_Exists},
+   {"subtree",CnfSubTree,METH_VARARGS,doc_SubTree},
+   {"list",CnfList,METH_VARARGS,doc_List},
+   {"value_list",CnfValueList,METH_VARARGS,doc_ValueList},
+   {"my_tag",CnfMyTag,METH_VARARGS,doc_MyTag},
+   {"clear",CnfClear,METH_VARARGS,doc_Clear},
    // Python Special
    {"keys",CnfKeys,METH_VARARGS,doc_Keys},
+   #if PY_MAJOR_VERSION < 3
    {"has_key",CnfExists,METH_VARARGS,doc_Exists},
+   #endif
    {"get",CnfFind,METH_VARARGS,doc_Find},
    {}
 };
 
-// CnfGetAttr - Get an attribute - variable/method			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static PyObject *CnfGetAttr(PyObject *Self,char *Name)
-{
-   return Py_FindMethod(CnfMethods,Self,Name);
+static PyObject *CnfNew(PyTypeObject *type, PyObject *args, PyObject *kwds) {
+    char *kwlist[] = {NULL};
+    if (PyArg_ParseTupleAndKeywords(args,kwds,"",kwlist) == 0)
+        return 0;
+    return CppPyObject_NEW<Configuration*>(NULL, type, new Configuration());
 }
 
 // Type for a Normal Configuration object
+static PySequenceMethods ConfigurationSeq = {0,0,0,0,0,0,0,CnfContains,0,0};
 static PyMappingMethods ConfigurationMap = {0,CnfMap,CnfMapSet};
-PyTypeObject ConfigurationType =
-{
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "Configuration",                     // tp_name
-   sizeof(CppPyObject<Configuration>),  // tp_basicsize
-   0,                                   // tp_itemsize
-   // Methods
-   CppDealloc<Configuration>,           // tp_dealloc
-   0,                                   // tp_print
-   CnfGetAttr,                          // tp_getattr
-   0,                                   // tp_setattr
-   0,                                   // tp_compare
-   0,                                   // tp_repr
-   0,                                   // tp_as_number
-   0,                                   // tp_as_sequence
-   &ConfigurationMap,                   // tp_as_mapping
-   0,                                   // tp_hash
-};
-
-PyTypeObject ConfigurationPtrType =
-{
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "ConfigurationPtr",                  // tp_name
-   sizeof(CppPyObject<Configuration *>),  // tp_basicsize
-   0,                                   // tp_itemsize
-   // Methods
-   (destructor)PyObject_Free,              // tp_dealloc
-   0,                                   // tp_print
-   CnfGetAttr,                          // tp_getattr
-   0,                                   // tp_setattr
-   0,                                   // tp_compare
-   0,                                   // tp_repr
-   0,                                   // tp_as_number
-   0,                                   // tp_as_sequence
-   &ConfigurationMap,                   // tp_as_mapping
-   0,                                   // tp_hash
-};
-
-PyTypeObject ConfigurationSubType =
+PyTypeObject PyConfiguration_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "ConfigurationSub",                  // tp_name
-   sizeof(SubConfiguration),            // tp_basicsize
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.Configuration",             // tp_name
+   sizeof(CppPyObject<Configuration*>),  // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CnfSubFree,		                // tp_dealloc
+   CppDeallocPtr<Configuration*>,  // tp_dealloc
    0,                                   // tp_print
-   CnfGetAttr,                          // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    0,                                   // tp_repr
    0,                                   // tp_as_number
-   0,                                   // tp_as_sequence
+   &ConfigurationSeq,                   // tp_as_sequence
    &ConfigurationMap,                   // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   (Py_TPFLAGS_DEFAULT |                // tp_flags
+    Py_TPFLAGS_BASETYPE),
+   "Configuration Object",              // tp_doc
+   0,                                   // tp_traverse
+   0,                                   // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   CnfMethods,                          // tp_methods
+   0,                                   // tp_members
+   0,                                   // tp_getset
+   0,                                   // tp_base
+   0,                                   // tp_dict
+   0,                                   // tp_descr_get
+   0,                                   // tp_descr_set
+   0,                                   // tp_dictoffset
+   0,                                   // tp_init
+   0,                                   // tp_alloc
+   CnfNew,                              // tp_new
 };
 
diff --git a/python/depcache.cc b/python/depcache.cc
index 7edb7b59..8b4e02b5 100644
--- a/python/depcache.cc
+++ b/python/depcache.cc
@@ -62,8 +62,6 @@ static PyObject *PkgDepCacheInit(PyObject *Self,PyObject *Args)
 
 static PyObject *PkgDepCacheCommit(PyObject *Self,PyObject *Args)
 {
-   PyObject *result;
-
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *pyInstallProgressInst = 0;
@@ -192,11 +190,10 @@ static PyObject *PkgDepCacheSetCandidateVer(PyObject *Self,PyObject *Args)
    PyObject *PackageObj;
    PyObject *VersionObj;
    if (PyArg_ParseTuple(Args,"O!O!",
-			&PackageType, &PackageObj,
-			&VersionType, &VersionObj) == 0)
+			&PyPackage_Type, &PackageObj,
+			&PyVersion_Type, &VersionObj) == 0)
       return 0;
 
-   pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    pkgCache::VerIterator &I = GetCpp<pkgCache::VerIterator>(VersionObj);
    if(I.end()) {
       return HandleErrors(Py_BuildValue("b",false));
@@ -211,7 +208,7 @@ static PyObject *PkgDepCacheGetCandidateVer(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
    PyObject *PackageObj;
    PyObject *CandidateObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -222,7 +219,7 @@ static PyObject *PkgDepCacheGetCandidateVer(PyObject *Self,PyObject *Args)
       Py_INCREF(Py_None);
       return Py_None;
    }
-   CandidateObj = CppOwnedPyObject_NEW<pkgCache::VerIterator>(PackageObj,&VersionType,I);
+   CandidateObj = CppPyObject_NEW<pkgCache::VerIterator>(PackageObj,&PyVersion_Type,I);
 
    return CandidateObj;
 }
@@ -303,7 +300,7 @@ static PyObject *PkgDepCacheMarkKeep(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache*>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -319,7 +316,7 @@ static PyObject *PkgDepCacheSetReInstall(PyObject *Self,PyObject *Args)
 
    PyObject *PackageObj;
    char value = 0;
-   if (PyArg_ParseTuple(Args,"O!b",&PackageType,&PackageObj, &value) == 0)
+   if (PyArg_ParseTuple(Args,"O!b",&PyPackage_Type,&PackageObj, &value) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -336,7 +333,7 @@ static PyObject *PkgDepCacheMarkDelete(PyObject *Self,PyObject *Args)
 
    PyObject *PackageObj;
    char purge = 0;
-   if (PyArg_ParseTuple(Args,"O!|b",&PackageType,&PackageObj, &purge) == 0)
+   if (PyArg_ParseTuple(Args,"O!|b",&PyPackage_Type,&PackageObj, &purge) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -354,7 +351,7 @@ static PyObject *PkgDepCacheMarkInstall(PyObject *Self,PyObject *Args)
    PyObject *PackageObj;
    char autoInst=1;
    char fromUser=1;
-   if (PyArg_ParseTuple(Args,"O!|bb",&PackageType,&PackageObj,
+   if (PyArg_ParseTuple(Args,"O!|bb",&PyPackage_Type,&PackageObj,
 			&autoInst, &fromUser) == 0)
       return 0;
 
@@ -367,12 +364,29 @@ static PyObject *PkgDepCacheMarkInstall(PyObject *Self,PyObject *Args)
    return HandleErrors(Py_None);
 }
 
+static PyObject *PkgDepCacheMarkAuto(PyObject *Self,PyObject *Args)
+{
+   pkgDepCache *depcache = GetCpp<pkgDepCache*>(Self);
+
+   PyObject *PackageObj;
+   char value = 0;
+   if (PyArg_ParseTuple(Args,"O!b",&PyPackage_Type,&PackageObj, &value) == 0)
+      return 0;
+
+   pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
+   depcache->MarkAuto(Pkg,value);
+
+   Py_INCREF(Py_None);
+   return HandleErrors(Py_None);
+}
+
+
 static PyObject *PkgDepCacheIsUpgradable(PyObject *Self,PyObject *Args)
 {
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -386,7 +400,7 @@ static PyObject *PkgDepCacheIsGarbage(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -400,7 +414,7 @@ static PyObject *PkgDepCacheIsAutoInstalled(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -414,7 +428,7 @@ static PyObject *PkgDepCacheIsNowBroken(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -428,7 +442,7 @@ static PyObject *PkgDepCacheIsInstBroken(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -443,7 +457,7 @@ static PyObject *PkgDepCacheMarkedInstall(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -458,7 +472,7 @@ static PyObject *PkgDepCacheMarkedUpgrade(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -472,7 +486,7 @@ static PyObject *PkgDepCacheMarkedDelete(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -486,7 +500,7 @@ static PyObject *PkgDepCacheMarkedKeep(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -500,7 +514,7 @@ static PyObject *PkgDepCacheMarkedDowngrade(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -514,7 +528,7 @@ static PyObject *PkgDepCacheMarkedReinstall(PyObject *Self,PyObject *Args)
    pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
 
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
@@ -528,108 +542,163 @@ static PyObject *PkgDepCacheMarkedReinstall(PyObject *Self,PyObject *Args)
 
 static PyMethodDef PkgDepCacheMethods[] =
 {
-   {"Init",PkgDepCacheInit,METH_VARARGS,"Init the depcache (done on construct automatically)"},
-   {"GetCandidateVer",PkgDepCacheGetCandidateVer,METH_VARARGS,"Get candidate version"},
-   {"SetCandidateVer",PkgDepCacheSetCandidateVer,METH_VARARGS,"Set candidate version"},
+   {"init",PkgDepCacheInit,METH_VARARGS,"Init the depcache (done on construct automatically)"},
+   {"get_candidate_ver",PkgDepCacheGetCandidateVer,METH_VARARGS,"Get candidate version"},
+   {"set_candidate_ver",PkgDepCacheSetCandidateVer,METH_VARARGS,"Set candidate version"},
 
    // global cache operations
-   {"Upgrade",PkgDepCacheUpgrade,METH_VARARGS,"Perform Upgrade (optional boolean argument if dist-upgrade should be performed)"},
-   {"FixBroken",PkgDepCacheFixBroken,METH_VARARGS,"Fix broken packages"},
-   {"ReadPinFile",PkgDepCacheReadPinFile,METH_VARARGS,"Read the pin policy"},
-   {"MinimizeUpgrade",PkgDepCacheMinimizeUpgrade, METH_VARARGS,"Go over the entire set of packages and try to keep each package marked for upgrade. If a conflict is generated then the package is restored."},
+   {"upgrade",PkgDepCacheUpgrade,METH_VARARGS,"Perform Upgrade (optional boolean argument if dist-upgrade should be performed)"},
+   {"fix_broken",PkgDepCacheFixBroken,METH_VARARGS,"Fix broken packages"},
+   {"read_pinfile",PkgDepCacheReadPinFile,METH_VARARGS,"Read the pin policy"},
+   {"minimize_upgrade",PkgDepCacheMinimizeUpgrade, METH_VARARGS,"Go over the entire set of packages and try to keep each package marked for upgrade. If a conflict is generated then the package is restored."},
    // Manipulators
-   {"MarkKeep",PkgDepCacheMarkKeep,METH_VARARGS,"Mark package for keep"},
-   {"MarkDelete",PkgDepCacheMarkDelete,METH_VARARGS,"Mark package for delete (optional boolean argument if it should be purged)"},
-   {"MarkInstall",PkgDepCacheMarkInstall,METH_VARARGS,"Mark package for Install"},
-   {"SetReInstall",PkgDepCacheSetReInstall,METH_VARARGS,"Set if the package should be reinstalled"},
+   {"mark_keep",PkgDepCacheMarkKeep,METH_VARARGS,"Mark package for keep"},
+   {"mark_delete",PkgDepCacheMarkDelete,METH_VARARGS,"Mark package for delete (optional boolean argument if it should be purged)"},
+   {"mark_install",PkgDepCacheMarkInstall,METH_VARARGS,"Mark package for Install"},
+   {"mark_auto",PkgDepCacheMarkAuto,METH_VARARGS,"mark_auto(pkg: apt_pkg.Package, auto: bool)\n\nMark package as automatically installed."},
+   {"set_reinstall",PkgDepCacheSetReInstall,METH_VARARGS,"Set if the package should be reinstalled"},
    // state information
-   {"IsUpgradable",PkgDepCacheIsUpgradable,METH_VARARGS,"Is pkg upgradable"},
-   {"IsNowBroken",PkgDepCacheIsNowBroken,METH_VARARGS,"Is pkg is now broken"},
-   {"IsInstBroken",PkgDepCacheIsInstBroken,METH_VARARGS,"Is pkg broken on the current install"},
-   {"IsGarbage",PkgDepCacheIsGarbage,METH_VARARGS,"Is pkg garbage (mark-n-sweep)"},
-   {"IsAutoInstalled",PkgDepCacheIsAutoInstalled,METH_VARARGS,"Is pkg marked as auto installed"},
-   {"MarkedInstall",PkgDepCacheMarkedInstall,METH_VARARGS,"Is pkg marked for install"},
-   {"MarkedUpgrade",PkgDepCacheMarkedUpgrade,METH_VARARGS,"Is pkg marked for upgrade"},
-   {"MarkedDelete",PkgDepCacheMarkedDelete,METH_VARARGS,"Is pkg marked for delete"},
-   {"MarkedKeep",PkgDepCacheMarkedKeep,METH_VARARGS,"Is pkg marked for keep"},
-   {"MarkedReinstall",PkgDepCacheMarkedReinstall,METH_VARARGS,"Is pkg marked for reinstall"},
-   {"MarkedDowngrade",PkgDepCacheMarkedDowngrade,METH_VARARGS,"Is pkg marked for downgrade"},
-
+   {"is_upgradable",PkgDepCacheIsUpgradable,METH_VARARGS,"Is pkg upgradable"},
+   {"is_now_broken",PkgDepCacheIsNowBroken,METH_VARARGS,"Is pkg is now broken"},
+   {"is_inst_broken",PkgDepCacheIsInstBroken,METH_VARARGS,"Is pkg broken on the current install"},
+   {"is_garbage",PkgDepCacheIsGarbage,METH_VARARGS,"Is pkg garbage (mark-n-sweep)"},
+   {"is_auto_installed",PkgDepCacheIsAutoInstalled,METH_VARARGS,"Is pkg marked as auto installed"},
+   {"marked_install",PkgDepCacheMarkedInstall,METH_VARARGS,"Is pkg marked for install"},
+   {"marked_upgrade",PkgDepCacheMarkedUpgrade,METH_VARARGS,"Is pkg marked for upgrade"},
+   {"marked_delete",PkgDepCacheMarkedDelete,METH_VARARGS,"Is pkg marked for delete"},
+   {"marked_keep",PkgDepCacheMarkedKeep,METH_VARARGS,"Is pkg marked for keep"},
+   {"marked_reinstall",PkgDepCacheMarkedReinstall,METH_VARARGS,"Is pkg marked for reinstall"},
+   {"marked_downgrade",PkgDepCacheMarkedDowngrade,METH_VARARGS,"Is pkg marked for downgrade"},
    // Action
-   {"Commit", PkgDepCacheCommit, METH_VARARGS, "Commit pending changes"},
+   {"commit", PkgDepCacheCommit, METH_VARARGS, "Commit pending changes"},
    {}
 };
 
+#define depcache (GetCpp<pkgDepCache *>(Self))
+static PyObject *PkgDepCacheGetKeepCount(PyObject *Self,void*) {
+   return Py_BuildValue("l", depcache->KeepCount());
+}
+static PyObject *PkgDepCacheGetInstCount(PyObject *Self,void*) {
+   return Py_BuildValue("l", depcache->InstCount());
+}
+static PyObject *PkgDepCacheGetDelCount(PyObject *Self,void*) {
+   return Py_BuildValue("l", depcache->DelCount());
+}
+static PyObject *PkgDepCacheGetBrokenCount(PyObject *Self,void*) {
+   return Py_BuildValue("l", depcache->BrokenCount());
+}
+static PyObject *PkgDepCacheGetUsrSize(PyObject *Self,void*) {
+   return Py_BuildValue("d", depcache->UsrSize());
+}
+static PyObject *PkgDepCacheGetDebSize(PyObject *Self,void*) {
+   return Py_BuildValue("d", depcache->DebSize());
+}
+#undef depcache
+
+static PyObject *PkgDepCacheGetPolicy(PyObject *Self,void*) {
+   PyObject *Owner = GetOwner<pkgDepCache*>(Self);
+   pkgDepCache *DepCache = GetCpp<pkgDepCache*>(Self);
+   pkgPolicy *Policy = (pkgPolicy *)&DepCache->GetPolicy();
+   CppPyObject<pkgPolicy*> *PyPolicy =
+        CppPyObject_NEW<pkgPolicy*>(Owner,&PyPolicy_Type,Policy);
+   // Policy should not be deleted, it is managed by CacheFile.
+   PyPolicy->NoDelete = true;
+   return PyPolicy;
+}
 
-static PyObject *DepCacheAttr(PyObject *Self,char *Name)
-{
-   pkgDepCache *depcache = GetCpp<pkgDepCache *>(Self);
 
-   // size querries
-   if(strcmp("KeepCount",Name) == 0)
-      return Py_BuildValue("l", depcache->KeepCount());
-   else if(strcmp("InstCount",Name) == 0)
-      return Py_BuildValue("l", depcache->InstCount());
-   else if(strcmp("DelCount",Name) == 0)
-      return Py_BuildValue("l", depcache->DelCount());
-   else if(strcmp("BrokenCount",Name) == 0)
-      return Py_BuildValue("l", depcache->BrokenCount());
-   else if(strcmp("UsrSize",Name) == 0)
-      return Py_BuildValue("d", depcache->UsrSize());
-   else if(strcmp("DebSize",Name) == 0)
-      return Py_BuildValue("d", depcache->DebSize());
+static PyGetSetDef PkgDepCacheGetSet[] = {
+    {"broken_count",PkgDepCacheGetBrokenCount},
+    {"deb_size",PkgDepCacheGetDebSize},
+    {"del_count",PkgDepCacheGetDelCount},
+    {"inst_count",PkgDepCacheGetInstCount},
+    {"keep_count",PkgDepCacheGetKeepCount},
+    {"usr_size",PkgDepCacheGetUsrSize},
+    {"policy",PkgDepCacheGetPolicy},
+    {}
+};
 
+static PyObject *PkgDepCacheNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
+{
+   PyObject *Owner;
+   char *kwlist[] = {"cache", 0};
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PyCache_Type,
+                                   &Owner) == 0)
+      return 0;
 
-   return Py_FindMethod(PkgDepCacheMethods,Self,Name);
-}
 
+   // the owner of the Python cache object is a cachefile object, get it
+   PyObject *CacheFilePy = GetOwner<pkgCache*>(Owner);
+   // get the pkgCacheFile from the cachefile
+   pkgCacheFile *CacheF = GetCpp<pkgCacheFile*>(CacheFilePy);
+   // and now the depcache
+   pkgDepCache *depcache = (pkgDepCache *)(*CacheF);
 
+   CppPyObject<pkgDepCache*> *DepCachePyObj;
+   DepCachePyObj = CppPyObject_NEW<pkgDepCache*>(Owner,type,depcache);
 
+   // Do not delete the underlying pointer, it is managed by the cachefile.
+   DepCachePyObj->NoDelete = true;
 
-PyTypeObject PkgDepCacheType =
+   return HandleErrors(DepCachePyObj);
+}
+
+static char *doc_PkgDepCache = "DepCache(cache) -> DepCache() object\n\n"
+    "A DepCache() holds extra information on the state of the packages.\n\n"
+    "The parameter *cache* refers to an apt_pkg.Cache() object.";
+PyTypeObject PyDepCache_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgDepCache",                          // tp_name
-   sizeof(CppOwnedPyObject<pkgDepCache *>),   // tp_basicsize
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.DepCache",                  // tp_name
+   sizeof(CppPyObject<pkgDepCache *>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<pkgDepCache *>,        // tp_dealloc
+   CppDeallocPtr<pkgDepCache *>,   // tp_dealloc
    0,                                   // tp_print
-   DepCacheAttr,                           // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    0,                                   // tp_repr
    0,                                   // tp_as_number
    0,                                   // tp_as_sequence
-   0,	                                // tp_as_mapping
+   0,                                   // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   (Py_TPFLAGS_DEFAULT |                // tp_flags
+    Py_TPFLAGS_BASETYPE |
+    Py_TPFLAGS_HAVE_GC),
+   doc_PkgDepCache,                     // tp_doc
+   CppTraverse<pkgDepCache *>,     // tp_traverse
+   CppClear<pkgDepCache *>,        // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   PkgDepCacheMethods,                  // tp_methods
+   0,                                   // tp_members
+   PkgDepCacheGetSet,                   // tp_getset
+   0,                                   // tp_base
+   0,                                   // tp_dict
+   0,                                   // tp_descr_get
+   0,                                   // tp_descr_set
+   0,                                   // tp_dictoffset
+   0,                                   // tp_init
+   0,                                   // tp_alloc
+   PkgDepCacheNew,                      // tp_new
 };
 
-
+#ifdef COMPAT_0_7
 PyObject *GetDepCache(PyObject *Self,PyObject *Args)
 {
-   PyObject *Owner;
-   if (PyArg_ParseTuple(Args,"O!",&PkgCacheType,&Owner) == 0)
-      return 0;
-
-
-   // the owner of the Python cache object is a cachefile object, get it
-   PyObject *CacheFilePy = GetOwner<pkgCache*>(Owner);
-   // get the pkgCacheFile from the cachefile
-   pkgCacheFile *CacheF = GetCpp<pkgCacheFile*>(CacheFilePy);
-   // and now the depcache
-   pkgDepCache *depcache = (pkgDepCache *)(*CacheF);
-
-   CppOwnedPyObject<pkgDepCache*> *DepCachePyObj;
-   DepCachePyObj = CppOwnedPyObject_NEW<pkgDepCache*>(Owner,
-						      &PkgDepCacheType,
-						      depcache);
-   HandleErrors(DepCachePyObj);
-
-   return DepCachePyObj;
+    PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetDepCache() is deprecated"
+                 ". Please see apt_pkg.DepCache() for the replacement.",1);
+    return PkgDepCacheNew(&PyDepCache_Type,Args,0);
 }
-
+#endif
 
 
 
@@ -638,26 +707,33 @@ PyObject *GetDepCache(PyObject *Self,PyObject *Args)
 
 // pkgProblemResolver Class						/*{{{*/
 // ---------------------------------------------------------------------
-
-
-PyObject *GetPkgProblemResolver(PyObject *Self,PyObject *Args)
+static PyObject *PkgProblemResolverNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 {
    PyObject *Owner;
-   if (PyArg_ParseTuple(Args,"O!",&PkgDepCacheType,&Owner) == 0)
+   char *kwlist[] = {"depcache",0};
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PyDepCache_Type,
+                                   &Owner) == 0)
       return 0;
 
    pkgDepCache *depcache = GetCpp<pkgDepCache*>(Owner);
    pkgProblemResolver *fixer = new pkgProblemResolver(depcache);
-   CppOwnedPyObject<pkgProblemResolver*> *PkgProblemResolverPyObj;
-   PkgProblemResolverPyObj = CppOwnedPyObject_NEW<pkgProblemResolver*>(Owner,
-						      &PkgProblemResolverType,
+   CppPyObject<pkgProblemResolver*> *PkgProblemResolverPyObj;
+   PkgProblemResolverPyObj = CppPyObject_NEW<pkgProblemResolver*>(Owner,
+						      type,
 						      fixer);
    HandleErrors(PkgProblemResolverPyObj);
 
    return PkgProblemResolverPyObj;
-
 }
 
+#ifdef COMPAT_0_7
+PyObject *GetPkgProblemResolver(PyObject *Self,PyObject *Args) {
+    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgProblemResolver() is"
+                 " deprecated. Please see apt_pkg.ProblemResolver() for the "
+                 "replacement.", 1);
+    return PkgProblemResolverNew(&PyProblemResolver_Type,Args,0);
+}
+#endif
 
 static PyObject *PkgProblemResolverResolve(PyObject *Self,PyObject *Args)
 {
@@ -693,7 +769,7 @@ static PyObject *PkgProblemResolverProtect(PyObject *Self,PyObject *Args)
 {
    pkgProblemResolver *fixer = GetCpp<pkgProblemResolver *>(Self);
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    fixer->Protect(Pkg);
@@ -705,7 +781,7 @@ static PyObject *PkgProblemResolverRemove(PyObject *Self,PyObject *Args)
 {
    pkgProblemResolver *fixer = GetCpp<pkgProblemResolver *>(Self);
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    fixer->Remove(Pkg);
@@ -717,7 +793,7 @@ static PyObject *PkgProblemResolverClear(PyObject *Self,PyObject *Args)
 {
    pkgProblemResolver *fixer = GetCpp<pkgProblemResolver *>(Self);
    PyObject *PackageObj;
-   if (PyArg_ParseTuple(Args,"O!",&PackageType,&PackageObj) == 0)
+   if (PyArg_ParseTuple(Args,"O!",&PyPackage_Type,&PackageObj) == 0)
       return 0;
    pkgCache::PkgIterator &Pkg = GetCpp<pkgCache::PkgIterator>(PackageObj);
    fixer->Clear(Pkg);
@@ -738,37 +814,27 @@ static PyObject *PkgProblemResolverInstallProtect(PyObject *Self,PyObject *Args)
 static PyMethodDef PkgProblemResolverMethods[] =
 {
    // config
-   {"Protect", PkgProblemResolverProtect, METH_VARARGS, "Protect(PkgIterator)"},
-   {"Remove", PkgProblemResolverRemove, METH_VARARGS, "Remove(PkgIterator)"},
-   {"Clear", PkgProblemResolverClear, METH_VARARGS, "Clear(PkgIterator)"},
-   {"InstallProtect", PkgProblemResolverInstallProtect, METH_VARARGS, "ProtectInstalled()"},
+   {"protect", PkgProblemResolverProtect, METH_VARARGS, "protect(PkgIterator)"},
+   {"remove", PkgProblemResolverRemove, METH_VARARGS, "remove(PkgIterator)"},
+   {"clear", PkgProblemResolverClear, METH_VARARGS, "clear(PkgIterator)"},
+   {"install_protect", PkgProblemResolverInstallProtect, METH_VARARGS, "install_protect()"},
 
    // Actions
-   {"Resolve", PkgProblemResolverResolve, METH_VARARGS, "Try to intelligently resolve problems by installing and removing packages"},
-   {"ResolveByKeep", PkgProblemResolverResolveByKeep, METH_VARARGS, "Try to resolv problems only by using keep"},
+   {"resolve", PkgProblemResolverResolve, METH_VARARGS, "Try to intelligently resolve problems by installing and removing packages"},
+   {"resolve_by_keep", PkgProblemResolverResolveByKeep, METH_VARARGS, "Try to resolv problems only by using keep"},
    {}
 };
 
-
-static PyObject *ProblemResolverAttr(PyObject *Self,char *Name)
+PyTypeObject PyProblemResolver_Type =
 {
-   pkgProblemResolver *fixer = GetCpp<pkgProblemResolver *>(Self);
-
-   return Py_FindMethod(PkgProblemResolverMethods,Self,Name);
-}
-
-
-PyTypeObject PkgProblemResolverType =
-{
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgProblemResolver",                       // tp_name
-   sizeof(CppOwnedPyObject<pkgProblemResolver *>),   // tp_basicsize
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.ProblemResolver",                       // tp_name
+   sizeof(CppPyObject<pkgProblemResolver *>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<pkgProblemResolver *>,        // tp_dealloc
+   CppDeallocPtr<pkgProblemResolver *>,// tp_dealloc
    0,                                   // tp_print
-   ProblemResolverAttr,                           // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    0,                                   // tp_repr
@@ -776,6 +842,32 @@ PyTypeObject PkgProblemResolverType =
    0,                                   // tp_as_sequence
    0,	                                // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   (Py_TPFLAGS_DEFAULT |                // tp_flags
+    Py_TPFLAGS_BASETYPE |
+    Py_TPFLAGS_HAVE_GC),
+   "ProblemResolver Object",            // tp_doc
+   CppTraverse<pkgProblemResolver *>, // tp_traverse
+   CppClear<pkgProblemResolver *>, // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   PkgProblemResolverMethods,           // tp_methods
+   0,                                   // tp_members
+   0,                                   // tp_getset
+   0,                                   // tp_base
+   0,                                   // tp_dict
+   0,                                   // tp_descr_get
+   0,                                   // tp_descr_set
+   0,                                   // tp_dictoffset
+   0,                                   // tp_init
+   0,                                   // tp_alloc
+   PkgProblemResolverNew,               // tp_new
 };
 
 									/*}}}*/
@@ -797,7 +889,6 @@ static PyObject *PkgActionGroupRelease(PyObject *Self,PyObject *Args)
 static PyObject *PkgActionGroupEnter(PyObject *Self,PyObject *Args) {
    if (PyArg_ParseTuple(Args,"") == 0)
       return 0;
-    Py_INCREF(Self);
     return Self;
 }
 static PyObject *PkgActionGroupExit(PyObject *Self,PyObject *Args) {
@@ -806,35 +897,60 @@ static PyObject *PkgActionGroupExit(PyObject *Self,PyObject *Args) {
    Py_RETURN_FALSE;
 }
 
-
 static PyMethodDef PkgActionGroupMethods[] =
 {
    {"release", PkgActionGroupRelease, METH_VARARGS, "release()"},
-   {"__enter__", PkgActionGroupEnter, METH_VARARGS, "__enter__() -> self"},
-   {"__exit__", PkgActionGroupExit, METH_VARARGS, "__exit__()"},
+   {"__exit__", PkgActionGroupExit, METH_VARARGS, "__exit__(...) -> "
+               "Release the action group, for 'with' statement."},
+   {"__enter__", PkgActionGroupEnter, METH_VARARGS, "__enter__() -> "
+               "Enter, for the 'with' statement. Does nothing."},
    {}
 };
 
-
-static PyObject *ActionGroupAttr(PyObject *Self,char *Name)
+static PyObject *PkgActionGroupNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 {
-   pkgDepCache::ActionGroup *ag = GetCpp<pkgDepCache::ActionGroup*>(Self);
+   PyObject *Owner;
+   char *kwlist[] = {"depcache", 0};
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PyDepCache_Type,
+                                   &Owner) == 0)
+      return 0;
+
+   pkgDepCache *depcache = GetCpp<pkgDepCache*>(Owner);
+   pkgDepCache::ActionGroup *group = new pkgDepCache::ActionGroup(*depcache);
+   CppPyObject<pkgDepCache::ActionGroup*> *PkgActionGroupPyObj;
+   PkgActionGroupPyObj = CppPyObject_NEW<pkgDepCache::ActionGroup*>(Owner,
+						      type,
+						      group);
+   HandleErrors(PkgActionGroupPyObj);
+
+   return PkgActionGroupPyObj;
 
-   return Py_FindMethod(PkgActionGroupMethods,Self,Name);
 }
 
+static char *doc_PkgActionGroup = "ActionGroup(depcache)\n\n"
+    "Create a new ActionGroup() object. The parameter *depcache* refers to an\n"
+    "apt_pkg.DepCache() object.\n\n"
+    "ActionGroups disable certain cleanup actions, so modifying many packages\n"
+    "is much faster.\n\n"
+    "ActionGroup() can also be used with the 'with' statement, but be aware\n"
+    "that the ActionGroup() is active as soon as it is created, and not just\n"
+    "when entering the context. This means you can write::\n\n"
+    "    with apt_pkg.ActionGroup(depcache):\n"
+    "        depcache.markInstall(pkg)\n\n"
+    "Once the block of the with statement is left, the action group is \n"
+    "automatically released from the cache.";
+
 
-PyTypeObject PkgActionGroupType =
+PyTypeObject PyActionGroup_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgActionGroup",                       // tp_name
-   sizeof(CppOwnedPyObject<pkgDepCache::ActionGroup*>),   // tp_basicsize
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.ActionGroup",               // tp_name
+   sizeof(CppPyObject<pkgDepCache::ActionGroup*>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<pkgDepCache::ActionGroup*>,        // tp_dealloc
+   CppDeallocPtr<pkgDepCache::ActionGroup*>,        // tp_dealloc
    0,                                   // tp_print
-   ActionGroupAttr,                           // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    0,                                   // tp_repr
@@ -842,25 +958,43 @@ PyTypeObject PkgActionGroupType =
    0,                                   // tp_as_sequence
    0,	                                // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   0,                                   // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   (Py_TPFLAGS_DEFAULT |                // tp_flags
+    Py_TPFLAGS_BASETYPE |
+    Py_TPFLAGS_HAVE_GC),
+   doc_PkgActionGroup,                  // tp_doc
+   CppTraverse<pkgDepCache::ActionGroup*>, // tp_traverse
+   CppClear<pkgDepCache::ActionGroup*>, // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   PkgActionGroupMethods,               // tp_methods
+   0,                                   // tp_members
+   0,                                   // tp_getset
+   0,                                   // tp_base
+   0,                                   // tp_dict
+   0,                                   // tp_descr_get
+   0,                                   // tp_descr_set
+   0,                                   // tp_dictoffset
+   0,                                   // tp_init
+   0,                                   // tp_alloc
+   PkgActionGroupNew,                   // tp_new
 };
 
+#ifdef COMPAT_0_7
 PyObject *GetPkgActionGroup(PyObject *Self,PyObject *Args)
 {
-   PyObject *Owner;
-   if (PyArg_ParseTuple(Args,"O!",&PkgDepCacheType,&Owner) == 0)
-      return 0;
-
-   pkgDepCache *depcache = GetCpp<pkgDepCache*>(Owner);
-   pkgDepCache::ActionGroup *group = new pkgDepCache::ActionGroup(*depcache);
-   CppOwnedPyObject<pkgDepCache::ActionGroup*> *PkgActionGroupPyObj;
-   PkgActionGroupPyObj = CppOwnedPyObject_NEW<pkgDepCache::ActionGroup*>(Owner,
-						      &PkgActionGroupType,
-						      group);
-   HandleErrors(PkgActionGroupPyObj);
-
-   return PkgActionGroupPyObj;
-
+    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgActionGroup() is "
+                 "deprecated. Please see apt_pkg.ActionGroup() for the "
+                 "replacement.", 1);
+    return PkgActionGroupNew(&PyActionGroup_Type,Args,0);
 }
+#endif
 
 
 									/*}}}*/
diff --git a/python/generic.cc b/python/generic.cc
index 7309d978..f0980f2b 100644
--- a/python/generic.cc
+++ b/python/generic.cc
@@ -9,6 +9,8 @@
 									/*}}}*/
 // Include Files							/*{{{*/
 #include "generic.h"
+using namespace std;
+
 
 #include <apt-pkg/error.h>
 									/*}}}*/
@@ -25,14 +27,15 @@ PyObject *HandleErrors(PyObject *Res)
       return Res;
    }
 
-   if (Res != 0)
+   if (Res != 0) {
       Py_DECREF(Res);
+   }
 
-   string Err;
+   std::string Err;
    int errcnt = 0;
    while (_error->empty() == false)
    {
-      string Msg;
+      std::string Msg;
       bool Type = _error->PopMessage(Msg);
       if (errcnt > 0)
          Err.append(", ");
@@ -45,6 +48,75 @@ PyObject *HandleErrors(PyObject *Res)
    PyErr_SetString(PyExc_SystemError,Err.c_str());
    return 0;
 }
+
+# ifdef COMPAT_0_7
+// Helpers for deprecation.
+
+// Given the name of the old attribute, return the name of the new attribute
+// in a PyObject.
+static PyObject *_PyApt_NewNameForAttribute(const char *attr) {
+    // Some exceptions from the standard algorithm.
+    if (strcasecmp(attr, "FileName") == 0) return PyString_FromString("filename");
+    if (strcasecmp(attr, "DestFile") == 0) return PyString_FromString("destfile");
+    if (strcasecmp(attr, "FileSize") == 0) return PyString_FromString("filesize");
+    if (strcasecmp(attr, "SubTree") == 0) return PyString_FromString("subtree");
+    if (strcasecmp(attr, "ReadPinFile") == 0) return PyString_FromString("read_pinfile");
+    if (strcasecmp(attr, "SetReInstall") == 0) return PyString_FromString("set_reinstall");
+    if (strcasecmp(attr, "URI") == 0) return PyString_FromString("uri");
+    if (strcasecmp(attr, "MD5Hash") == 0) return PyString_FromString("md5_hash");
+    if (strcasecmp(attr, "SHA1Hash") == 0) return PyString_FromString("sha1_hash");
+    if (strcasecmp(attr, "SHA256Hash") == 0) return PyString_FromString("sha256_hash");
+    if (strcasecmp(attr, "UntranslatedDepType") == 0) return PyString_FromString("dep_type_untranslated");
+    size_t attrlen = strlen(attr);
+    // Reserve the old name + 5, this should reduce resize to a minimum.
+    string new_name;
+    new_name.reserve(attrlen + 5);
+    for(unsigned int i=0; i < attrlen; i++) {
+        // Replace all uppercase ASCII characters with their lower-case ones.
+        if (attr[i] > 64 && attr[i] < 91) {
+            if (i > 0)
+                new_name += "_";
+            new_name += attr[i] + 32;
+        } else {
+            new_name += attr[i];
+        }
+    }
+    return CppPyString(new_name);
+}
+
+// Handle deprecated attributes by setting a warning and returning the new
+// attribute.
+PyObject *_PyAptObject_getattro(PyObject *self, PyObject *attr) {
+    PyObject *value = PyObject_GenericGetAttr(self, attr);
+    if (value == NULL) {
+        PyObject *ptype, *pvalue, *ptraceback;
+        PyErr_Fetch(&ptype, &pvalue, &ptraceback);
+        const char *attrname = PyObject_AsString(attr);
+        PyObject *newattr = _PyApt_NewNameForAttribute(attrname);
+        value = PyObject_GenericGetAttr(self, newattr);
+        if (value != NULL) {
+            const char *newattrname = PyString_AsString(newattr);
+            const char *cls = self->ob_type->tp_name;
+            char *warning_string = new char[strlen(newattrname) + strlen(cls) +
+                                            strlen(attrname) + 66];
+            sprintf(warning_string, "Attribute '%s' of the '%s' object is "
+                    "deprecated, use '%s' instead.", attrname, cls, newattrname);
+            PyErr_WarnEx(PyExc_DeprecationWarning, warning_string, 1);
+            delete[] warning_string;
+        } else {
+            Py_XINCREF(ptype);
+            Py_XINCREF(pvalue);
+            Py_XINCREF(ptraceback);
+            PyErr_Restore(ptype, pvalue, ptraceback);
+        }
+        Py_DECREF(newattr);
+        Py_XDECREF(ptype);
+        Py_XDECREF(pvalue);
+        Py_XDECREF(ptraceback);
+    }
+    return value;
+}
+# endif //COMPAT_0_7
 									/*}}}*/
 // ListToCharChar - Convert a list to an array of char char		/*{{{*/
 // ---------------------------------------------------------------------
diff --git a/python/generic.h b/python/generic.h
index d2fcf42a..31c1bc2d 100644
--- a/python/generic.h
+++ b/python/generic.h
@@ -29,12 +29,81 @@
 
 #include <Python.h>
 #include <string>
+#include <iostream>
 #include <new>
 
 #if PYTHON_API_VERSION < 1013
 typedef int Py_ssize_t;
 #endif
 
+/* Define compatibility for Python 3.
+ *
+ * We will use the names PyString_* to refer to the default string type
+ * of the current Python version (PyString on 2.X, PyUnicode on 3.X).
+ *
+ * When we really need unicode strings, we will use PyUnicode_* directly, as
+ * long as it exists in Python 2 and Python 3.
+ *
+ * When we want bytes in Python 3, we use PyBytes*_ instead of PyString_* and
+ * define aliases from PyBytes_* to PyString_* for Python 2.
+ */
+
+#if PY_MAJOR_VERSION >= 3
+#define PyString_Check PyUnicode_Check
+#define PyString_FromString PyUnicode_FromString
+#define PyString_FromStringAndSize PyUnicode_FromStringAndSize
+#define PyString_AsString PyUnicode_AsString
+#define PyString_FromFormat PyUnicode_FromFormat
+#define PyString_Type PyUnicode_Type
+#define PyInt_Check PyLong_Check
+#define PyInt_AsLong PyLong_AsLong
+// Force 0.7 compatibility to be off in Python 3 builds
+#undef COMPAT_0_7
+#else
+// Compatibility for Python 2.5 and previous.
+#if (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 5)
+#define PyBytes_Check PyString_Check
+#define PyBytes_AS_STRING PyString_AS_STRING
+#define PyBytes_AsString PyString_AsString
+#define PyBytes_AsStringAndSize PyString_AsStringAndSize
+#define PyBytes_FromStringAndSize PyString_FromStringAndSize
+#define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,
+#endif
+#endif
+
+// Hacks to make Python 2.4 build.
+#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 4
+#define PyErr_WarnEx(cat,msg,stacklevel) PyErr_Warn(cat,msg)
+#endif
+
+
+static inline const char *PyUnicode_AsString(PyObject *op) {
+    // Convert to bytes object, using the default encoding.
+    PyObject *bytes = PyUnicode_AsEncodedString(op,0,0);
+    return bytes ? PyBytes_AS_STRING(bytes) : 0;
+}
+
+// Convert any type of string based object to a const char.
+#if PY_MAJOR_VERSION < 3
+static inline const char *PyObject_AsString(PyObject *object) {
+    if (PyBytes_Check(object))
+        return PyBytes_AsString(object);
+    else if (PyUnicode_Check(object))
+        return PyUnicode_AsString(object);
+    else
+        PyErr_SetString(PyExc_TypeError, "Argument must be str.");
+    return 0;
+}
+#else
+static inline const char *PyObject_AsString(PyObject *object) {
+    if (PyUnicode_Check(object) == 0) {
+        PyErr_SetString(PyExc_TypeError, "Argument must be str.");
+        return 0;
+    }
+    return PyUnicode_AsString(object);
+}
+#endif
+
 template <class T> struct CppPyObject : public PyObject
 {
    // We are only using CppPyObject and friends as dumb structs only, ie the
@@ -42,18 +111,22 @@ template <class T> struct CppPyObject : public PyObject
    // However if T doesn't have a default c'tor C++ doesn't generate one for
    // CppPyObject (since it can't know how it should initialize Object).
    //
-   // This causes problems then in CppOwnedPyObject, for which C++ can't create
+   // This causes problems then in CppPyObject, for which C++ can't create
    // a c'tor that calls the base class c'tor (which causes a compilation
    // error).
    // So basically having the c'tor here removes the need for T to have a
    // default c'tor, which is not always desireable.
    CppPyObject() { };
-   T Object;
-};
 
-template <class T> struct CppOwnedPyObject : public CppPyObject<T>
-{
+   // The owner of the object. The object keeps a reference to it during its
+   // lifetime.
    PyObject *Owner;
+
+   // Flag which causes the underlying object to not be deleted.
+   bool NoDelete;
+
+   // The underlying C++ object.
+   T Object;
 };
 
 template <class T>
@@ -65,66 +138,74 @@ inline T &GetCpp(PyObject *Obj)
 template <class T>
 inline PyObject *GetOwner(PyObject *Obj)
 {
-   return ((CppOwnedPyObject<T> *)Obj)->Owner;
+   return ((CppPyObject<T> *)Obj)->Owner;
 }
 
-// Generic 'new' functions
+
 template <class T>
-inline CppPyObject<T> *CppPyObject_NEW(PyTypeObject *Type)
+inline CppPyObject<T> *CppPyObject_NEW(PyObject *Owner,PyTypeObject *Type)
 {
-   CppPyObject<T> *New = PyObject_NEW(CppPyObject<T>,Type);
+   #ifdef ALLOC_DEBUG
+   std::cerr << "=== ALLOCATING " << Type->tp_name << "+ ===\n";
+   #endif
+   CppPyObject<T> *New = (CppPyObject<T>*)Type->tp_alloc(Type, 0);
    new (&New->Object) T;
+   New->Owner = Owner;
+   Py_XINCREF(Owner);
    return New;
 }
 
 template <class T,class A>
-inline CppPyObject<T> *CppPyObject_NEW(PyTypeObject *Type,A const &Arg)
+inline CppPyObject<T> *CppPyObject_NEW(PyObject *Owner, PyTypeObject *Type,A const &Arg)
 {
-   CppPyObject<T> *New = PyObject_NEW(CppPyObject<T>,Type);
+   #ifdef ALLOC_DEBUG
+   std::cerr << "=== ALLOCATING " << Type->tp_name << "+ ===\n";
+   #endif
+   CppPyObject<T> *New = (CppPyObject<T>*)Type->tp_alloc(Type, 0);
    new (&New->Object) T(Arg);
+   New->Owner = Owner;
+   Py_XINCREF(Owner);
    return New;
 }
 
+// Traversal and Clean for  objects
 template <class T>
-inline CppOwnedPyObject<T> *CppOwnedPyObject_NEW(PyObject *Owner,
-						 PyTypeObject *Type)
-{
-   CppOwnedPyObject<T> *New = PyObject_NEW(CppOwnedPyObject<T>,Type);
-   new (&New->Object) T;
-   New->Owner = Owner;
-   Py_INCREF(Owner);
-   return New;
+int CppTraverse(PyObject *self, visitproc visit, void* arg) {
+    Py_VISIT(((CppPyObject<T> *)self)->Owner);
+    return 0;
 }
 
-template <class T,class A>
-inline CppOwnedPyObject<T> *CppOwnedPyObject_NEW(PyObject *Owner,
-						 PyTypeObject *Type,A const &Arg)
-{
-   CppOwnedPyObject<T> *New = PyObject_NEW(CppOwnedPyObject<T>,Type);
-   new (&New->Object) T(Arg);
-   New->Owner = Owner;
-   if (Owner != 0)
-      Py_INCREF(Owner);
-   return New;
+template <class T>
+int CppClear(PyObject *self) {
+    Py_CLEAR(((CppPyObject<T> *)self)->Owner);
+    return 0;
 }
 
-// Generic Dealloc type functions
 template <class T>
-void CppDealloc(PyObject *Obj)
+void CppDealloc(PyObject *iObj)
 {
-   GetCpp<T>(Obj).~T();
-   PyObject_DEL(Obj);
+   #ifdef ALLOC_DEBUG
+   std::cerr << "=== DEALLOCATING " << iObj->ob_type->tp_name << "+ ===\n";
+   #endif
+   CppPyObject<T> *Obj = (CppPyObject<T> *)iObj;
+   if (!((CppPyObject<T>*)Obj)->NoDelete)
+      Obj->Object.~T();
+   CppClear<T>(iObj);
+   iObj->ob_type->tp_free(iObj);
 }
 
+
 template <class T>
-void CppOwnedDealloc(PyObject *iObj)
+void CppDeallocPtr(PyObject *iObj)
 {
-   CppOwnedPyObject<T> *Obj = (CppOwnedPyObject<T> *)iObj;
-   Obj->Object.~T();
-   if (Obj->Owner != 0) {
-      Py_DECREF(Obj->Owner);
-   }
-   PyObject_DEL(Obj);
+   #ifdef ALLOC_DEBUG
+   std::cerr << "=== DEALLOCATING " << iObj->ob_type->tp_name << "*+ ===\n";
+   #endif
+   CppPyObject<T> *Obj = (CppPyObject<T> *)iObj;
+   if (!((CppPyObject<T>*)Obj)->NoDelete)
+      delete Obj->Object;
+   CppClear<T>(iObj);
+   iObj->ob_type->tp_free(iObj);
 }
 
 inline PyObject *CppPyString(std::string Str)
@@ -146,4 +227,10 @@ PyObject *HandleErrors(PyObject *Res = 0);
 const char **ListToCharChar(PyObject *List,bool NullTerm = false);
 PyObject *CharCharToList(const char **List,unsigned long Size = 0);
 
+# ifdef COMPAT_0_7
+PyObject *_PyAptObject_getattro(PyObject *self, PyObject *attr);
+# else
+#  define _PyAptObject_getattro 0
+# endif
+
 #endif
diff --git a/python/hashes.cc b/python/hashes.cc
new file mode 100644
index 00000000..d0b0fb0c
--- /dev/null
+++ b/python/hashes.cc
@@ -0,0 +1,136 @@
+/* hashes.cc - Wrapper around apt-pkg's Hashes.
+ *
+ * Copyright 2009 Julian Andres Klode <jak@debian.org>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+#include <Python.h>
+#include "generic.h"
+#include "apt_pkgmodule.h"
+#include <apt-pkg/hashes.h>
+
+static PyObject *hashes_new(PyTypeObject *type,PyObject *args,
+                            PyObject *kwds)
+{
+    return CppPyObject_NEW<Hashes>(NULL, type);
+}
+
+static int hashes_init(PyObject *self, PyObject *args, PyObject *kwds)
+{
+    PyObject *object = 0;
+    int Fd;
+    char *kwlist[] = {"object",  NULL};
+
+    if (PyArg_ParseTupleAndKeywords(args, kwds, "|O:__init__", kwlist,
+                                    &object) == 0)
+        return -1;
+    if (object == 0)
+        return 0;
+    Hashes &hashes = GetCpp<Hashes>(self);
+
+    if (PyBytes_Check(object) != 0) {
+        char *s;
+        Py_ssize_t len;
+        PyBytes_AsStringAndSize(object, &s, &len);
+        hashes.Add((const unsigned char*)s, len);
+    }
+    else if ((Fd = PyObject_AsFileDescriptor(object)) != -1) {
+        struct stat St;
+        if (fstat(Fd, &St) != 0 || hashes.AddFD(Fd, St.st_size) == false) {
+            PyErr_SetFromErrno(PyExc_SystemError);
+            return -1;
+        }
+    }
+    else {
+        PyErr_SetString(PyExc_TypeError,
+                        "__init__() only understand strings and files");
+        return -1;
+    }
+    return 0;
+}
+
+static PyObject *hashes_get_md5(PyObject *self, void*)
+{
+    return CppPyString(GetCpp<Hashes>(self).MD5.Result().Value());
+}
+
+static PyObject *hashes_get_sha1(PyObject *self, void*)
+{
+    return CppPyString(GetCpp<Hashes>(self).SHA1.Result().Value());
+}
+
+static PyObject *hashes_get_sha256(PyObject *self, void*)
+{
+    return CppPyString(GetCpp<Hashes>(self).SHA256.Result().Value());
+}
+
+static PyGetSetDef hashes_getset[] = {
+    {"md5",hashes_get_md5,0,"The MD5Sum of the file as a string."},
+    {"sha1",hashes_get_sha1,0,"The SHA1Sum of the file as a string."},
+    {"sha256",hashes_get_sha256,0,"The SHA256Sum of the file as a string."},
+    {}
+};
+
+static char *hashes_doc =
+    "Hashes([object: (bytes, file)])\n\n"
+    "Calculate hashes for the given object. It can be used to create all\n"
+    "supported hashes for a file.\n\n"
+    "The parameter *object* can be a bytes (3.X) / str (2.X) object, or an\n"
+    "object providing the fileno() method or an integer describing a file\n"
+    "descriptor.";
+
+PyTypeObject PyHashes_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.Hashes",                  // tp_name
+    sizeof(CppPyObject<Hashes>),       // tp_basicsize
+    0,                                 // tp_itemsize
+    // Methods
+    CppDealloc<Hashes>,                // tp_dealloc
+    0,                                 // tp_print
+    0,                                 // tp_getattr
+    0,                                 // tp_setattr
+    0,                                 // tp_compare
+    0,                                 // tp_repr
+    0,                                 // tp_as_number
+    0,                                 // tp_as_sequence
+    0,                                 // tp_as_mapping
+    0,                                 // tp_hash
+    0,                                 // tp_call
+    0,                                 // tp_str
+    0,                                 // tp_getattro
+    0,                                 // tp_setattro
+    0,                                 // tp_as_buffer
+    Py_TPFLAGS_DEFAULT |               // tp_flags
+    Py_TPFLAGS_BASETYPE,
+    hashes_doc,                        // tp_doc
+    0,                                 // tp_traverse
+    0,                                 // tp_clear
+    0,                                 // tp_richcompare
+    0,                                 // tp_weaklistoffset
+    0,                                 // tp_iter
+    0,                                 // tp_iternext
+    0,                                 // tp_methods
+    0,                                 // tp_members
+    hashes_getset,                     // tp_getset
+    0,                                 // tp_base
+    0,                                 // tp_dict
+    0,                                 // tp_descr_get
+    0,                                 // tp_descr_set
+    0,                                 // tp_dictoffset
+    hashes_init,                       // tp_init
+    0,                                 // tp_alloc
+    hashes_new,                        // tp_new
+};
diff --git a/python/hashstring.cc b/python/hashstring.cc
new file mode 100644
index 00000000..59d533f8
--- /dev/null
+++ b/python/hashstring.cc
@@ -0,0 +1,134 @@
+/* hashstring.cc - Wrapper around HashString
+ *
+ * Copyright 2009 Julian Andres Klode <jak@debian.org>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+#include <Python.h>
+#include "generic.h"
+#include "apt_pkgmodule.h"
+#include <apt-pkg/hashes.h>
+
+static PyObject *hashstring_new(PyTypeObject *type,PyObject *Args,
+                                PyObject *kwds)
+{
+    char *Type = NULL;
+    char *Hash = NULL;
+    char *kwlist[] = {"type", "hash",  NULL};
+    if (PyArg_ParseTupleAndKeywords(Args, kwds, "s|s:__new__", kwlist, &Type,
+                                    &Hash) == 0)
+        return 0;
+    CppPyObject<HashString*> *PyObj = CppPyObject_NEW<HashString*>(NULL, type);
+    if (Hash)
+        PyObj->Object = new HashString(Type,Hash);
+    else // Type is the combined form now (i.e. type:hash)
+        PyObj->Object = new HashString(Type);
+    return PyObj;
+}
+
+static PyObject *hashstring_repr(PyObject *self)
+{
+    HashString *hash = GetCpp<HashString*>(self);
+    return PyString_FromFormat("<%s object: \"%s\">", self->ob_type->tp_name,
+                               hash->toStr().c_str());
+}
+
+static PyObject *hashstring_str(PyObject *self)
+{
+    HashString *hash = GetCpp<HashString*>(self);
+    return CppPyString(hash->toStr());
+}
+
+static PyObject *hashstring_get_hashtype(PyObject *self)
+{
+    HashString *hash = GetCpp<HashString*>(self);
+    return CppPyString(hash->HashType());
+}
+
+static char *hashstring_verify_file_doc =
+    "verify_file(filename: str) -> bool\n\n"
+    "Verify that the file indicated by filename matches the hash.";
+
+static PyObject *hashstring_verify_file(PyObject *self,PyObject *args)
+{
+    HashString *hash = GetCpp<HashString*>(self);
+    char *filename;
+    if (PyArg_ParseTuple(args, "s:verify_file", &filename) == 0)
+        return 0;
+    return PyBool_FromLong(hash->VerifyFile(filename));
+}
+
+static PyMethodDef hashstring_methods[] = {
+    {"verify_file",hashstring_verify_file,METH_VARARGS,
+     hashstring_verify_file_doc},
+    {NULL}
+};
+
+static PyGetSetDef hashstring_getset[] = {
+    {"hashtype",(getter)hashstring_get_hashtype,0,
+     "The type of the hash, as a string (possible: MD5Sum,SHA1,SHA256)."},
+    {NULL}
+};
+
+static char *hashstring_doc =
+    "HashString(type, hash) OR HashString('type:hash')\n\n"
+    "Create a new HashString object. The first form allows you to specify\n"
+    "a type and a hash, and the second form a single string where type and\n"
+    "hash are separated by a colon, e.g.::\n\n"
+    "   HashString('MD5Sum', '6cc1b6e6655e3555ac47e5b5fe26d04e')\n\n"
+    "Valid options for 'type' are: MD5Sum, SHA1, SHA256.";
+PyTypeObject PyHashString_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.HashString",              // tp_name
+    sizeof(CppPyObject<HashString*>),  // tp_basicsize
+    0,                                 // tp_itemsize
+    // Methods
+    CppDeallocPtr<HashString*>,        // tp_dealloc
+    0,                                 // tp_print
+    0,                                 // tp_getattr
+    0,                                 // tp_setattr
+    0,                                 // tp_compare
+    hashstring_repr,                   // tp_repr
+    0,                                 // tp_as_number
+    0,                                 // tp_as_sequence
+    0,                                 // tp_as_mapping
+    0,                                 // tp_hash
+    0,                                 // tp_call
+    hashstring_str,                    // tp_str
+    0,                                 // tp_getattro
+    0,                                 // tp_setattro
+    0,                                 // tp_as_buffer
+    Py_TPFLAGS_DEFAULT |               // tp_flags
+    Py_TPFLAGS_BASETYPE,
+    hashstring_doc,                    // tp_doc
+    0,                                 // tp_traverse
+    0,                                 // tp_clear
+    0,                                 // tp_richcompare
+    0,                                 // tp_weaklistoffset
+    0,                                 // tp_iter
+    0,                                 // tp_iternext
+    hashstring_methods,                // tp_methods
+    0,                                 // tp_members
+    hashstring_getset,                 // tp_getset
+    0,                                 // tp_base
+    0,                                 // tp_dict
+    0,                                 // tp_descr_get
+    0,                                 // tp_descr_set
+    0,                                 // tp_dictoffset
+    0,                                 // tp_init
+    0,                                 // tp_alloc
+    hashstring_new,                    // tp_new
+};
diff --git a/python/indexfile.cc b/python/indexfile.cc
index 107eae27..c6d0b1cc 100644
--- a/python/indexfile.cc
+++ b/python/indexfile.cc
@@ -15,76 +15,101 @@
 
 #include <Python.h>
 
-static PyObject *PackageIndexFileArchiveURI(PyObject *Self,PyObject *Args)
+static PyObject *IndexFileArchiveURI(PyObject *Self,PyObject *Args)
 {
    pkgIndexFile *File = GetCpp<pkgIndexFile*>(Self);
    char *path;
 
    if (PyArg_ParseTuple(Args, "s",&path) == 0)
       return 0;
-
    return HandleErrors(Safe_FromString(File->ArchiveURI(path).c_str()));
 }
 
-static PyMethodDef PackageIndexFileMethods[] =
+static PyMethodDef IndexFileMethods[] =
 {
-   {"ArchiveURI",PackageIndexFileArchiveURI,METH_VARARGS,"Returns the ArchiveURI"},
+   {"archive_uri",IndexFileArchiveURI,METH_VARARGS,"Returns the ArchiveURI"},
    {}
 };
 
-
-static PyObject *PackageIndexFileAttr(PyObject *Self,char *Name)
-{
-   pkgIndexFile *File = GetCpp<pkgIndexFile*>(Self);
-   if (strcmp("Label",Name) == 0)
-      return Safe_FromString(File->GetType()->Label);
-   else if (strcmp("Describe",Name) == 0)
-      return Safe_FromString(File->Describe().c_str());
-   else if (strcmp("Exists",Name) == 0)
-      return Py_BuildValue("i",(File->Exists()));
-   else if (strcmp("HasPackages",Name) == 0)
-      return Py_BuildValue("i",(File->HasPackages()));
-   else if (strcmp("Size",Name) == 0)
-      return Py_BuildValue("i",(File->Size()));
-   else if (strcmp("IsTrusted",Name) == 0)
-      return Py_BuildValue("i",(File->IsTrusted()));
-
-   return Py_FindMethod(PackageIndexFileMethods,Self,Name);
+#define File (GetCpp<pkgIndexFile*>(Self))
+static PyObject *IndexFileGetLabel(PyObject *Self,void*) {
+   return Safe_FromString(File->GetType()->Label);
+}
+static PyObject *IndexFileGetDescribe(PyObject *Self,void*) {
+   return Safe_FromString(File->Describe().c_str());
 }
+static PyObject *IndexFileGetExists(PyObject *Self,void*) {
+   return Py_BuildValue("i",(File->Exists()));
+}
+static PyObject *IndexFileGetHasPackages(PyObject *Self,void*) {
+   return Py_BuildValue("i",(File->HasPackages()));
+}
+static PyObject *IndexFileGetSize(PyObject *Self,void*) {
+   return Py_BuildValue("i",(File->Size()));
+}
+static PyObject *IndexFileGetIsTrusted(PyObject *Self,void*) {
+   return Py_BuildValue("i",(File->IsTrusted()));
+}
+#undef File
 
-static PyObject *PackageIndexFileRepr(PyObject *Self)
+#define S(x) (x ? x : "")
+static PyObject *IndexFileRepr(PyObject *Self)
 {
    pkgIndexFile *File = GetCpp<pkgIndexFile*>(Self);
-
-   char S[1024];
-   snprintf(S,sizeof(S),"<pkIndexFile object: "
+   return PyString_FromFormat("<pkIndexFile object: "
 			"Label:'%s' Describe='%s' Exists='%i' "
-	                "HasPackages='%i' Size='%i'  "
+	                "HasPackages='%i' Size='%lu'  "
  	                "IsTrusted='%i' ArchiveURI='%s'>",
-	    File->GetType()->Label,  File->Describe().c_str(), File->Exists(),
+	    S(File->GetType()->Label),  File->Describe().c_str(), File->Exists(),
 	    File->HasPackages(), File->Size(),
             File->IsTrusted(), File->ArchiveURI("").c_str());
-   return PyString_FromString(S);
 }
+#undef S
+
+static PyGetSetDef IndexFileGetSet[] = {
+    {"describe",IndexFileGetDescribe},
+    {"exists",IndexFileGetExists},
+    {"has_packages",IndexFileGetHasPackages},
+    {"is_trusted",IndexFileGetIsTrusted},
+    {"label",IndexFileGetLabel},
+    {"size",IndexFileGetSize},
+    {}
+};
 
-PyTypeObject PackageIndexFileType =
+PyTypeObject PyIndexFile_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgIndexFile",         // tp_name
-   sizeof(CppOwnedPyObject<pkgIndexFile*>),   // tp_basicsize
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.IndexFile",          // tp_name
+   sizeof(CppPyObject<pkgIndexFile*>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<pkgIndexFile*>,          // tp_dealloc
+   // Not ..Ptr, because the pointer is managed somewhere else.
+   CppDeallocPtr<pkgIndexFile*>,   // tp_dealloc
    0,                                   // tp_print
-   PackageIndexFileAttr,                     // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
-   PackageIndexFileRepr,                     // tp_repr
+   IndexFileRepr,                // tp_repr
    0,                                   // tp_as_number
-   0,		                        // tp_as_sequence
-   0,			                // tp_as_mapping
+   0,                                   // tp_as_sequence
+   0,                                   // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, // tp_flags
+   "IndexFile Object",               // tp_doc
+   CppTraverse<pkgIndexFile*>,     // tp_traverse
+   CppClear<pkgIndexFile*>,        // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   IndexFileMethods,             // tp_methods
+   0,                                   // tp_members
+   IndexFileGetSet,              // tp_getset
 };
 
 
diff --git a/python/indexrecords.cc b/python/indexrecords.cc
new file mode 100644
index 00000000..80960160
--- /dev/null
+++ b/python/indexrecords.cc
@@ -0,0 +1,127 @@
+/*
+ * indexrecords.cc - Wrapper around indexRecords
+ *
+ * Copyright 2009 Julian Andres Klode <jak@debian.org>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+#include <Python.h>
+#include "apt_pkgmodule.h"
+#include "generic.h"
+#include <apt-pkg/indexrecords.h>
+
+static PyObject *indexrecords_new(PyTypeObject *type,PyObject *Args,
+                                  PyObject *kwds)
+{
+    char * kwlist[] = {NULL};
+    if (PyArg_ParseTupleAndKeywords(Args, kwds, "", kwlist) == 0)
+        return 0;
+    indexRecords *records = new indexRecords();
+    CppPyObject<indexRecords*> *New = CppPyObject_NEW<indexRecords*>(NULL, type,
+                                      records);
+    return New;
+}
+
+static PyObject *indexrecords_load(PyObject *self,PyObject *args)
+{
+    const char *filename;
+    if (PyArg_ParseTuple(args, "s", &filename) == 0)
+        return 0;
+    indexRecords *records = GetCpp<indexRecords*>(self);
+    return HandleErrors(Py_BuildValue("i", records->Load(filename)));
+}
+
+static char *indexrecords_lookup_doc = "lookup(metakey)\n\n"
+    "Lookup the filename given by metakey, return a tuple (hash, size).\n"
+    "The hash part is a HashString() object.";
+static PyObject *indexrecords_lookup(PyObject *self,PyObject *args)
+{
+    const char *keyname;
+    if (PyArg_ParseTuple(args, "s", &keyname) == 0)
+        return 0;
+    indexRecords *records = GetCpp<indexRecords*>(self);
+    const indexRecords::checkSum *result = records->Lookup(keyname);
+    if (result == 0) {
+        PyErr_SetString(PyExc_KeyError,keyname);
+        return 0;
+    }
+    // Copy the HashString(), to prevent crashes and to not require the
+    // indexRecords object to exist.
+    PyObject *py_hash = PyHashString_FromCpp(new HashString(result->Hash), true, NULL);
+    PyObject *value = Py_BuildValue("(Oi)",py_hash,result->Size);
+    Py_DECREF(py_hash);
+    return value;
+}
+
+static PyObject *indexrecords_get_dist(PyObject *self)
+{
+    indexRecords *records = GetCpp<indexRecords*>(self);
+    return HandleErrors(PyString_FromString(records->GetDist().c_str()));
+}
+
+static PyMethodDef indexrecords_methods[] = {
+    {"load",indexrecords_load,METH_VARARGS,
+     "load(filename: str)\n\nLoad the file given by filename."},
+    {"get_dist",(PyCFunction)indexrecords_get_dist,METH_NOARGS,
+     "get_dist() -> str\n\nReturn a distribution set in the release file."},
+    {"lookup",indexrecords_lookup,METH_VARARGS,indexrecords_lookup_doc},
+    {}
+};
+
+static char *indexrecords_doc = "IndexRecords()\n\n"
+    "Representation of a release file.";
+PyTypeObject PyIndexRecords_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.IndexRecords",              // tp_name
+    sizeof(CppPyObject<indexRecords*>),  // tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    CppDeallocPtr<indexRecords*>,        // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    0,                                   // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                   // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    (Py_TPFLAGS_DEFAULT |                // tp_flags
+     Py_TPFLAGS_BASETYPE),
+    indexrecords_doc,                    // tp_doc
+    0,                                   // tp_traverse
+    0,                                   // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    indexrecords_methods,                // tp_methods
+    0,                                   // tp_members
+    0,                                   // tp_getset
+    0,                                   // tp_base
+    0,                                   // tp_dict
+    0,                                   // tp_descr_get
+    0,                                   // tp_descr_set
+    0,                                   // tp_dictoffset
+    0,                                   // tp_init
+    0,                                   // tp_alloc
+    indexrecords_new,                    // tp_new
+};
diff --git a/python/lock.cc b/python/lock.cc
new file mode 100644
index 00000000..fc78c0cb
--- /dev/null
+++ b/python/lock.cc
@@ -0,0 +1,265 @@
+/*
+ * lock.cc - Context managers for implementing locking.
+ *
+ * Copyright 2009 Julian Andres Klode <jak@debian.org>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+#include <Python.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/error.h>
+#include "generic.h"
+
+static PyObject *systemlock_exit(PyObject *self, PyObject *args)
+{
+
+    PyObject *exc_type = 0;
+    PyObject *exc_value = 0;
+    PyObject *traceback = 0;
+    if (!PyArg_UnpackTuple(args, "__exit__", 3, 3, &exc_type, &exc_value,
+                           &traceback)) {
+        return 0;
+    }
+
+    if (_system->UnLock() == 0) {
+        // The unlock failed. If no exception happened within the suite, we
+        // will raise an error here. Otherwise, we just display the error, so
+        // Python can handle the original exception instead.
+        HandleErrors();
+        if (exc_type == Py_None)
+            return NULL;
+        else
+            PyErr_WriteUnraisable(self);
+    }
+    // Return False, as required by the context manager protocol.
+    Py_RETURN_FALSE;
+}
+
+static PyObject *systemlock_enter(PyObject *self, PyObject *args)
+{
+    if (!PyArg_ParseTuple(args, ""))
+        return NULL;
+    if (!_system->Lock())
+        return HandleErrors();
+    Py_INCREF(self);
+    return self;
+}
+
+static PyObject *systemlock_new(PyTypeObject *type, PyObject *args,
+                                PyObject *kwds)
+{
+    if (_system == 0) {
+        PyErr_SetString(PyExc_ValueError,"_system not initialized");
+        return 0;
+    }
+    return PyType_GenericNew(type,args,kwds);
+}
+
+static PyMethodDef systemlock_methods[] = {
+    {"__enter__",systemlock_enter,METH_VARARGS,"Lock the system."},
+    {"__exit__",systemlock_exit,METH_VARARGS,"Unlock the system."},
+    {NULL}
+};
+
+static char *systemlock_doc = "SystemLock()\n\n"
+    "Context manager for locking the package system. The lock is established\n"
+    "as soon as the method __enter__() is called. It is released when\n"
+    "__exit__() is called.\n\n"
+    "This should be used via the 'with' statement, e.g.::\n\n"
+    "   with apt_pkg.SystemLock():\n"
+    "       ...\n\n"
+    "Once the block is left, the lock is released automatically. The object\n"
+    "can be used multiple times::\n\n"
+    "   lock = apt_pkg.SystemLock()\n"
+    "   with lock:\n"
+    "       ...\n"
+    "   with lock:\n"
+    "       ...\n\n";
+
+PyTypeObject PySystemLock_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.SystemLock",                // tp_name
+    0,                                   // tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    0,                                   // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    0,                                   // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                   // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    (Py_TPFLAGS_DEFAULT |                // tp_flags
+     Py_TPFLAGS_BASETYPE),
+    systemlock_doc,                      // tp_doc
+    0,                                   // tp_traverse
+    0,                                   // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    systemlock_methods,                  // tp_methods
+    0,                                   // tp_members
+    0,                                   // tp_getset
+    0,                                   // tp_base
+    0,                                   // tp_dict
+    0,                                   // tp_descr_get
+    0,                                   // tp_descr_set
+    0,                                   // tp_dictoffset
+    0,                                   // tp_init
+    0,                                   // tp_alloc
+    systemlock_new,                      // tp_new
+};
+
+
+/**
+ * File Based locking.
+ *
+ * The counter is increased by every call to filelock_enter() and decreased by
+ * every call to filelock_exit(). When the counter reaches 0, the underlying
+ * file descriptor is closed.
+ *
+ * Members:
+ * @member char* filename   The name of the file
+ * @member int   lock_count How many times we have locked it.
+ * @member int   fd         The filedescriptor returned by GetLock() or 0.
+ */
+struct filelock_object {
+    PyObject_HEAD
+    char *filename;
+    int lock_count;
+    int fd;
+};
+
+static PyObject *filelock_enter(filelock_object *self, PyObject *args)
+{
+    self->lock_count++;
+    // If we have no lock yet, get a lock.
+    if (self->lock_count == 1) {
+        self->fd = GetLock(self->filename, true);
+        if (self->fd == -1) {
+            self->lock_count--;
+            return HandleErrors();
+        }
+    }
+    Py_INCREF(self);
+    return (PyObject *)self;
+}
+
+static PyObject *filelock_exit(filelock_object *self, PyObject *args)
+{
+    // Count down the lock_count, if it is less than 0, reset it to 0.
+    self->lock_count--;
+    if (self->lock_count < 0)
+        self->lock_count = 0;
+    if (self->lock_count == 0 && self->fd != 0 && close(self->fd) == -1) {
+        return PyErr_SetFromErrno(PyExc_OSError);
+    }
+    Py_RETURN_FALSE;
+}
+
+static PyObject *filelock_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    char *filename = 0;
+    char *kwlist[] = {"filename",  NULL};
+    if (PyArg_ParseTupleAndKeywords(args, kwds, "s:__init__", kwlist,
+                                    &filename) == 0) {
+        return NULL;
+    }
+    filelock_object *self = (filelock_object *)type->tp_alloc(type, 0);
+    // Copy the string into the object.
+    self->filename = new char[strlen(filename) + 1];
+    strcpy(self->filename, filename);
+    return (PyObject *)self;
+}
+
+static void filelock_dealloc(filelock_object *self)
+{
+    delete[] self->filename;
+    ((PyObject*)self)->ob_type->tp_free(self);
+}
+
+static PyMethodDef filelock_methods[] = {
+    {"__enter__",(PyCFunction)filelock_enter,METH_VARARGS,"Lock the system."},
+    {"__exit__",(PyCFunction)filelock_exit,METH_VARARGS,"Unlock the system."},
+    {NULL}
+};
+
+static char *filelock_doc = "SystemLock(filename: str)\n\n"
+    "Context manager for locking using a file. The lock is established\n"
+    "as soon as the method __enter__() is called. It is released when\n"
+    "__exit__() is called.\n\n"
+    "This should be used via the 'with' statement, e.g.::\n\n"
+    "   with apt_pkg.FileLock(filename):\n"
+    "       ...\n\n"
+    "Once the block is left, the lock is released automatically. The object\n"
+    "can be used multiple times::\n\n"
+    "   lock = apt_pkg.FileLock(filename)\n"
+    "   with lock:\n"
+    "       ...\n"
+    "   with lock:\n"
+    "       ...\n\n";
+
+PyTypeObject PyFileLock_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.FileLock",                  // tp_name
+    sizeof(filelock_object),            // tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    destructor(filelock_dealloc),        // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    0,                                   // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                   // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    (Py_TPFLAGS_DEFAULT |                // tp_flags
+     Py_TPFLAGS_BASETYPE),
+    filelock_doc,                        // tp_doc
+    0,                                   // tp_traverse
+    0,                                   // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    filelock_methods,                    // tp_methods
+    0,                                   // tp_members
+    0,                                   // tp_getset
+    0,                                   // tp_base
+    0,                                   // tp_dict
+    0,                                   // tp_descr_get
+    0,                                   // tp_descr_set
+    0,                                   // tp_dictoffset
+    0,                                   // tp_init
+    0,                                   // tp_alloc
+    filelock_new,                        // tp_new
+};
diff --git a/python/makefile b/python/makefile
deleted file mode 100644
index 3e6458f4..00000000
--- a/python/makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- make -*-
-BASE=..
-SUBDIR=python
-
-# Bring in the default rules
-include ../buildlib/defaults.mak
-
-# The apt_pkg module
-MODULE=apt_pkg
-SLIBS = -lapt-pkg
-LIB_MAKES = apt-pkg/makefile
-APT_PKG_SRC = apt_pkgmodule.cc configuration.cc generic.cc tag.cc string.cc \
-              cache.cc pkgrecords.cc pkgsrcrecords.cc sourcelist.cc \
-	      depcache.cc progress.cc cdrom.cc acquire.cc pkgmanager.cc \
-	      indexfile.cc metaindex.cc
-SOURCE := $(APT_PKG_SRC)
-include $(PYTHON_H) progress.h
-
-# The apt_int module..
-MODULE=apt_inst
-SLIBS = -lapt-inst -lapt-pkg
-LIB_MAKES = apt-inst/makefile
-APT_INST_SRC = apt_instmodule.cc tar.cc generic.cc
-SOURCE := $(APT_INST_SRC)
-include $(PYTHON_H)
-
diff --git a/python/metaindex.cc b/python/metaindex.cc
index efbc38af..2dcade7d 100644
--- a/python/metaindex.cc
+++ b/python/metaindex.cc
@@ -1,13 +1,13 @@
 // -*- mode: cpp; mode: fold -*-
-// Description								/*{{{*/
+// Description                                /*{{{*/
 // $Id: metaindex.cc,v 1.2 2003/12/26 17:04:22 mdz Exp $
 /* ######################################################################
 
    metaindex - Wrapper for the metaIndex functions
 
    ##################################################################### */
-									/*}}}*/
-// Include Files							/*{{{*/
+                                    /*}}}*/
+// Include Files                            /*{{{*/
 #include "generic.h"
 #include "apt_pkgmodule.h"
 
@@ -15,67 +15,88 @@
 
 #include <Python.h>
 
+static PyObject *MetaIndexGetURI(PyObject *Self,void*) {
+    metaIndex *meta = GetCpp<metaIndex*>(Self);
+    return Safe_FromString(meta->GetURI().c_str());
+}
 
-static PyObject *MetaIndexAttr(PyObject *Self,char *Name)
-{
-   metaIndex *meta = GetCpp<metaIndex*>(Self);
-   if (strcmp("URI",Name) == 0)
-      return Safe_FromString(meta->GetURI().c_str());
-   else if (strcmp("Dist",Name) == 0)
-      return Safe_FromString(meta->GetDist().c_str());
-   else if (strcmp("IsTrusted",Name) == 0)
-      return Py_BuildValue("i",(meta->IsTrusted()));
-   else if (strcmp("IndexFiles",Name) == 0)
-   {
-      PyObject *List = PyList_New(0);
-      vector<pkgIndexFile *> *indexFiles = meta->GetIndexFiles();
-      for (vector<pkgIndexFile *>::const_iterator I = indexFiles->begin();
-	   I != indexFiles->end(); I++)
-      {
-	 PyObject *Obj;
-	 Obj = CppPyObject_NEW<pkgIndexFile*>(&PackageIndexFileType,*I);
-	 PyList_Append(List,Obj);
-      }
-      return List;
-   }
+static PyObject *MetaIndexGetDist(PyObject *Self,void*) {
+    metaIndex *meta = GetCpp<metaIndex*>(Self);
+    return Safe_FromString(meta->GetDist().c_str());
+}
 
-   PyErr_SetString(PyExc_AttributeError,Name);
-   return 0;
+static PyObject *MetaIndexGetIsTrusted(PyObject *Self,void*) {
+    metaIndex *meta = GetCpp<metaIndex*>(Self);
+    return Py_BuildValue("i",(meta->IsTrusted()));
 }
 
-static PyObject *MetaIndexRepr(PyObject *Self)
-{
-   metaIndex *meta = GetCpp<metaIndex*>(Self);
+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();
+        I != indexFiles->end(); I++)
+    {
+        CppPyObject<pkgIndexFile*> *Obj;
+        Obj = CppPyObject_NEW<pkgIndexFile*>(Self, &PyIndexFile_Type,*I);
+        // Do not delete pkgIndexFile*, they are managed by metaIndex.
+        Obj->NoDelete = true;
+        PyList_Append(List,Obj);
+        Py_DECREF(Obj);
+    }
+    return List;
+}
 
-   char S[1024];
-   snprintf(S,sizeof(S),"<metaIndex object: "
-	                "Type='%s', URI:'%s' Dist='%s' IsTrusted='%i'>",
-	    meta->GetType(),  meta->GetURI().c_str(), meta->GetDist().c_str(),
-            meta->IsTrusted());
+static PyGetSetDef MetaIndexGetSet[] = {
+   {"dist",MetaIndexGetDist},
+   {"index_files",MetaIndexGetIndexFiles},
+   {"is_trusted",MetaIndexGetIsTrusted},
+   {"uri",MetaIndexGetURI},
+   {}
+};
 
-   return PyString_FromString(S);
+#define S(x) (x ? x : "")
+static PyObject *MetaIndexRepr(PyObject *Self)
+{
+    metaIndex *meta = GetCpp<metaIndex*>(Self);
+    return PyString_FromFormat("<%s object: type='%s', uri:'%s' dist='%s' "
+                               "is_trusted='%i'>", Self->ob_type->tp_name,
+                               S(meta->GetType()),  meta->GetURI().c_str(),
+                               meta->GetDist().c_str(), meta->IsTrusted());
 }
+#undef S
 
-PyTypeObject MetaIndexType =
+PyTypeObject PyMetaIndex_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "metaIndex",         // tp_name
-   sizeof(CppOwnedPyObject<metaIndex*>),   // tp_basicsize
-   0,                                   // tp_itemsize
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.MetaIndex",                    // tp_name
+   sizeof(CppPyObject<metaIndex*>),   // tp_basicsize
+   0,                                      // tp_itemsize
    // Methods
-   CppOwnedDealloc<metaIndex*>,          // tp_dealloc
-   0,                                   // tp_print
-   MetaIndexAttr,                     // tp_getattr
-   0,                                   // tp_setattr
-   0,                                   // tp_compare
-   MetaIndexRepr,                     // tp_repr
-   0,                                   // tp_as_number
-   0,		                        // tp_as_sequence
-   0,			                // tp_as_mapping
-   0,                                   // tp_hash
+   CppDeallocPtr<metaIndex*>,         // tp_dealloc
+   0,                                      // tp_print
+   0,                                      // tp_getattr
+   0,                                      // tp_setattr
+   0,                                      // tp_compare
+   MetaIndexRepr,                          // tp_repr
+   0,                                      // tp_as_number
+   0,                                      // tp_as_sequence
+   0,                                      // tp_as_mapping
+   0,                                      // tp_hash
+   0,                                      // tp_call
+   0,                                      // tp_str
+   _PyAptObject_getattro,                  // tp_getattro
+   0,                                      // tp_setattro
+   0,                                      // tp_as_buffer
+   Py_TPFLAGS_DEFAULT,                     // tp_flags
+   "apt_pkg.MetaIndex Object",             // tp_doc
+   0,                                      // tp_traverse
+   0,                                      // tp_clear
+   0,                                      // tp_richcompare
+   0,                                      // tp_weaklistoffset
+   0,                                      // tp_iter
+   0,                                      // tp_iternext
+   0,                                      // tp_methods
+   0,                                      // tp_members
+   MetaIndexGetSet,                        // tp_getset
 };
-
-
-
-
diff --git a/python/pkgmanager.cc b/python/pkgmanager.cc
index 0eaa28cd..2fda14ee 100644
--- a/python/pkgmanager.cc
+++ b/python/pkgmanager.cc
@@ -15,8 +15,37 @@
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/configuration.h>
+
 #include <iostream>
 
+static PyObject *PkgManagerNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
+{
+   PyObject *Owner;
+   char *kwlist[] = {"depcache",0};
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PyDepCache_Type,
+                                   &Owner) == 0)
+      return 0;
+
+   pkgPackageManager *pm = _system->CreatePM(GetCpp<pkgDepCache*>(Owner));
+
+   CppPyObject<pkgPackageManager*> *PkgManagerObj =
+	   CppPyObject_NEW<pkgPackageManager*>(NULL, type,pm);
+
+   return PkgManagerObj;
+}
+
+#ifdef COMPAT_0_7
+PyObject *GetPkgManager(PyObject *Self,PyObject *Args)
+{
+    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPackageManager() is "
+                 "deprecated. Please see apt_pkg.PackageManager() for the "
+                 "replacement.", 1);
+    return PkgManagerNew(&PyPackageManager_Type,Args,0);
+}
+#endif
+
 
 static PyObject *PkgManagerGetArchives(PyObject *Self,PyObject *Args)
 {
@@ -24,9 +53,9 @@ static PyObject *PkgManagerGetArchives(PyObject *Self,PyObject *Args)
    PyObject *fetcher, *list, *recs;
 
    if (PyArg_ParseTuple(Args, "O!O!O!",
-			&PkgAcquireType,&fetcher,
-			&PkgSourceListType, &list,
-			&PkgRecordsType, &recs) == 0)
+			&PyAcquire_Type,&fetcher,
+			&PySourceList_Type, &list,
+			&PyPackageRecords_Type, &recs) == 0)
       return 0;
 
    pkgAcquire *s_fetcher = GetCpp<pkgAcquire*>(fetcher);
@@ -68,68 +97,57 @@ static PyObject *PkgManagerFixMissing(PyObject *Self,PyObject *Args)
 
 static PyMethodDef PkgManagerMethods[] =
 {
-   {"GetArchives",PkgManagerGetArchives,METH_VARARGS,"Load the selected archives into the fetcher"},
-   {"DoInstall",PkgManagerDoInstall,METH_VARARGS,"Do the actual install"},
-   {"FixMissing",PkgManagerFixMissing,METH_VARARGS,"Fix the install if a pkg couldn't be downloaded"},
+   {"get_archives",PkgManagerGetArchives,METH_VARARGS,"Load the selected archives into the fetcher"},
+   {"do_install",PkgManagerDoInstall,METH_VARARGS,"Do the actual install"},
+   {"fix_missing",PkgManagerFixMissing,METH_VARARGS,"Fix the install if a pkg couldn't be downloaded"},
    {}
 };
 
 
-static PyObject *PkgManagerAttr(PyObject *Self,char *Name)
-{
-   //PkgManagerStruct &Struct = GetCpp<PkgManagerStruct>(Self);
-   pkgPackageManager *pm = GetCpp<pkgPackageManager*>(Self);
-
-   // some constants
-   if(strcmp("ResultCompleted",Name) == 0)
-      return Py_BuildValue("i", pkgPackageManager::Completed);
-   if(strcmp("ResultFailed",Name) == 0)
-      return Py_BuildValue("i", pkgPackageManager::Failed);
-   if(strcmp("ResultIncomplete",Name) == 0)
-      return Py_BuildValue("i", pkgPackageManager::Incomplete);
-
-   return Py_FindMethod(PkgManagerMethods,Self,Name);
-}
-
-
-PyTypeObject PkgManagerType =
+PyTypeObject PyPackageManager_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "PackageManager",                          // tp_name
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.PackageManager",           // tp_name
    sizeof(CppPyObject<pkgPackageManager*>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppDealloc<pkgPackageManager*>,        // tp_dealloc
+   CppDeallocPtr<pkgPackageManager*>,   // tp_dealloc
    0,                                   // tp_print
-   PkgManagerAttr,                           // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    0,                                   // tp_repr
    0,                                   // tp_as_number
    0,                                   // tp_as_sequence
-   0,	                                // tp_as_mapping
+   0,                                   // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   (Py_TPFLAGS_DEFAULT |                // tp_flags
+    Py_TPFLAGS_BASETYPE),
+   "PackageManager Object",             // tp_doc
+   0,                                   // tp_traverse
+   0,                                   // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   PkgManagerMethods,                   // tp_methods
+   0,                                   // tp_members
+   0,                                   // tp_getset
+   0,                                   // tp_base
+   0,                                   // tp_dict
+   0,                                   // tp_descr_get
+   0,                                   // tp_descr_set
+   0,                                   // tp_dictoffset
+   0,                                   // tp_init
+   0,                                   // tp_alloc
+   PkgManagerNew,                         // tp_new
 };
 
-#include <apt-pkg/init.h>
-#include <apt-pkg/configuration.h>
-
-PyObject *GetPkgManager(PyObject *Self,PyObject *Args)
-{
-   PyObject *Owner;
-   if (PyArg_ParseTuple(Args,"O!",&PkgDepCacheType,&Owner) == 0)
-      return 0;
-
-   pkgPackageManager *pm = _system->CreatePM(GetCpp<pkgDepCache*>(Owner));
-
-   CppPyObject<pkgPackageManager*> *PkgManagerObj =
-	   CppPyObject_NEW<pkgPackageManager*>(&PkgManagerType,pm);
-
-   return PkgManagerObj;
-}
-
-
 
 
 									/*}}}*/
diff --git a/python/pkgrecords.cc b/python/pkgrecords.cc
index 5359ee6f..0e00edcd 100644
--- a/python/pkgrecords.cc
+++ b/python/pkgrecords.cc
@@ -27,7 +27,7 @@ static PyObject *PkgRecordsLookup(PyObject *Self,PyObject *Args)
 
    PyObject *PkgFObj;
    long int Index;
-   if (PyArg_ParseTuple(Args,"(O!l)",&PackageFileType,&PkgFObj,&Index) == 0)
+   if (PyArg_ParseTuple(Args,"(O!l)",&PyPackageFile_Type,&PkgFObj,&Index) == 0)
       return 0;
 
    // Get the index and check to make sure it is reasonable
@@ -49,59 +49,111 @@ static PyObject *PkgRecordsLookup(PyObject *Self,PyObject *Args)
 
 static PyMethodDef PkgRecordsMethods[] =
 {
-   {"Lookup",PkgRecordsLookup,METH_VARARGS,"Changes to a new package"},
+   {"lookup",PkgRecordsLookup,METH_VARARGS,"Changes to a new package"},
    {}
 };
 
-static PyObject *PkgRecordsAttr(PyObject *Self,char *Name)
-{
+/**
+ * Get the PkgSrcRecordsStruct from a PyObject. If no package has been looked
+ * up, set an AttributeError using the given name.
+ */
+static inline PkgRecordsStruct &GetStruct(PyObject *Self,char *name) {
    PkgRecordsStruct &Struct = GetCpp<PkgRecordsStruct>(Self);
+   if (Struct.Last == 0)
+      PyErr_SetString(PyExc_AttributeError,name);
+   return Struct;
+}
 
-   if (Struct.Last != 0)
-   {
-      if (strcmp("FileName",Name) == 0)
-	 return CppPyString(Struct.Last->FileName());
-      else if (strcmp("MD5Hash",Name) == 0)
-	 return CppPyString(Struct.Last->MD5Hash());
-      else if (strcmp("SHA1Hash",Name) == 0)
-	 return CppPyString(Struct.Last->SHA1Hash());
-      else if (strcmp("SHA256Hash",Name) == 0)
-	 return CppPyString(Struct.Last->SHA256Hash());
-      else if (strcmp("SourcePkg",Name) == 0)
-	 return CppPyString(Struct.Last->SourcePkg());
-      else if (strcmp("SourceVer",Name) == 0)
-	 return CppPyString(Struct.Last->SourceVer());
-      else if (strcmp("Maintainer",Name) == 0)
-	 return CppPyString(Struct.Last->Maintainer());
-      else if (strcmp("ShortDesc",Name) == 0)
-	 return CppPyString(Struct.Last->ShortDesc());
-      else if (strcmp("LongDesc",Name) == 0)
-	 return CppPyString(Struct.Last->LongDesc());
-      else if (strcmp("Name",Name) == 0)
-	 return CppPyString(Struct.Last->Name());
-      else if (strcmp("Homepage",Name) == 0)
-	 return CppPyString(Struct.Last->Homepage());
-      else if (strcmp("Record", Name) == 0)
-      {
-	 const char *start, *stop;
-	 Struct.Last->GetRec(start, stop);
-	 return PyString_FromStringAndSize(start,stop-start);
-      }
-   }
+static PyObject *PkgRecordsGetFileName(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"FileName");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->FileName()) : 0;
+}
+static PyObject *PkgRecordsGetMD5Hash(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"MD5Hash");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->MD5Hash()) : 0;
+}
+static PyObject *PkgRecordsGetSHA1Hash(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"SHA1Hash");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->SHA1Hash()) : 0;
+}
+static PyObject *PkgRecordsGetSHA256Hash(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"SHA256Hash");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->SHA256Hash()) : 0;
+}
+static PyObject *PkgRecordsGetSourcePkg(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"SourcePkg");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->SourcePkg()) : 0;
+}
+static PyObject *PkgRecordsGetSourceVer(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"SourceVer");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->SourceVer()) : 0;
+}
+static PyObject *PkgRecordsGetMaintainer(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"Maintainer");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->Maintainer()) : 0;
+}
+static PyObject *PkgRecordsGetShortDesc(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"ShortDesc");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->ShortDesc()) : 0;
+}
+static PyObject *PkgRecordsGetLongDesc(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"LongDesc");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->LongDesc()) : 0;
+}
+static PyObject *PkgRecordsGetName(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"Name");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->Name()) : 0;
+}
+static PyObject *PkgRecordsGetHomepage(PyObject *Self,void*) {
+   PkgRecordsStruct &Struct = GetStruct(Self,"Homepage");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->Homepage()) : 0;
+}
+static PyObject *PkgRecordsGetRecord(PyObject *Self,void*) {
+   const char *start, *stop;
+   PkgRecordsStruct &Struct = GetStruct(Self,"Record");
+   if (Struct.Last == 0)
+      return 0;
+   Struct.Last->GetRec(start, stop);
+   return PyString_FromStringAndSize(start,stop-start);
+}
+static PyGetSetDef PkgRecordsGetSet[] = {
+   {"filename",PkgRecordsGetFileName},
+   {"homepage",PkgRecordsGetHomepage},
+   {"long_desc",PkgRecordsGetLongDesc},
+   {"md5_hash",PkgRecordsGetMD5Hash},
+   {"maintainer",PkgRecordsGetMaintainer},
+   {"name",PkgRecordsGetName},
+   {"record",PkgRecordsGetRecord},
+   {"sha1_hash",PkgRecordsGetSHA1Hash},
+   {"sha256_hash",PkgRecordsGetSHA256Hash},
+   {"short_desc",PkgRecordsGetShortDesc},
+   {"source_pkg",PkgRecordsGetSourcePkg},
+   {"source_ver",PkgRecordsGetSourceVer},
+   {}
+};
+
+static PyObject *PkgRecordsNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
+{
+   PyObject *Owner;
+   char *kwlist[] = {"cache",0};
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O!",kwlist,&PyCache_Type,
+                                   &Owner) == 0)
+      return 0;
 
-   return Py_FindMethod(PkgRecordsMethods,Self,Name);
+   return HandleErrors(CppPyObject_NEW<PkgRecordsStruct>(Owner,type,
+							      GetCpp<pkgCache *>(Owner)));
 }
-PyTypeObject PkgRecordsType =
+
+PyTypeObject PyPackageRecords_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgRecords",                          // tp_name
-   sizeof(CppOwnedPyObject<PkgRecordsStruct>),   // tp_basicsize
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.PackageRecords",                          // tp_name
+   sizeof(CppPyObject<PkgRecordsStruct>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppOwnedDealloc<PkgRecordsStruct>,   // tp_dealloc
+   CppDealloc<PkgRecordsStruct>,   // tp_dealloc
    0,                                   // tp_print
-   PkgRecordsAttr,                      // tp_getattr
+   0,                                    // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    0,                                   // tp_repr
@@ -109,17 +161,43 @@ PyTypeObject PkgRecordsType =
    0,                                   // tp_as_sequence
    0,                                   // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   (Py_TPFLAGS_DEFAULT |                // tp_flags
+    Py_TPFLAGS_BASETYPE |
+    Py_TPFLAGS_HAVE_GC),
+   "Records Object",                    // tp_doc
+   CppTraverse<PkgRecordsStruct>,  // tp_traverse
+   CppClear<PkgRecordsStruct>,     // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   PkgRecordsMethods,                   // tp_methods
+   0,                                   // tp_members
+   PkgRecordsGetSet,                    // tp_getset
+   0,                                   // tp_base
+   0,                                   // tp_dict
+   0,                                   // tp_descr_get
+   0,                                   // tp_descr_set
+   0,                                   // tp_dictoffset
+   0,                                   // tp_init
+   0,                                   // tp_alloc
+   PkgRecordsNew,                       // tp_new
 };
 
 									/*}}}*/
 
+
+#ifdef COMPAT_0_7
 PyObject *GetPkgRecords(PyObject *Self,PyObject *Args)
 {
-   PyObject *Owner;
-   if (PyArg_ParseTuple(Args,"O!",&PkgCacheType,&Owner) == 0)
-      return 0;
-
-   return HandleErrors(CppOwnedPyObject_NEW<PkgRecordsStruct>(Owner,&PkgRecordsType,
-							      GetCpp<pkgCache *>(Owner)));
+    PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgRecords() is "
+                 "deprecated. Please see apt_pkg.Records() for the "
+                 "replacement.", 1);
+    return PkgRecordsNew(&PyPackageRecords_Type,Args,0);
 }
-
+#endif
diff --git a/python/pkgsrcrecords.cc b/python/pkgsrcrecords.cc
index 36493e7b..95f35f23 100644
--- a/python/pkgsrcrecords.cc
+++ b/python/pkgsrcrecords.cc
@@ -58,7 +58,6 @@ static PyObject *PkgSrcRecordsRestart(PyObject *Self,PyObject *Args)
 {
    PkgSrcRecordsStruct &Struct = GetCpp<PkgSrcRecordsStruct>(Self);
 
-   char *Name = 0;
    if (PyArg_ParseTuple(Args,"") == 0)
       return 0;
 
@@ -70,87 +69,190 @@ static PyObject *PkgSrcRecordsRestart(PyObject *Self,PyObject *Args)
 
 static PyMethodDef PkgSrcRecordsMethods[] =
 {
-   {"Lookup",PkgSrcRecordsLookup,METH_VARARGS,doc_PkgSrcRecordsLookup},
-   {"Restart",PkgSrcRecordsRestart,METH_VARARGS,doc_PkgSrcRecordsRestart},
+   {"lookup",PkgSrcRecordsLookup,METH_VARARGS,doc_PkgSrcRecordsLookup},
+   {"restart",PkgSrcRecordsRestart,METH_VARARGS,doc_PkgSrcRecordsRestart},
    {}
 };
 
-static PyObject *PkgSrcRecordsAttr(PyObject *Self,char *Name)
-{
+/**
+ * Get the PkgSrcRecordsStruct from a PyObject. If no package has been looked
+ * up, set an AttributeError using the given name.
+ */
+static inline PkgSrcRecordsStruct &GetStruct(PyObject *Self,char *name) {
    PkgSrcRecordsStruct &Struct = GetCpp<PkgSrcRecordsStruct>(Self);
+   if (Struct.Last == 0)
+      PyErr_SetString(PyExc_AttributeError,name);
+   return Struct;
+}
 
-   if (Struct.Last != 0)
-   {
-      if (strcmp("Package",Name) == 0)
-	 return CppPyString(Struct.Last->Package());
-      else if (strcmp("Version",Name) == 0)
-	 return CppPyString(Struct.Last->Version());
-      else if (strcmp("Maintainer",Name) == 0)
-	 return CppPyString(Struct.Last->Maintainer());
-      else if (strcmp("Section",Name) == 0)
-	 return CppPyString(Struct.Last->Section());
-      else if (strcmp("Record",Name) == 0)
-	 return CppPyString(Struct.Last->AsStr());
-      else if (strcmp("Binaries",Name) == 0) {
-         PyObject *List = PyList_New(0);
-
-         for(const char **b = Struct.Last->Binaries();
-             *b != 0;
-             ++b)
-            PyList_Append(List, CppPyString(*b));
-         return List; // todo
-      } else if (strcmp("Index",Name) == 0) {
-	 const pkgIndexFile &tmp = Struct.Last->Index();
-	 return CppOwnedPyObject_NEW<pkgIndexFile*>(Self,&PackageIndexFileType, (pkgIndexFile*)&tmp);
-      } else if (strcmp("Files",Name) == 0) {
-         PyObject *List = PyList_New(0);
-
-         vector<pkgSrcRecords::File> f;
-	 if(!Struct.Last->Files(f))
-	    return NULL; // error
-
-	 PyObject *v;
-	 for(unsigned int i=0;i<f.size();i++) {
-	    v = Py_BuildValue("(siss)",
-			      f[i].MD5Hash.c_str(),
-			      f[i].Size,
-			      f[i].Path.c_str(),
-			      f[i].Type.c_str());
-	    PyList_Append(List, v);
-	    Py_DECREF(v);
+static PyObject *PkgSrcRecordsGetPackage(PyObject *Self,void*) {
+   PkgSrcRecordsStruct &Struct = GetStruct(Self,"Package");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->Package()) : 0;
+}
+static PyObject *PkgSrcRecordsGetVersion(PyObject *Self,void*) {
+   PkgSrcRecordsStruct &Struct = GetStruct(Self,"Version");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->Version()) : 0;
+}
+static PyObject *PkgSrcRecordsGetMaintainer(PyObject *Self,void*) {
+   PkgSrcRecordsStruct &Struct = GetStruct(Self,"Maintainer");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->Maintainer()) : 0;
+}
+static PyObject *PkgSrcRecordsGetSection(PyObject *Self,void*) {
+   PkgSrcRecordsStruct &Struct = GetStruct(Self,"Section");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->Section()) : 0;
+}
+static PyObject *PkgSrcRecordsGetRecord(PyObject *Self,void*) {
+   PkgSrcRecordsStruct &Struct = GetStruct(Self,"Record");
+   return (Struct.Last != 0) ? CppPyString(Struct.Last->AsStr()) : 0;
+}
+static PyObject *PkgSrcRecordsGetBinaries(PyObject *Self,void*) {
+   PkgSrcRecordsStruct &Struct = GetStruct(Self,"Binaries");
+   if (Struct.Last == 0)
+      return 0;
+   PyObject *List = PyList_New(0);
+   for(const char **b = Struct.Last->Binaries(); *b != 0; ++b)
+      PyList_Append(List, CppPyString(*b));
+   return List; // todo
+}
+static PyObject *PkgSrcRecordsGetIndex(PyObject *Self,void*) {
+   PkgSrcRecordsStruct &Struct = GetStruct(Self,"Index");
+   if (Struct.Last == 0)
+      return 0;
+   const pkgIndexFile &tmp = Struct.Last->Index();
+   CppPyObject<pkgIndexFile*> *PyObj;
+   PyObj = CppPyObject_NEW<pkgIndexFile*>(Self,&PyIndexFile_Type,
+                                              (pkgIndexFile*)&tmp);
+   // Do not delete the pkgIndexFile*, it is managed by PkgSrcRecords::Parser.
+   PyObj->NoDelete=true;
+   return PyObj;
+}
+
+static PyObject *PkgSrcRecordsGetFiles(PyObject *Self,void*) {
+   PkgSrcRecordsStruct &Struct = GetStruct(Self,"Files");
+   if (Struct.Last == 0)
+      return 0;
+   PyObject *List = PyList_New(0);
+
+   vector<pkgSrcRecords::File> f;
+   if(!Struct.Last->Files(f))
+      return NULL; // error
+
+   PyObject *v;
+   for(unsigned int i=0;i<f.size();i++) {
+      v = Py_BuildValue("(siss)",
+			f[i].MD5Hash.c_str(),
+			f[i].Size,
+			f[i].Path.c_str(),
+			f[i].Type.c_str());
+      PyList_Append(List, v);
+      Py_DECREF(v);
+   }
+   return List;
+}
+
+static PyObject *PkgSrcRecordsGetBuildDepends(PyObject *Self,void*) {
+   PkgSrcRecordsStruct &Struct = GetStruct(Self,"BuildDepends");
+   if (Struct.Last == 0)
+      return 0;
+
+   PyObject *Dict = PyDict_New();
+   PyObject *Dep = 0;
+   PyObject *LastDep = 0;
+   PyObject *OrGroup = 0;
+   
+   vector<pkgSrcRecords::Parser::BuildDepRec> bd;
+   if(!Struct.Last->BuildDepends(bd, false /* arch-only*/))
+      return NULL; // error
+   
+   PyObject *v;
+   for(unsigned int i=0;i<bd.size();i++) {
+     
+     Dep = PyString_FromString(pkgSrcRecords::Parser::BuildDepType(bd[i].Type));
+     
+	 LastDep = PyDict_GetItem(Dict,Dep);
+	 if (LastDep == 0)
+	 {
+	    LastDep = PyList_New(0);
+	    PyDict_SetItem(Dict,Dep,LastDep);
+	    Py_DECREF(LastDep);
 	 }
-         return List;
-      } else if (strcmp("BuildDepends",Name) == 0) {
-         PyObject *List = PyList_New(0);
-
-         vector<pkgSrcRecords::Parser::BuildDepRec> bd;
-	 if(!Struct.Last->BuildDepends(bd, false /* arch-only*/))
-	    return NULL; // error
-
-	 PyObject *v;
-	 for(unsigned int i=0;i<bd.size();i++) {
-	    v = Py_BuildValue("(ssii)", bd[i].Package.c_str(),
-			      bd[i].Version.c_str(), bd[i].Op, bd[i].Type);
-	    PyList_Append(List, v);
+     Py_DECREF(Dep);
+     OrGroup = PyList_New(0);
+     PyList_Append(LastDep, OrGroup);
+     Py_DECREF(OrGroup);
+
+     // Add at least one package to the group, add more if Or is set.
+     while (1)
+     {
+	    v = Py_BuildValue("(sss)", bd[i].Package.c_str(),
+			bd[i].Version.c_str(), pkgCache::CompType(bd[i].Op));
+	    PyList_Append(OrGroup, v);
 	    Py_DECREF(v);
-	 }
-         return List;
-      }
+	    if (pkgCache::Dep::Or != (bd[i].Op & pkgCache::Dep::Or) || i == bd.size())
+	       break;
+        i++;
+     }
+      
    }
+   return Dict;
+}
+
+#ifdef COMPAT_0_7
+static PyObject *PkgSrcRecordsGetBuildDepends_old(PyObject *Self,void*) {
+   PkgSrcRecordsStruct &Struct = GetStruct(Self,"BuildDepends");
+   if (Struct.Last == 0)
+      return 0;
+   PyObject *List = PyList_New(0);
+
+   vector<pkgSrcRecords::Parser::BuildDepRec> bd;
+   if(!Struct.Last->BuildDepends(bd, false /* arch-only*/))
+      return NULL; // error
+
+   PyObject *v;
+   for(unsigned int i=0;i<bd.size();i++) {
+      v = Py_BuildValue("(ssii)", bd[i].Package.c_str(),
+			bd[i].Version.c_str(), bd[i].Op, bd[i].Type);
+      PyList_Append(List, v);
+      Py_DECREF(v);
+   }
+   return List;
+}
+#endif
+
+static PyGetSetDef PkgSrcRecordsGetSet[] = {
+   {"binaries",PkgSrcRecordsGetBinaries},
+   {"build_depends",PkgSrcRecordsGetBuildDepends},
+   {"files",PkgSrcRecordsGetFiles},
+   {"index",PkgSrcRecordsGetIndex},
+   {"maintainer",PkgSrcRecordsGetMaintainer},
+   {"package",PkgSrcRecordsGetPackage},
+   {"record",PkgSrcRecordsGetRecord},
+   {"section",PkgSrcRecordsGetSection},
+   {"version",PkgSrcRecordsGetVersion},
+#ifdef COMPAT_0_7
+   {"BuildDepends",PkgSrcRecordsGetBuildDepends_old,0,"Deprecated function and deprecated output format."},
+#endif
+   {}
+};
 
-   return Py_FindMethod(PkgSrcRecordsMethods,Self,Name);
+static PyObject *PkgSrcRecordsNew(PyTypeObject *type,PyObject *args,PyObject *kwds) {
+   char *kwlist[] = {0};
+   if (PyArg_ParseTupleAndKeywords(args,kwds,"",kwlist) == 0)
+      return 0;
+
+   return HandleErrors(CppPyObject_NEW<PkgSrcRecordsStruct>(NULL, type));
 }
-PyTypeObject PkgSrcRecordsType =
+
+PyTypeObject PySourceRecords_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgSrcRecords",                          // tp_name
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.SourceRecords",     // tp_name
    sizeof(CppPyObject<PkgSrcRecordsStruct>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
    CppDealloc<PkgSrcRecordsStruct>,   // tp_dealloc
    0,                                   // tp_print
-   PkgSrcRecordsAttr,                      // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    0,                                   // tp_repr
@@ -158,23 +260,44 @@ PyTypeObject PkgSrcRecordsType =
    0,                                   // tp_as_sequence
    0,                                   // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   (Py_TPFLAGS_DEFAULT |                // tp_flags
+    Py_TPFLAGS_BASETYPE),
+   "SourceRecords Object",              // tp_doc
+   0,                                   // tp_traverse
+   0,                                   // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   PkgSrcRecordsMethods,                   // tp_methods
+   0,                                   // tp_members
+   PkgSrcRecordsGetSet,                    // tp_getset
+   0,                                   // tp_base
+   0,                                   // tp_dict
+   0,                                   // tp_descr_get
+   0,                                   // tp_descr_set
+   0,                                   // tp_dictoffset
+   0,                                   // tp_init
+   0,                                   // tp_alloc
+   PkgSrcRecordsNew,                         // tp_new
 };
 
 									/*}}}*/
 
+#ifdef COMPAT_0_7
 PyObject *GetPkgSrcRecords(PyObject *Self,PyObject *Args)
 {
-#if 0
-   PyObject *Owner;
-   if (PyArg_ParseTuple(Args,"O!",&PkgCacheType,&Owner) == 0)
-      return 0;
-
-   return HandleErrors(CppOwnedPyObject_NEW<PkgSrcRecordsStruct>(Owner,
-			   &PkgSrcRecordsType));
-#endif
+   PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgSrcRecords() is "
+                "deprecated. Please see apt_pkg.SourceRecords() for the "
+                "replacement.", 1);
    if (PyArg_ParseTuple(Args,"") == 0)
       return 0;
 
-   return HandleErrors(CppPyObject_NEW<PkgSrcRecordsStruct>(&PkgSrcRecordsType));
+   return HandleErrors(CppPyObject_NEW<PkgSrcRecordsStruct>(NULL, &PySourceRecords_Type));
 }
-
+#endif
diff --git a/python/policy.cc b/python/policy.cc
new file mode 100644
index 00000000..3e1ec589
--- /dev/null
+++ b/python/policy.cc
@@ -0,0 +1,205 @@
+/*
+ * policy.cc - Wrapper around pkgPolicy
+ *
+ * Copyright 2009 Julian Andres Klode <jak@debian.org>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+#include <Python.h>
+#include "apt_pkgmodule.h"
+#include "generic.h"
+#include <apt-pkg/policy.h>
+
+static PyObject *policy_new(PyTypeObject *type,PyObject *Args,
+                                  PyObject *kwds) {
+    PyObject *cache;
+    char *kwlist[] = {"cache", NULL};
+    if (PyArg_ParseTupleAndKeywords(Args, kwds, "O", kwlist, &cache) == 0)
+        return 0;
+    if (!PyObject_TypeCheck(cache, &PyCache_Type)) {
+        PyErr_SetString(PyExc_TypeError,"`cache` must be a apt_pkg.Cache().");
+        return 0;
+    }
+    pkgPolicy *policy = new pkgPolicy(GetCpp<pkgCache *>(cache));
+    return CppPyObject_NEW<pkgPolicy*>(cache,&PyPolicy_Type,policy);
+}
+
+static char *policy_get_priority_doc = "get_priority(package: apt_pkg.Package)"
+    " -> int\n\n"
+    "Return the priority of the package.";
+
+PyObject *policy_get_priority(PyObject *self, PyObject *arg) {
+    pkgPolicy *policy = GetCpp<pkgPolicy *>(self);
+    if (PyObject_TypeCheck(arg, &PyPackage_Type)) {
+        pkgCache::PkgIterator pkg = GetCpp<pkgCache::PkgIterator>(arg);
+        return Py_BuildValue("i", policy->GetPriority(pkg));
+    } else {
+        PyErr_SetString(PyExc_TypeError,"Argument must be of Package().");
+        return 0;
+    }
+}
+
+static char *policy_get_candidate_ver_doc = "get_match(package: apt_pkg.Package)"
+    " -> apt_pkg.Version\n\n"
+    "Get the best package for the job.";
+
+PyObject *policy_get_candidate_ver(PyObject *self, PyObject *arg) {
+    if (PyObject_TypeCheck(arg, &PyPackage_Type)) {
+        pkgPolicy *policy = GetCpp<pkgPolicy *>(self);
+        pkgCache::PkgIterator pkg = GetCpp<pkgCache::PkgIterator>(arg);
+        pkgCache::VerIterator ver = policy->GetCandidateVer(pkg);
+        return CppPyObject_NEW<pkgCache::VerIterator>(arg,&PyVersion_Type,
+                                                           ver);
+    } else {
+        PyErr_SetString(PyExc_TypeError,"Argument must be of Package().");
+        return 0;
+    }
+}
+
+static char *policy_get_match_doc = "get_match(package: apt_pkg.Package) -> "
+    "apt_pkg.Version\n\n"
+    "Return a matching version for the given package.";
+
+static PyObject *policy_get_match(PyObject *self, PyObject *arg) {
+    if (PyObject_TypeCheck(arg, &PyPackage_Type) == 0) {
+        PyErr_SetString(PyExc_TypeError,"Argument must be of Package().");
+        return 0;
+    }
+    pkgPolicy *policy = GetCpp<pkgPolicy *>(self);
+    pkgCache::PkgIterator pkg = GetCpp<pkgCache::PkgIterator>(arg);
+    pkgCache::VerIterator ver = policy->GetMatch(pkg);
+    return CppPyObject_NEW<pkgCache::VerIterator>(arg,&PyVersion_Type,ver);
+}
+
+static char *policy_read_pinfile_doc = "read_pinfile(filename: str) -> bool\n\n"
+    "Read the pin file given by filename (e.g. '/etc/apt/preferences') and\n"
+    "add it to the policy.";
+
+static PyObject *policy_read_pinfile(PyObject *self, PyObject *arg) {
+    if (!PyString_Check(arg))
+        return 0;
+    pkgPolicy *policy = GetCpp<pkgPolicy *>(self);
+
+    return PyBool_FromLong(ReadPinFile(*policy, PyString_AsString(arg)));
+}
+
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 8)
+static char *policy_read_pindir_doc = "read_pindir(dirname: str) -> bool\n\n"
+    "Read the pin files in the given dir (e.g. '/etc/apt/preferences.d') and\n"
+    "add them to the policy.";
+
+static PyObject *policy_read_pindir(PyObject *self, PyObject *arg) {
+    if (!PyString_Check(arg))
+        return 0;
+    pkgPolicy *policy = GetCpp<pkgPolicy *>(self);
+
+    return PyBool_FromLong(ReadPinDir(*policy, PyString_AsString(arg)));
+}
+#endif
+
+static char *policy_create_pin_doc = "create_pin(type: str, pkg: str, "
+    "data: str, priority: int)\n\n"
+    "Create a pin for the policy. The parameter 'type' refers to one of the\n"
+    "following strings: 'Version', 'Release', 'Origin'. The argument 'pkg'\n"
+    "is the name of the package, the parameter 'data' refers to the value\n"
+    "e.g. unstable for type='Release' and the other possible options. \n"
+    "The parameter 'priority' gives the priority of the pin.";
+
+static PyObject *policy_create_pin(PyObject *self, PyObject *args) {
+    pkgVersionMatch::MatchType match_type;
+    const char *type, *pkg, *data;
+    signed short priority;
+    if (PyArg_ParseTuple(args, "sssh", &type, &pkg, &data, &priority) == 0)
+        return 0;
+    pkgPolicy *policy = GetCpp<pkgPolicy *>(self);
+    if (strcmp(type,"Version") == 0 || strcmp(type, "version") == 0)
+        match_type = pkgVersionMatch::Version;
+    if (strcmp(type,"Release") == 0 || strcmp(type, "release") == 0)
+        match_type = pkgVersionMatch::Release;
+    if (strcmp(type,"Origin") == 0 || strcmp(type, "origin") == 0)
+        match_type = pkgVersionMatch::Origin;
+    else
+        match_type = pkgVersionMatch::None;
+    policy->CreatePin(match_type,pkg,data,priority);
+    HandleErrors();
+    Py_RETURN_NONE;
+}
+
+static PyMethodDef policy_methods[] = {
+    {"get_priority",(PyCFunction)policy_get_priority,METH_O,
+     policy_get_priority_doc},
+    {"get_candidate_ver",(PyCFunction)policy_get_candidate_ver,METH_O,
+     policy_get_candidate_ver_doc},
+    {"read_pinfile",(PyCFunction)policy_read_pinfile,METH_O,
+     policy_read_pinfile_doc},
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 8)
+    {"read_pindir",(PyCFunction)policy_read_pindir,METH_O,
+     policy_read_pindir_doc},
+#endif
+    {"create_pin",policy_create_pin,METH_VARARGS,policy_create_pin_doc},
+    {"get_match",(PyCFunction)policy_get_match,METH_O, policy_get_match_doc},
+    {}
+};
+
+static char *policy_doc = "Policy(cache)\n\n"
+    "Representation of the policy of the Cache object given by cache. This\n"
+    "provides a superset of policy-related functionality compared to the\n"
+    "DepCache class. The DepCache can be used for most purposes, but there\n"
+    "may be some cases where a special policy class is needed.";
+
+PyTypeObject PyPolicy_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_pkg.Policy",                    // tp_name
+    sizeof(CppPyObject<pkgPolicy*>),// tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    CppDeallocPtr<pkgPolicy*>,      // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    0,                                   // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                   // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    (Py_TPFLAGS_DEFAULT |                // tp_flags
+     Py_TPFLAGS_BASETYPE |
+     Py_TPFLAGS_HAVE_GC),
+    policy_doc,                          // tp_doc
+    CppTraverse<pkgPolicy*>,        // tp_traverse
+    CppClear<pkgPolicy*>,           // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    policy_methods,                      // tp_methods
+    0,                                   // tp_members
+    0,                                   // tp_getset
+    0,                                   // tp_base
+    0,                                   // tp_dict
+    0,                                   // tp_descr_get
+    0,                                   // tp_descr_set
+    0,                                   // tp_dictoffset
+    0,                                   // tp_init
+    0,                                   // tp_alloc
+    policy_new,                    // tp_new
+};
diff --git a/python/progress.cc b/python/progress.cc
index 82967687..097f06cf 100644
--- a/python/progress.cc
+++ b/python/progress.cc
@@ -5,7 +5,7 @@
    Progress - Wrapper for the progress related functions
 
    ##################################################################### */
-
+#include <Python.h>
 #include <iostream>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -13,8 +13,32 @@
 #include <utility>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire-worker.h>
-#include "generic.h"
 #include "progress.h"
+#include "generic.h"
+#include "apt_pkgmodule.h"
+
+/**
+ * Set an attribute on an object, after creating the value with
+ * Py_BuildValue(fmt, arg). Afterwards, decrease its refcount and return
+ * whether setting the attribute was successful.
+ */
+template<class T>
+inline bool setattr(PyObject *object, const char *attr, const char *fmt, T arg)
+{
+    if (!object)
+        return false;
+    PyObject *value = Py_BuildValue(fmt, arg);
+
+    int result = PyObject_SetAttrString(object, attr, value);
+    Py_DECREF(value);
+    return result != -1;
+}
+
+inline PyObject *TUPLEIZE(PyObject *op) {
+    PyObject *ret = Py_BuildValue("(O)", op);
+    Py_DECREF(op);
+    return ret;
+}
 
 // generic
 bool PyCallbackObj::RunSimpleCallback(const char* method_name,
@@ -36,8 +60,8 @@ bool PyCallbackObj::RunSimpleCallback(const char* method_name,
       }
       return false;
    }
-   PyObject *result = PyEval_CallObject(method, arglist);
-   
+
+   PyObject *result = PyObject_CallObject(method, arglist);
    Py_XDECREF(arglist);
 
    if(result == NULL) {
@@ -61,26 +85,24 @@ bool PyCallbackObj::RunSimpleCallback(const char* method_name,
 // OpProgress interface
 void PyOpProgress::Update()
 {
-   PyObject *o;
-   o = Py_BuildValue("s", Op.c_str());
-   PyObject_SetAttrString(callbackInst, "op", o);
-   Py_XDECREF(o);
-   o = Py_BuildValue("s", SubOp.c_str());
-   PyObject_SetAttrString(callbackInst, "subOp", o);
-   Py_XDECREF(o);
-   o = Py_BuildValue("b", MajorChange);
-   PyObject_SetAttrString(callbackInst, "majorChange", o);
-   Py_XDECREF(o);
-
-   // CheckChange takes a time delta argument how often we
-   // should run update - for interactive UIs it makes sense
-   // to run ~25/sec
-   if(CheckChange(0.04))
-   {
-      PyObject *arglist = Py_BuildValue("(f)", Percent);
-      RunSimpleCallback("update", arglist);
-   }
-};
+   // Build up the argument list...
+   if(!CheckChange(0.7))
+      return;
+
+   setattr(callbackInst, "op", "s", Op.c_str());
+   setattr(callbackInst, "subop", "s", SubOp.c_str());
+   setattr(callbackInst, "major_change", "b", MajorChange);
+   setattr(callbackInst, "percent", "f", Percent);
+#ifdef COMPAT_0_7
+   setattr(callbackInst, "Op", "s", Op.c_str());
+   setattr(callbackInst, "subOp", "s", SubOp.c_str());
+   setattr(callbackInst, "majorChange", "b", MajorChange);
+   PyObject *arglist = Py_BuildValue("(f)", Percent);
+   RunSimpleCallback("update", arglist);
+#else
+   RunSimpleCallback("update");
+#endif
+}
 
 void PyOpProgress::Done()
 {
@@ -95,17 +117,32 @@ void PyOpProgress::Done()
 
 // apt interface
 
+PyObject *PyFetchProgress::GetDesc(pkgAcquire::ItemDesc *item) {
+    if (!pyAcquire && item->Owner && item->Owner->GetOwner()) {
+        pyAcquire = PyAcquire_FromCpp(item->Owner->GetOwner(), false, NULL);
+    }
+    PyObject *pyItem = PyAcquireItem_FromCpp(item->Owner, false, pyAcquire);
+    PyObject *pyDesc = PyAcquireItemDesc_FromCpp(item, false, pyItem);
+    Py_DECREF(pyItem);
+    return pyDesc;
+}
+
 bool PyFetchProgress::MediaChange(string Media, string Drive)
 {
    PyCbObj_END_ALLOW_THREADS
    //std::cout << "MediaChange" << std::endl;
    PyObject *arglist = Py_BuildValue("(ss)", Media.c_str(), Drive.c_str());
    PyObject *result;
-   RunSimpleCallback("mediaChange", arglist, &result);
+
+   if(PyObject_HasAttrString(callbackInst, "mediaChange"))
+      RunSimpleCallback("mediaChange", arglist, &result);
+   else
+      RunSimpleCallback("media_change", arglist, &result);
 
    bool res = true;
    if(!PyArg_Parse(result, "b", &res)) {
       // no return value or None, assume false
+      PyCbObj_BEGIN_ALLOW_THREADS
       return false;
    }
 
@@ -116,14 +153,12 @@ bool PyFetchProgress::MediaChange(string Media, string Drive)
 void PyFetchProgress::UpdateStatus(pkgAcquire::ItemDesc &Itm, int status)
 {
    //std::cout << "UpdateStatus: " << Itm.URI << " " << status << std::endl;
-
    // Added object file size and object partial size to
    // parameters that are passed to updateStatus.
    // -- Stephan
-   PyCbObj_END_ALLOW_THREADS
-   PyObject *arglist = Py_BuildValue("(sssikk)", Itm.URI.c_str(), 
-				     Itm.Description.c_str(), 
-				     Itm.ShortDesc.c_str(), 
+   PyObject *arglist = Py_BuildValue("(sssikk)", Itm.URI.c_str(),
+				     Itm.Description.c_str(),
+				     Itm.ShortDesc.c_str(),
 				     status,
 				     Itm.Owner->FileSize,
 				     Itm.Owner->PartialSize);
@@ -131,42 +166,72 @@ void PyFetchProgress::UpdateStatus(pkgAcquire::ItemDesc &Itm, int status)
    RunSimpleCallback("update_status_full", arglist);
 
    // legacy version of the interface
-   arglist = Py_BuildValue("(sssi)", Itm.URI.c_str(), 
-				     Itm.Description.c_str(), 
-				     Itm.ShortDesc.c_str(), 
-                                     status);
-   RunSimpleCallback("updateStatus", arglist);
-   PyCbObj_BEGIN_ALLOW_THREADS
 
+   arglist = Py_BuildValue("(sssi)", Itm.URI.c_str(), Itm.Description.c_str(),
+                           Itm.ShortDesc.c_str(), status);
+
+   if(PyObject_HasAttrString(callbackInst, "updateStatus"))
+      RunSimpleCallback("updateStatus", arglist);
+   else
+      RunSimpleCallback("update_status", arglist);
 }
 
 void PyFetchProgress::IMSHit(pkgAcquire::ItemDesc &Itm)
 {
-   UpdateStatus(Itm, DLHit);
+   PyCbObj_END_ALLOW_THREADS
+   if (PyObject_HasAttrString(callbackInst, "ims_hit"))
+       RunSimpleCallback("ims_hit", TUPLEIZE(GetDesc(&Itm)));
+   else
+       UpdateStatus(Itm, DLHit);
+   PyCbObj_BEGIN_ALLOW_THREADS
 }
 
 void PyFetchProgress::Fetch(pkgAcquire::ItemDesc &Itm)
 {
-   UpdateStatus(Itm, DLQueued);
+   PyCbObj_END_ALLOW_THREADS
+   if (PyObject_HasAttrString(callbackInst, "fetch"))
+       RunSimpleCallback("fetch", TUPLEIZE(GetDesc(&Itm)));
+   else
+       UpdateStatus(Itm, DLQueued);
+   PyCbObj_BEGIN_ALLOW_THREADS
 }
 
 void PyFetchProgress::Done(pkgAcquire::ItemDesc &Itm)
 {
-   UpdateStatus(Itm, DLDone);
+   PyCbObj_END_ALLOW_THREADS
+   if (PyObject_HasAttrString(callbackInst, "done"))
+       RunSimpleCallback("done", TUPLEIZE(GetDesc(&Itm)));
+   else
+       UpdateStatus(Itm, DLDone);
+   PyCbObj_BEGIN_ALLOW_THREADS
 }
 
 void PyFetchProgress::Fail(pkgAcquire::ItemDesc &Itm)
 {
+   PyCbObj_END_ALLOW_THREADS
+   if (PyObject_HasAttrString(callbackInst, "fail")) {
+       RunSimpleCallback("fail", TUPLEIZE(GetDesc(&Itm)));
+       PyCbObj_BEGIN_ALLOW_THREADS
+       return;
+   }
+
    // Ignore certain kinds of transient failures (bad code)
-   if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
+   if (Itm.Owner->Status == pkgAcquire::Item::StatIdle) {
+      PyCbObj_BEGIN_ALLOW_THREADS
       return;
+   }
 
    if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
    {
       UpdateStatus(Itm, DLIgnored);
    }
 
-   UpdateStatus(Itm, DLFailed);
+
+   if (PyObject_HasAttrString(callbackInst, "fail"))
+       RunSimpleCallback("fail", TUPLEIZE(GetDesc(&Itm)));
+   else
+       UpdateStatus(Itm, DLFailed);
+   PyCbObj_BEGIN_ALLOW_THREADS
 }
 
 void PyFetchProgress::Start()
@@ -174,26 +239,13 @@ void PyFetchProgress::Start()
    //std::cout << "Start" << std::endl;
    pkgAcquireStatus::Start();
 
-   // These attributes should be initialized before the first callback (start)
-   // is invoked.
-   // -- Stephan
-   PyObject *o;
-
-   o = Py_BuildValue("f", 0.0f);
-   PyObject_SetAttrString(callbackInst, "currentCPS", o);
-   Py_XDECREF(o);
-   o = Py_BuildValue("f", 0.0f);
-   PyObject_SetAttrString(callbackInst, "currentBytes", o);
-   Py_XDECREF(o);
-   o = Py_BuildValue("i", 0);
-   PyObject_SetAttrString(callbackInst, "currentItems", o);
-   Py_XDECREF(o);
-   o = Py_BuildValue("i", 0);
-   PyObject_SetAttrString(callbackInst, "totalItems", o);
-   Py_XDECREF(o);
-   o = Py_BuildValue("f", 0.0f);
-   PyObject_SetAttrString(callbackInst, "totalBytes", o);
-   Py_XDECREF(o);
+#ifdef COMPAT_0_7
+   setattr(callbackInst, "currentCPS", "d", 0);
+   setattr(callbackInst, "currentBytes", "d", 0);
+   setattr(callbackInst, "currentItems", "k", 0);
+   setattr(callbackInst, "totalItems", "k", 0);
+   setattr(callbackInst, "totalBytes", "d", 0);
+#endif
 
    RunSimpleCallback("start");
    /* After calling the start method we can safely allow
@@ -206,10 +258,11 @@ void PyFetchProgress::Start()
 void PyFetchProgress::Stop()
 {
    /* After the stop operation occured no other threads
-    * are allowed. This is done so we have a matching 
+    * are allowed. This is done so we have a matching
     * PyCbObj_END_ALLOW_THREADS to our previous
     * PyCbObj_BEGIN_ALLOW_THREADS (Python requires this!).
     */
+
    PyCbObj_END_ALLOW_THREADS
    //std::cout << "Stop" << std::endl;
    pkgAcquireStatus::Stop();
@@ -222,31 +275,51 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner)
    pkgAcquireStatus::Pulse(Owner);
 
    //std::cout << "Pulse" << std::endl;
-   if(callbackInst == 0)
+   if(callbackInst == 0) {
+      PyCbObj_BEGIN_ALLOW_THREADS
       return false;
+   }
 
-   // set stats
-   PyObject *o;
-   o = Py_BuildValue("f", CurrentCPS);
-   PyObject_SetAttrString(callbackInst, "currentCPS", o);
-   Py_XDECREF(o);
-   o = Py_BuildValue("f", CurrentBytes);
-   PyObject_SetAttrString(callbackInst, "currentBytes", o);
-   Py_XDECREF(o);
-   o = Py_BuildValue("i", CurrentItems);
-   PyObject_SetAttrString(callbackInst, "currentItems", o);
-   Py_XDECREF(o);
-   o = Py_BuildValue("i", TotalItems);
-   PyObject_SetAttrString(callbackInst, "totalItems", o);
-   Py_XDECREF(o);
-   o = Py_BuildValue("f", TotalBytes);
-   PyObject_SetAttrString(callbackInst, "totalBytes", o);
-   Py_XDECREF(o);
+   setattr(callbackInst, "last_bytes", "d", LastBytes);
+   setattr(callbackInst, "current_cps", "d", CurrentCPS);
+   setattr(callbackInst, "current_bytes", "d", CurrentBytes);
+   setattr(callbackInst, "total_bytes", "d", TotalBytes);
+   setattr(callbackInst, "fetched_bytes", "d", FetchedBytes);
+   setattr(callbackInst, "elapsed_time", "k", ElapsedTime);
+   setattr(callbackInst, "current_items", "k", CurrentItems);
+   setattr(callbackInst, "total_items", "k", TotalItems);
+
+   // New style
+   if (!PyObject_HasAttrString(callbackInst, "updateStatus")) {
+      PyObject *result1;
+      bool res1 = true;
+
+      if (pyAcquire == NULL) {
+         pyAcquire = PyAcquire_FromCpp(Owner, false, NULL);
+      }
+      Py_INCREF(pyAcquire);
 
+      if (RunSimpleCallback("pulse", TUPLEIZE(pyAcquire) , &result1)) {
+      if (result1 != NULL && PyArg_Parse(result1, "b", &res1) && res1 == false) {
+         // the user returned a explicit false here, stop
+         PyCbObj_BEGIN_ALLOW_THREADS
+         return false;
+      }
+     }
+     PyCbObj_BEGIN_ALLOW_THREADS
+     return true;
+   }
+#ifdef COMPAT_0_7
+   setattr(callbackInst, "currentCPS", "d", CurrentCPS);
+   setattr(callbackInst, "currentBytes", "d", CurrentBytes);
+   setattr(callbackInst, "totalBytes", "d", TotalBytes);
+   setattr(callbackInst, "fetchedBytes", "d", FetchedBytes);
+   setattr(callbackInst, "currentItems", "k", CurrentItems);
+   setattr(callbackInst, "totalItems", "k", TotalItems);
    // Go through the list of items and add active items to the
    // activeItems vector.
    map<pkgAcquire::Worker *, pkgAcquire::ItemDesc *> activeItemMap;
-   
+
    for(pkgAcquire::Worker *Worker = Owner->WorkersBegin();
        Worker != 0; Worker = Owner->WorkerStep(Worker)) {
 
@@ -256,7 +329,7 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner)
      }
      activeItemMap.insert(std::make_pair(Worker, Worker->CurrentItem));
    }
-   
+
    // Create the tuple that is passed as argument to pulse().
    // This tuple contains activeItemMap.size() item tuples.
    PyObject *arglist;
@@ -270,8 +343,8 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner)
      map<pkgAcquire::Worker *, pkgAcquire::ItemDesc *>::iterator iter;
      int tuplePos;
 
-     for(tuplePos = 0, iter = activeItemMap.begin(); 
-	 iter != activeItemMap.end(); ++iter, tuplePos++) {
+     for(tuplePos = 0, iter = activeItemMap.begin();
+         iter != activeItemMap.end(); ++iter, tuplePos++) {
        pkgAcquire::Worker *worker = iter->first;
        pkgAcquire::ItemDesc *itm = iter->second;
 
@@ -304,13 +377,15 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner)
    PyObject *result;
    bool res = true;
 
-   RunSimpleCallback("pulse_items", arglist, &result);
-   if (result != NULL && PyArg_Parse(result, "b", &res) && res == false) {
-      // the user returned a explicit false here, stop
-      PyCbObj_BEGIN_ALLOW_THREADS
-      return false;
+   if (RunSimpleCallback("pulse_items", arglist, &result)) {
+      if (result != NULL && PyArg_Parse(result, "b", &res) && res == false) {
+         // the user returned a explicit false here, stop
+         PyCbObj_BEGIN_ALLOW_THREADS
+         return false;
+      }
    }
 
+
    arglist = Py_BuildValue("()");
    if (!RunSimpleCallback("pulse", arglist, &result)) {
      PyCbObj_BEGIN_ALLOW_THREADS
@@ -319,7 +394,7 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner)
 
    if((result == NULL) || (!PyArg_Parse(result, "b", &res)))
    {
-      // most of the time the user who subclasses the pulse() 
+      // most of the time the user who subclasses the pulse()
       // method forgot to add a return {True,False} so we just
       // assume he wants a True
       PyCbObj_BEGIN_ALLOW_THREADS
@@ -329,6 +404,9 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner)
    PyCbObj_BEGIN_ALLOW_THREADS
    // fetching can be canceld by returning false
    return res;
+#else
+   return false;
+#endif
 }
 
 
@@ -337,26 +415,28 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner)
 
 void PyInstallProgress::StartUpdate()
 {
-   RunSimpleCallback("startUpdate");
+   if (!RunSimpleCallback("startUpdate"))
+       RunSimpleCallback("start_update");
    PyCbObj_BEGIN_ALLOW_THREADS
 }
 
 void PyInstallProgress::UpdateInterface()
 {
    PyCbObj_END_ALLOW_THREADS
-   RunSimpleCallback("updateInterface");
+   if (!RunSimpleCallback("updateInterface"))
+       RunSimpleCallback("update_interface");
    PyCbObj_BEGIN_ALLOW_THREADS
 }
 
 void PyInstallProgress::FinishUpdate()
 {
    PyCbObj_END_ALLOW_THREADS
-   RunSimpleCallback("finishUpdate");
+   if (!RunSimpleCallback("finishUpdate"))
+       RunSimpleCallback("finish_update");
 }
 
 pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm)
 {
-   void *dummy;
    pkgPackageManager::OrderResult res;
    int ret;
    pid_t child_id;
@@ -372,7 +452,7 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm)
       PyObject *method = PyObject_GetAttrString(callbackInst, "fork");
       std::cerr << "custom fork found" << std::endl;
       PyObject *arglist = Py_BuildValue("()");
-      PyObject *result = PyEval_CallObject(method, arglist);
+      PyObject *result = PyObject_CallObject(method, arglist);
       Py_DECREF(arglist);
       if (result == NULL) {
 	 std::cerr << "fork method invalid" << std::endl;
@@ -412,18 +492,23 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm)
    StartUpdate();
 
    PyCbObj_END_ALLOW_THREADS
-   if(PyObject_HasAttrString(callbackInst, "waitChild")) {
-      PyObject *method = PyObject_GetAttrString(callbackInst, "waitChild");
+   if(PyObject_HasAttrString(callbackInst, "waitChild") ||
+      PyObject_HasAttrString(callbackInst, "wait_child")) {
+      PyObject *method;
+      if (PyObject_HasAttrString(callbackInst, "waitChild"))
+          method = PyObject_GetAttrString(callbackInst, "waitChild");
+      else
+          method = PyObject_GetAttrString(callbackInst, "wait_child");
       //std::cerr << "custom waitChild found" << std::endl;
       PyObject *arglist = Py_BuildValue("(i)",child_id);
-      PyObject *result = PyEval_CallObject(method, arglist);
+      PyObject *result = PyObject_CallObject(method, arglist);
       Py_DECREF(arglist);
       if (result == NULL) {
 	 std::cerr << "waitChild method invalid" << std::endl;
 	 PyErr_Print();
+	 PyCbObj_BEGIN_ALLOW_THREADS
 	 return pkgPackageManager::Failed;
       }
-      int child_res;
       if(!PyArg_Parse(result, "i", &res) ) {
 	 std::cerr << "custom waitChild() result could not be parsed?"<< std::endl;
 	 PyCbObj_BEGIN_ALLOW_THREADS
@@ -456,11 +541,10 @@ pkgPackageManager::OrderResult PyInstallProgress::Run(pkgPackageManager *pm)
 void PyCdromProgress::Update(string text, int current)
 {
    PyObject *arglist = Py_BuildValue("(si)", text.c_str(), current);
-
-   PyObject *o = Py_BuildValue("i", totalSteps);
-   PyObject_SetAttrString(callbackInst, "totalSteps", o);
-   Py_XDECREF(o);
-
+   setattr(callbackInst, "total_steps", "i", totalSteps);
+   #ifdef COMPAT_0_7
+   setattr(callbackInst, "totalSteps", "i", totalSteps);
+   #endif
    RunSimpleCallback("update", arglist);
 }
 
@@ -468,7 +552,10 @@ bool PyCdromProgress::ChangeCdrom()
 {
    PyObject *arglist = Py_BuildValue("()");
    PyObject *result;
-   RunSimpleCallback("changeCdrom", arglist, &result);
+   if (PyObject_HasAttrString(callbackInst, "changeCdrom"))
+      RunSimpleCallback("changeCdrom", arglist, &result);
+   else
+      RunSimpleCallback("change_cdrom", arglist, &result);
 
    bool res = true;
    if(!PyArg_Parse(result, "b", &res))
@@ -481,18 +568,28 @@ bool PyCdromProgress::ChangeCdrom()
 bool PyCdromProgress::AskCdromName(string &Name)
 {
    PyObject *arglist = Py_BuildValue("()");
-   PyObject *result;
-   RunSimpleCallback("askCdromName", arglist, &result);
-
    const char *new_name;
    bool res;
-   if(!PyArg_Parse(result, "(bs)", &res, &new_name))
-      std::cerr << "AskCdromName: result could not be parsed" << std::endl;
-
-   //std::cerr << "got: " << res << " " << "name: " << new_name << std::endl;
-
-   // set the new name
-   Name = string(new_name);
+   PyObject *result;
 
-   return res;
+   // Old style: (True, name) on success, (False, name) on failure.
+   if (PyObject_HasAttrString(callbackInst, "askAdromName")) {
+      RunSimpleCallback("askAdromName", arglist, &result);
+      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);
+      return res;
+   }
+   // New style: String on success, None on failure.
+   else {
+        RunSimpleCallback("ask_cdrom_name", arglist, &result);
+        if(result == Py_None)
+            return false;
+        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;
+  }
 }
diff --git a/python/progress.h b/python/progress.h
index 29243bfc..4e66c771 100644
--- a/python/progress.h
+++ b/python/progress.h
@@ -18,7 +18,7 @@
 /* PyCbObj_BEGIN_ALLOW_THREADS and PyCbObj_END_ALLOW_THREADS are sligthly
  * modified versions of Py_BEGIN_ALLOW_THREADS and Py_END_ALLOW_THREADS.
  * Instead of storing the thread state in a function-local variable these
- * use a class attribute (with the same) name, allowing blocking and 
+ * use a class attribute (with the same) name, allowing blocking and
  * unblocking from different class methods.
  * Py_BLOCK_THREADS and Py_UNBLOCK_THREADS do not define their own
  * local variable but use the one provided by PyCbObj_BEGIN_ALLOW_THREADS
@@ -62,6 +62,10 @@ struct PyOpProgress : public OpProgress, public PyCallbackObj
 
 struct PyFetchProgress : public pkgAcquireStatus, public PyCallbackObj
 {
+   protected:
+   PyObject *pyAcquire;
+   PyObject *GetDesc(pkgAcquire::ItemDesc *item);
+   public:
    enum {
       DLDone, DLQueued, DLFailed, DLHit, DLIgnored
    };
@@ -70,6 +74,12 @@ struct PyFetchProgress : public pkgAcquireStatus, public PyCallbackObj
 
    virtual bool MediaChange(string Media, string Drive);
 
+   void setPyAcquire(PyObject *o) {
+      Py_CLEAR(pyAcquire);
+      Py_INCREF(o);
+      pyAcquire = o;
+   }
+
    /* apt stuff */
    virtual void IMSHit(pkgAcquire::ItemDesc &Itm);
    virtual void Fetch(pkgAcquire::ItemDesc &Itm);
@@ -79,7 +89,8 @@ struct PyFetchProgress : public pkgAcquireStatus, public PyCallbackObj
    virtual void Stop();
 
    bool Pulse(pkgAcquire * Owner);
-   PyFetchProgress() : PyCallbackObj() {};
+   PyFetchProgress() : PyCallbackObj(), pyAcquire(0) {};
+   ~PyFetchProgress()  { Py_XDECREF(pyAcquire); };
 };
 
 struct PyInstallProgress : public PyCallbackObj
diff --git a/python/python-apt-helpers.cc b/python/python-apt-helpers.cc
new file mode 100644
index 00000000..7a0f20c4
--- /dev/null
+++ b/python/python-apt-helpers.cc
@@ -0,0 +1,68 @@
+/*
+ * python-apt.h - Common object creation functions for the public API
+ *
+ * Copyright 2010 Julian Andres Klode <jak@debian.org>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "apt_pkgmodule.h"
+
+/**
+ * Short macro to be used for the generic FromCpp functions.
+ *
+ */
+#define NEW_FROM(NAME,TYPE,Cpp) \
+PyObject* NAME(Cpp const &obj, bool Delete, PyObject *Owner) \
+{ \
+    CppPyObject<Cpp> *Obj = CppPyObject_NEW<Cpp>(Owner, TYPE, obj); \
+    Obj->NoDelete = (!Delete); \
+    return Obj; \
+}
+
+// Create all those functions
+NEW_FROM(PyAcquireFile_FromCpp,&PyAcquireFile_Type,pkgAcqFile*)
+NEW_FROM(PyAcquireItem_FromCpp,&PyAcquireItem_Type,pkgAcquire::Item*)
+NEW_FROM(PyAcquireItemDesc_FromCpp,&PyAcquireItemDesc_Type,pkgAcquire::ItemDesc*)
+NEW_FROM(PyAcquireWorker_FromCpp,&PyAcquireWorker_Type,pkgAcquire::Worker*)
+NEW_FROM(PyActionGroup_FromCpp,&PyActionGroup_Type,pkgDepCache::ActionGroup*)
+NEW_FROM(PyCache_FromCpp,&PyCache_Type,pkgCache*)
+NEW_FROM(PyCacheFile_FromCpp,&PyCacheFile_Type,pkgCacheFile*)
+NEW_FROM(PyCdrom_FromCpp,&PyCdrom_Type,pkgCdrom)
+NEW_FROM(PyConfiguration_FromCpp,&PyConfiguration_Type,Configuration*)
+NEW_FROM(PyDepCache_FromCpp,&PyDepCache_Type,pkgDepCache*)
+NEW_FROM(PyDependency_FromCpp,&PyDependency_Type,pkgCache::DepIterator)
+//NEW_FROM(PyDependencyList_FromCpp,&PyDependencyList_Type,RDepListStruct)
+NEW_FROM(PyDescription_FromCpp,&PyDescription_Type,pkgCache::DescIterator)
+NEW_FROM(PyHashes_FromCpp,&PyHashes_Type,Hashes)
+NEW_FROM(PyHashString_FromCpp,&PyHashString_Type,HashString*)
+NEW_FROM(PyIndexRecords_FromCpp,&PyIndexRecords_Type,indexRecords*)
+NEW_FROM(PyMetaIndex_FromCpp,&PyMetaIndex_Type,metaIndex*)
+NEW_FROM(PyPackage_FromCpp,&PyPackage_Type,pkgCache::PkgIterator)
+NEW_FROM(PyIndexFile_FromCpp,&PyIndexFile_Type,pkgIndexFile*)
+NEW_FROM(PyPackageFile_FromCpp,&PyPackageFile_Type,pkgCache::PkgFileIterator)
+//NEW_FROM(PyPackageList_FromCpp,&PyPackageList_Type,PkgListStruct)
+NEW_FROM(PyPackageManager_FromCpp,&PyPackageManager_Type,pkgPackageManager*)
+//NEW_FROM(PyPackageRecords_FromCpp,&PyPackageRecords_Type,PkgRecordsStruct)
+NEW_FROM(PyPolicy_FromCpp,&PyPolicy_Type,pkgPolicy*)
+NEW_FROM(PyProblemResolver_FromCpp,&PyProblemResolver_Type,pkgProblemResolver*)
+NEW_FROM(PySourceList_FromCpp,&PySourceList_Type,pkgSourceList*)
+//NEW_FROM(PySourceRecords_FromCpp,&PySourceRecords_Type,PkgSrcRecordsStruct)
+NEW_FROM(PyTagFile_FromCpp,&PyTagFile_Type,pkgTagFile)
+NEW_FROM(PyTagSection_FromCpp,&PyTagSection_Type,pkgTagSection)
+NEW_FROM(PyVersion_FromCpp,&PyVersion_Type,pkgCache::VerIterator)
+
+#undef NEW_FROM
diff --git a/python/python-apt.h b/python/python-apt.h
new file mode 100644
index 00000000..b9fc9212
--- /dev/null
+++ b/python/python-apt.h
@@ -0,0 +1,347 @@
+/*
+ * python-apt.h - Header file for the public interface.
+ *
+ * Copyright 2009-2010 Julian Andres Klode <jak@debian.org>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef PYTHON_APT_H
+#define PYTHON_APT_H
+#include <Python.h>
+#include "generic.h"
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/packagemanager.h>
+#include <apt-pkg/version.h>
+#include <apt-pkg/deblistparser.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cachefile.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/cdrom.h>
+#include <apt-pkg/algorithms.h>
+#include <apt-pkg/hashes.h>
+
+typedef PyObject *ActionGroupF(pkgDepCache::ActionGroup *);
+typedef pkgDepCache::ActionGroup*& ActionGroupT(PyObject *self);
+
+struct _PyAptPkgAPIStruct {
+    // apt_pkg.Acquire (pkgAcquire*)
+    PyTypeObject *acquire_type;
+    PyObject*    (*acquire_fromcpp)(pkgAcquire *acquire, bool Delete, PyObject*);
+    pkgAcquire*& (*acquire_tocpp)(PyObject *self);
+    // apt_pkg.AcquireFile
+    PyTypeObject *acquirefile_type;
+    PyObject* (*acquirefile_fromcpp)(pkgAcqFile* const &obj, bool Delete, PyObject *Owner);
+    pkgAcqFile*& (*acquirefile_tocpp)(PyObject *self);
+
+    // apt_pkg.AcquireItem
+    PyTypeObject *acquireitem_type;
+    PyObject* (*acquireitem_fromcpp)(pkgAcquire::Item* const &obj, bool Delete, PyObject *Owner);
+    pkgAcquire::Item*& (*acquireitem_tocpp)(PyObject *self);
+    // apt_pkg.AcquireItemDesc
+    PyTypeObject *acquireitemdesc_type;
+    PyObject* (*acquireitemdesc_fromcpp)(pkgAcquire::ItemDesc* const &obj, bool Delete, PyObject *Owner);
+    pkgAcquire::ItemDesc*& (*acquireitemdesc_tocpp)(PyObject *self);
+    
+    PyTypeObject *acquireworker_type;
+    PyObject* (*acquireworker_fromcpp)(pkgAcquire::Worker* const &obj, bool Delete, PyObject *Owner);
+    pkgAcquire::Worker*& (*acquireworker_tocpp)(PyObject *self);
+    
+    PyTypeObject *actiongroup_type;
+    PyObject* (*actiongroup_fromcpp)(pkgDepCache::ActionGroup* const &obj, bool Delete, PyObject *Owner);
+    pkgDepCache::ActionGroup*& (*actiongroup_tocpp)(PyObject *self);
+    
+    PyTypeObject *cache_type;
+    PyObject* (*cache_fromcpp)(pkgCache* const &obj, bool Delete, PyObject *Owner);
+    pkgCache*& (*cache_tocpp)(PyObject *self);
+    
+    PyTypeObject *cachefile_type;
+    PyObject* (*cachefile_fromcpp)(pkgCacheFile* const &obj, bool Delete, PyObject *Owner);
+    pkgCacheFile*& (*cachefile_tocpp)(PyObject *self);
+    
+    PyTypeObject *cdrom_type;
+    PyObject* (*cdrom_fromcpp)(pkgCdrom const &obj, bool Delete, PyObject *Owner);
+    pkgCdrom&   (*cdrom_tocpp)(PyObject *self);
+    
+    PyTypeObject *configuration_type;
+    PyObject* (*configuration_fromcpp)(Configuration* const &obj, bool Delete, PyObject *Owner);
+    Configuration*& (*configuration_tocpp)(PyObject *self);
+    
+    PyTypeObject *depcache_type;
+    PyObject* (*depcache_fromcpp)(pkgDepCache* const &obj, bool Delete, PyObject *Owner);
+    pkgDepCache*& (*depcache_tocpp)(PyObject *self);
+    
+    PyTypeObject *dependency_type;
+    PyObject* (*dependency_fromcpp)(pkgCache::DepIterator const &obj, bool Delete, PyObject *Owner);
+    pkgCache::DepIterator& (*dependency_tocpp)(PyObject *self);
+    
+    PyTypeObject *dependencylist_type;
+    void *dependencylist_fromcpp; // FIXME: need dependencylist_fromcpp
+    void *dependencylist_tocpp; // FIXME: need dependencylist_tocpp
+    
+    PyTypeObject *description_type;
+    PyObject* (*description_fromcpp)(pkgCache::DescIterator const &obj, bool Delete, PyObject *Owner);
+    pkgCache::DescIterator& (*description_tocpp)(PyObject *self);
+    
+    PyTypeObject *hashes_type;
+    PyObject* (*hashes_fromcpp)(Hashes const &obj, bool Delete, PyObject *Owner);
+    Hashes& (*hashes_tocpp)(PyObject *self);
+    
+    PyTypeObject *hashstring_type;
+    PyObject* (*hashstring_fromcpp)(HashString* const &obj, bool Delete, PyObject *Owner);
+    HashString*& (*hashstring_tocpp)(PyObject *self);
+    
+    PyTypeObject *indexrecords_type;
+    PyObject* (*indexrecords_fromcpp)(indexRecords* const &obj, bool Delete, PyObject *Owner);
+    indexRecords*& (*indexrecords_tocpp)(PyObject *self);
+    
+    PyTypeObject *metaindex_type;
+    PyObject* (*metaindex_fromcpp)(metaIndex* const &obj, bool Delete, PyObject *Owner);
+    metaIndex*& (*metaindex_tocpp)(PyObject *self);
+
+    PyTypeObject *package_type;
+    PyObject* (*package_fromcpp)(pkgCache::PkgIterator const &obj, bool Delete, PyObject *Owner);
+    pkgCache::PkgIterator& (*package_tocpp)(PyObject *self);
+    
+    PyTypeObject *packagefile_type;
+    PyObject* (*packagefile_fromcpp)(pkgCache::PkgFileIterator const &obj, bool Delete, PyObject *Owner);
+    pkgCache::PkgFileIterator& (*packagefile_tocpp)(PyObject *self);
+
+    PyTypeObject *packageindexfile_type;
+    PyObject* (*indexfile_fromcpp)(pkgIndexFile* const &obj, bool Delete, PyObject *Owner);
+    pkgIndexFile*& (*packageindexfile_tocpp)(PyObject *self);
+    
+    PyTypeObject *packagelist_type;
+    void *packagelist_fromcpp;     // FIXME: need packagelist_fromcpp
+    void *packagelist_tocpp;     // FIXME: need packagelist_tocpp
+    
+    PyTypeObject *packagemanager_type;
+    PyObject* (*packagemanager_fromcpp)(pkgPackageManager* const &obj, bool Delete, PyObject *Owner);
+    pkgPackageManager*& (*packagemanager_tocpp)(PyObject *self);
+    
+    PyTypeObject *packagerecords_type;
+    void *packagerecords_fromcpp; // FIXME: need packagerecords_fromcpp
+    void *packagerecords_tocpp; // FIXME: need packagerecords_tocpp
+    
+    PyTypeObject *policy_type;
+    PyObject* (*policy_fromcpp)(pkgPolicy* const &obj, bool Delete, PyObject *Owner);
+    pkgPolicy*& (*policy_tocpp)(PyObject *self);
+    
+    PyTypeObject *problemresolver_type;
+    PyObject* (*problemresolver_fromcpp)(pkgProblemResolver* const &obj, bool Delete, PyObject *Owner);
+    pkgProblemResolver*& (*problemresolver_tocpp)(PyObject *self);
+    
+    PyTypeObject *sourcelist_type;
+    PyObject* (*sourcelist_fromcpp)(pkgSourceList* const &obj, bool Delete, PyObject *Owner);
+    pkgSourceList*& (*sourcelist_tocpp)(PyObject *self);
+    
+    PyTypeObject *sourcerecords_type;
+    void *sourcerecords_fromcpp; // FIXME: need sourcerecords_fromcpp
+    void *sourcerecords_tocpp; // FIXME: need sourcerecords_tocpp
+    
+    PyTypeObject *tagfile_type;
+    PyObject* (*tagfile_fromcpp)(pkgTagFile const &obj, bool Delete, PyObject *Owner);
+    pkgTagFile& (*tagfile_tocpp)(PyObject *self);
+    
+    PyTypeObject *tagsection_type;
+    PyObject* (*tagsection_fromcpp)(pkgTagSection const &obj, bool Delete, PyObject *Owner);
+    pkgTagSection& (*tagsection_tocpp)(PyObject *self);
+    
+    PyTypeObject *version_type;
+    PyObject* (*version_fromcpp)(pkgCache::VerIterator const &obj, bool Delete, PyObject *Owner);
+    pkgCache::VerIterator& (*version_tocpp)(PyObject *self);
+
+};
+
+// Checking macros.
+# define PyAcquire_Check(op)          PyObject_TypeCheck(op, &PyAcquire_Type)
+# define PyAcquireFile_Check(op)      PyObject_TypeCheck(op, &PyAcquireFile_Type)
+# define PyAcquireItem_Check(op)      PyObject_TypeCheck(op, &PyAcquireItem_Type)
+# define PyAcquireItemDesc_Check(op)  PyObject_TypeCheck(op, &PyAcquireItemDesc_Type)
+# define PyAcquireWorker_Check(op)    PyObject_TypeCheck(op, &PyAcquireWorker_Type)
+# define PyActionGroup_Check(op)      PyObject_TypeCheck(op, &PyActionGroup_Type)
+# define PyCache_Check(op)            PyObject_TypeCheck(op, &PyCache_Type)
+# define PyCacheFile_Check(op)        PyObject_TypeCheck(op, &PyCacheFile_Type)
+# define PyCdrom_Check(op)            PyObject_TypeCheck(op, &PyCdrom_Type)
+# define PyConfiguration_Check(op)    PyObject_TypeCheck(op, &PyConfiguration_Type)
+# define PyDepCache_Check(op)         PyObject_TypeCheck(op, &PyDepCache_Type)
+# define PyDependency_Check(op)       PyObject_TypeCheck(op, &PyDependency_Type)
+# define PyDependencyList_Check(op)   PyObject_TypeCheck(op, &PyDependencyList_Type)
+# define PyDescription_Check(op)      PyObject_TypeCheck(op, &PyDescription_Type)
+# define PyHashes_Check(op)           PyObject_TypeCheck(op, &PyHashes_Type)
+# define PyHashString_Check(op)       PyObject_TypeCheck(op, &PyHashString_Type)
+# define PyIndexRecords_Check(op)     PyObject_TypeCheck(op, &PyIndexRecords_Type)
+# define PyMetaIndex_Check(op)        PyObject_TypeCheck(op, &PyMetaIndex_Type)
+# define PyPackage_Check(op)          PyObject_TypeCheck(op, &PyPackage_Type)
+# define PyPackageFile_Check(op)      PyObject_TypeCheck(op, &PyPackageFile_Type)
+# define PyIndexFile_Check(op)        PyObject_TypeCheck(op, &PyIndexFile_Type)
+# define PyPackageList_Check(op)      PyObject_TypeCheck(op, &PyPackageList_Type)
+# define PyPackageManager_Check(op)   PyObject_TypeCheck(op, &PyPackageManager_Type)
+# define PyPackageRecords_Check(op)   PyObject_TypeCheck(op, &PyPackageRecords_Type)
+# define PyPolicy_Check(op)           PyObject_TypeCheck(op, &PyPolicy_Type)
+# define PyProblemResolver_Check(op)  PyObject_TypeCheck(op, &PyProblemResolver_Type)
+# define PySourceList_Check(op)       PyObject_TypeCheck(op, &PySourceList_Type)
+# define PySourceRecords_Check(op)    PyObject_TypeCheck(op, &PySourceRecords_Type)
+# define PyTagFile_Check(op)          PyObject_TypeCheck(op, &PyTagFile_Type)
+# define PyTagSection_Check(op)       PyObject_TypeCheck(op, &PyTagSection_Type)
+# define PyVersion_Check(op)          PyObject_TypeCheck(op, &PyVersion_Type)
+// Exact check macros.
+# define PyAcquire_CheckExact(op)          (op->op_type == &PyAcquire_Type)
+# define PyAcquireFile_CheckExact(op)      (op->op_type == &PyAcquireFile_Type)
+# define PyAcquireItem_CheckExact(op)      (op->op_type == &PyAcquireItem_Type)
+# define PyAcquireItemDesc_CheckExact(op)  (op->op_type == &PyAcquireItemDesc_Type)
+# define PyAcquireWorker_CheckExact(op)    (op->op_type == &PyAcquireWorker_Type)
+# define PyActionGroup_CheckExact(op)      (op->op_type == &PyActionGroup_Type)
+# define PyCache_CheckExact(op)            (op->op_type == &PyCache_Type)
+# define PyCacheFile_CheckExact(op)        (op->op_type == &PyCacheFile_Type)
+# define PyCdrom_CheckExact(op)            (op->op_type == &PyCdrom_Type)
+# define PyConfiguration_CheckExact(op)    (op->op_type == &PyConfiguration_Type)
+# define PyDepCache_CheckExact(op)         (op->op_type == &PyDepCache_Type)
+# define PyDependency_CheckExact(op)       (op->op_type == &PyDependency_Type)
+# define PyDependencyList_CheckExact(op)   (op->op_type == &PyDependencyList_Type)
+# define PyDescription_CheckExact(op)      (op->op_type == &PyDescription_Type)
+# define PyHashes_CheckExact(op)           (op->op_type == &PyHashes_Type)
+# define PyHashString_CheckExact(op)       (op->op_type == &PyHashString_Type)
+# define PyIndexRecords_CheckExact(op)     (op->op_type == &PyIndexRecords_Type)
+# define PyMetaIndex_CheckExact(op)        (op->op_type == &PyMetaIndex_Type)
+# define PyPackage_CheckExact(op)          (op->op_type == &PyPackage_Type)
+# define PyPackageFile_CheckExact(op)      (op->op_type == &PyPackageFile_Type)
+# define PyIndexFile_CheckExact(op)        (op->op_type == &PyIndexFile_Type)
+# define PyPackageList_CheckExact(op)      (op->op_type == &PyPackageList_Type)
+# define PyPackageManager_CheckExact(op)   (op->op_type == &PyPackageManager_Type)
+# define PyPackageRecords_CheckExact(op)   (op->op_type == &PyPackageRecords_Type)
+# define PyPolicy_CheckExact(op)           (op->op_type == &PyPolicy_Type)
+# define PyProblemResolver_CheckExact(op)  (op->op_type == &PyProblemResolver_Type)
+# define PySourceList_CheckExact(op)       (op->op_type == &PySourceList_Type)
+# define PySourceRecords_CheckExact(op)    (op->op_type == &PySourceRecords_Type)
+# define PyTagFile_CheckExact(op)          (op->op_type == &PyTagFile_Type)
+# define PyTagSection_CheckExact(op)       (op->op_type == &PyTagSection_Type)
+# define PyVersion_CheckExact(op)          (op->op_type == &PyVersion_Type)
+
+# ifndef APT_PKGMODULE_H
+static struct _PyAptPkgAPIStruct *_PyAptPkg_API;
+
+static int import_apt_pkg(void) {
+#  if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 1
+    _PyAptPkg_API = (_PyAptPkgAPIStruct *)PyCapsule_Import("apt_pkg._C_API", 0);
+#  else
+    _PyAptPkg_API = (_PyAptPkgAPIStruct *)PyCObject_Import("apt_pkg", "_C_API");
+#  endif // PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 1
+    return (_PyAptPkg_API != NULL) ? 0 : -1;
+}
+
+#  define PyAcquire_Type           *(_PyAptPkg_API->acquire_type)
+#  define PyAcquireFile_Type       *(_PyAptPkg_API->acquirefile_type)
+#  define PyAcquireItem_Type       *(_PyAptPkg_API->acquireitem_type)
+#  define PyAcquireItemDesc_Type   *(_PyAptPkg_API->acquireitemdesc_type)
+#  define PyAcquireWorker_Type     *(_PyAptPkg_API->acquireworker_type)
+#  define PyActionGroup_Type       *(_PyAptPkg_API->actiongroup_type)
+#  define PyCache_Type             *(_PyAptPkg_API->cache_type)
+#  define PyCacheFile_Type         *(_PyAptPkg_API->cachefile_type)
+#  define PyCdrom_Type             *(_PyAptPkg_API->cdrom_type)
+#  define PyConfiguration_Type     *(_PyAptPkg_API->configuration_type)
+#  define PyDepCache_Type          *(_PyAptPkg_API->depcache_type)
+#  define PyDependency_Type        *(_PyAptPkg_API->dependency_type)
+#  define PyDependencyList_Type    *(_PyAptPkg_API->dependencylist_type)
+#  define PyDescription_Type       *(_PyAptPkg_API->description_type)
+#  define PyHashes_Type            *(_PyAptPkg_API->hashes_type)
+#  define PyHashString_Type        *(_PyAptPkg_API->hashstring_type)
+#  define PyIndexRecords_Type      *(_PyAptPkg_API->indexrecords_type)
+#  define PyMetaIndex_Type         *(_PyAptPkg_API->metaindex_type)
+#  define PyPackage_Type           *(_PyAptPkg_API->package_type)
+#  define PyPackageFile_Type       *(_PyAptPkg_API->packagefile_type)
+#  define PyIndexFile_Type         *(_PyAptPkg_API->packageindexfile_type)
+#  define PyPackageList_Type       *(_PyAptPkg_API->packagelist_type)
+#  define PyPackageManager_Type    *(_PyAptPkg_API->packagemanager_type)
+#  define PyPackageRecords_Type    *(_PyAptPkg_API->packagerecords_type)
+#  define PyPolicy_Type            *(_PyAptPkg_API->policy_type)
+#  define PyProblemResolver_Type   *(_PyAptPkg_API->problemresolver_type)
+#  define PySourceList_Type        *(_PyAptPkg_API->sourcelist_type)
+#  define PySourceRecords_Type     *(_PyAptPkg_API->sourcerecords_type)
+#  define PyTagFile_Type           *(_PyAptPkg_API->tagfile_type)
+#  define PyTagSection_Type        *(_PyAptPkg_API->tagsection_type)
+#  define PyVersion_Type           *(_PyAptPkg_API->version_type)
+// Code 
+#  define PyAcquire_ToCpp          _PyAptPkg_API->acquire_tocpp
+#  define PyAcquireFile_ToCpp      _PyAptPkg_API->acquirefile_tocpp
+#  define PyAcquireItem_ToCpp      _PyAptPkg_API->acquireitem_tocpp
+#  define PyAcquireItemDesc_ToCpp  _PyAptPkg_API->acquireitemdesc_tocpp
+#  define PyAcquireWorker_ToCpp    _PyAptPkg_API->acquireworker_tocpp
+#  define PyActionGroup_ToCpp      _PyAptPkg_API->actiongroup_tocpp
+#  define PyCache_ToCpp            _PyAptPkg_API->cache_tocpp
+#  define PyCacheFile_ToCpp        _PyAptPkg_API->cachefile_tocpp
+#  define PyCdrom_ToCpp            _PyAptPkg_API->cdrom_tocpp
+#  define PyConfiguration_ToCpp    _PyAptPkg_API->configuration_tocpp
+#  define PyDepCache_ToCpp         _PyAptPkg_API->depcache_tocpp
+#  define PyDependency_ToCpp       _PyAptPkg_API->dependency_tocpp
+#  define PyDependencyList_ToCpp   _PyAptPkg_API->dependencylist_tocpp // NULL
+#  define PyDescription_ToCpp      _PyAptPkg_API->description_tocpp
+#  define PyHashes_ToCpp           _PyAptPkg_API->hashes_tocpp
+#  define PyHashString_ToCpp       _PyAptPkg_API->hashstring_tocpp
+#  define PyIndexRecords_ToCpp     _PyAptPkg_API->indexrecords_tocpp
+#  define PyMetaIndex_ToCpp        _PyAptPkg_API->metaindex_tocpp
+#  define PyPackage_ToCpp          _PyAptPkg_API->package_tocpp
+#  define PyPackageFile_ToCpp      _PyAptPkg_API->packagefile_tocpp
+#  define PyIndexFile_ToCpp        _PyAptPkg_API->packageindexfile_tocpp
+#  define PyPackageList_ToCpp      _PyAptPkg_API->packagelist_tocpp // NULL
+#  define PyPackageManager_ToCpp   _PyAptPkg_API->packagemanager_tocpp
+#  define PyPackageRecords_ToCpp   _PyAptPkg_API->packagerecords_tocpp
+#  define PyPolicy_ToCpp           _PyAptPkg_API->policy_tocpp
+#  define PyProblemResolver_ToCpp  _PyAptPkg_API->problemresolver_tocpp
+#  define PySourceList_ToCpp       _PyAptPkg_API->sourcelist_tocpp
+#  define PySourceRecords_ToCpp    _PyAptPkg_API->sourcerecords_tocpp // NULL
+#  define PyTagFile_ToCpp          _PyAptPkg_API->tagfile_tocpp
+#  define PyTagSection_ToCpp       _PyAptPkg_API->tagsection_tocpp
+#  define PyVersion_ToCpp          _PyAptPkg_API->version_tocpp
+// Get the C++ object
+#  define PyAcquire_FromCpp          _PyAptPkg_API->acquire_fromcpp
+#  define PyAcquireFile_FromCpp      _PyAptPkg_API->acquirefile_fromcpp
+#  define PyAcquireItem_FromCpp      _PyAptPkg_API->acquireitem_fromcpp
+#  define PyAcquireItemDesc_FromCpp  _PyAptPkg_API->acquireitemdesc_fromcpp
+#  define PyAcquireWorker_FromCpp    _PyAptPkg_API->acquireworker_fromcpp
+#  define PyActionGroup_FromCpp      _PyAptPkg_API->actiongroup_fromcpp
+#  define PyCache_FromCpp            _PyAptPkg_API->cache_fromcpp
+#  define PyCacheFile_FromCpp        _PyAptPkg_API->cachefile_fromcpp
+#  define PyCdrom_FromCpp            _PyAptPkg_API->cdrom_fromcpp
+#  define PyConfiguration_FromCpp    _PyAptPkg_API->configuration_fromcpp
+#  define PyDepCache_FromCpp         _PyAptPkg_API->depcache_fromcpp
+#  define PyDependency_FromCpp       _PyAptPkg_API->dependency_fromcpp
+#  define PyDependencyList_FromCpp   _PyAptPkg_API->dependencylist_fromcpp // NULL
+#  define PyDescription_FromCpp      _PyAptPkg_API->description_fromcpp
+#  define PyHashes_FromCpp           _PyAptPkg_API->hashes_fromcpp
+#  define PyHashString_FromCpp       _PyAptPkg_API->hashstring_fromcpp
+#  define PyIndexRecords_FromCpp     _PyAptPkg_API->indexrecords_fromcpp
+#  define PyMetaIndex_FromCpp        _PyAptPkg_API->metaindex_fromcpp
+#  define PyPackage_FromCpp          _PyAptPkg_API->package_fromcpp
+#  define PyPackageFile_FromCpp      _PyAptPkg_API->packagefile_fromcpp
+#  define PyIndexFile_FromCpp        _PyAptPkg_API->packageindexfile_fromcpp
+#  define PyPackageList_FromCpp      _PyAptPkg_API->packagelist_fromcpp // NULL
+#  define PyPackageManager_FromCpp   _PyAptPkg_API->packagemanager_fromcpp
+#  define PyPackageRecords_FromCpp   _PyAptPkg_API->packagerecords_fromcpp
+#  define PyPolicy_FromCpp           _PyAptPkg_API->policy_fromcpp
+#  define PyProblemResolver_FromCpp  _PyAptPkg_API->problemresolver_fromcpp
+#  define PySourceList_FromCpp       _PyAptPkg_API->sourcelist_fromcpp
+#  define PySourceRecords_FromCpp    _PyAptPkg_API->sourcerecords_fromcpp // NULL
+#  define PyTagFile_FromCpp          _PyAptPkg_API->tagfile_fromcpp
+#  define PyTagSection_FromCpp       _PyAptPkg_API->tagsection_fromcpp
+#  define PyVersion_FromCpp          _PyAptPkg_API->version_fromcpp
+# endif // APT_PKGMODULE_H
+
+#endif
+
diff --git a/python/sourcelist.cc b/python/sourcelist.cc
index 5dcaf86b..6184fee3 100644
--- a/python/sourcelist.cc
+++ b/python/sourcelist.cc
@@ -26,20 +26,22 @@ static PyObject *PkgSourceListFindIndex(PyObject *Self,PyObject *Args)
 {
    pkgSourceList *list = GetCpp<pkgSourceList*>(Self);
    PyObject *pyPkgFileIter;
-   PyObject *pyPkgIndexFile;
+   CppPyObject<pkgIndexFile*> *pyPkgIndexFile;
 
-   if (PyArg_ParseTuple(Args, "O!", &PackageFileType,&pyPkgFileIter) == 0)
+   if (PyArg_ParseTuple(Args, "O!", &PyPackageFile_Type,&pyPkgFileIter) == 0)
       return 0;
 
    pkgCache::PkgFileIterator &i = GetCpp<pkgCache::PkgFileIterator>(pyPkgFileIter);
    pkgIndexFile *index;
    if(list->FindIndex(i, index))
    {
-      pyPkgIndexFile = CppOwnedPyObject_NEW<pkgIndexFile*>(pyPkgFileIter,&PackageIndexFileType,index);
+      pyPkgIndexFile = CppPyObject_NEW<pkgIndexFile*>(pyPkgFileIter,&PyIndexFile_Type,index);
+      // Do not delete the pkgIndexFile*, it is managed by pkgSourceList.
+      pyPkgIndexFile->NoDelete = true;
       return pyPkgIndexFile;
    }
 
-   //&PackageIndexFileType,&pyPkgIndexFile)
+   //&PyIndexFile_Type,&pyPkgIndexFile)
 
    Py_INCREF(Py_None);
    return Py_None;
@@ -61,7 +63,7 @@ static PyObject *PkgSourceListGetIndexes(PyObject *Self,PyObject *Args)
 
    PyObject *pyFetcher;
    char all = 0;
-   if (PyArg_ParseTuple(Args, "O!|b",&PkgAcquireType,&pyFetcher, &all) == 0)
+   if (PyArg_ParseTuple(Args, "O!|b",&PyAcquire_Type,&pyFetcher, &all) == 0)
       return 0;
 
    pkgAcquire *fetcher = GetCpp<pkgAcquire*>(pyFetcher);
@@ -72,41 +74,52 @@ static PyObject *PkgSourceListGetIndexes(PyObject *Self,PyObject *Args)
 
 static PyMethodDef PkgSourceListMethods[] =
 {
-   {"FindIndex",PkgSourceListFindIndex,METH_VARARGS,doc_PkgSourceListFindIndex},
-   {"ReadMainList",PkgSourceListReadMainList,METH_VARARGS,doc_PkgSourceListReadMainList},
-   {"GetIndexes",PkgSourceListGetIndexes,METH_VARARGS,doc_PkgSourceListReadMainList},
+   {"find_index",PkgSourceListFindIndex,METH_VARARGS,doc_PkgSourceListFindIndex},
+   {"read_main_list",PkgSourceListReadMainList,METH_VARARGS,doc_PkgSourceListReadMainList},
+   {"get_indexes",PkgSourceListGetIndexes,METH_VARARGS,doc_PkgSourceListGetIndexes},
    {}
 };
 
-static PyObject *PkgSourceListAttr(PyObject *Self,char *Name)
+static PyObject *PkgSourceListGetList(PyObject *Self,void*)
 {
    pkgSourceList *list = GetCpp<pkgSourceList*>(Self);
-
-   if (strcmp("List",Name) == 0)
+   PyObject *List = PyList_New(0);
+   for (vector<metaIndex *>::const_iterator I = list->begin();
+        I != list->end(); I++)
    {
-      PyObject *List = PyList_New(0);
-      for (vector<metaIndex *>::const_iterator I = list->begin();
-	   I != list->end(); I++)
-      {
-	 PyObject *Obj;
-	 Obj = CppPyObject_NEW<metaIndex*>(&MetaIndexType,*I);
-	 PyList_Append(List,Obj);
-      }
-      return List;
+      CppPyObject<metaIndex*> *Obj;
+      Obj = CppPyObject_NEW<metaIndex*>(Self, &PyMetaIndex_Type,*I);
+      // Never delete metaIndex*, they are managed by the pkgSourceList.
+      Obj->NoDelete = true;
+      PyList_Append(List,Obj);
+      Py_DECREF(Obj);
    }
-   return Py_FindMethod(PkgSourceListMethods,Self,Name);
+   return List;
 }
-PyTypeObject PkgSourceListType =
+
+static PyGetSetDef PkgSourceListGetSet[] = {
+    {"list",PkgSourceListGetList,0,"A list of MetaIndex() objects.",0},
+    {}
+};
+
+static PyObject *PkgSourceListNew(PyTypeObject *type,PyObject *args,PyObject *kwds)
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "pkgSourceList",                          // tp_name
+   char *kwlist[] = {0};
+   if (PyArg_ParseTupleAndKeywords(args,kwds,"",kwlist) == 0)
+      return 0;
+   return CppPyObject_NEW<pkgSourceList*>(NULL, type,new pkgSourceList());
+}
+
+PyTypeObject PySourceList_Type =
+{
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.SourceList",                          // tp_name
    sizeof(CppPyObject<pkgSourceList*>),   // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
-   CppDealloc<pkgSourceList*>,   // tp_dealloc
+   CppDeallocPtr<pkgSourceList*>,       // tp_dealloc
    0,                                   // tp_print
-   PkgSourceListAttr,                      // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    0,                                   // tp_repr
@@ -114,10 +127,39 @@ PyTypeObject PkgSourceListType =
    0,                                   // tp_as_sequence
    0,                                   // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   (Py_TPFLAGS_DEFAULT |                // tp_flags
+    Py_TPFLAGS_BASETYPE),
+   "pkgSourceList Object",              // tp_doc
+   0,                                   // tp_traverse
+   0,                                   // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   PkgSourceListMethods,                // tp_methods
+   0,                                   // tp_members
+   PkgSourceListGetSet,                 // tp_getset
+   0,                                   // tp_base
+   0,                                   // tp_dict
+   0,                                   // tp_descr_get
+   0,                                   // tp_descr_set
+   0,                                   // tp_dictoffset
+   0,                                   // tp_init
+   0,                                   // tp_alloc
+   PkgSourceListNew,                    // tp_new
 };
 
+#ifdef COMPAT_0_7
 PyObject *GetPkgSourceList(PyObject *Self,PyObject *Args)
 {
-   return CppPyObject_NEW<pkgSourceList*>(&PkgSourceListType,new pkgSourceList());
+   PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgSourceList() is "
+                "deprecated. Please see apt_pkg.SourceList() for the "
+                "replacement.", 1);
+   return PkgSourceListNew(&PySourceList_Type,Args,0);
 }
-
+#endif
diff --git a/python/string.cc b/python/string.cc
index 8168ea5b..b95ee3eb 100644
--- a/python/string.cc
+++ b/python/string.cc
@@ -38,7 +38,21 @@ PyObject *Python(PyObject *Self,PyObject *Args) \
 }
 
 MkStr(StrDeQuote,DeQuoteString);
-MkStr(StrBase64Encode,Base64Encode);
+
+/*
+ * Input bytes(Py3k)/str(Py2), output str.
+ */
+PyObject *StrBase64Encode(PyObject *Self,PyObject *Args) {
+   char *Str = 0;
+   #if PY_MAJOR_VERSION >= 3
+   if (PyArg_ParseTuple(Args,"y",&Str) == 0)
+   #else
+   if (PyArg_ParseTuple(Args,"s",&Str) == 0)
+   #endif
+      return 0;
+   return CppPyString(Base64Encode(Str));
+}
+
 MkStr(StrURItoFileName,URItoFileName);
 
 //MkFloat(StrSizeToStr,SizeToStr);
diff --git a/python/tag.cc b/python/tag.cc
index 6fe97ed5..c7edcb31 100644
--- a/python/tag.cc
+++ b/python/tag.cc
@@ -39,14 +39,27 @@ struct TagSecData : public CppPyObject<pkgTagSection>
    char *Data;
 };
 
-struct TagFileData : public PyObject
+// The owner of the TagFile is a Python file object.
+struct TagFileData : public CppPyObject<pkgTagFile>
 {
-   pkgTagFile Object;
-   PyObject *File;
    TagSecData *Section;
    FileFd Fd;
 };
 
+// Traversal and Clean for owned objects
+int TagFileTraverse(PyObject *self, visitproc visit, void* arg) {
+    Py_VISIT(((TagFileData *)self)->Section);
+    Py_VISIT(((TagFileData *)self)->Owner);
+    return 0;
+}
+
+int TagFileClear(PyObject *self) {
+    Py_CLEAR(((TagFileData *)self)->Section);
+    Py_CLEAR(((TagFileData *)self)->Owner);
+    return 0;
+}
+
+
 									/*}}}*/
 // TagSecFree - Free a Tag Section					/*{{{*/
 // ---------------------------------------------------------------------
@@ -63,12 +76,15 @@ void TagSecFree(PyObject *Obj)
 /* */
 void TagFileFree(PyObject *Obj)
 {
+   #ifdef ALLOC_DEBUG
+   std::cerr << "=== DEALLOCATING " << Obj->ob_type->tp_name << "^ ===\n";
+   #endif
    TagFileData *Self = (TagFileData *)Obj;
-   Py_DECREF((PyObject *)Self->Section);
+   Py_CLEAR(Self->Section);
    Self->Object.~pkgTagFile();
    Self->Fd.~FileFd();
-   Py_DECREF(Self->File);
-   PyObject_DEL(Obj);
+   Py_CLEAR(Self->Owner);
+   Obj->ob_type->tp_free(Obj);
 }
 									/*}}}*/
 
@@ -183,6 +199,7 @@ static PyObject *TagSecKeys(PyObject *Self,PyObject *Args)
    return List;
 }
 
+#if PY_MAJOR_VERSION < 3
 static char *doc_Exists = "Exists(Name) -> integer";
 static PyObject *TagSecExists(PyObject *Self,PyObject *Args)
 {
@@ -196,6 +213,19 @@ static PyObject *TagSecExists(PyObject *Self,PyObject *Args)
       return Py_BuildValue("i",0);
    return Py_BuildValue("i",1);
 }
+#endif
+
+static int TagSecContains(PyObject *Self,PyObject *Arg)
+{
+   if (PyString_Check(Arg) == 0)
+       return 0;
+   const char *Name = PyString_AsString(Arg);
+   const char *Start;
+   const char *Stop;
+   if (GetCpp<pkgTagSection>(Self).Find(Name,Start,Stop) == false)
+      return 0;
+   return 1;
+}
 
 static char *doc_Bytes = "Bytes() -> integer";
 static PyObject *TagSecBytes(PyObject *Self,PyObject *Args)
@@ -228,6 +258,44 @@ static PyObject *TagFileStep(PyObject *Self,PyObject *Args)
    return HandleErrors(Py_BuildValue("i",1));
 }
 
+// TagFile Wrappers							/*{{{*/
+static PyObject *TagFileNext(PyObject *Self)
+{
+   TagFileData &Obj = *(TagFileData *)Self;
+   // Replace the section.
+   Py_CLEAR(Obj.Section);
+   Obj.Section = (TagSecData*)(&PyTagSection_Type)->tp_alloc(&PyTagSection_Type, 0);
+   new (&Obj.Section->Object) pkgTagSection();
+   Obj.Section->Owner = Self;
+   Py_INCREF(Obj.Section->Owner);
+   Obj.Section->Data = 0;
+   if (Obj.Object.Step(Obj.Section->Object) == false)
+      return HandleErrors(NULL);
+
+   // Bug-Debian: http://bugs.debian.org/572596
+   // Duplicate the data here and scan the duplicated section data; in order
+   // to not use any shared storage.
+   // TODO: Provide an API in apt-pkg to do this; this is really ugly.
+
+   // Fetch old section data
+   const char *Start;
+   const char *Stop;
+   Obj.Section->Object.GetSection(Start,Stop);
+   // Duplicate the data
+   Obj.Section->Data = new char[Stop-Start];
+   strncpy(Obj.Section->Data, Start, Stop-Start);
+   // Rescan it
+   Obj.Section->Object.Scan(Obj.Section->Data, Stop-Start);
+
+   Py_INCREF(Obj.Section);
+   return HandleErrors(Obj.Section);
+}
+
+static PyObject *TagFileIter(PyObject *Self) {
+    Py_INCREF(Self);
+    return Self;
+}
+
 static char *doc_Offset = "Offset() -> Integer";
 static PyObject *TagFileOffset(PyObject *Self,PyObject *Args)
 {
@@ -252,15 +320,14 @@ static PyObject *TagFileJump(PyObject *Self,PyObject *Args)
 									/*}}}*/
 // ParseSection - Parse a single section from a tag file		/*{{{*/
 // ---------------------------------------------------------------------
-char *doc_ParseSection ="ParseSection(Text) -> SectionObject";
-PyObject *ParseSection(PyObject *self,PyObject *Args)
-{
+static PyObject *TagSecNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) {
    char *Data;
-   if (PyArg_ParseTuple(Args,"s",&Data) == 0)
+   char *kwlist[] = {"text", 0};
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"s",kwlist,&Data) == 0)
       return 0;
 
    // Create the object..
-   TagSecData *New = PyObject_NEW(TagSecData,&TagSecType);
+   TagSecData *New = (TagSecData*)type->tp_alloc(type, 0);
    new (&New->Object) pkgTagSection();
    New->Data = new char[strlen(Data)+2];
    snprintf(New->Data,strlen(Data)+2,"%s\n",Data);
@@ -277,30 +344,56 @@ PyObject *ParseSection(PyObject *self,PyObject *Args)
 
    return New;
 }
+
+#ifdef COMPAT_0_7
+char *doc_ParseSection ="ParseSection(Text) -> TagSection() object. Deprecated.";
+PyObject *ParseSection(PyObject *self,PyObject *Args)
+{
+   PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.ParseSection() is "
+                "deprecated. Please see apt_pkg.TagSection() for the "
+                "replacement.", 1);
+    return TagSecNew(&PyTagSection_Type,Args,0);
+}
+#endif
 									/*}}}*/
 // ParseTagFile - Parse a tagd file					/*{{{*/
 // ---------------------------------------------------------------------
 /* This constructs the parser state. */
-char *doc_ParseTagFile = "ParseTagFile(File) -> TagFile";
-PyObject *ParseTagFile(PyObject *self,PyObject *Args)
+
+static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
 {
    PyObject *File;
-   if (PyArg_ParseTuple(Args,"O!",&PyFile_Type,&File) == 0)
+   char *kwlist[] = {"file", 0};
+   if (PyArg_ParseTupleAndKeywords(Args,kwds,"O",kwlist,&File) == 0)
+      return 0;
+   int fileno = PyObject_AsFileDescriptor(File);
+   if (fileno == -1)
       return 0;
 
-   TagFileData *New = PyObject_NEW(TagFileData,&TagFileType);
-   new (&New->Fd) FileFd(fileno(PyFile_AsFile(File)),false);
-   New->File = File;
-   Py_INCREF(New->File);
+   TagFileData *New = (TagFileData*)type->tp_alloc(type, 0);
+   new (&New->Fd) FileFd(fileno,false);
+   New->Owner = File;
+   Py_INCREF(New->Owner);
    new (&New->Object) pkgTagFile(&New->Fd);
 
    // Create the section
-   New->Section = PyObject_NEW(TagSecData,&TagSecType);
+   New->Section = (TagSecData*)(&PyTagSection_Type)->tp_alloc(&PyTagSection_Type, 0);
    new (&New->Section->Object) pkgTagSection();
+   New->Section->Owner = New;
+   Py_INCREF(New->Section->Owner);
    New->Section->Data = 0;
 
    return HandleErrors(New);
 }
+#ifdef COMPAT_0_7
+char *doc_ParseTagFile = "ParseTagFile(File) -> TagFile() object. Deprecated.";
+PyObject *ParseTagFile(PyObject *self,PyObject *Args) {
+   PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.ParseTagFile() is "
+                "deprecated. Please see apt_pkg.TagFile() for the "
+                "replacement.", 1);
+    return TagFileNew(&PyTagFile_Type,Args,0);
+}
+#endif
 									/*}}}*/
 // RewriteSection - Rewrite a section..					/*{{{*/
 // ---------------------------------------------------------------------
@@ -326,7 +419,7 @@ PyObject *RewriteSection(PyObject *self,PyObject *Args)
    PyObject *Section;
    PyObject *Order;
    PyObject *Rewrite;
-   if (PyArg_ParseTuple(Args,"O!O!O!",&TagSecType,&Section,
+   if (PyArg_ParseTuple(Args,"O!O!O!",&PyTagSection_Type,&Section,
 			&PyList_Type,&Order,&PyList_Type,&Rewrite) == 0)
       return 0;
 
@@ -377,93 +470,155 @@ PyObject *RewriteSection(PyObject *self,PyObject *Args)
 static PyMethodDef TagSecMethods[] =
 {
    // Query
-   {"Find",TagSecFind,METH_VARARGS,doc_Find},
-   {"FindRaw",TagSecFindRaw,METH_VARARGS,doc_FindRaw},
-   {"FindFlag",TagSecFindFlag,METH_VARARGS,doc_FindFlag},
-   {"Bytes",TagSecBytes,METH_VARARGS,doc_Bytes},
+   {"find",TagSecFind,METH_VARARGS,doc_Find},
+   {"find_raw",TagSecFindRaw,METH_VARARGS,doc_FindRaw},
+   {"find_flag",TagSecFindFlag,METH_VARARGS,doc_FindFlag},
+   {"bytes",TagSecBytes,METH_VARARGS,doc_Bytes},
 
    // Python Special
    {"keys",TagSecKeys,METH_VARARGS,doc_Keys},
+#if PY_MAJOR_VERSION < 3
    {"has_key",TagSecExists,METH_VARARGS,doc_Exists},
+#endif
    {"get",TagSecFind,METH_VARARGS,doc_Find},
    {}
 };
 
-// TagSecGetAttr - Get an attribute - variable/method			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static PyObject *TagSecGetAttr(PyObject *Self,char *Name)
-{
-   return Py_FindMethod(TagSecMethods,Self,Name);
-}
-									/*}}}*/
-// Type for a Tag Section
+
+PySequenceMethods TagSecSeqMeth = {0,0,0,0,0,0,0,TagSecContains,0,0};
 PyMappingMethods TagSecMapMeth = {TagSecLength,TagSecMap,0};
-PyTypeObject TagSecType =
+
+
+static char *doc_TagSec = "TagSection(text) -> Create a new object.\n\n"
+   "TagSection() objects provide methods to access rfc822-style formatted\n"
+   "header sections, like those 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)";
+PyTypeObject PyTagSection_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "TagSection",	                // tp_name
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.TagSection",                // tp_name
    sizeof(TagSecData),                  // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
    TagSecFree,                          // tp_dealloc
-   0,		                        // tp_print
-   TagSecGetAttr,                       // tp_getattr
+   0,                                   // tp_print
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    0,                                   // tp_repr
    0,                                   // tp_as_number
-   0,                                   // tp_as_sequence
+   &TagSecSeqMeth,                      // tp_as_sequence
    &TagSecMapMeth,                      // tp_as_mapping
    0,                                   // tp_hash
-   0,					// tp_call
-   TagSecStr,				// tp_str
+   0,                                   // tp_call
+   TagSecStr,                           // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   (Py_TPFLAGS_DEFAULT |                // tp_flags
+    Py_TPFLAGS_BASETYPE |
+    Py_TPFLAGS_HAVE_GC),
+   doc_TagSec,                          // tp_doc
+   CppTraverse<pkgTagSection>,     // tp_traverse
+   CppClear<pkgTagSection>,         // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   0,                                   // tp_iter
+   0,                                   // tp_iternext
+   TagSecMethods,                       // tp_methods
+   0,                                   // tp_members
+   0,                                   // tp_getset
+   0,                                   // tp_base
+   0,                                   // tp_dict
+   0,                                   // tp_descr_get
+   0,                                   // tp_descr_set
+   0,                                   // tp_dictoffset
+   0,                                   // tp_init
+   0,                                   // tp_alloc
+   TagSecNew,                           // tp_new
 };
 
 // Method table for the Tag File object
 static PyMethodDef TagFileMethods[] =
 {
    // Query
-   {"Step",TagFileStep,METH_VARARGS,doc_Step},
-   {"Offset",TagFileOffset,METH_VARARGS,doc_Offset},
-   {"Jump",TagFileJump,METH_VARARGS,doc_Jump},
+   {"step",TagFileStep,METH_VARARGS,doc_Step},
+   {"offset",TagFileOffset,METH_VARARGS,doc_Offset},
+   {"jump",TagFileJump,METH_VARARGS,doc_Jump},
 
    {}
 };
 
-// TagFileGetAttr - Get an attribute - variable/method			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static PyObject *TagFileGetAttr(PyObject *Self,char *Name)
-{
-   if (strcmp("Section",Name) == 0)
-   {
-      PyObject *Obj = ((TagFileData *)Self)->Section;
-      Py_INCREF(Obj);
-      return Obj;
-   }
-
-   return Py_FindMethod(TagFileMethods,Self,Name);
+// Return the current section.
+static PyObject *TagFileGetSection(PyObject *Self,void*) {
+   PyObject *Obj = ((TagFileData *)Self)->Section;
+   Py_INCREF(Obj);
+   return Obj;
 }
 
+static PyGetSetDef TagFileGetSet[] = {
+    {"section",TagFileGetSection,0,"Return a TagSection.",0},
+    {}
+};
+
+
+static char *doc_TagFile = "TagFile(file) -> TagFile() object. \n\n"
+   "TagFile() objects provide access to debian control files, which consists\n"
+   "of multiple RFC822-like formatted sections.\n\n"
+   "To provide access to those sections, TagFile objects provide an iterator\n"
+   "which yields TagSection objects for each section.\n\n"
+   "TagFile objects also provide another API which uses a shared TagSection\n"
+   "object in the 'section' member. The functions step() and jump() can be\n"
+   "used to navigate in the file; and offset() tells the current position.\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)";
+
 // Type for a Tag File
-PyTypeObject TagFileType =
+PyTypeObject PyTagFile_Type =
 {
-   PyObject_HEAD_INIT(&PyType_Type)
-   0,			                // ob_size
-   "TagFile",		                // tp_name
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
+   "apt_pkg.TagFile",                   // tp_name
    sizeof(TagFileData),                 // tp_basicsize
    0,                                   // tp_itemsize
    // Methods
    TagFileFree,                         // tp_dealloc
    0,                                   // tp_print
-   TagFileGetAttr,                      // tp_getattr
+   0,                                   // tp_getattr
    0,                                   // tp_setattr
    0,                                   // tp_compare
    0,                                   // tp_repr
    0,                                   // tp_as_number
    0,                                   // tp_as_sequence
-   0,		                        // tp_as_mapping
+   0,                                   // tp_as_mapping
    0,                                   // tp_hash
+   0,                                   // tp_call
+   0,                                   // tp_str
+   _PyAptObject_getattro,               // tp_getattro
+   0,                                   // tp_setattro
+   0,                                   // tp_as_buffer
+   (Py_TPFLAGS_DEFAULT |                // tp_flags
+    Py_TPFLAGS_BASETYPE |
+    Py_TPFLAGS_HAVE_GC),
+   doc_TagFile,                         // tp_doc
+   TagFileTraverse,                     // tp_traverse
+   TagFileClear,                        // tp_clear
+   0,                                   // tp_richcompare
+   0,                                   // tp_weaklistoffset
+   TagFileIter,                         // tp_iter
+   TagFileNext,                         // tp_iternext
+   TagFileMethods,                      // tp_methods
+   0,                                   // tp_members
+   TagFileGetSet,                       // tp_getset
+   0,                                   // tp_base
+   0,                                   // tp_dict
+   0,                                   // tp_descr_get
+   0,                                   // tp_descr_set
+   0,                                   // tp_dictoffset
+   0,                                   // tp_init
+   0,                                   // tp_alloc
+   TagFileNew,                          // tp_new
+
 };
diff --git a/python/tar.cc b/python/tar.cc
index e5aaee6f..b994d4e7 100644
--- a/python/tar.cc
+++ b/python/tar.cc
@@ -4,10 +4,13 @@
 /* ######################################################################
 
    Tar Inteface
+   * THIS FILE IS COMPLETELY DEPRECATED, AND NOT USED ANYMORE IF BUILT *
+   * WITHOUT COMPATIBILITY. *
 
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#ifdef COMPAT_0_7
 #include "generic.h"
 
 #include <apt-pkg/extracttar.h>
@@ -72,8 +75,12 @@ bool ProcessTar::DoItem(Item &Itm,int &Fd)
       case Item::FIFO:
       Type = "FIFO";
       break;
+
+      default:
+      return false;
    }
 
+
    if (PyObject_CallFunction(Function,"sssiiiiiii",Type,Itm.Name,
 			     Itm.LinkTarget,Itm.Mode,Itm.UID,Itm.GID,Itm.Size,
 			     Itm.MTime,Itm.Major,Itm.Minor) == 0)
@@ -97,8 +104,7 @@ PyObject *tarExtract(PyObject *Self,PyObject *Args)
    PyObject *Function;
    char *Comp;
 
-   if (PyArg_ParseTuple(Args,"O!Os",&PyFile_Type,&File,
-			&Function,&Comp) == 0)
+   if (PyArg_ParseTuple(Args,"OOs",&File, &Function,&Comp) == 0)
       return 0;
 
    if (PyCallable_Check(Function) == 0)
@@ -109,7 +115,11 @@ PyObject *tarExtract(PyObject *Self,PyObject *Args)
 
    {
       // Open the file and associate the tar
-      FileFd Fd(fileno(PyFile_AsFile(File)),false);
+      int fileno = PyObject_AsFileDescriptor(File);
+      if (fileno == -1)
+        return 0;
+
+      FileFd Fd(fileno,false);
       ExtractTar Tar(Fd,0xFFFFFFFF,Comp);
       if (_error->PendingError() == true)
 	 return HandleErrors();
@@ -139,8 +149,7 @@ PyObject *debExtract(PyObject *Self,PyObject *Args)
    char *Chunk;
    const char *Comp = "gzip";
 
-   if (PyArg_ParseTuple(Args,"O!Os",&PyFile_Type,&File,
-			&Function,&Chunk) == 0)
+   if (PyArg_ParseTuple(Args,"OOs",&File,&Function,&Chunk) == 0)
       return 0;
 
    if (PyCallable_Check(Function) == 0)
@@ -149,10 +158,13 @@ PyObject *debExtract(PyObject *Self,PyObject *Args)
       return 0;
    }
 
+   int fileno = PyObject_AsFileDescriptor(File);
+   if (fileno == -1)
+      return 0;
    {
       // Open the file and associate the tar
       // Open the file and associate the .deb
-      FileFd Fd(fileno(PyFile_AsFile(File)),false);
+      FileFd Fd(fileno,false);
       debDebFile Deb(Fd);
       if (_error->PendingError() == true)
 	 return HandleErrors();
@@ -180,3 +192,4 @@ PyObject *debExtract(PyObject *Self,PyObject *Args)
    return HandleErrors(Py_None);
 }
 									/*}}}*/
+#endif // defined(COMPAT_0_7)
diff --git a/python/tarfile.cc b/python/tarfile.cc
new file mode 100644
index 00000000..6363af0f
--- /dev/null
+++ b/python/tarfile.cc
@@ -0,0 +1,490 @@
+/*
+ * arfile.cc - Wrapper around ExtractTar which behaves like Python's tarfile.
+ *
+ * Copyright 2009 Julian Andres Klode <jak@debian.org>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "generic.h"
+#include "apt_instmodule.h"
+#include <apt-pkg/extracttar.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/dirstream.h>
+
+/**
+ * A subclass of pkgDirStream which calls a Python callback.
+ *
+ * This calls a Python callback in FinishedFile() with the Item as the first
+ * argument and the data as the second argument.
+ *
+ * It can also work without a callback, in which case it just sets the
+ * 'py_member' and 'py_data' members. This can be combined with setting
+ * 'member' to extract a single member into the memory.
+ */
+class PyDirStream : public pkgDirStream
+{
+
+public:
+    PyObject *callback;
+    PyObject *py_data;
+    // The requested member or NULL.
+    const char *member;
+    // Set to true if an error occured in the Python callback.
+    bool error;
+    // Place where the copy of the data is stored.
+    char *copy;
+    // The size of the copy
+    size_t copy_size;
+
+    virtual bool DoItem(Item &Itm,int &Fd);
+    virtual bool FinishedFile(Item &Itm,int Fd);
+    virtual bool Process(Item &Itm,const unsigned char *Data,
+                         unsigned long Size,unsigned long Pos);
+
+    PyDirStream(PyObject *callback, const char *member=0) : callback(callback),
+        py_data(0), member(member), error(false), copy(0)
+    {
+        Py_XINCREF(callback);
+    }
+
+    virtual ~PyDirStream() {
+        Py_XDECREF(callback);
+        Py_XDECREF(py_data);
+        delete[] copy;
+    }
+};
+
+bool PyDirStream::DoItem(Item &Itm, int &Fd)
+{
+    if (!member || strcmp(Itm.Name, member) == 0) {
+        // Allocate a new buffer if the old one is too small.
+        if (copy == NULL || copy_size < Itm.Size) {
+            delete[] copy;
+            copy = new char[Itm.Size];
+            copy_size = Itm.Size;
+        }
+        Fd = -2;
+    } else {
+        Fd = -1;
+    }
+    return true;
+}
+
+bool PyDirStream::Process(Item &Itm,const unsigned char *Data,
+                          unsigned long Size,unsigned long Pos)
+{
+    memcpy(copy + Pos, Data,Size);
+    return true;
+}
+
+bool PyDirStream::FinishedFile(Item &Itm,int Fd)
+{
+    if (member && strcmp(Itm.Name, member) != 0)
+        // Skip non-matching Items, if a specific one is requested.
+        return true;
+
+    Py_XDECREF(py_data);
+    py_data = PyBytes_FromStringAndSize(copy, Itm.Size);
+
+    if (!callback)
+        return true;
+
+    // The current member and data.
+    CppPyObject<Item> *py_member;
+    py_member = CppPyObject_NEW<Item>(0, &PyTarMember_Type);
+    // Clone our object, including the strings in it.
+    py_member->Object = Itm;
+    py_member->Object.Name = new char[strlen(Itm.Name)+1];
+    py_member->Object.LinkTarget = new char[strlen(Itm.LinkTarget)+1];
+    strcpy(py_member->Object.Name, Itm.Name);
+    strcpy(py_member->Object.LinkTarget,Itm.LinkTarget);
+    py_member->NoDelete = true;
+    error = PyObject_CallFunctionObjArgs(callback, py_member, py_data, 0) == 0;
+    // Clear the old objects and create new ones.
+    Py_XDECREF(py_member);
+    return (!error);
+}
+
+void tarmember_dealloc(PyObject *self) {
+    // We cloned those strings, delete them again.
+    delete[] GetCpp<pkgDirStream::Item>(self).Name;
+    delete[] GetCpp<pkgDirStream::Item>(self).LinkTarget;
+    CppDealloc<pkgDirStream::Item>(self);
+}
+
+// The tarfile.TarInfo interface for our TarMember class.
+static PyObject *tarmember_isblk(PyObject *self, PyObject *args)
+{
+    return PyBool_FromLong(GetCpp<pkgDirStream::Item>(self).Type ==
+                           pkgDirStream::Item::BlockDevice);
+}
+static PyObject *tarmember_ischr(PyObject *self, PyObject *args)
+{
+    return PyBool_FromLong(GetCpp<pkgDirStream::Item>(self).Type ==
+                           pkgDirStream::Item::CharDevice);
+}
+static PyObject *tarmember_isdev(PyObject *self, PyObject *args)
+{
+    pkgDirStream::Item::Type_t type = GetCpp<pkgDirStream::Item>(self).Type;
+    return PyBool_FromLong(type == pkgDirStream::Item::CharDevice ||
+                           type == pkgDirStream::Item::BlockDevice ||
+                           type == pkgDirStream::Item::FIFO);
+}
+
+static PyObject *tarmember_isdir(PyObject *self, PyObject *args)
+{
+    return PyBool_FromLong(GetCpp<pkgDirStream::Item>(self).Type ==
+                           pkgDirStream::Item::Directory);
+}
+
+static PyObject *tarmember_isfifo(PyObject *self, PyObject *args)
+{
+    return PyBool_FromLong(GetCpp<pkgDirStream::Item>(self).Type ==
+                           pkgDirStream::Item::FIFO);
+}
+
+static PyObject *tarmember_isfile(PyObject *self, PyObject *args)
+{
+    return PyBool_FromLong(GetCpp<pkgDirStream::Item>(self).Type ==
+                           pkgDirStream::Item::File);
+}
+static PyObject *tarmember_islnk(PyObject *self, PyObject *args)
+{
+    return PyBool_FromLong(GetCpp<pkgDirStream::Item>(self).Type ==
+                           pkgDirStream::Item::HardLink);
+}
+static PyObject *tarmember_isreg(PyObject *self, PyObject *args)
+{
+    return tarmember_isfile(self, NULL);
+}
+static PyObject *tarmember_issym(PyObject *self, PyObject *args)
+{
+    return PyBool_FromLong(GetCpp<pkgDirStream::Item>(self).Type ==
+                           pkgDirStream::Item::SymbolicLink);
+}
+
+static PyObject *tarmember_get_name(PyObject *self, void *closure)
+{
+    return PyString_FromString(GetCpp<pkgDirStream::Item>(self).Name);
+}
+
+static PyObject *tarmember_get_linkname(PyObject *self, void *closure)
+{
+    return Safe_FromString(GetCpp<pkgDirStream::Item>(self).LinkTarget);
+}
+
+static PyObject *tarmember_get_mode(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).Mode);
+}
+
+static PyObject *tarmember_get_uid(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).UID);
+}
+static PyObject *tarmember_get_gid(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).GID);
+}
+static PyObject *tarmember_get_size(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).Size);
+}
+
+static PyObject *tarmember_get_mtime(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).MTime);
+}
+
+static PyObject *tarmember_get_major(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).Major);
+}
+
+static PyObject *tarmember_get_minor(PyObject *self, void *closure)
+{
+    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).Minor);
+}
+
+static PyObject *tarmember_repr(PyObject *self)
+{
+    return PyString_FromFormat("<%s object: name:'%s'>",
+                               self->ob_type->tp_name,
+                               GetCpp<pkgDirStream::Item>(self).Name);
+
+}
+
+
+static PyMethodDef tarmember_methods[] = {
+    {"isblk",tarmember_isblk,METH_NOARGS,
+        "Determine whether the member is a block device."},
+    {"ischr",tarmember_ischr,METH_NOARGS,
+     "Determine whether the member is a character device."},
+    {"isdev",tarmember_isdev,METH_NOARGS,
+     "Determine whether the member is a device (block,character or FIFO)."},
+    {"isdir",tarmember_isdir,METH_NOARGS,
+     "Determine whether the member is a directory."},
+    {"isfifo",tarmember_isfifo,METH_NOARGS,
+     "Determine whether the member is a FIFO."},
+    {"isfile",tarmember_isfile,METH_NOARGS,
+     "Determine whether the member is a regular file."},
+    {"islnk",tarmember_islnk,METH_NOARGS,
+     "Determine whether the member is a hardlink."},
+    {"isreg",tarmember_isreg,METH_NOARGS,
+     "Determine whether the member is a regular file, same as isfile()."},
+    {"issym",tarmember_issym,METH_NOARGS,
+     "Determine whether the member is a symbolic link."},
+    {NULL}
+};
+
+static PyGetSetDef tarmember_getset[] = {
+    {"gid",tarmember_get_gid,0,"The owner's group id"},
+    {"linkname",tarmember_get_linkname,0,"The target of the link."},
+    {"major",tarmember_get_major,0,"The major ID of the device."},
+    {"minor",tarmember_get_minor,0,"The minor ID of the device."},
+    {"mode",tarmember_get_mode,0,"The mode (permissions)."},
+    {"mtime",tarmember_get_mtime,0,"Last time of modification."},
+    {"name",tarmember_get_name,0,"The name of the file."},
+    {"size",tarmember_get_size,0,"The size of the file."},
+    {"uid",tarmember_get_uid,0,"The owner's user id."},
+    {NULL}
+};
+
+static const char *tarmember_doc =
+    "Represent a single member of a 'tar' archive.\n\n"
+    "This class, which has been modelled after 'tarfile.TarInfo', represents\n"
+    "information about a given member in an archive.";
+PyTypeObject PyTarMember_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_inst.TarMember",                // tp_name
+    sizeof(CppPyObject<pkgDirStream::Item>),           // tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    tarmember_dealloc,                   // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    tarmember_repr,                      // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                   // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    Py_TPFLAGS_DEFAULT |                 // tp_flags
+    Py_TPFLAGS_HAVE_GC,
+    tarmember_doc,                       // tp_doc
+    CppTraverse<pkgDirStream::Item>,       // tp_traverse
+    CppClear<pkgDirStream::Item>,          // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    tarmember_methods,                   // tp_methods
+    0,                                   // tp_members
+    tarmember_getset                     // tp_getset
+};
+
+
+
+static PyObject *tarfile_new(PyTypeObject *type,PyObject *args,PyObject *kwds)
+{
+    PyObject *file;
+    PyTarFileObject *self;
+    char *filename;
+    int fileno;
+    int min = 0;
+    int max = 0xFFFFFFFF;
+    char *comp = "gzip";
+
+    static char *kwlist[] = {"file","min","max","comp",NULL};
+    if (PyArg_ParseTupleAndKeywords(args, kwds, "O|iis", kwlist, &file, &min,
+                                    &max,&comp) == 0)
+        return 0;
+
+    self = (PyTarFileObject*)CppPyObject_NEW<ExtractTar*>(file,type);
+
+    // We receive a filename.
+    if ((filename = (char*)PyObject_AsString(file)))
+        new (&self->Fd) FileFd(filename,FileFd::ReadOnly);
+    else if ((fileno = PyObject_AsFileDescriptor(file)) != -1) {
+        // clear the error set by PyObject_AsString().
+        PyErr_Clear();
+        new (&self->Fd) FileFd(fileno,false);
+    }
+    else {
+        Py_DECREF(self);
+        return 0;
+    }
+
+    self->min = min;
+    self->Object = new ExtractTar(self->Fd,max,comp);
+    if (_error->PendingError() == true)
+        return HandleErrors(self);
+    return self;
+}
+
+static const char *tarfile_extractall_doc =
+    "extractall([rootdir: str]) -> True\n\n"
+    "Extract the archive in the current directory. The argument 'rootdir'\n"
+    "can be used to change the target directory.";
+static PyObject *tarfile_extractall(PyObject *self, PyObject *args)
+{
+    string cwd = SafeGetCWD();
+    char *rootdir = 0;
+    if (PyArg_ParseTuple(args,"|s:extractall",&rootdir) == 0)
+        return 0;
+
+    if (rootdir) {
+        if (chdir(rootdir) == -1)
+            return PyErr_SetFromErrnoWithFilename(PyExc_OSError, rootdir);
+    }
+
+    pkgDirStream Extract;
+
+    ((PyTarFileObject*)self)->Fd.Seek(((PyTarFileObject*)self)->min);
+    bool res = GetCpp<ExtractTar*>(self)->Go(Extract);
+
+
+
+    if (rootdir) {
+        if (chdir(cwd.c_str()) == -1)
+            return PyErr_SetFromErrnoWithFilename(PyExc_OSError,
+                                                  (char*)cwd.c_str());
+    }
+    return HandleErrors(PyBool_FromLong(res));
+}
+
+static const char *tarfile_go_doc =
+    "go(callback: callable[, member: str]) -> True\n\n"
+    "Go through the archive and call the callable callback for each\n"
+    "member with 2 arguments. The first argument is the TarMember and\n"
+    "the second one is the data, as bytes.\n\n"
+    "The optional parameter 'member' can be used to specify the member for\n"
+    "which call the callback. If not specified, it will be called for all\n"
+    "members. If specified and not found, LookupError will be raised.";
+static PyObject *tarfile_go(PyObject *self, PyObject *args)
+{
+    PyObject *callback;
+    char *member = 0;
+    if (PyArg_ParseTuple(args,"O|s",&callback,&member) == 0)
+        return 0;
+    if (member && strcmp(member, "") == 0)
+        member = 0;
+    pkgDirStream Extract;
+    PyDirStream stream(callback, member);
+    ((PyTarFileObject*)self)->Fd.Seek(((PyTarFileObject*)self)->min);
+    bool res = GetCpp<ExtractTar*>(self)->Go(stream);
+    if (stream.error)
+        return 0;
+    if (member && !stream.py_data)
+        return PyErr_Format(PyExc_LookupError, "There is no member named '%s'",
+                            member);
+    return HandleErrors(PyBool_FromLong(res));
+}
+
+static const char *tarfile_extractdata_doc =
+    "extractdata(member: str) -> bytes\n\n"
+    "Return the contents of the member, as a bytes object. Raise\n"
+    "LookupError if there is no member with the given name.";
+static PyObject *tarfile_extractdata(PyObject *self, PyObject *args)
+{
+    const char *member;
+    if (PyArg_ParseTuple(args,"s",&member) == 0)
+        return 0;
+    PyDirStream stream(NULL, member);
+    ((PyTarFileObject*)self)->Fd.Seek(((PyTarFileObject*)self)->min);
+    // Go through the stream.
+    GetCpp<ExtractTar*>(self)->Go(stream);
+
+    if (!stream.py_data)
+        return PyErr_Format(PyExc_LookupError, "There is no member named '%s'",
+                            member);
+    if (stream.error) {
+        return 0;
+    }
+    return Py_INCREF(stream.py_data), stream.py_data;
+}
+
+static PyMethodDef tarfile_methods[] = {
+    {"extractdata",tarfile_extractdata,METH_VARARGS,tarfile_extractdata_doc},
+    {"extractall",tarfile_extractall,METH_VARARGS,tarfile_extractall_doc},
+    {"go",tarfile_go,METH_VARARGS,tarfile_go_doc},
+    {NULL}
+};
+
+static PyObject *tarfile_repr(PyObject *self)
+{
+    return PyString_FromFormat("<%s object: %s>", self->ob_type->tp_name,
+                               PyString_AsString(PyObject_Repr(GetOwner<ExtractTar*>(self))));
+}
+
+static const char *tarfile_doc =
+    "TarFile(file: str/int/file[, min: int, max: int, comp: str])\n\n"
+    "The parameter 'file' may be a string specifying the path of a file, or\n"
+    "a file-like object providing the fileno() method. It may also be an int\n"
+    "specifying a file descriptor (returned by e.g. os.open()).\n\n"
+    "The parameter 'min' describes the offset in the file where the archive\n"
+    "begins and the parameter 'max' is the size of the archive.\n\n"
+    "The compression of the archive is set by the parameter 'comp'. It can\n"
+    "be set to any program supporting the -d switch, the default being gzip.";
+PyTypeObject PyTarFile_Type = {
+    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    "apt_inst.TarFile",                  // tp_name
+    sizeof(PyTarFileObject),             // tp_basicsize
+    0,                                   // tp_itemsize
+    // Methods
+    CppDealloc<ExtractTar*>,        // tp_dealloc
+    0,                                   // tp_print
+    0,                                   // tp_getattr
+    0,                                   // tp_setattr
+    0,                                   // tp_compare
+    tarfile_repr,                        // tp_repr
+    0,                                   // tp_as_number
+    0,                                   // tp_as_sequence
+    0,                                   // tp_as_mapping
+    0,                                   // tp_hash
+    0,                                   // tp_call
+    0,                                   // tp_str
+    0,                                   // tp_getattro
+    0,                                   // tp_setattro
+    0,                                   // tp_as_buffer
+    Py_TPFLAGS_DEFAULT |                 // tp_flags
+    Py_TPFLAGS_HAVE_GC,
+    tarfile_doc,                         // tp_doc
+    CppTraverse<ExtractTar*>,       // tp_traverse
+    CppClear<ExtractTar*>,          // tp_clear
+    0,                                   // tp_richcompare
+    0,                                   // tp_weaklistoffset
+    0,                                   // tp_iter
+    0,                                   // tp_iternext
+    tarfile_methods,                     // tp_methods
+    0,                                   // tp_members
+    0,                                   // tp_getset
+    0,                                   // tp_base
+    0,                                   // tp_dict
+    0,                                   // tp_descr_get
+    0,                                   // tp_descr_set
+    0,                                   // tp_dictoffset
+    0,                                   // tp_init
+    0,                                   // tp_alloc
+    tarfile_new                          // tp_new
+};
diff --git a/setup.py b/setup.py
index a9b45066..9c6eda60 100755..100644
--- a/setup.py
+++ b/setup.py
@@ -1,49 +1,62 @@
-#! /usr/bin/env python
+#!/usr/bin/python
+# Builds on python2.X and python3
 # $Id: setup.py,v 1.2 2002/01/08 07:13:21 jgg Exp $
 import glob
 import os
-import shutil
 import sys
 
 from distutils.core import setup, Extension
-from distutils.sysconfig import parse_makefile
-from DistUtilsExtra.command import build_extra, build_i18n
+cmdclass = {}
 
+try:
+    from DistUtilsExtra.command import build_extra, build_i18n
+    from DistUtilsExtra.auto import clean_build_tree
+    cmdclass['build'] = build_extra.build_extra
+    cmdclass['build_i18n'] = build_i18n.build_i18n
+    cmdclass['clean'] = clean_build_tree
+except ImportError:
+    print('W: [python%s] DistUtilsExtra import error.' % sys.version[:3])
 
-# The apt_pkg module
-files = map(lambda source: "python/"+source,
-            parse_makefile("python/makefile")["APT_PKG_SRC"].split())
+try:
+    from sphinx.setup_command import BuildDoc
+    cmdclass['build_sphinx'] = BuildDoc
+except ImportError:
+    print('W: [python%s] Sphinx import error.' % sys.version[:3])
+
+if sys.version_info[0] == 3:
+    from distutils.command.build_py import build_py_2to3
+    cmdclass['build_py'] = build_py_2to3
+
+# The apt_pkg module.
+files = ['apt_pkgmodule.cc', 'acquire.cc', 'cache.cc', 'cdrom.cc',
+         'configuration.cc', 'depcache.cc', 'generic.cc', 'hashes.cc',
+         'hashstring.cc', 'indexfile.cc', 'indexrecords.cc', 'metaindex.cc',
+         'pkgmanager.cc', 'pkgrecords.cc', 'pkgsrcrecords.cc', 'policy.cc',
+         'progress.cc', 'sourcelist.cc', 'string.cc', 'tag.cc',
+         'lock.cc', 'acquire-item.cc', 'python-apt-helpers.cc']
+files = sorted(['python/' + fname for fname in files], key=lambda s: s[:-3])
 apt_pkg = Extension("apt_pkg", files, libraries=["apt-pkg"])
 
 # The apt_inst module
-files = map(lambda source: "python/"+source,
-            parse_makefile("python/makefile")["APT_INST_SRC"].split())
+files = ["python/apt_instmodule.cc", "python/generic.cc", "python/tar.cc",
+         "python/arfile.cc", "python/tarfile.cc"]
 apt_inst = Extension("apt_inst", files, libraries=["apt-pkg", "apt-inst"])
 
 # Replace the leading _ that is used in the templates for translation
-templates = []
-
-# build doc
 if len(sys.argv) > 1 and sys.argv[1] == "build":
     if not os.path.exists("build/data/templates/"):
         os.makedirs("build/data/templates")
     for template in glob.glob('data/templates/*.info.in'):
         source = open(template, "r")
-        build = open(os.path.join("build", template[:-3]), "w")
-        lines = source.readlines()
-        for line in lines:
+        build = open("build/" + template[:-3], "w")
+        for line in source:
             build.write(line.lstrip("_"))
         source.close()
         build.close()
-
-
-if len(sys.argv) > 1 and sys.argv[1] == "clean" and '-a' in sys.argv:
-    for dirname in "build/doc", "doc/build", "build/data", "build/mo":
-        if os.path.exists(dirname):
-            print "Removing", dirname
-            shutil.rmtree(dirname)
-        else:
-            print "Not removing", dirname, "because it does not exist"
+    for template in glob.glob('data/templates/*.mirrors'):
+        import shutil
+        shutil.copy(template, os.path.join("build", template))
+        
 
 setup(name="python-apt",
       description="Python bindings for APT",
@@ -56,15 +69,6 @@ setup(name="python-apt",
                     glob.glob('build/data/templates/*.info')),
                     ('share/python-apt/templates',
                     glob.glob('data/templates/*.mirrors'))],
-      cmdclass = {"build": build_extra.build_extra,
-                  "build_i18n": build_i18n.build_i18n},
+      cmdclass = cmdclass,
       license = 'GNU GPL',
       platforms = 'posix')
-
-if (len(sys.argv) > 1 and sys.argv[1] == "build" and
-    sys.version_info[0] >= 2 and sys.version_info[1] >= 5):
-    import sphinx
-    sphinx.main(["sphinx", "-b", "html", "-d", "build/doc/doctrees",
-                os.path.abspath("doc/source"), "build/doc/html"])
-    sphinx.main(["sphinx", "-b", "text", "-d", "build/doc/doctrees",
-                os.path.abspath("doc/source"), "build/doc/text"])
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 00000000..792d6005
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1 @@
+#
diff --git a/tests/data/sources.list b/tests/data/aptsources/sources.list
index 5481d4f0..5481d4f0 100644
--- a/tests/data/sources.list
+++ b/tests/data/aptsources/sources.list
diff --git a/tests/data/sources.list.testDistribution b/tests/data/aptsources/sources.list.testDistribution
index 0f40e85a..79224a34 100644
--- a/tests/data/sources.list.testDistribution
+++ b/tests/data/aptsources/sources.list.testDistribution
@@ -6,8 +6,8 @@ deb http://de.archive.ubuntu.com/ubuntu/ hardy-updates restricted
 deb http://de.archive.ubuntu.com/ubuntu/ hardy-security main
 deb http://de.archive.ubuntu.com/ubuntu/ hardy-security multiverse
 deb http://ftp.debian.org/debian sid main
-deb http://ubuntu.cs.uaf.edu/ubuntu/ hardy main
-deb http://ubuntu.cs.uaf.edu/ubuntu/ hardy-backports main
+deb http://ftp.hosteurope.de/mirror/archive.ubuntu.com/ hardy main
+deb http://ftp.hosteurope.de/mirror/archive.ubuntu.com/ hardy-backports main
 deb http://archive.ubuntu.com/ubuntu/ intrepid main
 deb cdrom:[Ubuntu 8.10 _Intrepid Ibex_ - Alpha]/ intrepid main
-deb cdrom:[Ubuntu 8.04 _Hardy Heron_] hardy main
\ No newline at end of file
+deb cdrom:[Ubuntu 8.04 _Hardy Heron_] hardy main
diff --git a/tests/test-data-ports/sources.list b/tests/data/aptsources_ports/sources.list
index a6b2f6ed..a6b2f6ed 100644
--- a/tests/test-data-ports/sources.list
+++ b/tests/data/aptsources_ports/sources.list
diff --git a/tests/getcache_mem_corruption.py b/tests/getcache_mem_corruption.py
deleted file mode 100644
index 42e9af00..00000000
--- a/tests/getcache_mem_corruption.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/python
-import apt
-import apt_pkg
-import re
-
-import unittest
-
-class TestGetCache(unittest.TestCase):
-    
-    def setUp(self):
-        apt_pkg.InitConfig()
-        apt_pkg.InitSystem()
-    
-    def testWrongInvocation(self):
-        # wrongly invoke GetCache() rather than GetDepCache()
-        apt_cache = apt_pkg.GetCache()
-        self.assertRaises(ValueError, apt_pkg.GetCache, apt_cache)
-    
-    def testProperInvocation(self):
-        apt_cache = apt_pkg.GetCache(apt.progress.OpTextProgress())
-        apt_depcache = apt_pkg.GetDepCache(apt_cache)
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tests/old/__init__.py b/tests/old/__init__.py
new file mode 100644
index 00000000..afd0f074
--- /dev/null
+++ b/tests/old/__init__.py
@@ -0,0 +1,13 @@
+import os
+import unittest
+
+
+
+if __name__ == '__main__':
+    os.chdir(os.path.dirname(__file__))
+    print os.getcwd()
+
+    for path in os.listdir('.'):
+        if path.endswith('.py'):
+            exec 'from %s import *' % path[:-3]
+    unittest.main()
diff --git a/tests/apt-test.py b/tests/old/apt-test.py
index fac2ff43..fac2ff43 100644
--- a/tests/apt-test.py
+++ b/tests/old/apt-test.py
diff --git a/tests/cache.py b/tests/old/cache.py
index 87a544e8..f0bf6761 100644
--- a/tests/cache.py
+++ b/tests/old/cache.py
@@ -9,8 +9,8 @@ import sys
 
 def main():
     apt_pkg.init()
-    cache = apt_pkg.GetCache()
-    depcache = apt_pkg.GetDepCache(cache)
+    cache = apt_pkg.Cache()
+    depcache = apt_pkg.DepCache(cache)
     depcache.Init()
     i=0
     all=cache.PackageCount
diff --git a/tests/depcache.py b/tests/old/depcache.py
index 19aba680..0d59648e 100644
--- a/tests/depcache.py
+++ b/tests/old/depcache.py
@@ -9,8 +9,8 @@ import sys
 
 def main():
     apt_pkg.init()
-    cache = apt_pkg.GetCache()
-    depcache = apt_pkg.GetDepCache(cache)
+    cache = apt_pkg.Cache()
+    depcache = apt_pkg.DepCache(cache)
     depcache.Init()
     i=0
     all=cache.PackageCount
diff --git a/tests/hashsum_test.data b/tests/old/hashsum_test.data
index 19102815..19102815 100644
--- a/tests/hashsum_test.data
+++ b/tests/old/hashsum_test.data
diff --git a/tests/hashsum_test_with_zero.data b/tests/old/hashsum_test_with_zero.data
index 2ec9a6df..2ec9a6df 100644
--- a/tests/hashsum_test_with_zero.data
+++ b/tests/old/hashsum_test_with_zero.data
diff --git a/tests/lock.py b/tests/old/lock.py
index d45b3964..d45b3964 100644
--- a/tests/lock.py
+++ b/tests/old/lock.py
diff --git a/tests/memleak.py b/tests/old/memleak.py
index 659091fc..5299f35f 100755
--- a/tests/memleak.py
+++ b/tests/old/memleak.py
@@ -29,10 +29,10 @@ for i in range(100):
 
 # no memleak, but more or less the apt.Cache.open() code
 for i in range(100):
-    cache = apt_pkg.GetCache()
-    depcache = apt_pkg.GetDepCache(cache)
-    records = apt_pkg.GetPkgRecords(cache)
-    list = apt_pkg.GetPkgSourceList()
+    cache = apt_pkg.Cache()
+    depcache = apt_pkg.DepCache(cache)
+    records = apt_pkg.PackageRecords(cache)
+    list = apt_pkg.SourceList()
     list.ReadMainList()
     dict = {}
     for pkg in cache.Packages:
diff --git a/tests/pkgproblemresolver.py b/tests/old/pkgproblemresolver.py
index a21d8d9d..0d6d0611 100644
--- a/tests/pkgproblemresolver.py
+++ b/tests/old/pkgproblemresolver.py
@@ -9,8 +9,8 @@ import sys
 
 def main():
     apt_pkg.init()
-    cache = apt_pkg.GetCache()
-    depcache = apt_pkg.GetDepCache(cache)
+    cache = apt_pkg.Cache()
+    depcache = apt_pkg.DepCache(cache)
     depcache.Init()
     i=0
     all=cache.PackageCount
@@ -25,7 +25,7 @@ def main():
         if ver is not None:
             depcache.MarkInstall(pkg)
             if depcache.BrokenCount > 0:
-                fixer = apt_pkg.GetPkgProblemResolver(depcache)
+                fixer = apt_pkg.ProblemResolver(depcache)
                 fixer.Clear(pkg)
                 fixer.Protect(pkg)
                 # we first try to resolve the problem
diff --git a/tests/pkgrecords.py b/tests/old/pkgrecords.py
index 5866847d..2fe6ad20 100644
--- a/tests/pkgrecords.py
+++ b/tests/old/pkgrecords.py
@@ -10,14 +10,14 @@ import sys
 
 def main():
     apt_pkg.init()
-    cache = apt_pkg.GetCache()
-    depcache = apt_pkg.GetDepCache(cache)
+    cache = apt_pkg.Cache()
+    depcache = apt_pkg.DepCache(cache)
     depcache.Init()
     i=0
     print "Running PkgRecords test on all packages:"
     for pkg in cache.Packages:
         i += 1
-        records = apt_pkg.GetPkgRecords(cache)
+        records = apt_pkg.PackageRecords(cache)
         if len(pkg.VersionList) == 0:
             #print "no available version, cruft"
             continue
diff --git a/tests/pkgsrcrecords.py b/tests/old/pkgsrcrecords.py
index 77670540..2ea9dd3a 100644
--- a/tests/pkgsrcrecords.py
+++ b/tests/old/pkgsrcrecords.py
@@ -10,12 +10,12 @@ import sys
 
 def main():
     apt_pkg.init()
-    cache = apt_pkg.GetCache()
+    cache = apt_pkg.Cache()
     i=0
     print "Running PkgSrcRecords test on all packages:"
     for x in cache.Packages:
         i += 1
-        src = apt_pkg.GetPkgSrcRecords()
+        src = apt_pkg.SourceRecords()
         if src.Lookup(x.Name):
             #print src.Package
             pass
diff --git a/tests/refcount.py b/tests/old/refcount.py
index a29744ae..a29744ae 100755
--- a/tests/refcount.py
+++ b/tests/old/refcount.py
diff --git a/tests/test_debextract.py b/tests/old/test_debextract.py
index 4ba498ae..4ba498ae 100755
--- a/tests/test_debextract.py
+++ b/tests/old/test_debextract.py
diff --git a/tests/test_enhances.py b/tests/old/test_enhances.py
index 3eced9f9..3eced9f9 100644
--- a/tests/test_enhances.py
+++ b/tests/old/test_enhances.py
diff --git a/tests/test_extract_archive.py b/tests/old/test_extract_archive.py
index ce202b06..ce202b06 100644
--- a/tests/test_extract_archive.py
+++ b/tests/old/test_extract_archive.py
diff --git a/tests/test_hashsums.py b/tests/old/test_hashsums.py
index 0cf6beb7..0cf6beb7 100644
--- a/tests/test_hashsums.py
+++ b/tests/old/test_hashsums.py
diff --git a/tests/test_all.py b/tests/test_all.py
new file mode 100644
index 00000000..d561a9ae
--- /dev/null
+++ b/tests/test_all.py
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+# Copyright (C) 2009 Julian Andres Klode <jak@debian.org>
+#
+# 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.
+"""Run all available unit tests."""
+import os
+import unittest
+import sys
+
+if __name__ == '__main__':
+    sys.stderr.write("[tests] Running on %s\n" % sys.version.replace("\n", ""))
+    os.chdir(os.path.dirname(__file__))
+    # Find the path to the built apt_pkg and apt_inst extensions
+    if os.path.exists("../build"):
+        from distutils.util import get_platform
+        from distutils.sysconfig import get_python_version
+        # Set the path to the build directory.
+        plat_specifier = ".%s-%s" % (get_platform(), get_python_version())
+        if sys.version_info[0] >= 3 or sys.version_info[1] >= 6:
+            library_dir = "../build/lib%s%s" % (plat_specifier,
+                                            (sys.pydebug and "-pydebug" or ""))
+        else:
+            library_dir = "../build/lib%s%s" % ((sys.pydebug and "_d" or ""),
+                                            plat_specifier)
+        sys.path.insert(0, os.path.abspath(library_dir))
+
+    for path in os.listdir('.'):
+        if path.endswith('.py') and os.path.isfile(path):
+            exec('from %s import *' % path[:-3])
+
+    unittest.main()
diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py
index 3761f3ff..767f5244 100644
--- a/tests/test_aptsources.py
+++ b/tests/test_aptsources.py
@@ -3,24 +3,28 @@
 import unittest
 import os
 import copy
-import sys
 
-sys.path.insert(0, "../")
 import apt_pkg
-import aptsources
 import aptsources.sourceslist
 import aptsources.distro
 
 
 class TestAptSources(unittest.TestCase):
 
-    def __init__(self, methodName):
-        unittest.TestCase.__init__(self, methodName)
-        apt_pkg.init()
-        apt_pkg.Config.Set("Dir::Etc", os.getcwd())
-        apt_pkg.Config.Set("Dir::Etc::sourceparts", "/xxx")
+    def setUp(self):
+        apt_pkg.init_config()
+        apt_pkg.init_system()
+        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")
+        if os.path.exists("../build/data/templates"):
+            self.templates = os.path.abspath("../build/data/templates")
+        else:
+            self.templates = "/usr/share/python-apt/templates/"
 
     def testIsMirror(self):
+        """aptsources: Test mirror detection."""
         yes = aptsources.sourceslist.is_mirror("http://archive.ubuntu.com",
                                                "http://de.archive.ubuntu.com")
         no = aptsources.sourceslist.is_mirror("http://archive.ubuntu.com",
@@ -29,17 +33,21 @@ class TestAptSources(unittest.TestCase):
         self.assertFalse(no)
 
     def testSourcesListReading(self):
-        apt_pkg.Config.Set("Dir::Etc::sourcelist", "data/sources.list")
-        sources = aptsources.sourceslist.SourcesList()
+        """aptsources: Test sources.list parsing."""
+        apt_pkg.config.set("Dir::Etc::sourcelist", "data/aptsources/"
+                                                   "sources.list")
+        sources = aptsources.sourceslist.SourcesList(True, self.templates)
         self.assertEqual(len(sources.list), 6)
         # test load
         sources.list = []
-        sources.load("data/sources.list")
+        sources.load("data/aptsources/sources.list")
         self.assertEqual(len(sources.list), 6)
 
     def testSourcesListAdding(self):
-        apt_pkg.Config.Set("Dir::Etc::sourcelist", "data/sources.list")
-        sources = aptsources.sourceslist.SourcesList()
+        """aptsources: Test additions to sources.list"""
+        apt_pkg.config.set("Dir::Etc::sourcelist", "data/aptsources/"
+                                                   "sources.list")
+        sources = aptsources.sourceslist.SourcesList(True, self.templates)
         # test to add something that is already there (main)
         before = copy.deepcopy(sources)
         sources.add("deb", "http://de.archive.ubuntu.com/ubuntu/",
@@ -86,9 +94,10 @@ class TestAptSources(unittest.TestCase):
         self.assertEqual(found_universe, 1)
 
     def testMatcher(self):
-        apt_pkg.Config.Set("Dir::Etc::sourcelist", "data/sources.list.test"
-                                                   "Distribution")
-        sources = aptsources.sourceslist.SourcesList()
+        """aptsources: Test matcher"""
+        apt_pkg.config.set("Dir::Etc::sourcelist", "data/aptsources/"
+                           "sources.list.testDistribution")
+        sources = aptsources.sourceslist.SourcesList(True, self.templates)
         distro = aptsources.distro.get_distro()
         distro.get_sources(sources)
         # test if all suits of the current distro were detected correctly
@@ -98,9 +107,10 @@ class TestAptSources(unittest.TestCase):
                 self.fail("source entry '%s' has no matcher" % s)
 
     def testDistribution(self):
-        apt_pkg.Config.Set("Dir::Etc::sourcelist", "data/sources.list.test"
-                                                   "Distribution")
-        sources = aptsources.sourceslist.SourcesList()
+        """aptsources: Test distribution detection."""
+        apt_pkg.config.set("Dir::Etc::sourcelist", "data/aptsources/"
+                           "sources.list.testDistribution")
+        sources = aptsources.sourceslist.SourcesList(True, self.templates)
         distro = aptsources.distro.get_distro()
         distro.get_sources(sources)
         # test if all suits of the current distro were detected correctly
@@ -148,4 +158,5 @@ class TestAptSources(unittest.TestCase):
 
 
 if __name__ == "__main__":
+    os.chdir(os.path.dirname(__file__))
     unittest.main()
diff --git a/tests/test_aptsources_ports.py b/tests/test_aptsources_ports.py
index 09d6e9d9..991b532a 100644
--- a/tests/test_aptsources_ports.py
+++ b/tests/test_aptsources_ports.py
@@ -1,30 +1,32 @@
 #!/usr/bin/env python
-
+import os
 import unittest
 
-import os
-import copy
-import sys
 
-sys.path.insert(0, "../")
 import apt_pkg
-import aptsources
 import aptsources.sourceslist
 import aptsources.distro
 
 
-class TestAptSources(unittest.TestCase):
+class TestAptSourcesPorts(unittest.TestCase):
+    """Test aptsources on ports.ubuntu.com."""
 
-    def __init__(self, methodName):
-        unittest.TestCase.__init__(self, methodName)
-        apt_pkg.init()
-        apt_pkg.Config.Set("APT::Architecture", "powerpc")
-        apt_pkg.Config.Set("Dir::Etc", os.path.abspath("test-data-ports"))
-        apt_pkg.Config.Set("Dir::Etc::sourceparts", "/xxx")
+    def setUp(self):
+        apt_pkg.init_config()
+        apt_pkg.init_system()
+        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")
+        if os.path.exists("../build/data/templates"):
+            self.templates = os.path.abspath("../build/data/templates")
+        else:
+            self.templates = "/usr/share/python-apt/templates/"
 
     def testMatcher(self):
-        apt_pkg.Config.Set("Dir::Etc::sourcelist", "sources.list")
-        sources = aptsources.sourceslist.SourcesList()
+        """aptsources_ports: Test matcher."""
+        apt_pkg.config.set("Dir::Etc::sourcelist", "sources.list")
+        sources = aptsources.sourceslist.SourcesList(True, self.templates)
         distro = aptsources.distro.get_distro("Ubuntu", "hardy", "desc",
                                               "8.04")
         distro.get_sources(sources)
diff --git a/tests/test_cache_invocation.py b/tests/test_cache_invocation.py
new file mode 100644
index 00000000..6f4014de
--- /dev/null
+++ b/tests/test_cache_invocation.py
@@ -0,0 +1,30 @@
+#!/usr/bin/python
+import unittest
+
+import apt_pkg
+import apt.progress.base
+
+
+class TestCache(unittest.TestCase):
+    """Test invocation of apt_pkg.Cache()"""
+
+    def setUp(self):
+        apt_pkg.init_config()
+        apt_pkg.init_system()
+
+    def test_wrong_invocation(self):
+        """cache_invocation: Test wrong invocation."""
+        apt_cache = apt_pkg.Cache(apt.progress.base.OpProgress())
+
+        self.assertRaises(ValueError, apt_pkg.Cache, apt_cache)
+        self.assertRaises(ValueError, apt_pkg.Cache,
+                          apt.progress.base.AcquireProgress())
+        self.assertRaises(ValueError, apt_pkg.Cache, 0)
+
+    def test_proper_invocation(self):
+        """cache_invocation: Test correct invocation."""
+        apt_cache = apt_pkg.Cache(apt.progress.base.OpProgress())
+        apt_depcache = apt_pkg.DepCache(apt_cache)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/test_deps.py b/tests/test_deps.py
new file mode 100644
index 00000000..674c9485
--- /dev/null
+++ b/tests/test_deps.py
@@ -0,0 +1,119 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2010 Julian Andres Klode <jak@debian.org>
+#
+# 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 check_dep, etc in apt_pkg."""
+import unittest
+
+import apt_pkg
+
+
+class TestDependencies(unittest.TestCase):
+
+    def setUp(self):
+        apt_pkg.init()
+
+    def testCheckDep(self):
+        """dependencies: Test apt_pkg.CheckDep() for '<' and '>'
+
+        The CheckDep function should treat '<' as '<=' and '>' as '>=', for
+        compatibility reasons."""
+        if not hasattr(apt_pkg, 'CheckDep'):
+            return
+        self.assertFalse(apt_pkg.CheckDep("1", "<", "0"))
+        self.assertTrue(apt_pkg.CheckDep("1", "<", "1"))
+        self.assertTrue(apt_pkg.CheckDep("1", "<", "2"))
+
+        self.assertFalse(apt_pkg.CheckDep("0", ">", "1"))
+        self.assertTrue(apt_pkg.CheckDep("1", ">", "1"))
+        self.assertTrue(apt_pkg.CheckDep("2", ">", "1"))
+
+    def test_check_dep(self):
+        "dependencies: Test apt_pkg.check_dep()"
+        self.assertFalse(apt_pkg.check_dep("1", "<<", "0"))
+        self.assertFalse(apt_pkg.check_dep("1", "<<", "1"))
+        self.assertTrue(apt_pkg.check_dep("1", "<<", "2"))
+
+        self.assertFalse(apt_pkg.check_dep("1", "<", "0"))
+        self.assertFalse(apt_pkg.check_dep("1", "<", "1"))
+        self.assertTrue(apt_pkg.check_dep("1", "<", "2"))
+
+        self.assertFalse(apt_pkg.check_dep("1", "<=", "0"))
+        self.assertTrue(apt_pkg.check_dep("1", "<=", "1"))
+        self.assertTrue(apt_pkg.check_dep("1", "<=", "2"))
+
+        self.assertFalse(apt_pkg.check_dep("0", "=", "1"))
+        self.assertTrue(apt_pkg.check_dep("1", "=", "1"))
+        self.assertFalse(apt_pkg.check_dep("2", "=", "1"))
+
+        self.assertFalse(apt_pkg.check_dep("0", ">=", "1"))
+        self.assertTrue(apt_pkg.check_dep("1", ">=", "1"))
+        self.assertTrue(apt_pkg.check_dep("2", ">=", "1"))
+
+        self.assertFalse(apt_pkg.check_dep("0", ">", "1"))
+        self.assertFalse(apt_pkg.check_dep("1", ">", "1"))
+        self.assertTrue(apt_pkg.check_dep("2", ">", "1"))
+
+        self.assertFalse(apt_pkg.check_dep("0", ">>", "1"))
+        self.assertFalse(apt_pkg.check_dep("1", ">>", "1"))
+        self.assertTrue(apt_pkg.check_dep("2", ">>", "1"))
+
+    def test_parse_depends(self):
+        """dependencies: Test apt_pkg.parse_depends()"""
+        deps = apt_pkg.parse_depends("p1a (<< 1a) | p1b (>> 1b)")
+        self.assertTrue(isinstance(deps, list))
+        self.assertEqual(len(deps), 1)
+        self.assertTrue(isinstance(deps[0], list))
+        self.assertEqual(len(deps[0]), 2)
+        self.assertEqual(len(deps[0][0]), 3)
+        self.assertEqual(len(deps[0][1]), 3)
+        self.assertEqual(deps[0][0][0], "p1a")
+        self.assertEqual(deps[0][0][1], "1a")
+        self.assertEqual(deps[0][0][2], "<")
+        self.assertEqual(deps[0][1][0], "p1b")
+        self.assertEqual(deps[0][1][1], "1b")
+        self.assertEqual(deps[0][1][2], ">")
+
+        # Check that the type of comparison is parsed correctly.
+        self.assertEqual("<", apt_pkg.parse_depends("p1 (<< 1)")[0][0][2])
+        self.assertEqual("<=", apt_pkg.parse_depends("p1 (< 1)")[0][0][2])
+        self.assertEqual("<=", apt_pkg.parse_depends("p1 (<= 1)")[0][0][2])
+        self.assertEqual("=", apt_pkg.parse_depends("p1 (= 1)")[0][0][2])
+        self.assertEqual(">=", apt_pkg.parse_depends("p1 (>= 1)")[0][0][2])
+        self.assertEqual(">=", apt_pkg.parse_depends("p1 (> 1)")[0][0][2])
+        self.assertEqual(">", apt_pkg.parse_depends("p1 (>> 1)")[0][0][2])
+
+    def test_parse_src_depends(self):
+        """dependencies: Test apt_pkg.parse_src_depends()."""
+        # Check that architecture exclusion works
+        # depends_this: Current architecture is included
+        # depends_this_too: Another architecture is excluded
+        # depends_other: The current architecture is excluded
+        # depends_other: Another architecture is requested.
+        architecture = apt_pkg.config["APT::Architecture"]
+        depends_this = apt_pkg.parse_src_depends("p [%s]" % architecture)
+        depends_this_too = apt_pkg.parse_src_depends("p [!not-existing-arch]")
+        depends_other = apt_pkg.parse_src_depends("p [!%s]" % architecture)
+        depends_other_too = apt_pkg.parse_src_depends("p [not-existing-arch]")
+
+        self.assertEqual(len(depends_this), len(depends_this_too), 1)
+        self.assertEqual(len(depends_other), len(depends_other_too), 0)
+
+    def testParseDepends(self):
+        """dependencies: Test apt_pkg.ParseDepends()."""
+        if not hasattr(apt_pkg, 'ParseDepends'):
+            return
+        # Check that the type of comparison is parsed correctly.
+        self.assertEqual("<<", apt_pkg.ParseDepends("p1 (<< 1)")[0][0][2])
+        self.assertEqual("<=", apt_pkg.ParseDepends("p1 (< 1)")[0][0][2])
+        self.assertEqual("<=", apt_pkg.ParseDepends("p1 (<= 1)")[0][0][2])
+        self.assertEqual("=", apt_pkg.ParseDepends("p1 (= 1)")[0][0][2])
+        self.assertEqual(">=", apt_pkg.ParseDepends("p1 (>= 1)")[0][0][2])
+        self.assertEqual(">=", apt_pkg.ParseDepends("p1 (> 1)")[0][0][2])
+        self.assertEqual(">>", apt_pkg.ParseDepends("p1 (>> 1)")[0][0][2])
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/test_hashes.py b/tests/test_hashes.py
new file mode 100644
index 00000000..e0aabe09
--- /dev/null
+++ b/tests/test_hashes.py
@@ -0,0 +1,113 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2009 Julian Andres Klode <jak@debian.org>
+#
+# 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 hashsums in apt_pkg.
+
+Unit tests to verify the correctness of Hashes, HashString and the various
+functions like md5sum."""
+import unittest
+import hashlib
+import sys
+
+import apt_pkg
+
+
+class TestHashes(unittest.TestCase):
+    """Test apt_pkg.Hashes() and the various apt_pkg.*sum() functions."""
+
+    def setUp(self):
+        """Prepare the tests, create reference values..."""
+        self.file = open(apt_pkg.__file__, "rb")
+        self.value = self.file.read()
+        self.hashes = apt_pkg.Hashes(self.value)
+        self.file.seek(0)
+        self.fhashes = apt_pkg.Hashes(self.file)
+        # Reference values.
+        self.md5 = hashlib.md5(self.value).hexdigest()
+        self.sha1 = hashlib.sha1(self.value).hexdigest()
+        self.sha256 = hashlib.sha256(self.value).hexdigest()
+        self.file.seek(0)
+
+    def tearDown(self):
+        """Cleanup, Close the file object used for the tests."""
+        self.file.close()
+
+    def test_md5sum(self):
+        """hashes: Test apt_pkg.md5sum()"""
+        self.assertEqual(apt_pkg.md5sum(self.value), self.md5)
+        self.assertEqual(apt_pkg.md5sum(self.file), self.md5)
+
+    def test_sha1sum(self):
+        """hashes: Test apt_pkg.sha1sum()"""
+        self.assertEqual(apt_pkg.sha1sum(self.value), self.sha1)
+        self.assertEqual(apt_pkg.sha1sum(self.file), self.sha1)
+
+    def test_sha256sum(self):
+        """hashes: Test apt_pkg.sha256sum()"""
+        self.assertEqual(apt_pkg.sha256sum(self.value), self.sha256)
+        self.assertEqual(apt_pkg.sha256sum(self.file), self.sha256)
+
+    def test_bytes(self):
+        """hashes: Test apt_pkg.Hashes(bytes)"""
+        self.assertEqual(self.hashes.md5, self.md5)
+        self.assertEqual(self.hashes.sha1, self.sha1)
+        self.assertEqual(self.hashes.sha256, self.sha256)
+
+    def test_file(self):
+        """hashes: Test apt_pkg.Hashes(file)."""
+        self.assertEqual(self.hashes.md5, self.fhashes.md5)
+        self.assertEqual(self.hashes.sha1, self.fhashes.sha1)
+        self.assertEqual(self.hashes.sha256, self.fhashes.sha256)
+
+    def test_unicode(self):
+        """hashes: Test apt_pkg.Hashes(unicode)."""
+        if sys.version_info[0] == 3:
+            self.assertRaises(TypeError, apt_pkg.Hashes, "D")
+            self.assertRaises(TypeError, apt_pkg.md5sum, "D")
+            self.assertRaises(TypeError, apt_pkg.sha1sum, "D")
+            self.assertRaises(TypeError, apt_pkg.sha256sum, "D")
+        else:
+            self.assertRaises(TypeError, apt_pkg.Hashes, unicode())
+            self.assertRaises(TypeError, apt_pkg.md5sum, unicode())
+            self.assertRaises(TypeError, apt_pkg.sha1sum, unicode())
+            self.assertRaises(TypeError, apt_pkg.sha256sum, unicode())
+
+
+class TestHashString(unittest.TestCase):
+    """Test apt_pkg.HashString()."""
+
+    def setUp(self):
+        """Prepare the test by reading the file."""
+        self.hashes = apt_pkg.Hashes(open(apt_pkg.__file__))
+        self.md5 = apt_pkg.HashString("MD5Sum", self.hashes.md5)
+        self.sha1 = apt_pkg.HashString("SHA1", self.hashes.sha1)
+        self.sha256 = apt_pkg.HashString("SHA256", self.hashes.sha256)
+
+    def test_md5(self):
+        """hashes: Test apt_pkg.HashString().md5"""
+        self.assertEqual("MD5Sum:%s" % self.hashes.md5, str(self.md5))
+        self.assertTrue(self.md5.verify_file(apt_pkg.__file__))
+
+    def test_sha1(self):
+        """hashes: Test apt_pkg.HashString().sha1"""
+        self.assertEqual("SHA1:%s" % self.hashes.sha1, str(self.sha1))
+        self.assertTrue(self.sha1.verify_file(apt_pkg.__file__))
+
+    def test_sha256(self):
+        """hashes: Test apt_pkg.HashString().sha256"""
+        self.assertEqual("SHA256:%s" % self.hashes.sha256, str(self.sha256))
+        self.assertTrue(self.sha256.verify_file(apt_pkg.__file__))
+
+    def test_wrong(self):
+        """hashes: Test apt_pkg.HashString(wrong_type)."""
+        self.assertRaises(TypeError, apt_pkg.HashString, 0)
+        if sys.version_info[0] == 3:
+            self.assertRaises(TypeError, apt_pkg.HashString, bytes())
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/utils/doclint.py b/utils/doclint.py
new file mode 100644
index 00000000..a387b05f
--- /dev/null
+++ b/utils/doclint.py
@@ -0,0 +1,77 @@
+#!/usr/bin/python
+# Documentation lint.
+# Copyright (C) 2009 Julian Andres Klode <jak@debian.org>
+#
+# 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.
+#
+# This comes without any warranty.
+"""Read the pickle file created by sphinx and check it."""
+
+from __future__ import with_statement
+import cPickle
+import os
+import sys
+
+
+def handle(filename):
+    with open(filename) as fobj:
+        index = cPickle.load(fobj)
+
+        objects = index['descrefs']
+        modules = index['modules']
+        types = index['desctypes']
+
+    for modname in modules:
+        module = __import__(modname, fromlist=["*"])
+
+        for modmember in objects[modname]:
+            if not modmember in module.__dict__:
+                print 'W: Unknown', modname + '.' + modmember
+            elif types[objects[modname][modmember][1]] == u'class':
+                if modname + '.' + modmember not in objects:
+                    print 'I: No members', modname + '.' + modmember
+                    continue
+                for member in objects.get(modname + '.' + modmember):
+                    if not member in dir(module.__dict__[modmember]):
+                        print 'W: Unknown', modname + '.' + modmember + '.' + member
+
+                    assert(types[objects[modname+"."+modmember][member][1]] in ('method', 'attribute'))
+
+        all = getattr(module, '__all__', [])
+        for modmember in dir(module):
+            if getattr(module.__dict__[modmember], "__module__", modname) != modname:
+                continue
+            if isinstance(module.__dict__[modmember], type(module)):
+                continue
+            if modmember.startswith("_"):
+                continue
+            if not modmember in objects[modname] and (not all or modmember in all):
+                print 'E: Missing', modname + '.' + modmember
+            elif not modmember in objects[modname]:
+                print 'W: Missing', modname + '.' + modmember
+            elif types[objects[modname][modmember][1]] == u'class':
+                for member in dir(module.__dict__[modmember]):
+                    if member.startswith("_"):
+                        continue
+                    try:
+                        contin = False
+                        for base in module.__dict__[modmember].__bases__:
+                            if member in dir(base):
+                                contin = True
+                        if contin:
+                            continue
+                    except:
+                        pass
+                    if not member in objects.get(modname + '.' + modmember, ""):
+                        print 'E: Missing', modname + '.' + modmember + '.' + member
+
+
+if __name__ == '__main__':
+    scriptdir = os.path.dirname(__file__)
+    parentdir = os.path.join(scriptdir, "..")
+    directory = os.path.join(parentdir,  "doc", "build", "pickle")
+    directory = os.path.normpath(directory)
+    sys.path.insert(0, os.path.abspath(parentdir))
+    handle(os.path.join(directory, "searchindex.pickle"))
diff --git a/utils/get_debian_mirrors.py b/utils/get_debian_mirrors.py
index 9fb783bd..395c21da 100755
--- a/utils/get_debian_mirrors.py
+++ b/utils/get_debian_mirrors.py
@@ -1,13 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/python
+#  get_debian_mirrors.py - Parse Mirrors.masterlist and create a mirror list.
 #
-#  get_debian_mirrors.py
-#
-#  Download the latest list with available mirrors from the Debian
-#  website and extract the hosts from the raw page
-#
-#  Copyright (c) 2006, 2009 Free Software Foundation Europe
-#
-#  Author: Sebastian Heinlein <glatzor@ubuntu.com>
+#  Copyright (c) 2010 Julian Andres Klode <jak@debian.org>
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License as
@@ -23,52 +17,22 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
-
+import collections
 import urllib2
-import re
-import os
-import commands
-import sys
-
-# the list of official Ubuntu servers
-mirrors = []
-# path to the local mirror list
-list_path = "../data/templates/Debian.mirrors"
-
-req = urllib2.Request("http://www.debian.org/mirror/mirrors_full")
-match = re.compile("^.*>([A-Za-z0-9-.\/_]+)<\/a>.*\n$")
-match_location = re.compile('^<h3><a name="([A-Z]+)">.*')
-match_sites = re.compile('^Site: <tt>([A-Za-z0-9-.\ \/_,]+)<\/tt>.*\n$')
-
-
-def add_sites(line, proto, sites, mirror_type):
-    path = match.sub(r"\1", line)
-    for site in sites:
-        mirror_type.append("%s://%s%s\n" % (proto, site.lstrip(), path))
-
-
-try:
-    print "Downloading mirrors list from the Debian website..."
-    uri=urllib2.urlopen(req)
-    for line in uri.readlines():
-        if line.startswith('<h3><a name="'):
-            location = match_location.sub(r"\1", line)
-            if location:
-                mirrors.append("#LOC:%s" % location)
-        if line.startswith("Site:"):
-            sites = match_sites.sub(r"\1", line).split(",")
-        elif line.startswith('<br>Packages over HTTP'):
-            add_sites(line, "http", sites, mirrors)
-        elif line.startswith('<br>Packages over FTP'):
-            add_sites(line, "ftp", sites, mirrors)
-    uri.close()
-except:
-    print "Failed to download or to extract the mirrors list!"
-    sys.exit(1)
-
-print "Writing local mirrors list: %s" % list_path
-list = open(list_path, "w")
-for mirror in mirrors:
-    list.write("%s" % mirror)
-list.close()
-print "Done."
+from debian_bundle import deb822
+
+mirrors = collections.defaultdict(set)
+masterlist = urllib2.urlopen("http://cvs.debian.org/webwml/webwml/english/"
+                             "mirror/Mirrors.masterlist?revision=HEAD")
+
+for mirror in deb822.Deb822.iter_paragraphs(masterlist):
+    country = mirror["Country"].split(None, 1)[0]
+    site = mirror["Site"]
+    for proto in 'http', 'ftp':
+        if "Archive-%s" % proto in mirror:
+            mirrors[country].add("%s://%s%s" % (proto, site,
+                                                mirror["Archive-%s" % proto]))
+
+for country in sorted(mirrors):
+    print "#LOC:%s" % country
+    print "\n".join(sorted(mirrors[country]))
diff --git a/utils/get_ubuntu_mirrors_from_lp.py b/utils/get_ubuntu_mirrors_from_lp.py
index 3c183b6d..341dba8a 100755
--- a/utils/get_ubuntu_mirrors_from_lp.py
+++ b/utils/get_ubuntu_mirrors_from_lp.py
@@ -44,4 +44,4 @@ keys = countries.keys()
 keys.sort()
 for country in keys:
     print "#LOC:%s" % country
-    print "\n".join(countries[country])
+    print "\n".join(sorted(countries[country]))
diff --git a/utils/migrate-0.8.py b/utils/migrate-0.8.py
new file mode 100755
index 00000000..d0d8e9a1
--- /dev/null
+++ b/utils/migrate-0.8.py
@@ -0,0 +1,246 @@
+#!/usr/bin/python2.6
+#
+# migrate-0.8.py - Find use of deprecated methods/attributes in the code.
+#
+# Copyright (C) 2009 Julian Andres Klode <jak@debian.org>
+#
+# 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
+"""migrate-0.8.py - Find all occurences of funcs./attrs. deprecated in 0.8.
+
+Usage: python2.6 migrate-0.8.py [options] <file/directory>...
+
+This reads the list of all functions and attributes available only in
+COMPAT_0_7 builds and checks for occurences in the given Python modules. Has
+to be run from the python-apt source code directory.
+
+Requires python2.6 to be installed.
+
+Parameters:
+    -h  Display this help
+    -c  Colorize the matching parts in the output.
+"""
+import _ast
+import ast
+import glob
+import linecache
+import os
+import re
+import sys
+import types
+from collections import defaultdict
+from textwrap import fill
+
+color=False
+if len(sys.argv) > 1 and sys.argv[1] in ('-c', '--color', '--colour'):
+    color=True
+    del sys.argv[1]
+
+if '-h' in sys.argv or '--help' in sys.argv or not sys.argv[1:]:
+    print __doc__.strip()
+    sys.exit(0)
+
+if os.path.dirname(__file__).endswith('utils'):
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+
+deprecated_cpp_stuff = set([
+    '.Add', '.AllTargets', '.Arch', '.Architecture', '.Archive', 
+    '.ArchiveURI', '.Auto', '.Base64Encode', '.Binaries', '.BrokenCount', 
+    '.BuildDepends', '.Bytes', '.CheckDep', '.CheckDomainList', '.Clear', 
+    '.Close', '.Commit', '.CompType', '.Complete', '.Component', '.Config', 
+    '.CurStateConfigFiles', '.CurStateHalfConfigured', 
+    '.CurStateHalfInstalled', '.CurStateInstalled', '.CurStateNotInstalled', 
+    '.CurStateUnPacked', '.CurrentState', '.CurrentVer', '.Date', 
+    '.DeQuoteString', '.DebSize', '.DelCount', '.DepType', '.DependsCount', 
+    '.DependsList', '.DependsListStr', '.DescURI', '.Describe', '.DestFile', 
+    '.Dist', '.DoInstall', '.Downloadable', '.ErrorText', '.Essential', 
+    '.Exists', '.FetchNeeded', '.FileList', '.FileName', '.FileSize', 
+    '.Files', '.Find', '.FindB', '.FindDir', '.FindFile', '.FindFlag', 
+    '.FindI', '.FindIndex', '.FindRaw', '.FixBroken', '.FixMissing', 
+    '.GetAcquire', '.GetArchives', '.GetCache', '.GetCandidateVer', 
+    '.GetCdrom', '.GetDepCache', '.GetIndexes', '.GetLock', 
+    '.GetPackageManager', '.GetPkgAcqFile', '.GetPkgActionGroup', 
+    '.GetPkgProblemResolver', '.GetPkgRecords', '.GetPkgSourceList', 
+    '.GetPkgSrcRecords', '.HasPackages', '.Hash', '.Homepage', '.ID', 
+    '.Ident', '.Important', '.Index', '.IndexFiles', '.IndexType', '.Init', 
+    '.InitConfig', '.InitSystem', '.InstCount', '.InstState', 
+    '.InstStateHold', '.InstStateHoldReInstReq', '.InstStateOk', 
+    '.InstStateReInstReq', '.InstallProtect', '.InstalledSize', 
+    '.IsAutoInstalled', '.IsGarbage', '.IsInstBroken', '.IsNowBroken', 
+    '.IsTrusted', '.IsUpgradable', '.Items', '.Jump', '.KeepCount', 
+    '.Label', '.LanguageCode', '.LibVersion', '.List', '.Local', 
+    '.LongDesc', '.Lookup', '.MD5Hash', '.Maintainer', '.MarkDelete', 
+    '.MarkInstall', '.MarkKeep', '.MarkedDelete', '.MarkedDowngrade', 
+    '.MarkedInstall', '.MarkedKeep', '.MarkedReinstall', '.MarkedUpgrade', 
+    '.MinimizeUpgrade', '.MyTag', '.Name', '.NotAutomatic', '.NotSource', 
+    '.Offset', '.Open', '.Origin', '.Package', '.PackageCount', 
+    '.PackageFileCount', '.Packages', '.ParentPkg', '.ParentVer', 
+    '.ParseCommandLine', '.ParseDepends', '.ParseSection', 
+    '.ParseSrcDepends', '.ParseTagFile', '.PartialPresent', 
+    '.PkgSystemLock', '.PkgSystemUnLock', '.PriExtra', '.PriImportant', 
+    '.PriOptional', '.PriRequired', '.PriStandard', '.Priority', 
+    '.PriorityStr', '.Protect', '.ProvidesCount', '.ProvidesList', 
+    '.QuoteString', '.ReadConfigDir', '.ReadConfigFile', 
+    '.ReadConfigFileISC', '.ReadMainList', '.ReadPinFile', '.Record', 
+    '.Remove', '.Resolve', '.ResolveByKeep', '.Restart', '.RevDependsList', 
+    '.RewriteSection', '.RewriteSourceOrder', '.Run', '.SHA1Hash', 
+    '.SHA256Hash', '.Section', '.SelStateDeInstall', '.SelStateHold', 
+    '.SelStateInstall', '.SelStatePurge', '.SelStateUnknown', 
+    '.SelectedState', '.Set', '.SetCandidateVer', '.SetReInstall', 
+    '.ShortDesc', '.Shutdown', '.Site', '.Size', '.SizeToStr', 
+    '.SmartTargetPkg', '.SourcePkg', '.SourceVer', '.Status', '.Step', 
+    '.StrToTime', '.StringToBool', '.SubTree', '.TargetPkg', '.TargetVer', 
+    '.Time', '.TimeRFC1123', '.TimeToStr', '.TotalNeeded', 
+    '.TranslationDescription', '.URI', '.URItoFileName', '.Update', 
+    '.Upgrade', '.UpstreamVersion', '.UsrSize', '.ValueList', 
+    '.VerFileCount', '.VerStr', '.Version', '.VersionCompare', 
+    '.VersionCount', '.VersionList', '.newConfiguration', 'Base64Encode', 
+    'CheckDep', 'CheckDomainList', 'Config', 'CurStateConfigFiles', 
+    'CurStateHalfConfigured', 'CurStateHalfInstalled', 'CurStateInstalled', 
+    'CurStateNotInstalled', 'CurStateUnPacked', 'Date', 'DeQuoteString', 
+    'GetAcquire', 'GetCache', 'GetCdrom', 'GetDepCache', 'GetLock', 
+    'GetPackageManager', 'GetPkgAcqFile', 'GetPkgActionGroup', 
+    'GetPkgProblemResolver', 'GetPkgRecords', 'GetPkgSourceList', 
+    'GetPkgSrcRecords', 'InitConfig', 'InitSystem', 'InstStateHold', 
+    'InstStateHoldReInstReq', 'InstStateOk', 'InstStateReInstReq', 
+    'LibVersion', 'ParseCommandLine', 'ParseDepends', 'ParseSection', 
+    'ParseSrcDepends', 'ParseTagFile', 'PkgSystemLock', 'PkgSystemUnLock', 
+    'PriExtra', 'PriImportant', 'PriOptional', 'PriRequired', 'PriStandard', 
+    'QuoteString', 'ReadConfigDir', 'ReadConfigFile', 'ReadConfigFileISC', 
+    'RewriteSection', 'RewriteSourceOrder', 'SelStateDeInstall', 
+    'SelStateHold', 'SelStateInstall', 'SelStatePurge', 'SelStateUnknown', 
+    'SizeToStr', 'StrToTime', 'StringToBool', 'Time', 'TimeRFC1123', 
+    'TimeToStr', 'URItoFileName', 'UpstreamVersion', 'VersionCompare', 
+    'newConfiguration'])
+
+def do_color(string, words):
+    """Colorize (red) the given words in the given string."""
+    if not color:
+        return string
+    for word in words:
+        word = re.escape(word)
+        string = re.sub('([^_]*)(%s)([^_]*)' % word, "\\1\033[31m\033[1m" +
+                        r"\2" + "\033[0m\\3", string)
+    return string
+
+def find_deprecated_py():
+    """Find all the deprecated functions and attributes.
+
+    Import apt_pkg, set _COMPAT_0_7 to 0, import apt and aptsources and
+    create a list of all attributes. Then remove the imported modules,
+    reimport them (with _COMPAT_0_7=1), and see which functions do not
+    exist anymore.
+    """
+
+    modules = ('apt', 'apt.package', 'apt.cdrom', 'apt.cache', 'apt.debfile',
+               'apt.progress', 'apt.progress.old', 'aptsources.distinfo',
+               'aptsources.distro', 'aptsources.sourceslist')
+
+    import apt_pkg
+    apt_pkg._COMPAT_0_7 = 0
+
+    empty = set(sys.modules)
+    new, deprecated = set(), set()
+
+    for mname in sorted(modules):
+        module = __import__(mname, fromlist=['*'])
+
+        for clsname in dir(module):
+            cls = getattr(module, clsname)
+            if not isinstance(cls, types.TypeType):
+                new.add(clsname)
+                continue
+            # Attributes/Methods
+            new.update(clsname + '.' + name for name in dir(cls))
+
+    for mname in sys.modules.keys():
+        if not mname in empty:
+            del sys.modules[mname]
+
+    apt_pkg._COMPAT_0_7 = 1
+
+    for mname in sorted(modules):
+        module = __import__(mname, fromlist=['*'])
+        for clsname in dir(module):
+            cls = getattr(module, clsname)
+            if not isinstance(cls, types.TypeType):
+                deprecated.add(clsname)
+                continue
+            for name in dir(cls):
+                if not clsname + '.' + name in new:
+                    # Attributes/Methods, which are deprecated (not in new).
+                    deprecated.add('.' + name)
+
+    for mname in sys.modules.keys():
+        if not mname in empty:
+            del sys.modules[mname]
+
+    return deprecated.difference(new)
+
+
+def find_occurences(all_old, files):
+    """Find all ocurrences in the given Python files."""
+    for fname in files:
+        if fname.endswith('setup3.py') or not fname.endswith('.py'):
+            continue
+
+        words = defaultdict(lambda: set())
+        for i in ast.walk(ast.parse(open(fname).read())):
+            if isinstance(i, _ast.ImportFrom):
+                for alias in i.names:
+                    if alias.name in all_old:
+                        words[i.lineno].add(alias.name)
+            if isinstance(i, _ast.Name) and i.id in all_old:
+                words[i.lineno].add(i.id)
+
+            if isinstance(i, _ast.Attribute) and ('.' + i.attr in all_old):
+                words[i.lineno].add(i.attr)
+
+        for lineno in sorted(words):
+            line = do_color(linecache.getline(fname, lineno).rstrip('\n'),
+                            words[lineno])
+            print '%s:%s:%s' % (fname, lineno, line)
+
+# Now, let's find them in the code.
+
+print __doc__.split("\n")[0]
+print
+print fill('Information: Please verify that the results are correct before '
+           'you modify any code, because there may be false positives.', 79)
+print
+if color:
+    print fill('Information: The color is not always correct, because we '
+               'simply highlight the matched words (like grep).', 79)
+    print
+
+all_old = deprecated_cpp_stuff
+
+if not '-P' in sys.argv:
+    all_old |= find_deprecated_py()
+else:
+    sys.argv.remove('-P')
+
+files = set()
+for path in sys.argv[1:]:
+    if not os.path.exists(path):
+        raise ValueError('Path does not exist: %s' % path)
+    if os.path.isfile(path):
+        files.add(path)
+    else:
+        for root, dirs, files_ in os.walk(path):
+            for fname in files_:
+                files.add(os.path.normpath(os.path.join(root, fname)))
+
+find_occurences(all_old, sorted(files))