* merge with mvo

85 files changed, 34048 insertions, 13114 deletions

diff --git a/DistUpgrade/Changelog b/DistUpgrade/Changelog
index 5f7ba584..ece5feda 100644
--- a/DistUpgrade/Changelog
+++ b/DistUpgrade/Changelog
@@ -1,3 +1,7 @@
+2006-10-06:
+	- fix source.list rewrite corner case bug (#64159)
+2006-10-04:
+	- improve the space checking/logging
 2006-09-29:
 	- typo fix (thanks to Jane Silber) (lp: #62946)
 2006-09-28:
diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg
index b25def9a..f399a1f5 100644
--- a/DistUpgrade/DistUpgrade.cfg
+++ b/DistUpgrade/DistUpgrade.cfg
@@ -1,6 +1,7 @@
 [View]
 View=DistUpgradeViewGtk
 #View=DistUpgradeViewNonInteractive
+#View=DistUpgradeViewText
 
 # Distro contains global information about the upgrade
 [Distro]
@@ -20,7 +21,7 @@ KeepInstalledSection=translations
 [ubuntu-desktop]
 KeyDependencies=gdm, gnome-panel, ubuntu-artwork
 # those pkgs will be marked remove right after the distUpgrade in the cache
-PostUpgradeRemove=xchat, xscreensaver
+PostUpgradeRemove=xscreensaver
 
 [kubuntu-desktop]
 KeyDependencies=kdm, kicker, kubuntu-artwork-usplash
diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade
index 615f698c..2d4ebf92 100644
--- a/DistUpgrade/DistUpgrade.glade
+++ b/DistUpgrade/DistUpgrade.glade
@@ -682,7 +682,7 @@
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">_Start Upgrade</property>
+	      <property name="label" translatable="yes">_Start Upgrade</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
@@ -1264,7 +1264,7 @@
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">_Continue</property>
+	      <property name="label" translatable="yes">_Continue</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
@@ -1487,7 +1487,7 @@
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">_Cancel Upgrade</property>
+	      <property name="label" translatable="yes">_Cancel Upgrade</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
diff --git a/DistUpgrade/DistUpgradeCache.py b/DistUpgrade/DistUpgradeCache.py
index 318c30cd..7d0d27e0 100644
--- a/DistUpgrade/DistUpgradeCache.py
+++ b/DistUpgrade/DistUpgradeCache.py
@@ -1,7 +1,6 @@
 
 import warnings
 warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning)
-warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning)
 import apt
 import apt_pkg
 import os
@@ -164,6 +163,31 @@ class MyCache(apt.Cache):
         if func is not None:
             func()
 
+    def edgyQuirks(self):
+        """ this function works around quirks in the dapper->edgy upgrade """
+        logging.debug("running edgyQuirks handler")
+        # deal with the python2.4-$foo -> python-$foo transition
+        for pkg in self:
+            if (pkg.name.startswith("python2.4-") and
+                pkg.isInstalled and
+                not pkg.markedUpgrade):
+                basepkg = "python-"+pkg.name[len("python2.4-"):]
+                if (self.has_key(basepkg) and not self[basepkg].markedInstall):
+                    try:
+                        self.markInstall(basepkg,
+                                         "python2.4->python upgrade rule")
+                    except SystemError, e:
+                        logging.debug("Failed to apply python2.4->python install: %s (%s)" % (basepkg, e))
+        # deal with *gar*gar* hpijs
+        if (self.has_key("hpijs") and self["hpijs"].isInstalled and
+            not self["hpijs"].markedUpgrade):
+            try:
+                self.markInstall("hpijs","hpijs quirk upgrade rule")
+            except SystemError, e:
+                logging.debug("Failed to apply hpijs install (%s)" % e)
+            
+        
+                                  
     def dapperQuirks(self):
         """ this function works around quirks in the breezy->dapper upgrade """
         logging.debug("running dapperQuirks handler")
@@ -283,8 +307,8 @@ class MyCache(apt.Cache):
                     logging.debug("guessing '%s' as missing meta-pkg" % key)
                     try:
                         self[key].markInstall()
-                    except SystemError:
-                        logging.error("failed to mark '%s' for install" % key)
+                    except SystemError, e:
+                        logging.error("failed to mark '%s' for install (%s)" % (key,e))
                         view.error(_("Can't install '%s'" % key),
                                    _("It was impossible to install a "
                                      "required package. Please report "
@@ -316,13 +340,18 @@ class MyCache(apt.Cache):
         # if it dosn't remove other packages depending on it
         # that are not obsolete as well
         self.create_snapshot()
-        self[pkgname].markDelete()
-        for pkg in self.getChanges():
-            if pkg.name not in remove_candidates or \
-                   pkg.name in foreign_pkgs or \
-                   self._inRemovalBlacklist(pkg.name):
-                self.restore_snapshot()
-                return False
+        try:
+            self[pkgname].markDelete()
+            for pkg in self.getChanges():
+                if pkg.name not in remove_candidates or \
+                       pkg.name in foreign_pkgs or \
+                       self._inRemovalBlacklist(pkg.name):
+                    self.restore_snapshot()
+                    return False
+        except (SystemError,KeyError),e:
+            loggging.warning("_tryMarkObsoleteForRemoval failed for '%s' (%s)" % (pkgname,e))
+            self.restore_snapshot()
+            return False
         return True
     
     def _getObsoletesPkgs(self):
diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py
index 7b255cf0..7b35f3c8 100644
--- a/DistUpgrade/DistUpgradeControler.py
+++ b/DistUpgrade/DistUpgradeControler.py
@@ -75,7 +75,7 @@ class AptCdrom(object):
                              _("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'" % e))
+                               "The error message was:\n'%s'") % e)
             return False
         logging.debug("AptCdrom.add() returned: %s" % res)
         return res
@@ -142,7 +142,11 @@ class DistUpgradeControler(object):
 
     def prepare(self):
         """ initial cache opening, sanity checking, network checking """
-        self.openCache()
+        try:
+            self.openCache()
+        except SystemError, e:
+            logging.error("openCache() failed: '%s'" % e)
+            return False
         if not self.cache.sanityCheck(self._view):
             return False
         # FIXME: we may try to find out a bit more about the network
@@ -368,6 +372,18 @@ class DistUpgradeControler(object):
                     "packages of former installations using "
                     "'sudo apt-get clean'.")
 
+        # gather/log some staticts
+        mnt_map = {}
+        for d in ["/","/usr","/var","/boot"]:
+            st = os.statvfs(d)
+            free = st[statvfs.F_BAVAIL]*st[statvfs.F_FRSIZE]
+            if st in mnt_map:
+                logging.debug("Dir %s mounted on %s" % (d,mnt_map[st]))
+            else:
+                logging.debug("Free space on %s: %s" % (d,free))
+                mnt_map[st] = d
+        del mnt_map
+
         # first check for /var (or where the archives are downloaded too)
         archivedir = apt_pkg.Config.FindDir("Dir::Cache::archives")
         st_archivedir = os.statvfs(archivedir)
@@ -613,7 +629,7 @@ class DistUpgradeControler(object):
                         uri = match.group(1) + path
                         apt_pkg.GetPkgAcqFile(fetcher, uri=uri,
                                               size=ver.Size,
-                                              descr=_("Fetching backport of '%s'" % pkgname))
+                                              descr=_("Fetching backport of '%s'") % pkgname)
         res = fetcher.Run()
         if res != fetcher.ResultContinue:
             # ick! error ...
@@ -644,7 +660,7 @@ class DistUpgradeControler(object):
         else:
             args.append("--without-network")
         os.execve(sys.argv[0],args, os.environ)
-    
+
     # this is the core
     def edgyUpgrade(self):
         # sanity check (check for ubuntu-desktop, brokenCache etc)
@@ -652,7 +668,14 @@ class DistUpgradeControler(object):
         self._view.setStep(1)
         
         if not self.prepare():
-            self.abort(1)
+            self._view.error(_("Preparing the upgrade failed"),
+                             _("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." ))
+            sys.exit(1)
 
         # mvo: commented out for now, see #54234, this needs to be
         #      refactored to use a arch=any tarball
diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py
index a9cd16d7..40617774 100644
--- a/DistUpgrade/DistUpgradeView.py
+++ b/DistUpgrade/DistUpgradeView.py
@@ -35,8 +35,8 @@ def estimatedDownloadTime(requiredDownload):
     """ get the estimated download time """
     timeModem = requiredDownload/(56*1024/8)  # 56 kbit 
     timeDSL = requiredDownload/(1024*1024/8)  # 1Mbit = 1024 kbit
-    s= _("This download will take about %s with a 56k modem and about %s with "
-         "a 1Mbit DSL connection" % (FuzzyTimeToStr(timeModem), FuzzyTimeToStr(timeDSL)))
+    s= _("This download will take about %s with a 1Mbit DSL connection "
+         "and about %s with a 56k modem" % (FuzzyTimeToStr(timeDSL),FuzzyTimeToStr(timeModem)))
     return s
 
 
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py
index 1385d18f..e77fe858 100644
--- a/DistUpgrade/DistUpgradeViewGtk.py
+++ b/DistUpgrade/DistUpgradeViewGtk.py
@@ -97,7 +97,7 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress):
         self.parent = parent
     def mediaChange(self, medium, drive):
       #print "mediaChange %s %s" % (medium, drive)
-      msg = _("Please insert '%s' into the drive '%s'" % (medium,drive))
+      msg = _("Please insert '%s' into the drive '%s'") % (medium,drive)
       dialog = gtk.MessageDialog(parent=self.parent.window_main,
                                  flags=gtk.DIALOG_MODAL,
                                  type=gtk.MESSAGE_QUESTION,
@@ -126,10 +126,10 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress):
             currentItem = self.totalItems
 
         if self.currentCPS > 0:
-            self.status.set_text(_("Fetching file %li of %li at %s/s" % (currentItem, self.totalItems, apt_pkg.SizeToStr(self.currentCPS))))
+            self.status.set_text(_("Fetching file %li of %li at %s/s") % (currentItem, self.totalItems, apt_pkg.SizeToStr(self.currentCPS)))
             self.progress.set_text(_("About %s remaining") % FuzzyTimeToStr(self.eta))
         else:
-            self.status.set_text(_("Fetching file %li of %li" % (currentItem, self.totalItems)))
+            self.status.set_text(_("Fetching file %li of %li") % (currentItem, self.totalItems))
             self.progress.set_text("  ")
 
         while gtk.events_pending():
@@ -184,7 +184,7 @@ class GtkInstallProgressAdapter(InstallProgress):
         logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg))
         #self.expander_terminal.set_expanded(True)
         self.parent.dialog_error.set_transient_for(self.parent.window_main)
-        summary = _("Could not install '%s'" % pkg)
+        summary = _("Could not install '%s'") % pkg
         msg = _("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.")
         markup="<big><b>%s</b></big>\n\n%s" % (summary, msg)
@@ -200,9 +200,9 @@ class GtkInstallProgressAdapter(InstallProgress):
         logging.debug("got a conffile-prompt from dpkg for file: '%s'" % current)
         #self.expander.set_expanded(True)
         prim = _("Replace the customized configuration file\n'%s'?") % current
-        sec = _("You will loose all customizations, that have been made by "
-                "yourself or by a script, if you replace the file by its "
-                "latest version.")
+        sec = _("You will lose any changes you have made to this "
+                "configuration file if you choose to replace it with "
+                "a newer version.")
         markup = "<span weight=\"bold\" size=\"larger\">%s </span> \n\n%s" % (prim, sec)
         self.parent.label_conffile.set_markup(markup)
         self.parent.dialog_conffile.set_transient_for(self.parent.window_main)
@@ -500,8 +500,8 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
                                     pkgs_upgrade) % pkgs_upgrade
             msg +=" "
         if downloadSize > 0:
-            msg += _("\n\nYou have to download a total of %s. " %\
-                     apt_pkg.SizeToStr(downloadSize))
+            msg += _("\n\nYou have to download a total of %s. ") %\
+                     apt_pkg.SizeToStr(downloadSize)
             msg += estimatedDownloadTime(downloadSize)
             msg += "."
 
@@ -532,11 +532,11 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp):
         # fill in the details
         self.details_list.clear()
         for rm in self.toRemove:
-            self.details_list.append([_("<b>Remove %s</b>" % rm)])
+            self.details_list.append([_("<b>Remove %s</b>") % rm])
         for inst in self.toInstall:
-            self.details_list.append([_("Install %s" % inst)])
+            self.details_list.append([_("Install %s") % inst])
         for up in self.toUpgrade:
-            self.details_list.append([_("Upgrade %s" % up)])
+            self.details_list.append([_("Upgrade %s") % up])
         self.treeview_details.scroll_to_cell((0,))
         self.dialog_changes.set_transient_for(self.window_main)
         self.dialog_changes.realize()
diff --git a/DistUpgrade/DistUpgradeViewText.py b/DistUpgrade/DistUpgradeViewText.py
new file mode 100644
index 00000000..b3bd61e3
--- /dev/null
+++ b/DistUpgrade/DistUpgradeViewText.py
@@ -0,0 +1,196 @@
+# DistUpgradeViewText.py 
+#  
+#  Copyright (c) 2004-2006 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
+
+import sys
+import logging
+import time
+import subprocess
+
+import apt
+import apt_pkg
+import os
+
+from apt.progress import InstallProgress
+from DistUpgradeView import DistUpgradeView, FuzzyTimeToStr, estimatedDownloadTime
+
+import gettext
+from gettext import gettext as _
+
+class TextCdromProgressAdapter(apt.progress.CdromProgress):
+    """ Report the cdrom add progress  """
+    def update(self, text, step):
+        """ update is called regularly so that the gui can be redrawn """
+        if text:
+          print "%s (%f)" % (text, step/float(self.totalSteps)*100)
+    def askCdromName(self):
+        return (False, "")
+    def changeCdrom(self):
+        return False
+
+
+class DistUpgradeViewText(DistUpgradeView):
+    " text frontend of the distUpgrade tool "
+    def __init__(self, datadir=None):
+        if not datadir:
+          localedir=os.path.join(os.getcwd(),"mo")
+        else:
+          localedir="/usr/share/locale/update-manager"
+
+        try:
+          gettext.bindtextdomain("update-manager", localedir)
+          gettext.textdomain("update-manager")
+        except Exception, e:
+          logging.warning("Error setting locales (%s)" % e)
+        
+        self.last_step = 0 # keep a record of the latest step
+        self._opCacheProgress = apt.progress.OpTextProgress()
+        self._fetchProgress = apt.progress.TextFetchProgress()
+        self._cdromProgress = TextCdromProgressAdapter()
+        self._installProgress = apt.progress.InstallProgress()
+        sys.excepthook = self._handleException
+
+    def _handleException(self, type, value, tb):
+      import traceback
+      lines = traceback.format_exception(type, value, tb)
+      logging.error("not handled expection:\n%s" % "\n".join(lines))
+      self.error(_("A fatal error occured"),
+                 _("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."),
+                 "\n".join(lines))
+      sys.exit(1)
+
+    def getFetchProgress(self):
+        return self._fetchProgress
+    def getInstallProgress(self, cache):
+        self._installProgress._cache = cache
+        return self._installProgress
+    def getOpCacheProgress(self):
+        return self._opCacheProgress
+    def getCdromProgress(self):
+        return self._cdromProgress
+    def updateStatus(self, msg):
+      print msg
+    def abort(self):
+      print _("Aborting")
+    def setStep(self, step):
+      self.last_step = step
+    def information(self, summary, msg, extended_msg=None):
+      print summary
+      print msg
+      if extended_msg:
+        print extended_msg
+    def error(self, summary, msg, extended_msg=None):
+      print summary
+      print msg
+      if extended_msg:
+        print extended_msg
+      return False
+    def confirmChanges(self, summary, changes, downloadSize, actions=None):
+      DistUpgradeView.confirmChanges(self, summary, changes, downloadSize, actions)
+      pkgs_remove = len(self.toRemove)
+      pkgs_inst = len(self.toInstall)
+      pkgs_upgrade = len(self.toUpgrade)
+      msg = ""
+
+      if pkgs_remove > 0:
+        # FIXME: make those two seperate lines to make it clear
+        #        that the "%" applies to the result of ngettext
+        msg += gettext.ngettext("%d package is going to be removed.",
+                                "%d packages are going to be removed.",
+                                pkgs_remove) % pkgs_remove
+        msg += " "
+        if pkgs_inst > 0:
+          msg += gettext.ngettext("%d new package is going to be "
+                                  "installed.",
+                                  "%d new packages are going to be "
+                                  "installed.",pkgs_inst) % pkgs_inst
+          msg += " "
+        if pkgs_upgrade > 0:
+          msg += gettext.ngettext("%d package is going to be upgraded.",
+                                  "%d packages are going to be upgraded.",
+                                  pkgs_upgrade) % pkgs_upgrade
+          msg +=" "
+        if downloadSize > 0:
+          msg += _("\n\nYou have to download a total of %s. ") %\
+                 apt_pkg.SizeToStr(downloadSize)
+          msg += estimatedDownloadTime(downloadSize)
+          msg += "."
+        if (pkgs_upgrade + pkgs_inst + pkgs_remove) > 100:
+          msg += "\n\n%s" % _("Fetching and installing the upgrade can take several hours and "\
+                              "cannot be canceled at any time later.")
+
+      # Show an error if no actions are planned
+      if (pkgs_upgrade + pkgs_inst + pkgs_remove) < 1:
+        # FIXME: this should go into DistUpgradeController
+        summary = _("Your system is up-to-date")
+        msg = _("There are no upgrades available for your system. "
+                "The upgrade will now be canceled.")
+        self.error(summary, msg)
+        return False
+
+      return self.askYesNoQuestion(summary, msg)
+
+    def askYesNoQuestion(self, summary, msg):
+      print summary
+      print msg
+      print _("Continue [Yn] "),
+      res = sys.stdin.readline()
+      if res.strip().lower().startswith("y"):
+        return True
+      return False
+    
+    def confirmRestart(self):
+      return self.askYesNoQuestion(_("Restart required"),
+                                   _("To fully ugprade, please restart"))
+
+
+if __name__ == "__main__":
+  
+  view = DistUpgradeViewText()
+  view.confirmChanges("xx",[], 100)
+  sys.exit(0)
+
+  fp = apt.progress.TextFetchProgress()
+  ip = apt.progress.InstallProgress()
+
+  cache = apt.Cache()
+  for pkg in sys.argv[1:]:
+    cache[pkg].markInstall()
+  cache.commit(fp,ip)
+  
+  #sys.exit(0)
+  view.getTerminal().call(["dpkg","--configure","-a"])
+  #view.getTerminal().call(["ls","-R","/usr"])
+  view.error("short","long",
+             "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n"
+             "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n"
+             "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n"
+             "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n"
+             "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n"
+             "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n"
+             "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n"
+             )
+  view.confirmChanges("xx",[], 100)
+  print view.askYesNoQuestion("hello", "Icecream?")
diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index 14ddeefc..983a8cce 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -33,8 +33,7 @@ from gettext import gettext as _
 import os
 import string
 import re
-
-#sys.path.append("@prefix/share/update-manager/python")
+from xml.sax.saxutils import escape
 
 from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp
 from UpdateManager.Common.HelpViewer import HelpViewer
@@ -46,6 +45,7 @@ import dialog_add_sources_list
 from dialog_apt_key import apt_key
 from utils import *
 
+
 (LIST_MARKUP, LIST_ENABLED, LIST_ENTRY_OBJ) = range(3)
 
 CONF_MAP = {
@@ -701,7 +701,7 @@ class SoftwareProperties(SimpleGladeApp):
 
     if source.template == None:
         if source.comment:
-            contents = "<b>%s</b>" % source.comment
+            contents = "<b>%s</b>" % escape(source.comment)
             # Only show the components if there are more than one
             if len(source.comps) > 1:
                 for c in source.comps:
diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py
index 8153f04b..57621f52 100644
--- a/UpdateManager/Common/DistInfo.py
+++ b/UpdateManager/Common/DistInfo.py
@@ -26,7 +26,7 @@ from os import getenv
 import ConfigParser
 import string
 
-_ = gettext.gettext
+from gettext import gettext as _
 
 class Suite:
     def __init__(self):
diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py
index 06d83e01..34b5b967 100644
--- a/UpdateManager/Common/aptsources.py
+++ b/UpdateManager/Common/aptsources.py
@@ -606,8 +606,15 @@ class Distribution:
         a repository could be splitted into different apt lines. If not
         add the component
         """
+        # if we don't that distro, just reutnr (can happen for e.g.
+        # dapper-update only in deb-src
+        if not comps_per_dist.has_key(source.dist):
+          return
+        # if we have seen this component already for this distro,
+        # return (nothing to do
         if comp in comps_per_dist[source.dist]:
           return
+        # add it
         source.comps.append(comp)
         comps_per_dist[source.dist].add(comp)
 
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 04ad107c..af1a1b8e 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -44,13 +44,13 @@ import string
 import sys
 import os
 import os.path
-import urllib2
 import re
 import locale
 import tempfile
 import pango
 import subprocess
 import pwd
+import urllib2
 import time
 import thread
 import xml.sax.saxutils
@@ -114,10 +114,12 @@ class MyCache(apt.Cache):
     def saveDistUpgrade(self):
         """ this functions mimics a upgrade but will never remove anything """
         self._depcache.Upgrade(True)
+        wouldDelete = self._depcache.DelCount
         if self._depcache.DelCount > 0:
             self.clear()
         assert self._depcache.BrokenCount == 0 and self._depcache.DelCount == 0
         self._depcache.Upgrade()
+        return wouldDelete
 
     def get_changelog(self, name, lock):
         # don't touch the gui in this function, it needs to be thread-safe
@@ -208,12 +210,12 @@ class MyCache(apt.Cache):
         except urllib2.HTTPError:
             if lock.locked():
                 self.all_changes[name] = [_("The list of changes is not "
-                                            "available yet. Please try again "
+                                            "available yet.\nPlease try again "
                                             "later."), srcpkg]
         except IOError:
             if lock.locked():
                 self.all_changes[name] = [_("Failed to download the list "
-                                            "of changes. Please "
+                                            "of changes. \nPlease "
                                             "check your Internet "
                                             "connection."), srcpkg]
         if lock.locked():
@@ -250,7 +252,7 @@ class UpdateList:
     self.held_back = []
 
     # do the upgrade
-    cache.saveDistUpgrade()
+    self.distUpgradeWouldDelete = cache.saveDistUpgrade()
 
     # sort by origin
     for pkg in cache:
@@ -353,26 +355,6 @@ class UpdateManager(SimpleGladeApp):
     self.treeview_update.connect("button-press-event", self.show_context_menu)
 
 
-    # proxy stuff
-    # FIXME: move this into it's own function
-    SYNAPTIC_CONF_FILE = "%s/.synaptic/synaptic.conf" % pwd.getpwuid(0)[5]
-    if os.path.exists(SYNAPTIC_CONF_FILE):
-      cnf = apt_pkg.newConfiguration()
-      apt_pkg.ReadConfigFile(cnf, SYNAPTIC_CONF_FILE)
-      use_proxy = cnf.FindB("Synaptic::useProxy", False)
-      if use_proxy:
-        proxy_host = cnf.Find("Synaptic::httpProxy")
-        proxy_port = str(cnf.FindI("Synaptic::httpProxyPort"))
-        if proxy_host and proxy_port:
-	  # FIXME: set the proxy for libapt here as well (e.g. for the
-	  #        DistUpgradeFetcher
-          proxy_support = urllib2.ProxyHandler({"http":"http://%s:%s" % (proxy_host, proxy_port)})
-          opener = urllib2.build_opener(proxy_support)
-          urllib2.install_opener(opener)
-	  # install a proxy environment too
-	  if not os.environ.has_key("http_proxy"):
-		  os.putenv("http_proxy",
-			    "http://%s:%s/" % (proxy_host, proxy_port))
 
     # setup the help viewer and disable the help button if there
     # is no viewer available
@@ -381,10 +363,46 @@ class UpdateManager(SimpleGladeApp):
         self.button_help.set_sensitive(False)
 
     self.gconfclient = gconf.client_get_default()
+    self.init_proxy()
+
     # restore state
     self.restore_state()
     self.window_main.show()
 
+  def init_proxy(self):
+      # proxy settings, first check for http_proxy environment (always wins),
+      # then look into synaptics conffile, then into gconf 
+      if os.getenv("http_proxy"):
+          return
+      SYNAPTIC_CONF_FILE = "%s/.synaptic/synaptic.conf" % pwd.getpwuid(0)[5]
+      proxy = None
+      if os.path.exists(SYNAPTIC_CONF_FILE):
+          cnf = apt_pkg.newConfiguration()
+          apt_pkg.ReadConfigFile(cnf, SYNAPTIC_CONF_FILE)
+          use_proxy = cnf.FindB("Synaptic::useProxy", False)
+          if use_proxy:
+              proxy_host = cnf.Find("Synaptic::httpProxy")
+              proxy_port = str(cnf.FindI("Synaptic::httpProxyPort"))
+              if proxy_host and proxy_port:
+                  # FIXME: set the proxy for libapt here as well (e.g. for the
+                  #        DistUpgradeFetcher
+                  proxy = "http://%s:%s/" % (proxy_host, proxy_port)
+      elif self.gconfclient.get_bool("/system/http_proxy/use_http_proxy"):
+          host = self.gconfclient.get_string("/system/http_proxy/host")
+          port = self.gconfclient.get_int("/system/http_proxy/port")
+          use_auth = self.gconfclient.get_bool("/system/http_proxy/use_authentication")
+          if use_auth:
+              auth_user = self.gconfclient.get_string("/system/http_proxy/authentication_user")
+              auth_pw = self.gconfclient.get_string("/system/http_proxy/authentication_password")
+              proxy = "http://%s:%s@%s:%s/" % (auth_user,auth_pass,host, port)
+          else:
+              proxy = "http://%s:%s/" % (host, port)
+      if proxy:
+          proxy_support = urllib2.ProxyHandler({"http":proxy})
+          opener = urllib2.build_opener(proxy_support)
+          urllib2.install_opener(opener)
+          os.putenv("http_proxy",proxy)
+
   def header_column_func(self, cell_layout, renderer, model, iter):
     pkg = model.get_value(iter, LIST_PKG)
     if pkg == None:
@@ -601,7 +619,7 @@ class UpdateManager(SimpleGladeApp):
       self.refresh_updates_count()
       num_updates = self.cache.installCount
       if num_updates == 0:
-          text_header= "<big><b>%s</b></big>"  %_("Your system is up-to-date")
+          text_header= "<big><b>%s</b></big>"  % _("Your system is up-to-date")
           text_download = ""
           self.notebook_details.set_sensitive(False)
           self.treeview_update.set_sensitive(False)
@@ -834,7 +852,7 @@ class UpdateManager(SimpleGladeApp):
     dialog.set_markup(msg)
     dialog.run()
     dialog.destroy()
-    
+
   def on_button_dist_upgrade_clicked(self, button):
       #print "on_button_dist_upgrade_clicked"
       fetcher = DistUpgradeFetcher(self, self.new_dist)
@@ -873,7 +891,11 @@ class UpdateManager(SimpleGladeApp):
                                              self.progressbar_cache,
                                              self.label_cache,
                                              self.window_main)
-        self.cache = MyCache(progress)
+        if hasattr(self, "cache"):
+            self.cache.open(progress)
+            self.cache._initDepCache()
+        else:
+            self.cache = MyCache(progress)
     except AssertionError:
         # we assert a clean cache
         msg=("<big><b>%s</b></big>\n\n%s"% \
@@ -911,7 +933,7 @@ class UpdateManager(SimpleGladeApp):
   def check_all_updates_installable(self):
     """ Check if all available updates can be installed and suggest
         to run a distribution upgrade if not """
-    if self.list.keepcount > 0:
+    if self.list.distUpgradeWouldDelete > 0:
       self.dialog_dist_upgrade.set_transient_for(self.window_main)
       res = self.dialog_dist_upgrade.run()
       self.dialog_dist_upgrade.hide()
diff --git a/data/channels/Ubuntu.info b/data/channels/Ubuntu.info
index 4588a9b1..2908e85b 100644
--- a/data/channels/Ubuntu.info
+++ b/data/channels/Ubuntu.info
@@ -8,7 +8,7 @@ MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 6.10 'Edgy Eft'
 Component: main
 CompDescription: Officially supported
-CompDescriptionLong: By Canonical supported Open Source software
+CompDescriptionLong: Canonical supported Open Source software
 Component: universe
 CompDescription: Community maintained
 CompDescriptionLong: Community maintained Open Source software
@@ -17,7 +17,7 @@ CompDescription: Non-free drivers
 CompDescriptionLong: Proprietary drivers for devices
 Component: multiverse
 CompDescription: Restricted software
-CompDescriptionLong: By copyright or legal issues restricted software
+CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: edgy
 MatchName: .*
@@ -25,7 +25,7 @@ BaseURI: cdrom:\[Ubuntu.*6.10
 Description: Cdrom with Ubuntu 6.10 'Edgy Eft'
 Available: False
 Component: main
-CompDescription: Oficially supported
+CompDescription: Officially supported
 Component: restricted
 CompDescription: Restricted copyright
 
@@ -59,7 +59,7 @@ MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 6.06 LTS 'Dapper Drake'
 Component: main
 CompDescription: Officially supported
-CompDescriptionLong: By Canonical supported Open Source software
+CompDescriptionLong: Canonical supported Open Source software
 Component: universe
 CompDescription: Community maintained (universe)
 CompDescriptionLong: Community maintained Open Source software
@@ -68,7 +68,7 @@ CompDescription: Non-free drivers
 CompDescriptionLong: Proprietary drivers for devices 
 Component: multiverse
 CompDescription: Restricted software (Multiverse)
-CompDescriptionLong: By copyright or legal issues restricted software
+CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: dapper
 MatchName: .*
@@ -76,7 +76,7 @@ BaseURI: cdrom:\[Ubuntu.*6.06
 Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'
 Available: False
 Component: main
-CompDescription: Oficially supported
+CompDescription: Officially supported
 Component: restricted
 CompDescription: Restricted copyright
 
@@ -123,7 +123,7 @@ BaseURI: cdrom:\[Ubuntu.*5.10
 Description: Cdrom with Ubuntu 5.10 'Breezy Badger'
 Available: False
 Component: main
-CompDescription: Oficially supported
+CompDescription: Officially supported
 Component: restricted
 CompDescription: Restricted copyright
 
@@ -151,7 +151,7 @@ MatchURI: archive.ubuntu.com/ubuntu
 MirrorsFile: /usr/share/update-manager/mirrors.cfg
 Description: Ubuntu 5.04 'Hoary Hedgehog'
 Component: main
-CompDescription: Oficially supported
+CompDescription: Officially supported
 Component: restricted
 CompDescription: Restricted copyright
 Component: universe
@@ -165,7 +165,7 @@ BaseURI: cdrom:\[Ubuntu.*5.04
 Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog'
 Available: False
 Component: main
-CompDescription: Oficially supported
+CompDescription: Officially supported
 Component: restricted
 CompDescription: Restricted copyright
 
@@ -192,7 +192,7 @@ BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu
 Description: Ubuntu 4.10 'Warty Warthog'
 Component: main
-CompDescription: No longer oficially supported
+CompDescription: No longer officially supported
 Component: restricted
 CompDescription: Restricted copyright
 Component: universe
@@ -206,7 +206,7 @@ BaseURI: cdrom:\[Ubuntu.*4.10
 Description: Cdrom with Ubuntu 4.10 'Warty Warthog'
 Available: False
 Component: main
-CompDescription: No longer oficially supported
+CompDescription: No longer officially supported
 Component: restricted
 CompDescription: Restricted copyright
 
diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in
index 1afc66c9..f3cce4f7 100644
--- a/data/channels/Ubuntu.info.in
+++ b/data/channels/Ubuntu.info.in
@@ -8,7 +8,7 @@ MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 6.10 'Edgy Eft'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: By Canonical supported Open Source software
+_CompDescriptionLong: Canonical supported Open Source software
 Component: universe
 _CompDescription: Community maintained
 _CompDescriptionLong: Community maintained Open Source software
@@ -17,7 +17,7 @@ _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices
 Component: multiverse
 _CompDescription: Restricted software
-_CompDescriptionLong: By copyright or legal issues restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: edgy
 MatchName: .*
@@ -59,7 +59,7 @@ MirrorsFile: /usr/share/update-manager/mirrors.cfg
 _Description: Ubuntu 6.06 LTS 'Dapper Drake'
 Component: main
 _CompDescription: Officially supported
-_CompDescriptionLong: By Canonical supported Open Source software
+_CompDescriptionLong: Canonical supported Open Source software
 Component: universe
 _CompDescription: Community maintained (universe)
 _CompDescriptionLong: Community maintained Open Source software
@@ -68,7 +68,7 @@ _CompDescription: Non-free drivers
 _CompDescriptionLong: Proprietary drivers for devices 
 Component: multiverse
 _CompDescription: Restricted software (Multiverse)
-_CompDescriptionLong: By copyright or legal issues restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
 
 Suite: dapper
 MatchName: .*
diff --git a/debian/changelog b/debian/changelog
index 8bc27537..721ed39b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,51 @@
+update-manager (0.44.17) edgy; urgency=low
+
+  * memory leak fixed (lp: #43096)
+
+ -- 
+
+update-manager (0.44.16) edgy; urgency=low
+
+  * fix proxy usage when runing in non-root mode (lp: #40626)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  6 Oct 2006 15:17:37 +0200
+
 update-manager (0.44.15) edgy; urgency=low
 
-  * data/glade/SoftwareProperties.glade:
-    - fix missing "translatable" property (lp: #62681)
-  * missing i18n added (lp: 62519)
+  * added missing python-vte dependency (lp: #63609)
+  * added missing gksu dependency (lp: #63572)
+  * don't remove xchat automatically anymore on upgrade (leftover
+    from breezy->dapper) (lp: #63881)
+  * do not come up with bogus dist-upgrade suggestions
+  * fix bad english grammar (lp: #63761, #63474)
+  * fix in the edgyUpdates quirks handler (lp: #63723)
+  * catch error from _tryMarkObsoleteForRemoval() (lp: #63617)
+  * fix plural forms for ro, pl (lp: #46421)
+  * properly escape comments before displaying them (lp: #63475)
 
- --
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  4 Oct 2006 21:10:40 +0200
 
 update-manager (0.44.14) edgy; urgency=low
 
-  * UpdateManager/UpdateManager.py:
-    - put the cancel button inside the text-area to avoid flickering
-  * DistUprade/DistUpgradeControler.py:
-    - check for self.sources, self.aptcdrom before using it (lp: #61852)
+  * fix some incorrect i18n markings (lp: #62681)
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 26 Sep 2006 23:17:27 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  2 Oct 2006 14:41:52 +0200
 
 update-manager (0.44.13) edgy; urgency=low
 
+  * fix missing i18n declarations (lp: #62519)
+  * data/glade/SoftwareProperties.glade:
+    - fix missing "translatable" property (lp: #62681)
+  * DistUpgrade:
+    - deal better with the python transition and the hpijs 
+      upgrade (lp: #62948)
   * UpdateManager/UpdateManager.py:
+    - put the cancel button inside the text-area to avoid flickering
     - make sure that src_ver is always initialized (thanks to
       Simira for reporting)
     - filter python-apt future warning (especially for seb128)
+  * DistUprade/DistUpgradeControler.py:
+    - check for self.sources, self.aptcdrom before using it (lp: #61852)
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Sat, 23 Sep 2006 00:53:06 +0200
 
diff --git a/debian/control b/debian/control
index e3c72b8d..7ed4c7a5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.2
 
 Package: update-manager
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python, python-glade2, python-apt (>= 0.6.16.2), synaptic (>= 0.57.8), lsb-release,  python-gnupginterface, unattended-upgrades, gksu, iso-codes, python-dbus
+Depends: ${python:Depends}, ${misc:Depends}, python, python-glade2, python-apt (>= 0.6.16.2), synaptic (>= 0.57.8), lsb-release,  python-gnupginterface, unattended-upgrades, gksu, iso-codes, python-dbus, python-vte, gksu
 Recommends: python-gnome2
 Description: GNOME application that manages apt updates
  This is the GNOME apt update manager. It checks for updates and lets the user
diff --git a/po/am.po b/po/am.po
new file mode 100644
index 00000000..7bb6aaf2
--- /dev/null
+++ b/po/am.po
@@ -0,0 +1,1501 @@
+# Amharic translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-06-11 10:15+0000\n"
+"Last-Translator: Habte <adbaru@gmail.com>\n"
+"Language-Team: Amharic <am@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "Daily"
+msgstr "በየቀኑ"
+
+#: ../SoftwareProperties/SoftwareProperties.py:137
+msgid "Every two days"
+msgstr "በየሁለት ቀን"
+
+#: ../SoftwareProperties/SoftwareProperties.py:138
+msgid "Weekly"
+msgstr "በየሳምንቱ"
+
+#: ../SoftwareProperties/SoftwareProperties.py:139
+msgid "Every two weeks"
+msgstr "በየሁለት ሳምንት"
+
+#: ../SoftwareProperties/SoftwareProperties.py:144
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:167
+msgid "After one week"
+msgstr "ከአንድ ሳምንት በሓላ"
+
+#: ../SoftwareProperties/SoftwareProperties.py:168
+msgid "After two weeks"
+msgstr "ከሁለት ሳምንት በሓላ"
+
+#: ../SoftwareProperties/SoftwareProperties.py:169
+msgid "After one month"
+msgstr "ከአንድ ወር በሓላ"
+
+#: ../SoftwareProperties/SoftwareProperties.py:174
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
+#: ../SoftwareProperties/SoftwareProperties.py:252
+#, python-format
+msgid "%s updates"
+msgstr ""
+
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
+msgid "Main server"
+msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:324
+msgid "Nearest server"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:345
+msgid "Custom servers"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
+msgid "Software Channel"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
+msgid "Active"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:714
+msgid "(Source Code)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:720
+msgid "Source Code"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:969
+#, fuzzy
+msgid "Import key"
+msgstr "ቁልፉን አምጣ"
+
+#: ../SoftwareProperties/SoftwareProperties.py:979
+#, fuzzy
+msgid "Error importing selected file"
+msgstr "ሰህተት የመረጡትን ፋይል ለማምጣት"
+
+#: ../SoftwareProperties/SoftwareProperties.py:980
+msgid "The selected file may not be a GPG key file or it might be corrupt."
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:992
+#, fuzzy
+msgid "Error removing the key"
+msgstr "ቁለፉን የማጥፋት ሰህተት"
+
+#: ../SoftwareProperties/SoftwareProperties.py:993
+#, fuzzy
+msgid "The key you selected could not be removed. Please report this as a bug."
+msgstr "የመረጡትን ቁለፍ ማጥፋት አይቻልም፣ እባክዎን ይህንን ሰህተት ያመለከቱ"
+
+#: ../SoftwareProperties/SoftwareProperties.py:1039
+#, python-format
+msgid ""
+"<big><b>Error scanning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1096
+msgid "Please enter a name for the disc"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1112
+msgid "Please insert a disc in the drive:"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:91
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+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 ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:207
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:217
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:220
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:221
+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 ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:246
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:247
+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 ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:312
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:313
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:320
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:321
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:75
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "Reading cache"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:155
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:156
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:248
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:249
+#, python-format
+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 ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:266
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:267
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:301
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:302
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:308
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:309
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:358
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:359
+msgid ""
+"A problem occured during the update. This is usually some sort of network "
+"problem, please check your network connection and retry."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:368
+msgid "Not enough free disk space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:369
+#, python-format
+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 ""
+
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeControler.py:440
+msgid "Do you want to start the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:460
+msgid "Could not install the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:461
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:479
+msgid "Could not download the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:480
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:516
+msgid "Support for some applications ended"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:517
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:552
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:563
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:564
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. generate a new cache
+#: ../DistUpgrade/DistUpgradeControler.py:576
+msgid "Restoring original system state"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:632
+#, python-format
+msgid "Fetching backport of '%s'"
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
+msgid "Checking package manager"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
+msgid "Invalid package information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:733
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:737
+msgid "Upgrading"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:744
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:749
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:249
+#, python-format
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, python-format
+msgid "Fetching file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+msgid "Applying changes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
+#, python-format
+msgid "Could not install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+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 ""
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#, python-format
+msgid ""
+"Replace the customized configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:203
+msgid ""
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
+msgid "The 'diff' command was not found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:356
+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 ""
+
+#. FIXME: make those two seperate lines to make it clear
+#. that the "%" applies to the result of ngettext
+#: ../DistUpgrade/DistUpgradeViewGtk.py:487
+#, python-format
+msgid "%d package is going to be removed."
+msgid_plural "%d packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
+#, python-format
+msgid "%d new package is going to be installed."
+msgid_plural "%d new packages are going to be installed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:498
+#, python-format
+msgid "%d package is going to be upgraded."
+msgid_plural "%d packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:503
+#, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
+msgid ""
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:512
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:518
+#: ../UpdateManager/UpdateManager.py:622
+msgid "Your system is up-to-date"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:519
+msgid ""
+"There are no upgrades available for your system. The upgrade will now be "
+"canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:535
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:537
+#, python-format
+msgid "Install %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:539
+#, python-format
+msgid "Upgrade %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:31
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:32
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:38
+#, python-format
+msgid ""
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:109
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:110
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/glade/SoftwareProperties.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+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 ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Fetching and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr ""
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:149
+msgid "Could not run the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:150
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:171
+msgid "Downloading the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:180
+msgid "Upgrade tool signature"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:183
+msgid "Upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:209
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid "Failed to extract"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:215
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid "Verfication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:222
+msgid ""
+"Verifying the upgrade failed.  There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid "Authentication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:229
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:108
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:113
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:206
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:217
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
+msgid "Important security updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
+msgid "Recommended updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
+msgid "Proposed updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:241
+msgid "Backports"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:242
+msgid "Distribution updates"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
+msgid "Other updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:478
+#, python-format
+msgid "Version %s: \n"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:539
+msgid "Downloading list of changes..."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:566
+msgid "_Uncheck All"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:572
+msgid "_Check All"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid "Please wait, this can take some time."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:668
+msgid "Update is complete"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:719
+msgid "Checking for updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
+msgid "From version %(old_version)s to %(new_version)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:832
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:843
+msgid "Your distribution is not supported anymore"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:844
+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 ""
+
+#: ../UpdateManager/UpdateManager.py:863
+#, python-format
+msgid "<b>New distribution release '%s' is available</b>"
+msgstr ""
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:898
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:899
+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 ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:1
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:4
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:5
+msgid "<big><b>Not all updates can be installed</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:6
+msgid "<big><b>Starting update manager</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:7
+msgid "Changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:8
+msgid "Changes and description of the update"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:9
+msgid "Chec_k"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:10
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:11
+msgid "Description"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:13
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:16
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:17
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:18
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:19
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:20
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:21
+msgid "_Check"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:22
+msgid "_Distribution Upgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:23
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:24
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:25
+msgid "changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:26
+msgid "updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:2
+msgid "<b>Automatic updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:3
+msgid "<b>CDROM/DVD</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:4
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:5
+msgid "<b>Internet</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:6
+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 ""
+
+#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+msgid "Authentication"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
+msgid "Download from:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:13
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:16
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:17
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Sources"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:19
+msgid "Source code"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:20
+msgid "Statistics"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:21
+msgid "Submit statistical information"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:22
+msgid "Third Party"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:23
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:24
+msgid "_Download updates automatically, but do not install them"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:25
+msgid "_Import Key File"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:26
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Components:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
+msgid "APT line:"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Reload"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+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 ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changes and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:8
+msgid "Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:13
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:17
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:19
+msgid "Restricted software"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:25
+msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:59
+msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:62
+msgid "Canonical supported Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:64
+msgid "Community maintained (universe)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:65
+msgid "Community maintained Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:67
+msgid "Non-free drivers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:68
+msgid "Proprietary drivers for devices "
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:70
+msgid "Restricted software (Multiverse)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:71
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:76
+msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:103
+msgid "Backported updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:110
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:123
+msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:135
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:140
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:145
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:152
+msgid "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:165
+msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:177
+msgid "Ubuntu 5.04 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:182
+msgid "Ubuntu 5.04 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:187
+msgid "Ubuntu 5.04 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:193
+msgid "Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:199
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:201
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:206
+msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:209
+msgid "No longer officially supported"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:211
+msgid "Restricted copyright"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:218
+msgid "Ubuntu 4.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:223
+msgid "Ubuntu 4.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:228
+msgid "Ubuntu 4.10 Backports"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 91ddd359..c38adbbd 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:46+0000\n"
-"Last-Translator: Jadmadi <contact@jadmadi.net>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-08-05 12:39+0000\n"
+"Last-Translator: Saleh Odeh <kirk.lock@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -108,7 +108,7 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
-msgstr ""
+msgstr "استيراد المفتاح"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
@@ -123,8 +123,9 @@ msgid "Error removing the key"
 msgstr "خطاء في ازالة المفتاح"
 
 #: ../SoftwareProperties/SoftwareProperties.py:993
+#, fuzzy
 msgid "The key you selected could not be removed. Please report this as a bug."
-msgstr ""
+msgstr "إلمفتاح الذي إخترتة لا يمكن إزالتة, الرجاء التبليغ عن هذا كخطأ برمجي."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
 #, python-format
@@ -140,32 +141,37 @@ msgstr "الرجاء ادخال اسم القرص"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1112
 msgid "Please insert a disc in the drive:"
-msgstr "الرجاء ادخال القرص في الجهاز"
+msgstr "الرجاء ادخال القرص في الجهاز:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
-msgstr ""
+msgstr "الرزم المكسورة"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
+#, 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 قبل الإستمرار"
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
+#, fuzzy
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "لا يمكن تحديث الرزم العليا المطلوبة"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "سيكون من الضروري إزالة رزم مهمة"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
+#, fuzzy
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "لم يكن ممكنا إحتساب التحديث"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -174,34 +180,37 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
+#, fuzzy
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "خطأ في التحقق من هوية بعض الرزم"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "تعذّر تثبيت '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
+#, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
+"لم يكن بالإمكان تثبيت إحدى الرزم المطلوبة. الرجاء التبليغ عن هذا كخطأ برمجي. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -226,13 +235,13 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
-msgstr "قراءة من الكاش"
+msgstr "جاري القراءة من الكاش"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -240,11 +249,12 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
+#, fuzzy
 msgid "No valid mirror found"
-msgstr ""
+msgstr "لم يتم العثور على مرآه صالحة"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -257,11 +267,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -270,42 +280,45 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
-msgstr "importing"
+msgstr "معلومات المستودع غير صالحة"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
+#, fuzzy
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"تحديث معلومات المستودعادت أدت إلى إنتاج ملف غير صالح, الرجاء التبليغ عن هذا "
+"كخطأ برمجي."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
-msgstr "مصدر الطرف الثالث غير مفعل"
+msgstr "مصادر الطرف الثالث غير مفعلة"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
-msgstr "خطاء خلال التحديث"
+msgstr "خطأ خلال التحديث"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "لا يوجد مساحة كافية على القرص الصلب"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -314,15 +327,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "هل تريد البدء في عملية التحديث الان؟"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "لم يكن ممكنا تثبيت التحديثات"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -331,21 +344,25 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
+#, fuzzy
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "لم يكن ممكنا تنزيل التحديثات"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
+#, fuzzy
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"سيتم إلغاء التحديث الآن, الرجاء التأكد من إتصالك للإنترنت أو وسيط التثبيت "
+"والمحاولة ثانيا. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -354,54 +371,68 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
+#, fuzzy
 msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "هل تود إزالة الرزم الملغية?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
+#, fuzzy
 msgid "_Skip This Step"
-msgstr ""
+msgstr "_تجاهل هذه الخطوة"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
-msgstr ""
+msgstr "_إزالة"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
+#, fuzzy
 msgid "Error during commit"
-msgstr ""
+msgstr "خطأ أثناء التفعيل"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
+msgstr "جاري التأكد من مدير الحزم"
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:672
-msgid "Updating repository information"
+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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr "حاليا في عملية تحديث معلومات المستودع"
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
-msgstr ""
+msgstr "معلومات الرزمة غير صالحة"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -411,27 +442,28 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
+#, fuzzy
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "حاليا في عملية طلب التأكيد"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
-msgstr ""
+msgstr "جاري عملية التحديث"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "جاري عملية البحث عن البرامج الملغية"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "إنتهت عملية تحديث النظام."
 
 #. print "mediaChange %s %s" % (medium, drive)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
-#, python-format
+#, fuzzy, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "الرجاء ادراج '%s' في السوّاقة '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
 msgid "Fetching is complete"
@@ -458,12 +490,12 @@ msgstr ""
 #. -> longer term, move this code into python-apt
 #: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
-msgstr ""
+msgstr "جاري تطبيق التغييرات"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "لم يمكن تثبيت  '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:188
 msgid ""
@@ -481,17 +513,18 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "لم يمكن العثور على أمر 'diff'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy
 msgid "A fatal error occured"
-msgstr ""
+msgstr "وقع خطأ شديد"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
 msgid ""
@@ -543,13 +576,14 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
-msgstr ""
+msgstr "لمنع فقدان المعلومات الرجاء إغلاق جميع البرامج و الوثائق المفتوحة."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
+#, fuzzy
 msgid "Your system is up-to-date"
-msgstr ""
+msgstr "إن نظامك الآن محدث"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:519
 msgid ""
@@ -558,19 +592,19 @@ msgid ""
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
-#, python-format
+#, fuzzy, python-format
 msgid "<b>Remove %s</b>"
-msgstr ""
+msgstr "<b>إزالة %s </b>"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:537
 #, python-format
 msgid "Install %s"
-msgstr ""
+msgstr "تثبيت %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:539
 #, python-format
 msgid "Upgrade %s"
-msgstr ""
+msgstr "تحديث %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
 #, python-format
@@ -597,18 +631,20 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
-msgstr ""
+msgstr "مطلوب إعادة تشغيل النظام"
 
 #: ../DistUpgrade/DistUpgradeView.py:110
+#, fuzzy
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
+"لقد تم إنهاء التحديث, من المطلوب إعادة تشغيل النظام, هل تود القيام بذلك الآن?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -629,27 +665,29 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-msgstr ""
+msgstr "<b><big>إعادة تشغيل النظام من أجل إنهاء التحديث</big><b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
+#, fuzzy
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>إبدأ التحديث?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
+#, fuzzy
 msgid "Cleaning up"
-msgstr ""
+msgstr "جاري عملية التنظيف"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 msgid "Details"
-msgstr ""
+msgstr "التّفاصيل"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "الفرق بين الملفات"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Fetching and installing the upgrades"
@@ -657,103 +695,117 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "جاري تعديل قنوات البرامج"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "جاري تحضير التحديث"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr ""
+msgstr "جاري إعادة تشغيل النظام"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
-msgstr ""
+msgstr "شاشة طرفية"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
+msgid "_Continue"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
-msgstr ""
+msgid "_Keep"
+msgstr "_اترك"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
-msgstr ""
+msgid "_Replace"
+msgstr "_استبدل"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr "_بلغ عن خطأ برمجي"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr "_أعد التَشغيل اﻵن"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
+msgstr "_تابع التحديث"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
 msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
-msgstr ""
+msgstr "لم يمكن العثور على ملاحظات الإصدار"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "قد يكون الخادم مضغوطا فوق طاقته. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
 msgid "Could not download the release notes"
-msgstr ""
+msgstr "لم يمكن تنزيل ملاحظات الإصدار"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
+#, fuzzy
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "الرجاء التأكد من إتصالك بالإنترنت"
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
-msgstr ""
+msgstr "لم يكن ممكنا تشغيل أداة التحديث"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
-msgstr ""
+msgstr "هذا على الأغلب خطأ برمجي في أداة التحديث, الرجاء التبليغ عنه"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
-msgstr ""
+msgstr "جاري تنزيل أداة التحديث"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "سوف تدلك أداة التحديث أثناء عملية التحديث"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "توقيع أداة تحديث"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
-msgstr ""
+msgstr "أداة تحديث"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
+#, fuzzy
 msgid "Failed to fetch"
-msgstr ""
+msgstr "فشل في الإحضار"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "لقد فشل إحضار التحديث, قد تكون هناك مشكلة في الشبكة. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
-msgstr ""
+msgstr "فشل في الإستخلاص"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
-msgstr ""
+msgstr "لقد فشل إستخلاص التحديث, قد تكون هناك مشكلة في الشبكة أو الخادم. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
-msgstr ""
+msgstr "فشل في التأكد"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
@@ -762,8 +814,9 @@ msgid ""
 msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
+#, fuzzy
 msgid "Authentication failed"
-msgstr ""
+msgstr "خطأ في إثبات الهوية"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
@@ -781,72 +834,74 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
 msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
-msgstr ""
+msgstr "الإصدار %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
-#, python-format
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
+#, fuzzy, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "حجم التنزيل: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -854,56 +909,56 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "الرجاء الإنتظار, قد يستغرق هذا وقتا"
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr ""
+msgstr "لقد انتهت عملية التحديث"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, python-format
 msgid "Version %s"
 msgstr ""
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
-msgstr ""
+msgstr "فهرس البرامج تالف"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -953,8 +1008,9 @@ msgid "<big><b>Starting update manager</b></big>"
 msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:7
+#, fuzzy
 msgid "Changes"
-msgstr ""
+msgstr "تغييرات"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
@@ -970,11 +1026,11 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:11
 msgid "Description"
-msgstr ""
+msgstr "الوصف"
 
 #: ../data/glade/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "ملاحظات الإصدار"
 
 #: ../data/glade/UpdateManager.glade.h:13
 msgid ""
@@ -986,11 +1042,12 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
-msgstr ""
+msgstr "إظهار تقدّم الملفات المفردة"
 
 #: ../data/glade/UpdateManager.glade.h:17
+#, fuzzy
 msgid "Software Updates"
-msgstr ""
+msgstr "تحديثات البرامج"
 
 #: ../data/glade/UpdateManager.glade.h:18
 msgid ""
@@ -999,8 +1056,9 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:19
+#, fuzzy
 msgid "U_pgrade"
-msgstr ""
+msgstr "ت_حديث"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
@@ -1008,7 +1066,7 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:21
 msgid "_Check"
-msgstr ""
+msgstr "_تحقق"
 
 #: ../data/glade/UpdateManager.glade.h:22
 msgid "_Distribution Upgrade"
@@ -1016,11 +1074,11 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_أخفي هذة المعلومات في المستقبل"
 
 #: ../data/glade/UpdateManager.glade.h:24
 msgid "_Install Updates"
-msgstr ""
+msgstr "_ثبت التحديثات"
 
 #: ../data/glade/UpdateManager.glade.h:25
 msgid "changes"
@@ -1039,8 +1097,9 @@ msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
+#, fuzzy
 msgid "<b>Internet updates</b>"
-msgstr ""
+msgstr "<b>تحديثات الإنترنت</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 msgid "<b>Internet</b>"
@@ -1063,7 +1122,7 @@ msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
-msgstr ""
+msgstr "إثبات الهوية"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
@@ -1078,8 +1137,9 @@ msgid "Import the public key from a trusted software provider"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:14
+#, fuzzy
 msgid "Internet Updates"
-msgstr ""
+msgstr "تحديثات الإنترنت"
 
 #: ../data/glade/SoftwareProperties.glade.h:15
 msgid ""
@@ -1118,7 +1178,7 @@ msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "_تحقق من وجود التحديثات تلقائيا"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
 msgid "_Download updates automatically, but do not install them"
@@ -1126,7 +1186,7 @@ msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
-msgstr ""
+msgstr "_إستورد ملف المفاتيح"
 
 #: ../data/glade/SoftwareProperties.glade.h:26
 msgid "_Install security updates without confirmation"
@@ -1144,7 +1204,7 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
-msgstr ""
+msgstr "<b>تعليق</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
 msgid "<b>Components:</b>"
@@ -1159,8 +1219,9 @@ msgid "<b>Type:</b>"
 msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
 msgid "<b>URI:</b>"
-msgstr ""
+msgstr "<b>العنوان العالمي URI:"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
 msgid ""
@@ -1180,6 +1241,8 @@ msgid ""
 "Binary\n"
 "Source"
 msgstr ""
+"المصدر\n"
+"الثنائي"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
@@ -1187,7 +1250,7 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "جاري مسح القرص المدمج"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
@@ -1195,15 +1258,15 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
-msgstr ""
+msgstr "_إعادة التحميل"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "أظهر و ثبت التحديثات الموجودة"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
-msgstr ""
+msgstr "مدير التحديث"
 
 #: ../data/update-manager.schemas.in.h:1
 msgid ""
@@ -1228,7 +1291,7 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr ""
+msgstr "أظهر تفاصيل تحديث"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
@@ -1242,7 +1305,7 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
-msgstr ""
+msgstr "مساحة النافذة"
 
 #: ../data/software-properties.desktop.in.h:1
 msgid "Configure the sources for installable software and updates"
@@ -1286,7 +1349,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1316,7 +1379,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
@@ -1367,7 +1430,7 @@ msgstr ""
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
-msgstr ""
+msgstr "مدعوم بشكل رسمي"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
@@ -1412,7 +1475,7 @@ msgstr ""
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
 msgid "Restricted copyright"
-msgstr ""
+msgstr "حقوق نقل محدودة"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
diff --git a/po/be.po b/po/be.po
new file mode 100644
index 00000000..d53002d6
--- /dev/null
+++ b/po/be.po
@@ -0,0 +1,1535 @@
+# Belarusian translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-07-06 06:10+0000\n"
+"Last-Translator: Alexander Nyakhaychyk <nyakhaychyk@gmail.com>\n"
+"Language-Team: Belarusian <be@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "Daily"
+msgstr "Штодзённа"
+
+#: ../SoftwareProperties/SoftwareProperties.py:137
+msgid "Every two days"
+msgstr "Кожныя два дні"
+
+#: ../SoftwareProperties/SoftwareProperties.py:138
+msgid "Weekly"
+msgstr "Штотыдзень"
+
+#: ../SoftwareProperties/SoftwareProperties.py:139
+msgid "Every two weeks"
+msgstr "Кожныя два тыдні"
+
+#: ../SoftwareProperties/SoftwareProperties.py:144
+#, python-format
+msgid "Every %s days"
+msgstr "Кожныя %s дні"
+
+#: ../SoftwareProperties/SoftwareProperties.py:167
+msgid "After one week"
+msgstr "Пасьля тыдня"
+
+#: ../SoftwareProperties/SoftwareProperties.py:168
+msgid "After two weeks"
+msgstr "Пасьля двух тыдняў"
+
+#: ../SoftwareProperties/SoftwareProperties.py:169
+msgid "After one month"
+msgstr "Пасьля аднаго месяца"
+
+#: ../SoftwareProperties/SoftwareProperties.py:174
+#, python-format
+msgid "After %s days"
+msgstr "Пасьля %s дзён"
+
+#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
+#: ../SoftwareProperties/SoftwareProperties.py:252
+#, python-format
+msgid "%s updates"
+msgstr ""
+
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
+msgid "Main server"
+msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:324
+msgid "Nearest server"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:345
+msgid "Custom servers"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
+msgid "Software Channel"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
+msgid "Active"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:714
+msgid "(Source Code)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:720
+msgid "Source Code"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:969
+msgid "Import key"
+msgstr "Імпартаваць ключ"
+
+#: ../SoftwareProperties/SoftwareProperties.py:979
+msgid "Error importing selected file"
+msgstr "Памылка імпартаваньня выбранага файла"
+
+#: ../SoftwareProperties/SoftwareProperties.py:980
+msgid "The selected file may not be a GPG key file or it might be corrupt."
+msgstr "Выбраны файл можа быць пашкоджаны, альбо не зьяўляецца ключом PGP."
+
+#: ../SoftwareProperties/SoftwareProperties.py:992
+msgid "Error removing the key"
+msgstr "Памылка выдаленьня ключа"
+
+#: ../SoftwareProperties/SoftwareProperties.py:993
+msgid "The key you selected could not be removed. Please report this as a bug."
+msgstr ""
+"Выбраны ключ ня можа быць выдалены. Калі ласка, дашліце баг-рэпорт аб гэтым."
+
+#: ../SoftwareProperties/SoftwareProperties.py:1039
+#, python-format
+msgid ""
+"<big><b>Error scanning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1096
+msgid "Please enter a name for the disc"
+msgstr "Калі ласка, задайце назву для дыска"
+
+#: ../SoftwareProperties/SoftwareProperties.py:1112
+msgid "Please insert a disc in the drive:"
+msgstr "Калі ласка, устаўце дыск у дыскавод:"
+
+#: ../DistUpgrade/DistUpgradeCache.py:91
+msgid "Broken packages"
+msgstr "Пакеты з памылкай"
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+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 перш чым працягваць."
+
+#: ../DistUpgrade/DistUpgradeCache.py:207
+msgid "Can't upgrade required meta-packages"
+msgstr "Немагчыма абнавіць неабходныя мэтапакеты"
+
+#: ../DistUpgrade/DistUpgradeCache.py:217
+msgid "A essential package would have to be removed"
+msgstr "Трэба было-б выдаліць абавязковы пакет"
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:220
+msgid "Could not calculate the upgrade"
+msgstr "Немагчыма падлічыць абнаўленьне"
+
+#: ../DistUpgrade/DistUpgradeCache.py:221
+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 ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:246
+msgid "Error authenticating some packages"
+msgstr "Памылка аўтэнтыфікацыі некаторых пакетаў"
+
+#: ../DistUpgrade/DistUpgradeCache.py:247
+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 ""
+"Немагчыма аўтэнтыфікаваць некаторыя пакеты. Гэта можа быць з-за часовай "
+"праблемы зь сеткай. Вы можаце паспрабаваць паўтарыць дзеяньне пазьней. "
+"Глядзіце ніжэй сьпіс неаўтэнтыфікаваных пакетаў."
+
+#: ../DistUpgrade/DistUpgradeCache.py:312
+#, python-format
+msgid "Can't install '%s'"
+msgstr "Немагчыма ўсталяваць \"%s\""
+
+#: ../DistUpgrade/DistUpgradeCache.py:313
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+"Немагчыма ўсталяваць патрэбны пакет. Калі ласка, паведаміце аб гэтай "
+"памылцы. "
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:320
+msgid "Can't guess meta-package"
+msgstr "Немагчыма вызначыць мэта-пакет"
+
+#: ../DistUpgrade/DistUpgradeCache.py:321
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:75
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "Reading cache"
+msgstr "Чытаньне кэша"
+
+#: ../DistUpgrade/DistUpgradeControler.py:155
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:156
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:248
+msgid "No valid mirror found"
+msgstr "Ня знойдзены правільны люстраны сэрвэр"
+
+#: ../DistUpgrade/DistUpgradeControler.py:249
+#, python-format
+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 ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:266
+msgid "Generate default sources?"
+msgstr "Стварыць прадвызначаны сьпіс крыніц?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:267
+#, python-format
+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\"? Калі вы вылучыце "
+"\"Не\", абнаўленьне будзе скасавана."
+
+#: ../DistUpgrade/DistUpgradeControler.py:301
+msgid "Repository information invalid"
+msgstr "Нерэчаісныя зьвесткі аб сховішчы"
+
+#: ../DistUpgrade/DistUpgradeControler.py:302
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+"Вынік абнаўленьня зьвестак аб сховішчаў меў вынікам нерэчаісны файл. Калі "
+"ласка, паведаміце аб гэтым, як аб памылцы."
+
+#: ../DistUpgrade/DistUpgradeControler.py:308
+msgid "Third party sources disabled"
+msgstr "Зыходнікі ад трэціх бакоў - адключаныя"
+
+#: ../DistUpgrade/DistUpgradeControler.py:309
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:358
+msgid "Error during update"
+msgstr "Памылка ў час абналеньня"
+
+#: ../DistUpgrade/DistUpgradeControler.py:359
+msgid ""
+"A problem occured during the update. This is usually some sort of network "
+"problem, please check your network connection and retry."
+msgstr ""
+"Узьнікла памылка ў час абнаўленьня. Звычайна гэта праблемы зь сеткай, калі "
+"ласка, праверце вашае сеткавае далуэньне й паўтарыце спробу."
+
+#: ../DistUpgrade/DistUpgradeControler.py:368
+msgid "Not enough free disk space"
+msgstr "Бракуе дыскавае прасторы"
+
+#: ../DistUpgrade/DistUpgradeControler.py:369
+#, python-format
+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\"."
+
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeControler.py:440
+msgid "Do you want to start the upgrade?"
+msgstr "Ці жадаеце пачаць абнаўленьне?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:460
+msgid "Could not install the upgrades"
+msgstr "Немагчыма ўсталяваць абнаўленьні"
+
+#: ../DistUpgrade/DistUpgradeControler.py:461
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:479
+msgid "Could not download the upgrades"
+msgstr "Немагчыма зпампаваць абнаўленьні"
+
+#: ../DistUpgrade/DistUpgradeControler.py:480
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+"Абнаўленьне спынена. Калі ласка, праверце вашае сеткавае далучэньне альбо "
+"носьбіты ўсталёўкі  й паўтарыце спробу. "
+
+#: ../DistUpgrade/DistUpgradeControler.py:516
+msgid "Support for some applications ended"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:517
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:552
+msgid "Remove obsolete packages?"
+msgstr "Выдаліць састарэлыя пакеты?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Skip This Step"
+msgstr "Аб_мінуць гэты крок"
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Remove"
+msgstr "В_ыдаліць"
+
+#: ../DistUpgrade/DistUpgradeControler.py:563
+msgid "Error during commit"
+msgstr "Памылка ў час зацьвярджэньня"
+
+#: ../DistUpgrade/DistUpgradeControler.py:564
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+"Узьніклі нейкія памылкі ў час ачысткі. Калі ласка, паглядзіце зьмешчанае "
+"ніжэй паведамленьне. "
+
+#. generate a new cache
+#: ../DistUpgrade/DistUpgradeControler.py:576
+msgid "Restoring original system state"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:632
+#, python-format
+msgid "Fetching backport of '%s'"
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
+msgid "Checking package manager"
+msgstr "Праверка кіраўніка пакетаў"
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr "Абнаўленьне зьвестак сховішча"
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
+msgid "Invalid package information"
+msgstr "Недзеяздольныя зьвесткі пра пакет"
+
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:733
+msgid "Asking for confirmation"
+msgstr "Запыт пацьвярджэньня"
+
+#: ../DistUpgrade/DistUpgradeControler.py:737
+msgid "Upgrading"
+msgstr "Абнаўленьне"
+
+#: ../DistUpgrade/DistUpgradeControler.py:744
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:749
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr "Калі ласка, устаўце \"%s\" у прыладу \"%s\""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:249
+#, python-format
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, python-format
+msgid "Fetching file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+msgid "Applying changes"
+msgstr "Зьдзяйсьненьне зьменаў"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
+#, python-format
+msgid "Could not install '%s'"
+msgstr "Немагчыма ўсталяваць \"%s\""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+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 ""
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#, python-format
+msgid ""
+"Replace the customized configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:203
+msgid ""
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
+msgid "The 'diff' command was not found"
+msgstr "Ня знойдзена праграма \"diff\""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+msgid "A fatal error occured"
+msgstr "Узьнікла невыправімая памылка"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:356
+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 ""
+
+#. FIXME: make those two seperate lines to make it clear
+#. that the "%" applies to the result of ngettext
+#: ../DistUpgrade/DistUpgradeViewGtk.py:487
+#, python-format
+msgid "%d package is going to be removed."
+msgid_plural "%d packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
+#, python-format
+msgid "%d new package is going to be installed."
+msgid_plural "%d new packages are going to be installed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:498
+#, python-format
+msgid "%d package is going to be upgraded."
+msgid_plural "%d packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:503
+#, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
+msgid ""
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:512
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:518
+#: ../UpdateManager/UpdateManager.py:622
+msgid "Your system is up-to-date"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:519
+msgid ""
+"There are no upgrades available for your system. The upgrade will now be "
+"canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:535
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:537
+#, python-format
+msgid "Install %s"
+msgstr "Усталёўка %s"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:539
+#, python-format
+msgid "Upgrade %s"
+msgstr "Абнаўленьне %s"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:31
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:32
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:38
+#, python-format
+msgid ""
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:109
+msgid "Reboot required"
+msgstr "Патрабуецца перагрузка"
+
+#: ../DistUpgrade/DistUpgradeView.py:110
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr ""
+"Абнаўленьне скончана й патрабуецца перагрузка сыстэмы. Ці жадаеце зрабіць яе "
+"зараз?"
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/glade/SoftwareProperties.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+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"
+"Сыстэма можа патрапіць у нестабільны стан, калі вы скасуеце абнаўленьне. "
+"Вельмі пажадана дачакацца канца абнаўленьня."
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr "<b><big>Перагрузіце сыстэму для завяршэньня абнаўленьня</big></b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr "<b><big>Пачаць абнаўленьне?</big></b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr "Ачышчэньне"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Fetching and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr "Па_ведаміць пра памылку"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr "Пера_грузіць"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
+msgid "_Resume Upgrade"
+msgstr "Пра_цягваць абнаўленьне"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr "Немагчыма адшукаць нататкі выпуску"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr "Паслужнік можа быць звыш нагружаны. "
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr "Немагчыма зпампаваць нататкі рэдакцыі"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr "Калі ласка, праверце вашае далучэньне да інтэрнэту."
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:149
+msgid "Could not run the upgrade tool"
+msgstr "Немагчыма запусьціць сродак абнаўленьня"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:150
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr ""
+"Верагодна, гэта выклікана памылкай у сродку абнаўленьня. Калі ласка, "
+"паведаміце пра гэта як пра памылку."
+
+#: ../UpdateManager/DistUpgradeFetcher.py:171
+msgid "Downloading the upgrade tool"
+msgstr "Пампаваньне сродка абнаўленьня"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:180
+msgid "Upgrade tool signature"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:183
+msgid "Upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:209
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid "Failed to extract"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:215
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid "Verfication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:222
+msgid ""
+"Verifying the upgrade failed.  There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid "Authentication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:229
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:108
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:113
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:206
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:217
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
+msgid "Important security updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
+msgid "Recommended updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
+msgid "Proposed updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:241
+msgid "Backports"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:242
+msgid "Distribution updates"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
+msgid "Other updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:478
+#, python-format
+msgid "Version %s: \n"
+msgstr "Вэрсія %s: \n"
+
+#: ../UpdateManager/UpdateManager.py:539
+msgid "Downloading list of changes..."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:566
+msgid "_Uncheck All"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:572
+msgid "_Check All"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid "Please wait, this can take some time."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:668
+msgid "Update is complete"
+msgstr "Абнаўленьне завершана"
+
+#: ../UpdateManager/UpdateManager.py:719
+msgid "Checking for updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
+msgid "From version %(old_version)s to %(new_version)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:832
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:843
+msgid "Your distribution is not supported anymore"
+msgstr "Ваш дыстрыбутыў больш не падтрымліваецца"
+
+#: ../UpdateManager/UpdateManager.py:844
+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 ""
+
+#: ../UpdateManager/UpdateManager.py:863
+#, python-format
+msgid "<b>New distribution release '%s' is available</b>"
+msgstr "<b>Маецца ў наяўнасьці новая рэдакцыя \"%s\" дыстрыбутыву</b>"
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:898
+msgid "Software index is broken"
+msgstr "Пашкоджаны індэкс праграм"
+
+#: ../UpdateManager/UpdateManager.py:899
+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 ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:1
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:4
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:5
+msgid "<big><b>Not all updates can be installed</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:6
+msgid "<big><b>Starting update manager</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:7
+msgid "Changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:8
+msgid "Changes and description of the update"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:9
+msgid "Chec_k"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:10
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:11
+msgid "Description"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:13
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:16
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:17
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:18
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:19
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:20
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:21
+msgid "_Check"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:22
+msgid "_Distribution Upgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:23
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:24
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:25
+msgid "changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:26
+msgid "updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:2
+msgid "<b>Automatic updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:3
+msgid "<b>CDROM/DVD</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:4
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:5
+msgid "<b>Internet</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:6
+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 ""
+
+#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+msgid "Authentication"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
+msgid "Download from:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:13
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:16
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:17
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Sources"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:19
+msgid "Source code"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:20
+msgid "Statistics"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:21
+msgid "Submit statistical information"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:22
+msgid "Third Party"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:23
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:24
+msgid "_Download updates automatically, but do not install them"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:25
+msgid "_Import Key File"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:26
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Components:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
+msgid "APT line:"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Reload"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+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 ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changes and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:8
+msgid "Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:13
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:17
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:19
+msgid "Restricted software"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:25
+msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:59
+msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:62
+msgid "Canonical supported Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:64
+msgid "Community maintained (universe)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:65
+msgid "Community maintained Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:67
+msgid "Non-free drivers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:68
+msgid "Proprietary drivers for devices "
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:70
+msgid "Restricted software (Multiverse)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:71
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:76
+msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:103
+msgid "Backported updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:110
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:123
+msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:135
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:140
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:145
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:152
+msgid "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:165
+msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:177
+msgid "Ubuntu 5.04 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:182
+msgid "Ubuntu 5.04 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:187
+msgid "Ubuntu 5.04 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:193
+msgid "Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:199
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:201
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:206
+msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:209
+msgid "No longer officially supported"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:211
+msgid "Restricted copyright"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:218
+msgid "Ubuntu 4.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:223
+msgid "Ubuntu 4.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:228
+msgid "Ubuntu 4.10 Backports"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
index ce1fc9bc..d630f54b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:40+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:41+0000\n"
 "Last-Translator: Nikola Kasabov <nikola.kasabov@gmail.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
@@ -57,9 +57,9 @@ msgstr "След %s дни"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "_Инсталиране на актуализациите"
+msgstr ""
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -119,7 +119,7 @@ msgstr "Грешка при внасяне на избрания файл"
 
 #: ../SoftwareProperties/SoftwareProperties.py:980
 msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr "Избраният файл или не е GPG файл, или е повреден."
+msgstr "Избраният файл може да не е GPG файл ключ или може да е повреден."
 
 #: ../SoftwareProperties/SoftwareProperties.py:992
 msgid "Error removing the key"
@@ -128,7 +128,7 @@ msgstr "Грешка при премахване на ключа"
 #: ../SoftwareProperties/SoftwareProperties.py:993
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
-"Ключът, който сте избрали, не може да бъде премахнат. Докладвайте това като "
+"Ключът, който избрахте не може да бъде премахнат. Докладвайте това като "
 "грешка."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
@@ -150,11 +150,11 @@ msgstr "Моля, въведете име за диска"
 msgid "Please insert a disc in the drive:"
 msgstr "Моля, поставете диск в устройството:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Повредени пакети"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -163,20 +163,20 @@ msgstr ""
 "този софтуер. Моля, поправете ги със synaptic или apt-get преди да "
 "продължите!"
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Не може да бъдат надградени изисквани мета-пакети"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Ще трябва да бъде премахнат важен пакет"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Не може да бъде планирано надграждането"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -185,14 +185,14 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Възникна непреодолим проблем при планиране на надграждането. Докладвайте "
-"това като грешка. "
+"това като грешка."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Грешка при удостоверяването автентичността на някои пакети"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -202,12 +202,12 @@ msgstr ""
 "да е временен проблем с мрежата. Може би бихте искали да опитате отново по-"
 "късно. Вижте по-долу списъка на неудоствоерените пакети."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Не може да се инсталира '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -216,11 +216,11 @@ msgstr ""
 "грешка! "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Не могат да бъдат предположени мета-пакети"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Четене на кеша"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -265,11 +265,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Не е открит валиден огледален сървър"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -289,11 +289,11 @@ msgstr ""
 "Ако изберете \"Не\", актуализирането ще бъде отменено."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Генериране на източници по подразбиране?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -307,11 +307,11 @@ msgstr ""
 "Да бъдат ли добавени записи по подразбиране за \"%s\"? Ако изберете \"Не\", "
 "актуализацията ще бъде отменена."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Информацията от хранилището е невалидна"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -319,11 +319,11 @@ msgstr ""
 "Надграждане на информацията от хранилището доведе до невалиден файл. Моля, "
 "съобщете това като грешка!"
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Забранени са източници от трети страни"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, fuzzy
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
@@ -334,11 +334,11 @@ msgstr ""
 "Можете да ги разрешите отново след надграждането чрез инструмента software-"
 "properties или чрез synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Грешка по време на надграждане"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -346,11 +346,11 @@ msgstr ""
 "Възникна проблем при актуализацията. Това обикновено е накакъв проблем с "
 "мрежата. Моля, проверете мрежовата връзка и опитайте пак!"
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Недостатъчно свободно място на диска"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -359,15 +359,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Желаете ли да започне надграждането?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Не можеше да бъдат инсталирани надгражданията"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
@@ -379,11 +379,11 @@ msgstr ""
 "Надграждането сега ще бъде прекратено. Системата Ви може да е в "
 "неизползваемо състояние. Бе изпълнено възстановяване (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Не можеше да бъдат свалени надгражданията"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -391,11 +391,11 @@ msgstr ""
 "Надграждането се прекратява. Моля, проверете Интернет връзката или "
 "инсталационния носител и опитайте отново! "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -404,23 +404,23 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Премахване на остарелите пакети?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "П_рескачане на стъпката"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Премахване"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Грешка при прехвърляне"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -429,32 +429,47 @@ msgstr ""
 "информация! "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Рестартиране на системата"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Проверка на диспечера на пакети"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Подготвяне на надграждането"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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 ""
+"Възникна непреодолим проблем при планиране на надграждането. Докладвайте "
+"това като грешка."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Актуализиране информацията от хранилището"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 #, fuzzy
 msgid "Invalid package information"
 msgstr "Невалидна информация за пакет"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -467,19 +482,19 @@ msgstr ""
 "бъде открит.\n"
 "Това показва сериозна грешка. Моля, съобщете за това!"
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Запитване за потвърждение"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Надграждане"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Търсене на остарял софтуер"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Надграждането на системата завърши."
 
@@ -540,8 +555,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -595,7 +610,10 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Трябва да изтеглите данни общо %s."
+msgstr ""
+"\n"
+"\n"
+"Трябва да изтеглите данни общо %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy
@@ -614,7 +632,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Системата Ви е актуална"
 
@@ -664,8 +682,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -745,25 +763,39 @@ msgid "Terminal"
 msgstr "Терминал"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_Поднови надграждането"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Задържане"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Замяна"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Съобщи грешка"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Рестартирай сега"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Поднови надграждането"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_Поднови надграждането"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Не бяха открити бележки към изданието"
@@ -866,121 +898,126 @@ msgstr "Сваляне на файл %li от %li при %s/сек"
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Сваляне на файл %li от %li при %s/сек"
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!"
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "Неуспех при изтегляне на списъка с промени. Моля, проверете Интернет "
 "връзката си."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 актуализации на сигурността"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "_Инсталиране на актуализациите"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 Състарени версии"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "_Поднови надграждането"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "_Инсталиране на актуализациите"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Версия %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Сваляне на списъка с промени..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "_Проверка"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Размер за изтегляне: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Можете да инсталирате %s актуализация"
 msgstr[1] "Можете да инсталирате %s актуализации"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Моля, изчакайте! Това може да отнеме известно време."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Актуализацията е завършена"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "_Инсталиране на актуализациите"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Нова версия: %s (Размер: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "Версия %s: \n"
+msgstr "Версия %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Вашата дистрибуция вече не се поддържа"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -990,17 +1027,17 @@ msgstr ""
 "Надградете до по-късна версия на Ubuntu Linux. Вижте http://www.ubuntu.com "
 "за повече информация за надграждането!"
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "Индексът на софтуера е повреден"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1100,7 +1137,7 @@ msgstr "Показване напредъка на отделните файло
 
 #: ../data/glade/UpdateManager.glade.h:17
 msgid "Software Updates"
-msgstr "Актуализации на софтуера"
+msgstr "Обновления на програмите"
 
 #: ../data/glade/UpdateManager.glade.h:18
 msgid ""
@@ -1180,7 +1217,7 @@ msgstr "Добавяне на Cdrom"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
-msgstr "Идентифициране"
+msgstr "Идентификация"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
@@ -1310,7 +1347,7 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
-msgstr "Ред за APT:"
+msgstr "APT ред:"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
@@ -1344,7 +1381,7 @@ msgstr "Показване и инсталация на наличните ак�
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
-msgstr "Диспечер на актуализациите"
+msgstr "Управление на обновленията"
 
 #: ../data/update-manager.schemas.in.h:1
 msgid ""
@@ -1442,8 +1479,9 @@ msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Поддържани от обществото (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1476,9 +1514,8 @@ msgstr "Несвободни (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Ограничен за изнасяне от САЩ софтуер"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
@@ -1647,6 +1684,10 @@ msgstr "DFSG-съвместим софтуер с несвободни зави�
 msgid "Non-DFSG-compatible Software"
 msgstr "Софтуер несъвместим с DFSG"
 
+#, fuzzy
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "Ограничен за изнасяне от САЩ софтуер"
+
 #~ msgid "Downloading file %li of %li with unknown speed"
 #~ msgstr "Сваляне на файл %li от %li при неизвестна скорост"
 
@@ -1761,9 +1802,10 @@ msgstr "Софтуер несъвместим с DFSG"
 #~ msgid "Edit Channel"
 #~ msgstr "Редакция на канал"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Добави канал"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Добави канал"
+#~ msgstr[1] "_Добави канали"
 
 #~ msgid "_Custom"
 #~ msgstr "_Лично"
diff --git a/po/bn.po b/po/bn.po
index a3a8211b..e2eec2cf 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-26 12:09+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:37+0000\n"
 "Last-Translator: Khandakar Mujahidul Islam <suzan@bengalinux.org>\n"
 "Language-Team: Bengali <bn@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -57,9 +57,9 @@ msgstr "%s দিন পর"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "আপডেট ইন্সটল করো (_I)"
+msgstr ""
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -146,30 +146,30 @@ msgstr "ডিস্কের জন্য একটি নাম দিন"
 msgid "Please insert a disc in the drive:"
 msgstr "অনুগ্রহ করে ড্রাইভে একটি ডিস্ক দিন:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "ভাঙা প্যাকেজসমূহ"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "দরকারী meta-packages আপগ্রেড করতে পারে নি"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "একটি প্রয়োজনীয় প্যকেজ অপসারণ করা হতে পারে"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "আপগ্রেড গণনা করতে পারছে না"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -178,23 +178,23 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "'%s' ইন্সটল করা যাচ্ছে না"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -203,11 +203,11 @@ msgstr ""
 "রিপোর্ট করুন। "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "meta-package অনুমান করা যাচ্ছ না"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -235,11 +235,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr "ক্যাশ পড়া হচ্ছে"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -247,11 +247,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "কোন সঠিক মিরর পাওয়া যায় নি"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -264,11 +264,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "ডিফল্ট sources তৈরি করে?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -282,11 +282,11 @@ msgstr ""
 "'%s' জন্য ডিফল্ট যুক্ত করার উচিত? আপনি যদি 'না' নির্বাচন করেন তাহলে আপডেট বাতিল "
 "হবে।"
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "রিপোজিটরির তথ্য সঠিক নয়"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -294,22 +294,22 @@ msgstr ""
 "রিপোজিটোরি তথ্য আপগ্রেড করার সময় একটি ভুল ফাইল তৈরী হয়েছে। অনুগ্রহ করে এটিকে বাগ "
 "হিসাবে রিপোর্ট করুন।"
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "তৃতীয় পার্টির উত্স নিষ্ক্রিয়"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "আপগ্রেড করার সময় সমস্যা"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -317,11 +317,11 @@ msgstr ""
 "আপগ্রেড করার সময় একটি সমস্যা হয়েছে। এটি সাধারনত নেটওয়ার্কের সমস্যা, অনুগ্রহ করে "
 "আপনার নেটওয়ার্ক সংযোগ পরীক্ষা করুন এবং পুনরায় চেষ্টা করুন।"
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "ডিস্কে যথেস্ট ফাঁকা জায়গা নেই"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -330,15 +330,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "আপনি কি আপগ্রেড শুরু করতে চান?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "আপগ্রেড ইন্সটল করা যায় নি"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -347,11 +347,11 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "আপগ্রেড ডাউনলোড করা যায় নি"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -359,11 +359,11 @@ msgstr ""
 "আপগ্রেড এখন বন্ধ হবে। দয়া করে আপনার ইন্টারনেট সংযুক্তি বা ইনস্টলেশন মিডিয়া পরীক্ষা "
 "করুন এবং আবার চেষ্টা করুন। "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -372,54 +372,66 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "অপ্রচলিত প্যাকেজগুলো মুছে ফেলা হবে?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "এই ধাপটি এড়িয়ে যাও (_এ)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "সরাও (_স)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "প্রেরণ করার সময় সমস্যা"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "সিস্টেমটি রিস্টার্ট করছি"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "প্যাকেজ ম্যানেজার পরীক্ষা করা হচ্ছ"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "আপগ্রেড প্রস্তুত করা হচ্ছে"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "রিপজিটরির তথ্য আপডেট করা হচ্ছে"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "ভুল প্যাকেজ তথ্য"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -429,19 +441,19 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "তথ্যের জন্য জিজ্ঞাসা"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "আপগ্রেড করা হচ্ছে"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "অপ্রচলিত সফ্টওয়্যার অনুসন্ধান করা হচ্ছে"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "সিস্টেম আপগ্রেড সম্পন্ন।"
 
@@ -502,8 +514,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -551,7 +563,10 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "আপনাকে সর্বমোট %s ডাউনলোড করতে হবে।"
+msgstr ""
+"\n"
+"\n"
+"আপনাকে সর্বমোট %s ডাউনলোড করতে হবে। "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy
@@ -566,7 +581,7 @@ msgstr "তথ্য হারাতে না চাইলে সকল অ্�
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "আপনার সিস্টেম আপ-টু-ডেট"
 
@@ -616,8 +631,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -692,25 +707,39 @@ msgid "Terminal"
 msgstr "টার্মিন্যাল"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "পুনরায় আপগ্রেড শুরু (_R)"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "রাখো (_K)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "প্রতিস্হাপন (_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "বাগ রিপোর্ট (_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "এক্ষুনি রিস্টার্ট (_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "পুনরায় আপগ্রেড শুরু (_R)"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "পুনরায় আপগ্রেড শুরু (_R)"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "রিলিজ নোট পাওয়া যায় নি"
@@ -804,138 +833,142 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।"
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 #, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "আপডেট ইন্সটল করো (_I)"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "পুনরায় আপগ্রেড শুরু (_R)"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "আপডেট ইন্সটল করো (_I)"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "ভার্সন %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছ..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "পরীক্ষা করো (_C)"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "ডাউনলোড এর আকার: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "আপনি %s আপডেট ইনস্টল করতে পারেন"
 msgstr[1] "আপনি %s আপডেট ইনস্টল করতে পারেন"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।"
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "আপডেট সম্পন্ন"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "আপডেট ইন্সটল করো (_I)"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "নতুন ভার্সন: %s (আকার: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "ভার্সন %s: \n"
+msgstr "ভার্সন %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "আপনার ডিস্ট্রিবিউশনটি আর সমর্থিত নয়"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1337,7 +1370,7 @@ msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1369,7 +1402,7 @@ msgstr "ফ্রি নয় (মাল্টিভার্স)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
@@ -1634,9 +1667,10 @@ msgstr ""
 #~ msgid "Edit Channel"
 #~ msgstr "চ্যানেন সম্পাদন"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "চ্যানেল যোগ (_A)"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "চ্যানেল যোগ (_A)"
+#~ msgstr[1] "চ্যানেল যোগ (_A)"
 
 #~ msgid "_Custom"
 #~ msgstr "নিজ হাতে (_C)"
diff --git a/po/br.po b/po/br.po
index d933750b..cda3200d 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: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
+"POT-Creation-Date: 2006-10-06 23:18+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"
@@ -146,30 +146,30 @@ msgstr "Roit un anv evit ar bladenn marplij"
 msgid "Please insert a disc in the drive:"
 msgstr "Lakait ur bladenn e-barzh ul lenner marplij:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Pakadoù torr"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -178,34 +178,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -232,11 +232,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -244,11 +244,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -261,11 +261,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -274,42 +274,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -318,15 +318,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -335,21 +335,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -358,54 +358,65 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -415,19 +426,19 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr ""
 
@@ -485,8 +496,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -548,7 +559,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr ""
 
@@ -598,8 +609,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -673,25 +684,37 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
+msgid "_Continue"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
+msgid "_Replace"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -782,128 +805,130 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
 msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, python-format
 msgid "Version %s"
 msgstr ""
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1287,7 +1312,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1317,7 +1342,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
diff --git a/po/ca.po b/po/ca.po
index c29de9b3..0ce2d339 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-29 21:18+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:41+0000\n"
 "Last-Translator: Jordi Irazuzta <irazuzta@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
@@ -56,9 +56,9 @@ msgstr "Després de %s dies"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "_Instal·la les actualitzacions"
+msgstr ""
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -70,7 +70,7 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Servidor principal"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
@@ -81,7 +81,7 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Servidor més proper"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
@@ -151,11 +151,11 @@ msgstr "Introduïu un nom per al disc"
 msgid "Please insert a disc in the drive:"
 msgstr "Inseriu un disc a la unitat:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Paquets trencats"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -163,21 +163,21 @@ msgstr ""
 "El vostre sistema conté paquets trencats que no es poden arreglar amb "
 "aquesta aplicació. Utilitzeu el Synaptic o apt-get abans de continuar."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 #, fuzzy
 msgid "Can't upgrade required meta-packages"
 msgstr "No s'han pogut actualitzar els metapaquets sol·licitats"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "S'haurà d'esborrar un paquet essencial"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "No s'ha pogut calcular l'actualització"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -186,14 +186,14 @@ msgid ""
 "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. "
+"de l'error."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "S'ha produït un error en autenticar alguns paquets"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -203,12 +203,12 @@ msgstr ""
 "amb la xarxa. Podeu provar-ho després. A continuació es mostra la llista amb "
 "els paquets no autenticats."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "No s'ha pogut instal·lar '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -217,11 +217,11 @@ msgstr ""
 "els error. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -255,11 +255,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr "S'està llegint la memòria cau"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -267,11 +267,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "No s'ha trobat una rèplica vàlida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -284,11 +284,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
-msgstr ""
+msgstr "Voleu generar les fonts per defecte?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -297,11 +297,11 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "La informació del dipòsit no és vàlida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -309,11 +309,11 @@ msgstr ""
 "En actualitzar la informació del dipòsit s'ha produït un error. Informeu de "
 "l'error."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "S'han desactivat les fonts de tercers"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, fuzzy
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
@@ -324,11 +324,11 @@ msgstr ""
 "reactivar-los, després de l'actualització de programari, des de 'propietats "
 "del programari' o des del Synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "S'ha produït un error en l'actualització"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -336,11 +336,11 @@ msgstr ""
 "S'ha produït un error mentre s'actualizava el vostre sistema. Comproveu la "
 "vostra connexió de xarxa i torneu a intentar-ho."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "No disposeu de suficient espai al disc"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -353,15 +353,15 @@ msgstr ""
 "apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Voleu iniciar l'actualització?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "No s'han pogut instal·lar les actualitzacions"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
@@ -373,11 +373,11 @@ msgstr ""
 "L'actualització s'ha cancel·lat. El vostre sistema ha pogut quedar "
 "inservible.  S'ha executat una recuperació del sistema (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "No s'han pogut descarregar les actualitzacions"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -385,11 +385,11 @@ msgstr ""
 "S'ha cancel·lat l'actualització. Comproveu la vostra connexió a Internet o "
 "el mitjà d'instal·lació i torneu-ho a provar. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -401,56 +401,71 @@ 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. "
+"Si no teniu activat 'universe' se us sugerirà que els desintal·leu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Voleu esborrar els paquets obsolets?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Omet aquest pas"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "Esbo_rra"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "S'està restaurant l'estat original del sistema"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "S'està comprovant el gestor de paquets"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "S'està preparant l'actualització"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "S'està actualitzant la informació del dipòsit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "La informació del paquet no és valida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -460,19 +475,19 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Actualitzant"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "S'està cercant programari obsolet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "S'ha completat l'actualització del sistema"
 
@@ -533,8 +548,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -582,7 +597,10 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Heu de descarregar un total de %s."
+msgstr ""
+"\n"
+"\n"
+"Heu de descarregar un total de %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy
@@ -601,7 +619,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "El vostre sistema està actualitzat"
 
@@ -651,8 +669,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -733,25 +751,39 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_Reprén l'actualització"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Informa de l'error"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Reinicia"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Reprén l'actualització"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_Reprén l'actualització"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "No s'han pogut trobar les notes de la versió"
@@ -843,121 +875,126 @@ msgstr "S'està descarregant el fitxer %li de %li amb %s/s"
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "S'està descarregant el fitxer %li de %li amb %s/s"
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "La llista de canvis encara no està disponible. Proveu-ho després."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, 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."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"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."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Debian Stable Security Updates"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "_Instal·la les actualitzacions"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Actualitzacions d'Ubuntu 6.06 LTS"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "_Reprén l'actualització"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "_Instal·la les actualitzacions"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versió %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "S'està descarregant la llista de canvis..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "_Comprova"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Mida de la descàrrega: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 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"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Espereu, això pot tardar una estona."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "S'ha completat l'actualització"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "S'estan comprovant les actualitzacions..."
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Versió nova: %s (Mida: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "Versió %s: \n"
+msgstr "Versió %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "La vostra distribució ja no es mantindrà més"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -967,17 +1004,17 @@ msgstr ""
 "sistema a la darrera versió d'Ubuntu. Vegeu http://www.ubuntu.com per a més "
 "informació."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Ja disposeu de la nova distribució '%s'</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "L'índex de programari s'ha trencat"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1410,8 +1447,9 @@ msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Paquets mantinguts per la comunitat (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1444,9 +1482,8 @@ msgstr "Paquets sense llicència lliure (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Programari amb restriccions d'exportació als EUA"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
@@ -1616,6 +1653,10 @@ msgstr "Programari compatible DFSG amb dependències no lliures"
 msgid "Non-DFSG-compatible Software"
 msgstr "Programari no compatible DFSG"
 
+#, fuzzy
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "Programari amb restriccions d'exportació als EUA"
+
 #~ msgid "Downloading file %li of %li with unknown speed"
 #~ msgstr ""
 #~ "S'està descarregant el fitxer %li de %li a una velocitat desconeguda"
@@ -1736,9 +1777,10 @@ msgstr "Programari no compatible DFSG"
 #~ msgid "Edit Channel"
 #~ msgstr "Edita el canal"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Afegeix el canal"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Afegeix el canal"
+#~ msgstr[1] "_Afegeix els canals"
 
 #~ msgid "_Custom"
 #~ msgstr "_Personalitza"
diff --git a/po/cs.po b/po/cs.po
index 4554f451..43bb25e7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-25 18:52+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:41+0000\n"
 "Last-Translator: Tomáš Hála <tomas@monty.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -58,9 +58,9 @@ msgstr "Po %s dnech"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Instaluji aktualizace"
+msgstr "%s aktualizace"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -68,45 +68,45 @@ msgstr "Instaluji aktualizace"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Hlavní server"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Server pro %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Nejbližší server"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
+#, fuzzy
 msgid "Custom servers"
-msgstr ""
+msgstr "Uživatelem vybrané servery"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Aktualizace softwaru"
+msgstr "Softwarový kanál"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Aktivní"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(Zdrojový kód)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "Zdrojový kód"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -147,32 +147,33 @@ msgstr "Prosím zadejte jméno disku"
 msgid "Please insert a disc in the drive:"
 msgstr "Prosím vložte disk do mechaniky:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Poškozené balíky"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 oje prosím pravte použitím synaptic nebo apt-get."
+"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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Nemohu aktualizovat požadované meta-balíky"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Základní balík by musel být odstraněn"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Nemohu vypočítat aktualizaci"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -181,14 +182,17 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Při výpočtu aktualizace nastal neřešitelný problém. Prosím oznamte to jako "
-"chybu. "
+"chybu.\n"
+"\n"
+"Prosím oznamte tuto chybu jako problém balíčku 'update-manager' a přiložte "
+"soubory v adresáři /var/log/dist-upgrade/ k vašemu chybovému hlášení."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Chyba při ověření některých balíků"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -198,12 +202,12 @@ msgstr ""
 "problémem v síti. Možná to budete chtít zkusit později. Níže je uveden "
 "seznam neověřených balíků."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Nemohu nainstalovat '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -211,11 +215,11 @@ msgstr ""
 "Nebylo možné nainstalovat požadovaný balík. Prosím oznamte to jako chybu. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Nemohu odhadnout meta-balík"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -225,14 +229,14 @@ msgid ""
 "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 si prosím nainstalujte si jeden z výše uvedených balíků "
+"edubuntu-desktop a nebylo možné zjistit jakou verzi Ubuntu používáte.\n"
+" Před pokračováním si prosím nainstalujte jeden z výše uvedených balíků "
 "pomocí synaptic nebo apt-get."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
 #, fuzzy
 msgid "Failed to add the CD"
-msgstr "Chyba stahování"
+msgstr "Chyba při přidávání CD"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -243,28 +247,38 @@ msgid ""
 "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'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Probíhá čtení cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Stáhnout ze sítě nějaká data pro přechod na vyšší verzi?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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 zjištění nejnovějších "
+"aktualizací a pro 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'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Nenalezeno správné zrcadlo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -275,13 +289,20 @@ msgid ""
 "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 repozitářích nebylo nalezeno žádné zrcadlo "
+"pro aktualizace. Toto se může stát, pokud používáte interní zrcadlo nebo "
+"pokud jsou informace o zrcadle zastaralé.\n"
+"\n"
+"Přejete si i přesto přepsat váš '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."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Vytvořit standardní zdroje?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -289,12 +310,17 @@ msgid ""
 "Should default entries for '%s' be added? If you select 'No' the update will "
 "cancel."
 msgstr ""
+"Po prohledání vašeho '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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Neplatná informace zdroje"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -302,22 +328,25 @@ msgstr ""
 "Upgrade informací o úložišti vrátil neplatný soubor. Prosím oznamte to jako "
 "chybu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Zdroje třetích stran vypnuté"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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é položky třetích stran ve vašem sources.list byly vyřazeny. Tyto "
+"položky můžete opět povolit po přechodu na novou verzi za pomocí nástroje "
+"'software-propertie' nebo pomocí synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Chyba během aktualizace"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -325,28 +354,31 @@ msgstr ""
 "Nastala chyba během aktualizace. Toto je obvykle způsobeno chybou síťového "
 "připojení. Prosím zkontrolujte své připojení a zkuste to znovu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Nedostatek volného místa na disku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 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 váš koš a odstraňte dočasné balíčky z dřívějších instalací "
+"pomocí 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Chcete spustit aktualizaci?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Nelze nainstalovat aktualizace"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
@@ -357,13 +389,16 @@ msgid ""
 msgstr ""
 "Aktualizace byla předčasně ukončena. Váš systém může být v nepoužitelném "
 "stavu. Zkuste ho prosím opravit pomocí 'sudo apt-get install -f' nebo "
-"Synaptic."
+"Synaptic.\n"
+"\n"
+"Prosím nahlaste tuto chybu balíčku 'update-manager' a přiložte soubory z "
+"adresáře /var/log/dist-upgrade/ k hlášení o chybě."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Nelze stáhnout aktualizace"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -371,11 +406,11 @@ msgstr ""
 "Aktualizace byla předčasně ukončena. Prosím zkontrolujte si připojení k "
 "internetu nebo instalační médium a zkuste to znovu. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Podpora pro některé aplikace byla ukončena"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -383,24 +418,29 @@ msgid ""
 "If you have not enabled community maintained software (universe), these "
 "packages will be suggested for removal in the next step."
 msgstr ""
+"Canonical Ltd. již dále neposkytuje podporu pro následující balíčky "
+"softwaru. Stále můžete získat podporu komunity.\n"
+"\n"
+"Pokud nemáte povolen software spravovaný komunitou (universe), tyto balíčky "
+"budou navrhnuty k odstranění v dalším kroku."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Odebrat zastaralé balíky?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Přeskočit tento krok"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Odebrat"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Chyba při zaznamenávání"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -409,31 +449,46 @@ msgstr ""
 "prohléhněte níže uvedenou zprávu. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Obnovuje se původní stav systému"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "Stahuji backport '%s'"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Kontroluje se manažer balíků"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Připravuje se upgrade"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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 ""
+"Při výpočtu aktualizace nastal neřešitelný problém. Prosím oznamte to jako "
+"chybu."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Aktualizují se informace o úložišti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
-msgstr ""
+msgstr "Neplatná informace o balíčcích"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -442,20 +497,25 @@ msgid ""
 "manager' package and include the files in /var/log/dist-upgrade/ in the "
 "bugreport."
 msgstr ""
+"Poté co byly aktualizovány informaco o balíčcích, nebyl nalezen nezbytný "
+"balík '%s'.\n"
+"Toto ukazuje na závažný problém, prosím nahlašte toto jako chybu balíku "
+"'update-manager' a přiložte k hlášení o chybě soubory v adresáři /var/log/"
+"dist-upgrade/."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Požaduje se potvrzení"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Probíhá upgrade"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Vyhledáván zastaralý software"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Upgrade systému je dokončen."
 
@@ -503,6 +563,9 @@ 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 ""
+"Aktualizace se přerušila. Nahlašte prosím tuto chybu jako chybu balíku "
+"'update-manager'  a přiložte k chybovému hlášení soubory z adresáře /var/log/"
+"dist-upgrade/."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
@@ -516,8 +579,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -573,7 +636,10 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Bude staženo celkem %s."
+msgstr ""
+"\n"
+"\n"
+"Bude staženo celkem %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy
@@ -588,7 +654,7 @@ msgstr "Pro zamezení ztráty dat, uzavřete všechny aplikace a dokumenty."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Váš systém je aktuální"
 
@@ -597,6 +663,8 @@ msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
 msgstr ""
+"Pro váš počítač nejsou k dispozici žádné aktualizace. Aktualizace bude nyní "
+"ukončena."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -611,7 +679,7 @@ msgstr "Nainstalovat %s"
 #: ../DistUpgrade/DistUpgradeViewGtk.py:539
 #, python-format
 msgid "Upgrade %s"
-msgstr "Upgradovat %s"
+msgstr "Aktualizovat %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
 #, fuzzy, python-format
@@ -621,25 +689,25 @@ msgstr "Zhruba %li hodin %li minut zbývá"
 #: ../DistUpgrade/DistUpgradeView.py:29
 #, fuzzy, python-format
 msgid "%li hours %li minutes"
-msgstr "Zhruba %li hodin %li minut zbývá"
+msgstr "Zbývá zhruba %li hodin %li minut"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minut"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li sekund"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -650,7 +718,8 @@ msgstr "Vyžadován restartovat"
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
-"Upgrade byl dokončen a je třeba restartovat systém. Chcete restartovat nyní?"
+"Aktualizace byla dokončena a je třeba restartovat systém. Chcete restartovat "
+"nyní?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -719,25 +788,39 @@ msgid "Terminal"
 msgstr "Terminál"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_Pokračovat v upgradu"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Ponechat"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Nahradit"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Oznámit chybu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Restartovat nyní"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Pokračovat v upgradu"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_Pokračovat v upgradu"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Nebyly nalezeny poznámky k vydání."
@@ -756,9 +839,8 @@ msgstr "Prosím zkontrolujte své internetové připojení."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
-#, fuzzy
 msgid "Could not run the upgrade tool"
-msgstr "Nelze nainstalovat upgrady"
+msgstr "Nemohu spustit aktualizační nástroj"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
@@ -804,6 +886,7 @@ msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Rozbalování aktualizace selhalo. Může být problém se sítí nebo serverem. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
@@ -827,6 +910,7 @@ msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Autentizace aktualizace selhala. Může být problém se sítí nebo serverem. "
 
 #: ../UpdateManager/GtkProgress.py:108
 #, fuzzy, python-format
@@ -838,80 +922,82 @@ msgstr "Stahuji %li. soubor z %li rychlostí %s/s"
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Stahuji %li. soubor z %li rychlostí %s/s"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu."
+msgstr "Seznam změn není dostupný."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "Selhalo stažení seznamu změn. Prosím zkontrolujte své internetové připojení."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
+msgstr "Důležité bezpečnostní aktualizace"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Doporučené aktualizace"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
-msgstr "Instaluji aktualizace"
+msgstr "Navrhnuté aktualizace"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 Backports"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "_Pokračovat v upgradu"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Instaluji aktualizace"
+msgstr "Ostatní aktualizace"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Verze %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Stahuji seznam změn ..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "_Zkontrolovat"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Stahovaná velikost: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -919,40 +1005,40 @@ msgstr[0] "Můžete instalovat %s aktualizaci"
 msgstr[1] "Můžete instalovat %s aktualizace"
 msgstr[2] "Můžete instalovat %s aktualizací"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Prosím čekejte, může to nějakou dobu trvat."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Aktualizace je dokončena"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "Zkontrolovat dostupné aktualizace"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Nová verze: %s (Velikost: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Verze %s: \n"
+msgstr "Verze %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Velikost: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Vaše distribude už není podporovaná"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -962,22 +1048,25 @@ msgstr ""
 "Přejděte na další verzi Ubuntu Linuxu. Pro více informací o přechodu na "
 "vyšší verzi se podívejte na http://www.ubuntu.com."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>Nové vydání distribuce '%s' je k dispozici</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
-msgstr ""
+msgstr "Seznam softwaru je poškozen"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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é nainstalovat nebo odinstalovat žádný program. Prosím použijte "
+"správce balíčků \"Synaptic\" nebo nejdříve spusťe v terminálu \"sudo apt-get "
+"install -f\" pro opravu tohoto problému."
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
@@ -987,19 +1076,19 @@ msgstr ""
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 #, fuzzy
@@ -1037,7 +1126,7 @@ msgstr "Změny"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Změny a popis aktualizace"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1105,33 +1194,31 @@ msgid "_Install Updates"
 msgstr "Na_instalovat Aktualizace"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Změny"
+msgstr "změny"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "aktualizace"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Síťové aktualizace</b>"
+msgstr "<b>Automatické aktualizace</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Síťové aktualizace</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Síťové aktualizace</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
+#, fuzzy
 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 "
@@ -1141,6 +1228,12 @@ msgid ""
 "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, utkání oblíbenosti aby Ubuntu lépe poznalo zvyky "
+"uživatelů. Pokud tak učiníte, seznam nainstalovaného software a četnost "
+"použití bude každý týden anonymně odesílána projektu Ubuntu.\n"
+"\n"
+"Výsledky jsou použity ke zlepšení podpory pro oblíbené aplikace a řazení ve "
+"výsledcích vyhledávání.</i>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
 #, fuzzy
@@ -1156,9 +1249,8 @@ msgid "D_elete downloaded software files:"
 msgstr "_Smazat stažené soubory programů:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "Stahování bylo dokončeno"
+msgstr "Stáhnout z:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1186,39 +1278,36 @@ msgstr "Obnovit původní klíče vaší distribuce"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Vlastnosti softwaru"
+msgstr "Zdroje softwaru"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
 msgid "Source code"
-msgstr ""
+msgstr "Zdrojový kód"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Statistiky"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Odeslat statistické informace"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Třetí strana"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "_Zkontrolovat aktualizace automaticky"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "_Stáhnout aktualizace na pozadí, ale neinstalovat je."
+msgstr "Stá_hnout aktualizace automaticky, ale neinstalovat je"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
-#, fuzzy
 msgid "_Import Key File"
-msgstr "Importovat klíč"
+msgstr "_Importovat klíč"
 
 #: ../data/glade/SoftwareProperties.glade.h:26
 msgid "_Install security updates without confirmation"
@@ -1259,7 +1348,7 @@ msgstr "<b>Typ:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
 msgid "<b>URI:</b>"
-msgstr "<b>Adresa:</b>"
+msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
 #, fuzzy
@@ -1290,7 +1379,7 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
-msgstr ""
+msgstr "Upravit zdroj"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
@@ -1298,7 +1387,7 @@ msgstr "Prohledávám CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
-msgstr ""
+msgstr "Přid_at zdroj"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1358,9 +1447,8 @@ msgid "The window size"
 msgstr "Velikost okna"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Konfigurovat kanály softwaru a internetové aktualizace"
+msgstr "Konfigurovat zdroje pro instalovatelný software a aktualizace"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1370,9 +1458,8 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 Aktualizace"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
@@ -1394,24 +1481,23 @@ msgstr "Nesvobodný (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Cdrom s Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 \"Dapper Drake\""
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Udržováno komunitou (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Udržováno komunitou (Universe)"
+msgstr "Udržováno komunitou (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
@@ -1421,9 +1507,8 @@ msgstr "Udržováno komunitou (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Nesvobodný (Multiverse)"
+msgstr "Nesvobodné ovladače"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
@@ -1432,20 +1517,18 @@ msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Nesvobodný (Multiverse)"
+msgstr "Omezený software (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 \"Dapper Drake\""
+msgstr "Cdrom s Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
@@ -1459,9 +1542,8 @@ msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Cdrom s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1480,14 +1562,13 @@ msgstr "Ubuntu 5.10 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Cdrom s Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1496,27 +1577,24 @@ msgstr "Oficiálně podporováno"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
+msgstr "Ubuntu 5.04 Bezpečnostní aktualizace"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 Aktualizace"
+msgstr "Ubuntu 5.04 Aktualizace"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
 #, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 5.04 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1531,7 +1609,7 @@ msgstr "Nesvobodný (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Cdrom s Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
@@ -1546,21 +1624,19 @@ msgstr "Omezeno copyrightem"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
+msgstr "Ubuntu 4.10 Bezpečnostní aktualizace"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 5.10 Aktualizace"
+msgstr "Ubuntu 4.10 Aktualizace"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
 #, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 4.10 Backports"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1601,7 +1677,7 @@ msgstr "Debian \"Sid\" (unstable)"
 #. CompDescription
 #: ../data/channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "DFSG-kompatibilní software s Non-free závislostmi"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:57
@@ -1624,20 +1700,16 @@ msgstr "Žádný DFSG kompatibilní  Software"
 #~ msgid "Your system has already been upgraded."
 #~ msgstr "Váš systém byl již upgradován."
 
-#, fuzzy
 #~ 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.06 LTS</"
-#~ "span>"
+#~ "<span weight=\"bold\" size=\"x-large\">Přechází se na Ubuntu 6.10</span>"
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace"
+#~ msgstr "Důležité bezpečnostní aktualizace Ubuntu"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Upgradovat na poslední verzi Ubuntu"
+#~ msgstr "Aktualizace Ubuntu"
 
 #~ msgid "Cannot install all available updates"
 #~ msgstr "Nelze nainstalovat všechny dostupné aktualizace"
@@ -1705,7 +1777,7 @@ msgstr "Žádný DFSG kompatibilní  Software"
 #~ msgstr "<b>Zdroje</b>"
 
 #~ msgid "<b>Components</b>"
-#~ msgstr "<b>Součásti:</b>"
+#~ msgstr "<b>Součásti</b>"
 
 #~ msgid "Add Channel"
 #~ msgstr "Přidat zdroj"
@@ -1713,16 +1785,17 @@ msgstr "Žádný DFSG kompatibilní  Software"
 #~ msgid "Edit Channel"
 #~ msgstr "Editvat zdroj"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Přidat kanál"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Přidat kanál"
+#~ msgstr[1] "_Přidat kanály"
+#~ msgstr[2] "_Přidat kanály"
 
 #~ msgid "_Custom"
 #~ msgstr "_Uživatelský"
 
-#, fuzzy
 #~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS aktualizace"
+#~ msgstr "Ubuntu 6.06 LTS"
 
 #~ msgid "Ubuntu 6.06 LTS Security Updates"
 #~ msgstr "Ubuntu 6.06 LTS bezpečnostní aktualizace"
diff --git a/po/da.po b/po/da.po
index 9f8e8041..ee6d9106 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:41+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:41+0000\n"
 "Last-Translator: Mathias-K <mathias@computergeil.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,15 +23,15 @@ msgstr "Dagligt"
 
 #: ../SoftwareProperties/SoftwareProperties.py:137
 msgid "Every two days"
-msgstr "Hver 2. dag"
+msgstr "Hver anden dag"
 
 #: ../SoftwareProperties/SoftwareProperties.py:138
 msgid "Weekly"
-msgstr "Ugentligt"
+msgstr "Ugenligt"
 
 #: ../SoftwareProperties/SoftwareProperties.py:139
 msgid "Every two weeks"
-msgstr "Hver 2. uge"
+msgstr "Hver anden uge"
 
 #: ../SoftwareProperties/SoftwareProperties.py:144
 #, fuzzy, python-format
@@ -40,26 +40,26 @@ msgstr "Hver %s. dag"
 
 #: ../SoftwareProperties/SoftwareProperties.py:167
 msgid "After one week"
-msgstr "Efter 1 uge"
+msgstr "Efter en uge"
 
 #: ../SoftwareProperties/SoftwareProperties.py:168
 msgid "After two weeks"
-msgstr "Efter 2 uger"
+msgstr "Efter to uger"
 
 #: ../SoftwareProperties/SoftwareProperties.py:169
 msgid "After one month"
-msgstr "Efter 1 måned"
+msgstr "Efter en måned"
 
 #: ../SoftwareProperties/SoftwareProperties.py:174
 #, python-format
 msgid "After %s days"
-msgstr "Efter %s dag(e)"
+msgstr "Efter %s dage"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "_Installer Opdateringer"
+msgstr "%s opdateringer"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -67,45 +67,44 @@ msgstr "_Installer Opdateringer"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Hovedserver"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Server for %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Nærmeste server"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Brugerdefinerede servere"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Opdateringer"
+msgstr "Softwarekanal"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(Kildetekst)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "Kildetekst"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -113,11 +112,11 @@ msgstr "Importér nøgle"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
-msgstr "Fejl under importering af den valgte fil"
+msgstr "Fejl ved importering af den valgte fil"
 
 #: ../SoftwareProperties/SoftwareProperties.py:980
 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 er i stykker."
+msgstr "Den valgte fil er ikke en GPG-nøglefil eller den kan være ødelagt."
 
 #: ../SoftwareProperties/SoftwareProperties.py:992
 msgid "Error removing the key"
@@ -126,101 +125,98 @@ msgstr "Fejl ved fjernelse af nøgle"
 #: ../SoftwareProperties/SoftwareProperties.py:993
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
-"Den valgte nøgle kunne ikke fjernes. Rapporter venligst dette som en fejl."
+"Den valgte nøgle kunne ikke fjernes. Rapportér venligst dette som en fejl."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
-"<big><b>Fejl ved scanning af CD</b></big>\n"
+"<big><b>Fejl ved gennemsøgning af cd</b></big>\n"
 "\n"
 "%s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1096
 msgid "Please enter a name for the disc"
-msgstr "Indtast venligst et navn til disken"
+msgstr "Indtast venligst et navn for disken"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1112
 msgid "Please insert a disc in the drive:"
 msgstr "Indsæt venligst en disk i drevet:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 kan repareres med dette "
-"program. Reparer dem venligst med synaptic eller apt-get før du fortsætter."
+"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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
-msgstr "Kan ikke opgradere de krævede meta-pakker"
+msgstr "Kan ikke opgradere de krævede metapakker"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
-msgstr "Det ville være nødvendigt at fjerne en vigtig pakke"
+msgstr "Det ville være nødvendigt at fjerne en vital pakke"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
-msgstr "Kunne ikke udregne opgraderingen"
+msgstr "Kunne ikke beregne opgraderingen"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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 forekom et uløseligt problem under beregningen af opgraderingen. "
-"Rapportér venligst dette som en fejl. "
+"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."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Fejl ved godkendelse af nogle pakker"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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. "
-"Det anbefales du prøver igen senere. Se længere nede for en liste over "
-"pakker som ikke kunne godkendes."
+"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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
-msgstr "Kan ikke installere '%s'"
+msgstr "Kan ikke installere \"%s\""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 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. Rapporter venligst dette "
+"Det var umuligt at installere en påkrævet pakke. Rapportér venligst dette "
 "som en fejl. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
-msgstr "Kan ikke gætte meta-pakke"
+msgstr "Kan ikke gætte metapakke"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -228,16 +224,16 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
-"Dit system indeholder ikke en af pakkerne ubuntu-desktop, kubuntu-desktop "
-"eller edubuntu-desktop, og det var ikke muligt at finde ud af hvilken "
-"version af Ubuntu du kører.\n"
-" Installer venligst en af pakkerne nævnt herover ved hjælp af Synaptic eller "
-"apt-get før du fortsætter."
+"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."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Fejl ved hentning"
+msgstr "Kunne ikke tilføje cd"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -248,28 +244,38 @@ msgid ""
 "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\""
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
-msgstr "Læser cache-mellemlager"
+msgstr "Læser mellemlager"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Hent data fra netværket til opgraderingen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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\"."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
-msgstr ""
+msgstr "Intet gyldigt spejl fundet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -280,13 +286,20 @@ msgid ""
 "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."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
-msgstr ""
+msgstr "Generér standardkilder?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -294,47 +307,55 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
-msgstr "Arkivinformation ugyldig."
+msgstr "Arkivinformation ugyldig"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 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. raporter venligst dette "
-"som en fejl."
+"Opgradering af arkivet resulterede i en ødelagt fil. Rapportér venligst "
+"dette som en fejl."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
-msgstr "Trediepartskilder er fravalgt"
+msgstr "Tredjepartskilder er deaktiveret"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Fejl under opdatering"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 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 forekom under opdateringen. Dette skyldes som regel et "
+"En fejl opstod under opdateringen. Dette skyldes som regel et "
 "netværksproblem, tjek venligst din netværksforbindelse og prøv igen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
-msgstr "Der er ikke nok fri diskplads"
+msgstr "Ikke tilstrækkeligt ledig diskplads"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -346,16 +367,15 @@ msgstr ""
 "køre 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Vil du starte opgraderingen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Kunne ikke installere opgraderingerne"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -363,27 +383,29 @@ msgid ""
 "Please report this bug against the 'update-manager' package and include the "
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
-"Upgraderingen afbrydes nu. Dit system kan forekomme ustabilt. En oprydning "
-"blev foretaget (dpkg --configura -a)."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Kunne ikke hente opgraderingerne"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
-"Opgraderingen afbryder nu. Tjek venligst din internetforbindelse eller dit "
+"Opgraderingen afbrydes nu. Tjek venligst din internetforbindelse eller dit "
 "installationsmedie og prøv igen. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Support stoppede for nogle programmer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -391,31 +413,30 @@ msgid ""
 "If you have not enabled community maintained software (universe), these "
 "packages will be suggested for removal in the next step."
 msgstr ""
-"Disse installerede pakker er ikke længere officielt understøttet, og er nu "
-"kun understøttet af brugerne ('universe').↵\n"
-"↵\n"
-"Hvis du ikke har slået 'universe' til, vil fjernelsen af disse pakker blive "
-"foreslået i det næste trin. "
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Fjern forældede pakker?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 #, fuzzy
 msgid "_Skip This Step"
 msgstr "_Spring dette trin over"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
-msgstr "Fejl under udførsel"
+msgstr "Fejl under gennemførelse"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -424,31 +445,46 @@ msgstr ""
 "information. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
-msgstr "Genstarter oprindelig systemtilstand"
+msgstr "Genskaber oprindelig systemtilstand"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "Henter tilbageportering af \"%s\""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Undersøger pakkehåndtering"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Klargør opgraderingen"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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 ""
+"Der forekom et uløseligt problem under beregningen af opgraderingen. "
+"Rapportér venligst dette som en fejl."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Opdaterer arkivinformation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
-msgstr ""
+msgstr "Ugyldig pakkeinformation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -457,20 +493,25 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Anmoder om bekræftelse"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Opgraderer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Søger efter forældet software"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Systemopgradering er fuldført"
 
@@ -481,20 +522,19 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "Indsæt venligst '%s' i drevet '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "Opdatering udført"
+msgstr "Hentning er gennemført"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr "Henter fil %li af %li fra %s/s"
+msgstr "Henter fil %li af %li med %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Tid tilbage(ca.): %li minutter"
+msgstr "Omkring %s tilbage"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, fuzzy, python-format
@@ -506,93 +546,98 @@ msgstr "Henter fil %li af %li"
 #. -> longer term, move this code into python-apt
 #: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
-msgstr "Udfører ændringer"
+msgstr "Anvender ændringer"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
-msgstr "Kunne ikke installere '%s'"
+msgstr "Kunne ikke installere \"%s\""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:188
 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."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"Udskift opsætningsfilen\n"
-"'%s'?"
+"Udskift den tilpassede konfigurationsfil\n"
+"\"%s\"?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
-msgstr "Kommandoen 'diff' blev ikke fundet"
+msgstr "Kommandoen \"diff\" blev ikke fundet"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
-msgstr "En alvorlig fejl opstod"
+msgstr "Der opstod en alvorlig fejl"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 ""
-"Raporter venligst dette som en fejl og inkuder filerne /var/log/dist-upgrade."
-"log og /var/log/dist-upgrade-apt.log i din raportering. Opgraderingen "
-"afbryder nu.\n"
-"Din originale fil sources.list blev gemt i /etc/apt/sources.list.distUpgrade."
+"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."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s pakke vil blive fjernet."
-msgstr[1] "%s pakker vil blive fjernet."
+msgstr[0] "%d pakke vil blive fjernet."
+msgstr[1] "%d pakker vil blive fjernet."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] "%s ny pakke vil blive installeret."
-msgstr[1] "%s nye pakker vil blive installeret."
+msgstr[0] "%d ny pakke vil blive installeret."
+msgstr[1] "%d nye pakker vil blive installeret."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "%s pakke vil blive opgraderet."
-msgstr[1] "%s pakker vil bliver opgraderet."
+msgstr[0] "%d pakke vil blive opgraderet."
+msgstr[1] "%d pakker vil blive opgraderet."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Der skal i alt hentes %s."
+msgstr ""
+"\n"
+"\n"
+"Du skal hente i alt %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
-msgstr "Opgraderingen kan tage flere timer og kan ikke fortrydes senere."
+msgstr ""
+"Hentning og installation af opgraderingen kan tage flere timer og kan ikke "
+"afbrydes senere."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -600,7 +645,7 @@ msgstr "Luk alle åbne programmer og dokumenter for at undgå tab af data."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Dit system er opdateret"
 
@@ -609,6 +654,8 @@ 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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -618,51 +665,51 @@ msgstr "<b>Fjern %s</b>"
 #: ../DistUpgrade/DistUpgradeViewGtk.py:537
 #, python-format
 msgid "Install %s"
-msgstr "Installer %s"
+msgstr "Installér %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:539
 #, python-format
 msgid "Upgrade %s"
-msgstr "Opgrader %s"
+msgstr "Opgradér %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Tid tilbage(ca.): %li dage %li timer %li minutter"
+msgstr "%li dage %li timer %li minutter"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Tid tilbage(ca.): %li timer %li minutter"
+msgstr "%li timer %li minutter"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minutter"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li sekunder"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
-msgstr "Genstart af maskinen er påkrævet"
+msgstr "Genstart af maskinen påkrævet"
 
 #: ../DistUpgrade/DistUpgradeView.py:110
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
-"Opgraderingen er afsluttet og et genstart af maskinen er påkrævet. Vil du "
+"Opgraderingen er afsluttet og en genstart af maskinen er påkrævet. Vil du "
 "gøre dette nu?"
 
 #. testcode to see if the bullets look nice in the dialog
@@ -683,20 +730,20 @@ msgid ""
 msgstr ""
 "<b><big>Afbryd den igangværende opgradering?</big></b>\n"
 "\n"
-"Systemet kan være i en ubrugelig tilstand hvis du afbryder opgraderingen. "
+"Systemet kan være i en ubrugelig tilstand, hvis du afbryder opgraderingen. "
 "Det anbefales kraftigt at du fortsætter opgraderingen."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-msgstr "<b><big>Genstart systemet for at afslutte opgraderingen</big></b>"
+msgstr "<b><big>Genstart systemet for at færdiggøre opgraderingen</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr "<b><big>Start opgraderinegn?</big></b>"
+msgstr "<b><big>Start opgraderingen?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Opgraderer Ubuntu til version 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -716,13 +763,12 @@ msgid "Fetching and installing the upgrades"
 msgstr "Henter og installerer opgraderingerne"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
-#, fuzzy
 msgid "Modifying the software channels"
-msgstr "Konfigurer softwarekanalerne"
+msgstr "Ændrer softwarekanalerne"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr "Klargør opgraderingen"
+msgstr "Klargører opgraderingen"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
@@ -733,25 +779,39 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_Genoptag opgradering"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Behold"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Erstat"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
-msgstr "_Rapporter fejl"
+msgstr "_Rapportér fejl"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Genstart nu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Genoptag opgradering"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_Genoptag opgradering"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Kunne ikke finde udgivelsesnoterne"
@@ -786,15 +846,15 @@ msgstr "Henter opgraderingsværktøjet"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr "Opgraderingsværktøjet vil guide dig igennem opgraderings processen."
+msgstr "Opgraderingsværktøjet vil guide dig igennem opgraderingsprocessen."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
-msgstr "Opgrader værkstøjets signatur."
+msgstr "Signatur på opgraderingsværktøj"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
-msgstr "Opgraderingesværktøj"
+msgstr "Opgraderingsværktøj"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
@@ -803,7 +863,8 @@ msgstr "Fejl ved hentning"
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
-"Hentning af opgraderingen fejlede. Det kan være være et netværksproblem. "
+"Hentning af opgraderingen fejlede. Det skyldes muligvis et problem med "
+"netværket. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
@@ -814,21 +875,20 @@ msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
-"Udpakningen af opgraderingen fejlede. Det kan være et problem med netværket "
-"eller med serveren. "
+"Udpakningen af opgraderingen fejlede. Det skyldes muligvis et problem med "
+"netværket eller serveren. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Efterprøvning fejlede"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
 msgstr ""
-"Efterprøvning af opgraderingen fejlede. Det er muligvis en fejl i netværket "
-"eller på serveren. "
+"Efterprøvning af opgraderingen fejlede. Det skyldes muligvis et problem med "
+"netværket eller serveren. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
@@ -839,188 +899,183 @@ msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
-"Godkendelse af opgraderingen fejlede. Der er muligvis et problem med "
-"netværket eller med serveren. "
+"Godkendelse af opgraderingen fejlede. Det skyldes muligvis et problem med "
+"netværket eller serveren. "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Henter fil %li af %li med %s/s"
+msgstr "Henter fil %(current)li af %(total)li med %(speed)s/s"
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Henter fil %li af %li med %s/s"
+msgstr "Henter fil %(current)li af %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere."
+msgstr "Listen med ændringer er ikke tilgængelig"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 #, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "Fejl ved hentning af ændringslisten. Undersøg venligst din "
 "internetforbindelse."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
+msgstr "Vigtige sikkerhedsopdateringer"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Anbefalede opdateringer"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "_Installer Opdateringer"
+msgstr "Foreslåede opdateringer"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Tilbageporteringer"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "_Genoptag opgradering"
+msgstr "Distributionsopdateringer"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "_Installer Opdateringer"
+msgstr "Andre opdateringer"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Henter listen med ændringer..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "_Fjern alle afkrydsninger"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "_Tjek"
+msgstr "_Afkryds alle"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
-msgstr "Overføringsstørelse: %s"
+msgstr "Overføringsstørrelse: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 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"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Vent venligst, dette kan tage et stykke tid."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr "Opdatering udført"
+msgstr "Opdatering er gennemført"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "_Installer Opdateringer"
+msgstr "Leder efter opdateringer"
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "Ny version: %s (Size: %s)"
+msgstr "Fra version %(old_version)s til %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Version %s: \n"
+msgstr "Version %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Størrelse: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
-msgstr "Din distribution understøtes ikke længere"
+msgstr "Din distribution understøttes ikke længere"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 krittiske "
-"opdateringer. Opgrader til en senere version af Ubuntu Linux. Se http://www."
-"ubuntu.com (engalsk) for mere informaiton om opgradering."
+"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."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>Ny distributionsudgivelse \"%s\" er tilgængelig</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
-msgstr "Software indexet er i stykker"
+msgstr "Softwareindekset er ødelagt"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 umuligt at installere eller fjerne software. Brug venligst "
+"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 ordne dette problem først."
+"\" i en terminal for at fikse dette problem først."
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Intet"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>You must check for updates manually</big></b>\n"
 "\n"
@@ -1029,26 +1084,24 @@ msgid ""
 msgstr ""
 "<b><big>Du må undersøge for opdateringer manuelt</big></b>\n"
 "\n"
-"Dit system undersøger ikke automatisk om der er kommet nye opdateringer. Du "
-"kan indstille denne adfærd i \"System\" -> \"Administration\" -> \"Software "
-"Properties\"."
+"Dit system søger ikke automatisk efter nye opdateringer. Du kan indstille "
+"denne adfærd i <i>Softwarekilder</i> under <i>Internetopdateringer</i>-"
+"fanebladet."
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>Hold dit system opdateret</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
 msgstr ""
-"<big><b>Fejl ved scanning af CD</b></big>\n"
-"\n"
+"<big><b>Ikke alle opdateringer kan installeres</b></big>\r\n"
+"\r\n"
 "%s"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Start opgraderinegn?</big></b>"
+msgstr "<big><b>Starter opdateringshåndtering</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1056,17 +1109,15 @@ msgstr "Ændringer"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Ændringer og beskrivelse af opdateringen"
 
 #: ../data/glade/UpdateManager.glade.h:9
-#, fuzzy
 msgid "Chec_k"
-msgstr "_Tjek"
+msgstr "_Kontrollér"
 
 #: ../data/glade/UpdateManager.glade.h:10
-#, fuzzy
 msgid "Check the software channels for new updates"
-msgstr "Undersøg softwarekanalerne for nye opdateringer"
+msgstr "Kontrollér softwarekanalerne for nye opdateringer"
 
 #: ../data/glade/UpdateManager.glade.h:11
 msgid "Description"
@@ -1084,6 +1135,11 @@ msgid ""
 "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."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
@@ -1091,7 +1147,7 @@ msgstr "Vis fremgang for enkelte filer"
 
 #: ../data/glade/UpdateManager.glade.h:17
 msgid "Software Updates"
-msgstr "Opdateringer"
+msgstr "Softwareopdateringer"
 
 #: ../data/glade/UpdateManager.glade.h:18
 msgid ""
@@ -1103,55 +1159,51 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
-msgstr "_Opgrader"
+msgstr "O_pgradér"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr "Opgrader til seneste version af Ubuntu"
+msgstr "Opgradér til seneste version af Ubuntu"
 
 #: ../data/glade/UpdateManager.glade.h:21
 msgid "_Check"
 msgstr "_Tjek"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "_Genoptag opgradering"
+msgstr "_Distributionsopgradering"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
-msgstr "_Skjul denne information for fremtiden"
+msgstr "_Skjul denne information i fremtiden"
 
 #: ../data/glade/UpdateManager.glade.h:24
 msgid "_Install Updates"
-msgstr "_Installer Opdateringer"
+msgstr "_Installér opdateringer"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Ændringer"
+msgstr "ændringer"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "opdateringer"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Internetopdateringer</b>"
+msgstr "<b>Automatiske opdateringer</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>Cd-rom/dvd</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Internetopdateringer</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Internetopdateringer</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1163,30 +1215,33 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "Tilføj _CD-ROM"
+msgstr "Tilføj cd-rom"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
 msgstr "Godkendelse"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
-#, fuzzy
 msgid "D_elete downloaded software files:"
-msgstr "_Slet overførte softwarefiler:"
+msgstr "Sl_et hentede softwarefiler:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "Overførsel fuldført"
+msgstr "Hent fra:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "Importer den offentlige nøgle fra en betroet softwareleverandør"
+msgstr "Importér den offentlige nøgle fra en betroet softwareleverandør"
 
 #: ../data/glade/SoftwareProperties.glade.h:14
 msgid "Internet Updates"
@@ -1198,11 +1253,11 @@ msgid ""
 "automatically"
 msgstr ""
 "Kun sikkerhedsopdateringer fra de officielle Ubuntu-servere vil blive "
-"installeret automatisk."
+"installeret automatisk"
 
 #: ../data/glade/SoftwareProperties.glade.h:16
 msgid "Restore _Defaults"
-msgstr "Gendan _standard"
+msgstr "Gendan stan_darder"
 
 #: ../data/glade/SoftwareProperties.glade.h:17
 msgid "Restore the default keys of your distribution"
@@ -1210,46 +1265,42 @@ msgstr "Gendan standardnøglerne for din distribution"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Softwareinstillinger"
+msgstr "Softwarekilder"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
 msgid "Source code"
-msgstr ""
+msgstr "Kildetekst"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Statistikker"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Indsend statistisk information"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Tredjepart"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
-msgstr "_Kontroller automatisk om der er nye opdateringer"
+msgstr "_Undersøg automatisk efter opdateringer"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "_Hent opdateringer i baggrunden, men installer dem ikke"
+msgstr "_Hent automatisk opdateringer, men installér dem ikke"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
-#, fuzzy
 msgid "_Import Key File"
-msgstr "Importér nøgle"
+msgstr "_Importér nøglefil"
 
 #: ../data/glade/SoftwareProperties.glade.h:26
 msgid "_Install security updates without confirmation"
-msgstr "_Installer sikkerhedsopdateringer automatisk uden bekræftelse"
+msgstr "_Installér sikkerhedsopdateringer automatisk uden bekræftelse"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1258,12 +1309,13 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>Kanalinformationen er forældet</big></b>\n"
+"<b><big>Informationer omkring tilgængeligt software er forældede</big></b>\n"
 "\n"
-"Du er nødt til at genopfriske kanalinformationen for at installere softwarre "
-"og opdateringer fra nyligt tilføjede eller ændrede kanaler. \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 aktiv internetforbindelse for at fortsætte."
+"Du skal bruge en fungerende internetforbindelse for at fortsætte."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
@@ -1294,6 +1346,11 @@ msgid ""
 "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>."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
@@ -1310,15 +1367,15 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
-msgstr ""
+msgstr "Redigér kilde"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
-msgstr "Skanner CD-ROM"
+msgstr "Undersøger cd-rom"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
-msgstr ""
+msgstr "_Tilføj kilde"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1326,7 +1383,7 @@ msgstr "_Genindlæs"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr "Vis og installer tilgængelige opdateringer"
+msgstr "Vis og installér tilgængelige opdateringer"
 
 #: ../data/update-manager.desktop.in.h:2
 #, fuzzy
@@ -1338,24 +1395,22 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
-"Undersøg automatisk om der er en ny version af din distribution tilgængelig, "
-"og tilbyd at opgradere (hvis det er muligt)."
+"Undersøg automatisk om en ny version den nuværende distribution er "
+"tilgængelig, og tilbyd at opgradere (hvis det er muligt)."
 
 #: ../data/update-manager.schemas.in.h:2
-#, fuzzy
 msgid "Check for new distribution releases"
-msgstr "Undersøg om der er en ny distributionsudgivelse"
+msgstr "Undersøg om der er nye distributionsudgivelser"
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 undersøgelse for opdateringer er slået fra, er du nødt til "
-"at opdatere kanallisten manuelt. Denne indstilling tillader at påmindelsen "
-"skjules i dette tilfælde."
+"at genopfriske kanallisten manuelt. Denne indstilling tillader at "
+"påmindelsen skjules i det tilfælde."
 
 #: ../data/update-manager.schemas.in.h:4
 #, fuzzy
@@ -1368,16 +1423,14 @@ msgstr "Vis detaljer for opdatering"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr "Gemmer størrelsen på opdateringshåndteringens dialog"
+msgstr "Størrelsen på opdateringshåndteringens vindue"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changes and the "
 "description"
 msgstr ""
-"Gemmer tilstanden for udfolderen der indeholder listen med ændringer og "
-"beskrivelsen af dem."
+"Tilstanden for udfolderen der indeholder listen med ændringer og beskrivelser"
 
 #: ../data/update-manager.schemas.in.h:8
 #, fuzzy
@@ -1385,218 +1438,196 @@ msgid "The window size"
 msgstr "Vinduesstørrelsen"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Konfigurer softwarekanaler og internetopdateringer"
+msgstr "Konfigurér kilderne for installérbar software og opdateringer"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 Opdateringer"
+msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Vedligeholdt af fællesskabet (Universe)"
+msgstr "Vedligeholdt af fællesskabet"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Proprietære drivere til enheder"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Ikke frit programmel (Multiverse)"
+msgstr "Ikke-frit software"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Cd-rom med Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Vedligeholdt af fællesskabet (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Vedligeholdt af fællesskabet (Universe)"
+msgstr "Vedligeholdt af fællesskabet (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Vedligeholdt af fællesskabet (Universe)"
+msgstr "Fri software vedligeholdt af fællesskabet"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Ikke frit programmel (Multiverse)"
+msgstr "Proprietære drivere"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Proprietære drivere til enheder "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Ikke frit programmel (Multiverse)"
+msgstr "Ikke-frit software (multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Cd-rom med Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Tilbageporterede opdateringer"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
+msgstr "Ubuntu 5.10 sikkerhedsopdateringer"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:140
 msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 Opdateringer"
+msgstr "Ubuntu 5.10 opdateringer"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:145
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 5.10 tilbageporteringer"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
-#, fuzzy
 msgid "Officially supported"
-msgstr "Officielt understøttet"
+msgstr "Understøttet officielt"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
+msgstr "Ubuntu 5.04 sikkerhedsopdateringer"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 Opdateringer"
+msgstr "Ubuntu 5.04 opdateringer"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 5.04 tilbageporteringer"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
 msgid "Community maintained (Universe)"
-msgstr "Vedligeholdt af fællesskabet (Universe)"
+msgstr "Vedligeholdt af fællesskabet (universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:201
 msgid "Non-free (Multiverse)"
-msgstr "Ikke frit programmel (Multiverse)"
+msgstr "Ikke-frit (multiverse)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Noget software er ikke længere officielt understøttet"
+msgstr "Ikke længere officielt supporteret"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
-#, fuzzy
 msgid "Restricted copyright"
-msgstr "Begrænset copyright"
+msgstr "Begrænset ophavsret"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 5.10 Sikkerhedsopdateringer"
+msgstr "Ubuntu 4.10 sikkerhedsopdateringer"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 5.10 Opdateringer"
+msgstr "Ubuntu 4.10 opdateringer"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 4.10 tilbageporteringer"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Debian.info.in:6
@@ -1606,48 +1637,46 @@ msgstr "Debian 3.1 \"Sarge\""
 #. BaseURI
 #: ../data/channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
 #. Description
 #: ../data/channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Debian 3.1 \"Sarge\" Sikkerhedsopdateringer"
+msgstr "Debian 3.1 \"Sarge\" sikkerhedsopdateringer"
 
 #. Description
 #: ../data/channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr ""
+msgstr "Debian \"Etch\" (testing)"
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
 #. Description
 #: ../data/channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr ""
+msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "DFSG-kompatibel software med ikke-frie afhængigheder"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Ikke-DFSG-kompatibel software"
 
 #~ msgid "Downloading file %li of %li with unknown speed"
 #~ msgstr "Henter fil %li af %li med ukendt hastighed"
 
-#, fuzzy
 #~ msgid "Normal updates"
-#~ msgstr "_Installer Opdateringer"
+#~ msgstr "Almindelige opdateringer"
 
-#, fuzzy
 #~ msgid "Cancel _Download"
-#~ msgstr "Afbryd _Hentning"
+#~ msgstr "Afbryd _hentning"
 
 #~ msgid "Some software no longer officially supported"
 #~ msgstr "Noget software er ikke længere officielt understøttet"
@@ -1731,7 +1760,7 @@ msgstr ""
 #~ msgstr "Installationsmedie"
 
 #~ msgid "Software Preferences"
-#~ msgstr "Softwareindstillinger"
+#~ msgstr "Indstillinger"
 
 #~ msgid "     "
 #~ msgstr "     "
@@ -1748,20 +1777,19 @@ msgstr ""
 #~ msgid "Add Channel"
 #~ msgstr "Tilføj kanal"
 
-#, fuzzy
 #~ msgid "Edit Channel"
-#~ msgstr "Rediger kanal"
+#~ msgstr "Redigér kanal"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Tilføj kanal"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Tilføj kanal"
+#~ msgstr[1] "_Tilføj kanaler"
 
 #~ msgid "_Custom"
-#~ msgstr "_Brugerdefineret"
+#~ msgstr "_Tilpasset"
 
-#, fuzzy
 #~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 LTS Opdateringer"
+#~ msgstr "Ubuntu 6.06 LTS"
 
 #~ msgid "Ubuntu 6.06 LTS Security Updates"
 #~ msgstr "Ubuntu 6.06 LTS Sikkerhedsopdateringer"
diff --git a/po/de.po b/po/de.po
index 6dd01bb6..94bfb9aa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-27 10:58+0000\n"
-"Last-Translator: Sebastian Heinlein <glatzor@gmx.de>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:37+0000\n"
+"Last-Translator: Sebastian Heinlein <ubuntu@glatzor.de>\n"
 "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,9 +58,9 @@ msgstr "Nach %s Tagen"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Aktualisierungen werden installiert"
+msgstr "%s Aktualisierungen"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -68,47 +68,45 @@ msgstr "Aktualisierungen werden installiert"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Haupt-Server"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Server für %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Nächstgelegener Server"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Benutzerdefinierte Server"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
 #, fuzzy
 msgid "Software Channel"
-msgstr "Software-Aktualisierungen"
+msgstr "Software Kanal"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr "Quellen"
+msgstr "(Quelltext)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
-msgstr "Quellen"
+msgstr "Quelltext"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -121,7 +119,7 @@ msgstr "Fehler beim Importieren der gewählten Datei"
 #: ../SoftwareProperties/SoftwareProperties.py:980
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
-"Die ausgewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder "
+"Die gewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder ist "
 "beschädigt."
 
 #: ../SoftwareProperties/SoftwareProperties.py:992
@@ -131,7 +129,7 @@ msgstr "Fehler beim Entfernen des Schlüssels"
 #: ../SoftwareProperties/SoftwareProperties.py:993
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
-"Der ausgewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
+"Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie "
 "hierfür einen Fehlerbericht."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
@@ -153,11 +151,11 @@ msgstr "Geben Sie einen Namen für das Medium ein"
 msgid "Please insert a disc in the drive:"
 msgstr "Bitte legen Sie ein Medium in das Laufwerk:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Defekte Pakete"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -166,20 +164,20 @@ msgstr ""
 "werden können. Bitte reparieren Sie diese mit Synaptic oder apt-get, bevor "
 "Sie fortfahren."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Die erforderlichen Metapakete können nicht aktualisiert werden"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Ein grundlegendes Paket müsste entfernt werden"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Die Aktualisierung konnte nicht berechnet werden"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -188,14 +186,14 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Ein unlösbares Problem trat beim Berechnen der Aktualisierung auf. Bitte "
-"erstellen Sie hierfür einen Fehlerbericht. "
+"erstellen Sie hierfür einen Fehlerbericht."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Fehler bei der Echtheitsbestätigung einiger Pakete"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -206,12 +204,12 @@ msgstr ""
 "später noch einmal. Die unten stehenden Pakete konnten nicht auf ihre "
 "Echtheit hin bestätigt werden:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "›%s‹ kann nicht installiert werden"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -220,11 +218,11 @@ msgstr ""
 "Sie hierfür einen Fehlerbericht. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Metapaket konnte nicht bestimmt werden"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -240,9 +238,8 @@ msgstr ""
 "bevor Sie fortfahren."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Herunterladen ist fehlgeschlagen"
+msgstr "CD hinzufügen ist fehlgeschlagen"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -253,28 +250,39 @@ msgid ""
 "The error message was:\n"
 "'%s'"
 msgstr ""
+"Beim Hinzufügen der CD trat ein Fehler auf und die Systemerweiterung wird "
+"nun abgebrochen. Bitte melden Sie dies als einen Fehler, wenn Sie eine eine "
+"gültige Ubuntu CD verwenden.\n"
+"\n"
+"Die Fehlermeldung war:\n"
+"'%s'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Zwischenspeicher wird ausgelesen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Sollen die Daten für die Systemerweiterung aus dem Netz geholt werden?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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 ""
+"Das Upgrade kann das Netzwerk benutzen um die letzten Updates zu prüfen und "
+"Pakete zu holen die sich nicht auf der aktuellen CD befinden.\n"
+"Falls sie eine schnelle oder billige Netzwerkverbindung haben sollten sie "
+"hier 'Ja' antworten. Falls die Netzwerkbenutzung teuer ist sollten sie "
+"'Nein' wählen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Kein gültiger Mirror gefunden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -294,11 +302,11 @@ msgstr ""
 "Wenn Sie 'Nein' wählen, wird das Update abgebrochen."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Standardquellen generieren?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -312,11 +320,11 @@ msgstr ""
 "Sollen Standardeinträge für '%s' hinzugefügt werden? Wenn Sie 'Nein' "
 "auswählen, wird das Update abgebrochen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Ungültige Kanalinformationen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -324,11 +332,11 @@ msgstr ""
 "Die Aktualisierung der Quellen-Information ergab eine ungültige Datei. Bitte "
 "erstellen Sie einen Fehlerbericht."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Quellen von Drittanbietern deaktiviert"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, fuzzy
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
@@ -339,11 +347,11 @@ msgstr ""
 "Sie können diese nach dem Upgrade mit dem 'software-properties'-Werkzeug "
 "oder mit Synaptic reaktivieren."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Fehler während der Aktualisierung"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -352,11 +360,11 @@ msgstr ""
 "Netzwerkprobleme zurückzuführen. Bitte überprüfen Sie Ihre "
 "Netzwerkverbindung und versuchen Sie es noch einmal."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Unzureichender freier Festplattenspeicher"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -368,16 +376,15 @@ msgstr ""
 "temporäre Pakete von frühreren Installation mit 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Möchten Sie die Aktualisierung starten?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Die Aktualisierungen konnten nicht installiert werden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -385,15 +392,19 @@ msgid ""
 "Please report this bug against the 'update-manager' package and include the "
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
-"Das Upgrade wird jetzt abgebrochen. Ihr System kann sich in einem "
+"Das Upgrade wird jetzt abgebrochen. Ihr System könnte sich in einem "
 "unbenutzbaren Zustand befinden. Eine Wiederherstellung wurde durchgeführt "
-"(dpkg --configure -a)."
+"(dpkg --configure -a).\n"
+"\n"
+"Bitte erstellen Sie hierfür einen Fehlerbericht für das Paket \"update-"
+"manager\" und fügen sie alle Dateien in /var/log/dist-upgrade dem "
+"Fehlerbericht hinzu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Die Aktualisierungen konnten nicht heruntergeladen werden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -402,11 +413,11 @@ msgstr ""
 "Internet-Verbindung oder Ihr Installationsmedium und versuchen Sie es noch "
 "einmal. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -419,25 +430,25 @@ msgstr ""
 "werden jetzt nur mehr von der Gemeinschaft unterstützt ('universe').\n"
 "\n"
 "Wenn sie 'universe' nicht aktiviert haben, werden diese Pakete im nächsten "
-"Schritt zum Entfernen vorgeschlagen. "
+"Schritt zum Entfernen vorgeschlagen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Veraltete Pakete entfernen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "Ü_berspringen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Fehler beim Anwenden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -446,32 +457,47 @@ msgstr ""
 "Nachricht für nähere Informationen. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Wiederherstellen des alten Systemzustandes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Paketverwaltung wird überprüft"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Aktualisierung vorbereiten"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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 ""
+"Ein unlösbares Problem trat beim Berechnen der Aktualisierung auf. Bitte "
+"erstellen Sie hierfür einen Fehlerbericht."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Aktualisiere Quellen-Information"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Ungültige Paketinformationen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -482,21 +508,22 @@ msgstr ""
 "Nachdem Ihre Paketinformationen aktualisiert wurden, ist das unbedingt "
 "erforderliche Paket '%s' nicht mehr auffindbar.\n"
 "Dies deutet auf einen gravierenden Fehler hin, bitte erstellen Sie hierfür "
-"einen Fehlerbericht."
+"einen Fehlerbericht für das Paket \"update-manager\" und fügen sie alle "
+"Dateien in /var/log/dist-upgrade dem Fehlerbericht hinzu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Nach Bestätigung fragen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Aktualisiere"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Nach veralteter Software wird gesucht"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Aktualisierung ist abgeschlossen."
 
@@ -507,25 +534,24 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "Bitte legen Sie das Medium »%s« in das Laufwerk »%s«"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "Aktualisierung ist abgeschlossen"
+msgstr "Dateien wurden vollständig heruntergeladen"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr "Lade Datei %li von %li mit %s/s herunter"
+msgstr "Datei %li von %li wir mit %s/s heruntergeladen"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Ungefähr %li Minute(n) verbleibend"
+msgstr "Es verbleiben ungefähr %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
-msgstr "Lade Datei %li von %li"
+msgstr "Datei %li von %li wird heruntergeladen"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
@@ -544,6 +570,9 @@ 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 ""
+"Die Erweiterung Ihres Systems wird nun abgebrochen. Bitte Melden Sie dies "
+"als einen Fehler des Pakets 'update-manager' und fügen Sie die Dateien in "
+"dem Verzeichnis '/var/log/dist-upgrade/' Ihrer Fehlermeldung hinzu."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
@@ -557,8 +586,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -612,16 +641,18 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Insgesamt müssen %s heruntergeladen werden."
+msgstr ""
+"\n"
+"\n"
+"Insgesamt müssen %s heruntergeladen werden. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
 msgstr ""
-"Die Aktualisierung kann mehrere Stunden dauern und zu keiner Zeit mehr "
-"abgebrochen werden."
+"Die Aktualisierung kann mehrere Stunden in Anspruch nehmen. Desweiteren kann "
+"sie zu keinem späteren Zeitpunkt mehr abgebrochen werden."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -631,7 +662,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Ihr System ist auf dem aktuellen Stand"
 
@@ -657,32 +688,32 @@ msgid "Upgrade %s"
 msgstr "%s wird aktualisiert"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Ungefähr %li Tag(e) %li Stunde(n) %li Minute(n) verbleibend"
+msgstr "%li Tage %li Stunden %li Minuten"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Ungefähr %li Stunde(n) %li Minute(n) verbleibend"
+msgstr "%li Stunden %li Minuten"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li Minuten"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li Sekunden"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -764,25 +795,39 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_Aktualisierung fortsetzen"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Beibehalten"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Ersetzen"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Fehlerbericht ausfüllen"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Neu starten"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Aktualisierung fortsetzen"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_Aktualisierung fortsetzen"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Freigabemitteilungen konnten nicht gefunden werden"
@@ -886,125 +931,124 @@ msgstr "Datei %li von %li wird mit %s/s heruntergeladen"
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Datei %li von %li wird mit %s/s heruntergeladen"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr ""
-"Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen "
-"Sie es zu einem späteren Zeitpunkt erneut."
+msgstr "Die Liste mit Aktualisierungen ist momentan nicht verfügbar."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 "Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen "
 "Sie es zu einem späteren Zeitpunkt erneut."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "Die Liste mit Änderungen konnte nicht heruntergeladen werden. Bitte "
 "überprüfen Sie Ihre Internet-Verbindung."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
+msgstr "Wichtige Sicherheitsaktualisierungen"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Empfohlene Updates"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "Aktualisierungen werden installiert"
+msgstr "Vorgeschlagene Aktualisierungen"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 Backports"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "_Aktualisierung fortsetzen"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Aktualisierungen werden installiert"
+msgstr "Andere Aktualisierungen"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Liste mit Änderungen wird heruntergeladen..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "_Prüfen"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Download-Größe: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Sie können %s Aktualisierung installieren"
 msgstr[1] "Sie können %s Aktualisierungen installieren"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Bitte warten Sie, dieser Vorgang kann etwas Zeit in Anspruch nehmen."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Aktualisierung ist abgeschlossen"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "Nach verfügbaren Aktualisierungen suchen"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Neue Version: %s (Größe: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Version %s: \n"
+msgstr "Version %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Größe: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Ihre Distribution wird nicht länger unterstützt"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -1015,17 +1059,17 @@ msgstr ""
 "System auf eine neuere Version von Ubuntu Linux. Auf http://www.ubuntuusers."
 "de oder http://www.ubuntu.com finden Sie weitere Informationen hierzu."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Neue Version '%s' der Distribution ist freigegeben</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "Der Software-Index ist beschädigt"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1038,24 +1082,24 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Keine"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 #, fuzzy
@@ -1094,7 +1138,7 @@ msgstr "Änderungen"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Änderungen und Beschreibungen der Aktualisierung"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1168,16 +1212,15 @@ msgstr "Änderungen"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "Aktualisierungen"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Internet-Aktualisierungen</b>"
+msgstr "<b>Hintergrundaktualisierung</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
@@ -1198,6 +1241,13 @@ msgid ""
 "The results are used to improve the support for popular applications and to "
 "rank applications in the search results.</i>"
 msgstr ""
+"<i>Um die Handhabung von Ubuntu zu erleichtern, nehmen Sie bitte am "
+"Beliebheitswettbewerb teil. Falls Sie sich dafür entscheiden, wird jede "
+"Woche eine Liste aller installierten Anwendungen und wie oft sie diese "
+"benutzt haben an das Ubuntu-Projekt übertragen.\n"
+"\n"
+"Mit den Ergebnissen soll die Unterstzüng für beliebte Anwendungen verbessert "
+"werden und Suchergebnisse besser sortiert werden.</i>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
 #, fuzzy
@@ -1206,16 +1256,15 @@ msgstr "CD-Rom _hinzufügen"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
-msgstr "Echtheitsbestätigung"
+msgstr "Echtheitheitsbestätigung"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
 msgstr "Heruntergeladene Paketdateien _löschen:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "Herunterladen abgeschlossen"
+msgstr "Herunterladen von:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1245,26 +1294,24 @@ msgstr "Die Vorgabeschlüssel Ihrer Distribution wiederherstellen"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Software-Eigenschaften"
+msgstr "Software-Quellen"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
-msgstr "Quellen"
+msgstr "Quelltext"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Statistik"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Statistische Informationen übermitteln"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Drittanbieter"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
@@ -1319,7 +1366,7 @@ msgstr "<b>Typ:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
 msgid "<b>URI:</b>"
-msgstr "<b>URI:</b>"
+msgstr "<b>Adresse:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
 #, fuzzy
@@ -1346,21 +1393,19 @@ msgid ""
 "Source"
 msgstr ""
 "Binär\n"
-"Quellcode"
+"Quellen"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr "Quellen"
+msgstr "Quelle bearbeiten"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
 msgstr "CD wird eingelesen"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr "Quellen"
+msgstr "Quelle _hinzufügen"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1423,9 +1468,10 @@ msgid "The window size"
 msgstr "Die Fenstergröße"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Software-Kanäle und Aktualisierungen konfigurieren"
+msgstr ""
+"Software-Kanäle und Einstellungen für die automatische Aktualisierung "
+"festlegen"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1435,88 +1481,79 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 Aktualisierungen"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Von der Gemeinschaft betreut (Universe)"
+msgstr "Von der Ubuntu-Gemeinde betreut"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Proprietäre Gerätetreiber"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Contributed Software"
+msgstr "Eingeschränkte Software"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "CD-ROM mit Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 \"Dapper Drake\""
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Von der Gemeinschaft betreut (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Von der Gemeinschaft betreut (Universe)"
+msgstr "Von der Gemeinschaft betreut (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Von der Gemeinschaft betreut (Universe)"
+msgstr "Von der Ubuntu-Gemeinde betreute Open Source-Software"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Unfrei (Multiverse)"
+msgstr "Proprietäre Treiber"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Proprietäre Gerätetreiber "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Unfrei (Multiverse)"
+msgstr "Eingeschränkte Software (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Software mit US-Exportbeschränkungen"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 \"Dapper Drake\""
+msgstr "CD-ROM mit Ubuntu 6.06 LTS »Dapper Drake«"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Zurückportierte Aktualisierungen"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1525,9 +1562,8 @@ msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "CD-ROM mit Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1546,15 +1582,13 @@ msgstr "Ubuntu 5.10 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
+msgstr "CD-ROM mit Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1563,32 +1597,28 @@ msgstr "Offiziell unterstützt"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
+msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 Aktualisierungen"
+msgstr "Ubuntu 5.04 Aktualisierungen"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 5.04 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
 msgid "Community maintained (Universe)"
-msgstr "Von der Gemeinschaft betreut (Universe)"
+msgstr "Von der Gemeinschaft verwaltet (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:201
@@ -1598,7 +1628,7 @@ msgstr "Unfrei (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "CD-ROM mit Ubuntu 4.10 »Warty Warthog«"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
@@ -1609,7 +1639,7 @@ msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt"
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
 msgid "Restricted copyright"
-msgstr "Urheberrechtlich eingeschränkt"
+msgstr "Eingeschränktes Copyright"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
@@ -1618,15 +1648,13 @@ msgstr "Ubuntu 4.10 Sicherheitsaktualisierungen"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 5.10 Aktualisierungen"
+msgstr "Ubuntu 4.10 Aktualisierungen"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 4.10 Backports"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1674,6 +1702,9 @@ msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten"
 msgid "Non-DFSG-compatible Software"
 msgstr "Nicht DFSG-kompatible Software"
 
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "Urheberrechtlich oder gesetzlich eingeschränkte Software"
+
 #~ msgid "Downloading file %li of %li with unknown speed"
 #~ msgstr ""
 #~ "Datei %li von %li wird mit unbekannter Geschwindigkeit heruntergeladen"
@@ -1694,20 +1725,17 @@ msgstr "Nicht DFSG-kompatible Software"
 #~ msgid "Your system has already been upgraded."
 #~ msgstr "Ihr System wurde bereits aktualisiert."
 
-#, fuzzy
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Auf Ubuntu 6.06 LTS aktualisieren</"
+#~ "<span weight=\"bold\" size=\"x-large\">Auf Ubuntu 6.10 aktualisieren</"
 #~ "span>"
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen"
+#~ msgstr "Wichtige Sicherheitsaktualisierungen von Ubuntu"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Aus die neueste Version von Ubuntu aktualisieren"
+#~ msgstr "Aktualisierungen von Ubuntu"
 
 #~ msgid "Cannot install all available updates"
 #~ msgstr "Nicht alle verfügbaren Aktualisierungen können installiert werden"
@@ -1797,9 +1825,10 @@ msgstr "Nicht DFSG-kompatible Software"
 #~ msgid "Edit Channel"
 #~ msgstr "Kanal bearbeiten"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "Kanal _hinzufügen"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "Kanal _hinzufügen"
+#~ msgstr[1] "Kanäle _hinzufügen"
 
 #~ msgid "_Custom"
 #~ msgstr "_Benutzerdefiniert"
diff --git a/po/el.po b/po/el.po
index 779ef170..152bc4a7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-25 15:39+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:37+0000\n"
 "Last-Translator: Kostas Papadimas <pkst@gmx.net>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
 "MIME-Version: 1.0\n"
@@ -56,9 +56,9 @@ msgstr "Μετά από %s ημέρες"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Εγκατάσταση ενημερώσεων"
+msgstr "%s ενημερώσεις"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -66,26 +66,26 @@ msgstr "Εγκατάσταση ενημερώσεων"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Κύριος εξυπηρετητής"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Εξυπηρετητής για %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Κοντινότερος εξυπηρετητής"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Προσαρμοσμένοι εξυπηρετητές"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
@@ -99,11 +99,11 @@ msgstr "Ενεργό"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(Πηγαίος κώδικας)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "Πηγαίος κώδικας"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -117,26 +117,26 @@ msgstr "Σφάλμα εισαγωγής επιλεγμένου αρχείου"
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "Το επιλεγμένο αρχείο μπορεί να μην είναι ένα αρχείο κλειδιού GPG ή μπορεί να "
-"είναι κατεστραμμένο."
+"είναι κατεστραμμένο"
 
 #: ../SoftwareProperties/SoftwareProperties.py:992
 msgid "Error removing the key"
-msgstr "Σφάλμα απομάκρυνσης του κλειδιού"
+msgstr "Σφάλμα απομάκρυνσης κλειδιού"
 
 #: ../SoftwareProperties/SoftwareProperties.py:993
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
-"Το επιλεγμένο κλειδί δεν μπορεί να απομακρυνθεί. Παρακαλώ αναφέρετε το ως "
-"σφάλμα."
+"Το κλειδί που επιλέξατε δεν μπορεί να απομακρυνθεί. Παρακαλώ αναφέρετε αυτό "
+"ως σφάλμα."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
-"<big><b>Σφάλμα ελέγχου του CD</b></big>\n"
+"<big><b>Σφάλμα σάρωσης του CD</b></big>\n"
 "\n"
 "%s"
 
@@ -148,11 +148,11 @@ msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκ
 msgid "Please insert a disc in the drive:"
 msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Κατεστραμμένα πακέτα"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -161,36 +161,37 @@ msgstr ""
 "διορθωθούν με αυτό το λογισμικό. Παρακαλώ διορθώστε τα μέσω synaptic ή apt-"
 "get για να συνεχίσετε."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Αδυναμία αναβάθμισης απαιτούμενων μετα-πακέτων"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Αδυναμία υπολογισμού της αναβάθμισης"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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/."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -200,12 +201,12 @@ msgstr ""
 "σε ένα πρόβλημα δικτύου. Προσπαθήστε αργότερα. Δείτε παρακάτω τη λίστα των "
 "μη πιστοποιημένων πακέτων."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Αδυναμία εγκατάστασης '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -214,12 +215,11 @@ msgstr ""
 "ως σφάλμα. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Αδυναμία εύρεσης μετα-πακέτου"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -229,14 +229,14 @@ msgid ""
 msgstr ""
 "Το σύστημα σας δεν περιέχει κάποιο από τα πακέτα ubuntu-desktop, kubuntu-"
 "desktop or edubuntu-desktop, και έτσι δεν είναι δυνατός ο εντοπισμός της "
-"έκδοσης του Ubuntu σας..\n"
-"Εγκαταστήστε ένα από αυτά τα πακέτα πρώτα μέσω synaptic ή apt-get πριν να "
+"έκδοσης του Ubuntu σας.\n"
+"\n"
+" Εγκαταστήστε ένα από αυτά τα πακέτα πρώτα μέσω synaptic ή apt-get πριν να "
 "συνεχίσετε."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Αποτυχία λήψης"
+msgstr "Αποτυχία προσθήκης του CD"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -247,28 +247,37 @@ msgid ""
 "The error message was:\n"
 "'%s'"
 msgstr ""
+"Υπήρξε σφάλμα κατά την προσθήκη του CD και η αναβάθμιση θα τερματιστεί. "
+"Παρακαλώ αναφέρετε το ως σφάλμα αν αυτό είναι ένα έγκυρο Ubuntu CD.\n"
+"\n"
+"Το μήνυμα σφάλματος ήταν:\n"
+"'%s'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Ανάγνωση λανθάνουσας μνήμης"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Να γίνει λήψη δεδομένων από το δίκτυο για την αναβάθμιση;"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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"
+"Αν διαθέτετε μια γρήγορη ή φθηνή πρόσβαση στο δίκτυο  απαντήστε 'Ναι' εδώ. "
+"Αν η πρόσβαση είναι ακριβή πατήστε 'Όχι'"
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Δεν βρέθηκε έγκυρη εναλλακτική τοποθεσία αρχείων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -289,11 +298,11 @@ msgstr ""
 " Αν επιλέξετε 'Όχι' η ενημέρωση θα ακυρωθεί."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Δημιουργία προεπιλεγμένων πηγών;"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -307,11 +316,11 @@ msgstr ""
 "Να προστεθούν οι προεπιλεγμένες καταχωρίσεις για το '%s'; Αν απαντήσετε "
 "'Όχι' η ενημέρωση θα ακυρωθεί."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Μη έγκυρες πληροφορίες repository"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -319,11 +328,11 @@ msgstr ""
 "Η αναβάθμιση των πληροφοριών repository είχε σαν αποτέλεσμα ένα άκυρο "
 "αρχείο. Παρακαλώ αναφέρετε το ως σφάλμα."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Απενεργοποιήθηκαν πηγές τρίτων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, fuzzy
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
@@ -334,11 +343,11 @@ msgstr ""
 "Μπορείτε να τις ενεργοποιήσετε μετά την αναβάθμιση με το εργαλείο 'software-"
 "properties' ή με το synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Σφάλμα κατά την ενημέρωση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -346,11 +355,11 @@ msgstr ""
 "Δημιουργήθηκε ένα πρόβλημα κατά την αναβάθμιση. Αυτό συνήθως σημαίνει "
 "πρόβλημα δικτύου. Ελέγξτε τη σύνδεση δικτύου σας και προσπαθήστε ξανά."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Δεν υπάρχει αρκετός χώρος στο δίσκο"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -362,16 +371,15 @@ msgstr ""
 "προηγούμενων εγκαταστάσεων με  την εντολή 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Θέλετε να ξεκινήσετε την αναβάθμιση;"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Αδυναμία εγκατάστασης των αναβαθμίσεων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -380,13 +388,17 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Η αναβάθμιση τώρα θα τερματιστεί. Το σύστημα σας μπορεί να γίνει ασταθές. "
-"Εκτελείται μια διεργασία ανάκτησης (dpkg --configure -a)."
+"Εκτελείται μια διεργασία ανάκτησης (dpkg --configure -a).\n"
+"\n"
+"Παρακαλώ αναφέρετε το ως σφάλμα στο πακέτο 'update-manager' και "
+"συμπεριλάβετε και τα αρχεία του /var/log/dist-upgrade/ στην αναφορά "
+"σφάλματος."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Αδυναμία λήψης των αναβαθμίσεων"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -394,12 +406,11 @@ msgstr ""
 "Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ ελέγξτε τη σύνδεση σας στο "
 "διαδίκτυο ή το μέσο εγκατάστασης και προσπαθήστε ξανά. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Η υποστήριξη για ορισμένες εφαρμογές τερματίστηκε"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -407,29 +418,29 @@ msgid ""
 "If you have not enabled community maintained software (universe), these "
 "packages will be suggested for removal in the next step."
 msgstr ""
-"Αυτά τα εγκατεστημένα πακέτα δεν υποστηρίζονται πια επίσημα, και τώρα "
-"ανήκουν στο community-supported ('universe').\n"
+"Αυτά τα εγκατεστημένα πακέτα δεν υποστηρίζονται πια επίσημα από την "
+"Canonical Ltd, αλλά μπορείτε να λάβετε υποστήριξη από τη κοινότητα.\n"
 "\n"
 "Αν δεν έχετε ενεργοποιημένο το 'universe' , θα γίνει πρόταση για απομάκρυνση "
-"αυτών των πακέτων στο επόμενο βήμα. "
+"αυτών των πακέτων στο επόμενο βήμα."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Αφαίρεση παρωχημένων πακέτων;"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "Παράκα_μψη αυτου του βήματος"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Απομάκρυνση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Σφάλμα κατά την υποβολή"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -438,32 +449,47 @@ msgstr ""
 "παρακάτω μήνυμα για περισσότερες πληροφορίες. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Γίνεται επαναφορά αρχικής κατάστασης συστήματος"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "Λήψη backport του '%s'"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Έλεγχος διαχειριστή πακέτων"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Προετοιμασία της αναβάθμισης"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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 ""
+"Συνέβηκε ένα ανεπίλυτο πρόβλημα κατά τον υπολογισμό της αναβάθμισης. "
+"Παρακαλώ αναφέρετε το ως σφάλμα."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Ενημέρωση πληροφοριών repository"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Μη έγκυρες πληροφορίες πακέτου"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -473,21 +499,23 @@ msgid ""
 msgstr ""
 "Μετά την ενημέρωση των πληροφοριών πακέτων, δεν μπορεί να βρεθεί το "
 "απαραίτητο πακέτο '%s'.\n"
-" Αυτό σημαίνει ότι πρόκειται για σημαντικό σφάλμα, παρακαλώ αναφέρετε το."
+"Παρακαλώ αναφέρετε το ως σφάλμα στο πακέτο 'update-manager' και "
+"συμπεριλάβετε και τα αρχεία του /var/log/dist-upgrade/ στην αναφορά "
+"σφάλματος."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Ερώτηση για επιβεβαίωση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Γίνεται αναβάθμιση"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Γίνεται αναζήτηση για παρωχημένο λογισμικό"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε."
 
@@ -498,9 +526,8 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "Παρακαλώ εισάγετε τον δίσκο '%s' στον οδηγό '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "Η ενημέρωση ολοκληρώθηκε"
+msgstr "Η λήψη ολοκληρώθηκε"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, fuzzy, python-format
@@ -509,9 +536,9 @@ msgstr "Λήψη αρχείου %li από %li με %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Απομένουν περίπου %li λεπτά"
+msgstr "Απομένουν περίπου %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, fuzzy, python-format
@@ -535,21 +562,24 @@ 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/ "
+"στην αναφορά σφάλματος."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"Αντικατάσταση αρχείου ρύθμισης\n"
+"Αντικατάσταση προσαρμοσμένου αρχείου ρύθμισης\n"
 "'%s';"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -561,7 +591,6 @@ msgid "A fatal error occured"
 msgstr "Προέκυψε μοιραίο σφάλμα"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 "
@@ -569,41 +598,44 @@ msgid ""
 "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."
+"upgrade/main.log και /var/log/dist-upgrade/apt.log στην αναφορά σας. Η "
+"αναβάθμιση τώρα θα τερματιστεί. \n"
+"Το αρχικό αρχείο sources.list αποθηκεύτηκε στο /etc/apt/sources.list."
+"distUpgrade."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s πακέτο πρόκειται να απομακρυνθεί."
-msgstr[1] "%s πακέτα πρόκειται να απομακρυνθούν."
+msgstr[0] "%d πακέτο πρόκειται να απομακρυνθεί."
+msgstr[1] "%d πακέτα πρόκειται να απομακρυνθούν."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 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 νέο πακέτα πρόκειται να εγκατασταθούν."
+msgstr[0] "%d νέο πακέτο πρόκειται να εγκατασταθεί."
+msgstr[1] "%d νέα πακέτα πρόκειται να εγκατασταθούν."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "%s πακέτο πρόκειται να αναβαθμιστεί."
-msgstr[1] "%s πακέτα πρόκειται να αναβαθμιστούν."
+msgstr[0] "%d πακέτο πρόκειται να αναβαθμιστεί."
+msgstr[1] "%d πακέτα πρόκειται να αναβαθμιστούν."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Θα πρέπει να μεταφορτώσετε συνολικά %s."
+msgstr ""
+"\n"
+"\n"
+"Θα πρέπει να κάνετε συνολική λήψη %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy
@@ -622,7 +654,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Το σύστημα σας είναι ενημερωμένο"
 
@@ -631,6 +663,8 @@ msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
 msgstr ""
+"Δεν υπάρχουν διαθέσιμες αναβαθμίσεις για το σύστημα σας. Η αναβάθμιση θα "
+"ακυρωθεί."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -648,32 +682,32 @@ msgid "Upgrade %s"
 msgstr "Αναβάθμιση %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Απομένουν περίπου %li ημέρες %li ώρες και %li λεπτά"
+msgstr "Απομένουν περίπου %li μέρες %li ώρες και %li λεπτά"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Απομένουν περίπου %li ώρες και %li λεπτά"
+msgstr "%li ώρες και %li λεπτά"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li λεπτά"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li δευτερόλεπτα"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -719,7 +753,7 @@ msgstr "<b><big>Έναρξη της αναβάθμισης;</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Γίνεται αναβάθμιση του Ubuntu στην έκδοση 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -755,25 +789,39 @@ msgid "Terminal"
 msgstr "Τερματικό"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_Συνέχεια αναβάθμισης"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Διατήρηση"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "Αντικατά_σταση"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "Ανα_φορά σφάλματος"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "Επανε_κκίνηση τώρα"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Συνέχεια αναβάθμισης"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_Συνέχεια αναβάθμισης"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Αδυναμία εύρεσης σημειώσεων έκδοσης"
@@ -864,132 +912,128 @@ msgstr ""
 "εξυπηρετητή. "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Λήψη αρχείου %li από %li με %s/s"
+msgstr "Λήψη αρχείου %(current)li από %(total)li με %(speed)s/s"
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Λήψη αρχείου %li από %li με %s/s"
+msgstr "Λήψη αρχείου %(current)li από %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr ""
-"Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα."
+msgstr "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "Αποτυχία λήψης της λίστας των αλλαγών. Παρακαλώ ελέγξτε τη σύνδεση σας στο "
 "διαδίκτυο."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
+msgstr "Σημαντικές ενημερώσεις ασφαλείας"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Συνιστώμενες ενημερώσεις"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "Εγκατάσταση ενημερώσεων"
+msgstr "Προτεινόμενες ενημερώσεις"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Backports"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "_Συνέχεια αναβάθμισης"
+msgstr "Αναβαθμίσεις διανομής"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Εγκατάσταση ενημερώσεων"
+msgstr "Άλλες ενημερώσεις"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
-msgstr "Έκδοση%s: \n"
+msgstr "Έκδοση %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Λήψη της λίστας των αλλαγών..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "Α_ποεπιλογή όλων"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "Έλε_γχος"
+msgstr "Έλε_γχος όλων"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Μέγεθος λήψης: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Μπορείτε να εγκαταστήσετε %s ενημέρωση"
 msgstr[1] "Μπορείτε να εγκαταστήσετε %s ενημερώσεις"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Η ενημέρωση ολοκληρώθηκε"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "Έλεγχος για διαθέσιμες ενημερώσεις"
+msgstr "Έλεγχος για ενημερώσεις"
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "Νέα έκδοση: %s (Μέγεθος: %s)"
+msgstr "Από έκδοση: %(old_version)s σε %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Έκδοση%s: \n"
+msgstr "Έκδοση %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Μέγεθος: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Η διανομή σας δεν υποστηρίζεται πια"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -1000,17 +1044,17 @@ msgstr ""
 "Ubuntu Linux. Δείτε το http://www.ubuntu.com για περισσότερες πληροφορίες "
 "για την αναβάθμιση."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Είναι διαθέσιμη νέα έκδοση διανομής '%s'</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1023,27 +1067,26 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Καμία"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>You must check for updates manually</big></b>\n"
 "\n"
@@ -1053,25 +1096,20 @@ msgstr ""
 "<b><big>Θα πρέπει να κάνετε έλεγχο για ενημερώσεις χειροκίνητα</big></b>\n"
 "\n"
 "Το σύστημα σας δεν υποστηρίζει αυτόματο έλεγχο ενημερώσεων. Μπορείτε να "
-"ρυθμίσετε αυτή τη συμπεριφορά μέσω του μενού \"Σύστημα\" -> \"Διαχείριση "
-"συστήματος\" -> \"Ιδιότητες λογισμικού\"."
+"ρυθμίσετε αυτή τη συμπεριφορά μέσω του μενού <i>Πηγές λογισμικού</i> και "
+"στην καρτέλα <i>Ενημερώσεις διαδικτύου</i>."
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>Διατηρήστε το σύστημα σας ενημερωμένο</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
-"<big><b>Σφάλμα ελέγχου του CD</b></big>\n"
-"\n"
-"%s"
+msgstr "<big><b>Δεν είναι δυνατή η εγκατάσταση όλων των ενημερώσεων</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Έναρξη της αναβάθμισης;</big></b>"
+msgstr "<big><b>Εκκίνηση του update manager</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1079,7 +1117,7 @@ msgstr "Αλλαγές"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Αλλαγές και περιγραφή της ενημέρωσης"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1104,6 +1142,11 @@ msgid ""
 "This can be caused by an uncompleted upgrade, unofficial software packages "
 "or by running a development version."
 msgstr ""
+"Εκτελέστε μια αναβάθμιση διανομής για να εγκαταστήσετε όσες το δυνατόν "
+"περισσότερες ενημερώσεις.\n"
+"\n"
+"Αυτό μπορεί οφείλεται σε μη ολοκληρωμένη αναβάθμιση, σε ανεπίσημα πακέτα "
+"λογισμικού ή αν χρησιμοποιείτε μια έκδοση υπό ανάπτυξη."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
@@ -1134,9 +1177,8 @@ msgid "_Check"
 msgstr "Έλε_γχος"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "_Συνέχεια αναβάθμισης"
+msgstr "Αναβάθμιση _διανομής"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1147,31 +1189,28 @@ msgid "_Install Updates"
 msgstr "Ε_γκατάσταση ενημερώσεων"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Αλλαγές"
+msgstr "αλλαγές"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "ενημερώσεις"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
+msgstr "<b>Αυτόματες ενημερώσεις</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
+msgstr "<b>Διαδίκτυο</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1183,11 +1222,18 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "Προσθήκη _Cdrom"
+msgstr "Προσθήκη Cdrom"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
@@ -1198,9 +1244,8 @@ msgid "D_elete downloaded software files:"
 msgstr "Δια_γραφή αρχείων ληφθέντων πακέτων"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "Η λήψη ολοκληρώθηκε"
+msgstr "Λήψη από:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1228,34 +1273,32 @@ msgstr "Επαναφορά των προεπιλεγμένων κλειδιών
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Ιδιότητες λογισμικού"
+msgstr "Πηγές λογισμικού"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
 msgid "Source code"
-msgstr ""
+msgstr "Πηγαίος κώδικας"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Στατιστικά"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Υποβολή στατιστικών πληροφοριών"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Τρίτων"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "Αυτόματος έλεγ_χος για ενημερώσεις κάθε:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "Λή_ψη ενημερώσεων στο παρασκήνιο χωρίς να εγκατασταθούν"
+msgstr "Αυτόματη λή_ψη ενημερώσεων χωρίς να εγκατασταθούν"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1304,7 +1347,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1312,7 +1354,7 @@ msgid ""
 "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 του καναλιού που θέλετε να "
+"<big><b>Εισάγετε την πλήρη γραμμή  APT του repository που θέλετε να "
 "προσθέσετε</b></big>\n"
 "\n"
 "Η γραμμή APT περιέχει τον τύπο, τοποθεσία και το περιεχόμενο ενός καναλιού, "
@@ -1332,7 +1374,7 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
-msgstr ""
+msgstr "Επεξεργασία πηγής"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
@@ -1340,7 +1382,7 @@ msgstr "Σάρωση CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
-msgstr ""
+msgstr "Προσ_θήκη πηγής"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1352,7 +1394,7 @@ msgstr "Προβολή και εγκατάσταση διαθέσιμων ενη
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
-msgstr "Διαχείριση αναβαθμίσεων"
+msgstr "Διαχείριση ενημερώσεων"
 
 #: ../data/update-manager.schemas.in.h:1
 msgid ""
@@ -1402,9 +1444,8 @@ msgid "The window size"
 msgstr "Το μέγεθος του παραθύρου"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Ρύθμιση των καναλιών λογισμικού για ενημερώσεις"
+msgstr "Ρύθμιση των πηγών για λογισμικό και ενημερώσεις"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1414,65 +1455,59 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Αναβαθμίσεις  Ubuntu 5.10"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Community maintained (Universe)"
+msgstr "Community maintained"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Οδηγοί με κλειστό κώδικα για συσκευές"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Όχι-ελεύθερα (Multiverse)"
+msgstr "Λογισμικό με περιορισμούς"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Cdrom με το Ubuntu 6.10 'Edgy Eft"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Ubuntu 6.06 TLS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Community maintained (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Community maintained (Universe)"
+msgstr "Υποστηριζόμενα από την κοινότητα (Universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Community maintained (Universe)"
+msgstr "Community maintained Open Source software"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Όχι-ελεύθερα (Multiverse)"
+msgstr "Όχι-ελεύθεροι οδηγοί"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Οδηγοί με κλειστό κώδικα για συσκευές "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
@@ -1482,19 +1517,18 @@ msgstr "Όχι-ελεύθερα (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Cdrom με Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Backported ενημερώσεις"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1503,9 +1537,8 @@ msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Cdrom με Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1530,14 +1563,13 @@ msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Cdrom με Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
-msgstr "Με επίσημη υποστήριξη"
+msgstr "Officially supported"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
@@ -1546,21 +1578,18 @@ msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Αναβαθμίσεις  Ubuntu 5.10"
+msgstr "Ενημερώσεις Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 5.04 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1575,13 +1604,12 @@ msgstr "Όχι-ελεύθερα (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Cdrom με το Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα"
+msgstr "Δεν υποστηρίζονται πια επίσημα"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1590,21 +1618,18 @@ msgstr "Περιορισμένα πνευματικά δικαιώματα"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
+msgstr "Ενημερώσεις ασφαλείας Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Αναβαθμίσεις  Ubuntu 5.10"
+msgstr "Ενημερώσεις Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 4.10 Backports"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1655,9 +1680,8 @@ msgstr "Λογισμικό μη συμβατό με DFSG"
 #~ msgid "Downloading file %li of %li with unknown speed"
 #~ msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα"
 
-#, fuzzy
 #~ msgid "Normal updates"
-#~ msgstr "Εγκατάσταση ενημερώσεων"
+#~ msgstr "Κανονικές ενημερώσεις"
 
 #~ msgid "Cancel _Download"
 #~ msgstr "Ακύρωση _λήψης αρχείων"
@@ -1671,20 +1695,16 @@ msgstr "Λογισμικό μη συμβατό με DFSG"
 #~ 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>"
+#~ "<span weight=\"bold\" size=\"x-large\">Αναβάθμιση σε Ubuntu 6.10</span>"
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10"
+#~ msgstr "Σημαντικές αναβαθμίσεις ασφαλείας του Ubuntu"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu"
+#~ msgstr "Ενημερώσεις του Ubuntu"
 
 #~ msgid "Cannot install all available updates"
 #~ msgstr "Αδυναμία εγκατάστασης όλων των διαθέσιμων ενημερώσεων"
@@ -1762,7 +1782,7 @@ msgstr "Λογισμικό μη συμβατό με DFSG"
 #~ msgstr "<b>Κανάλι</b>"
 
 #~ msgid "<b>Components</b>"
-#~ msgstr "<b>Στοιχεία</b>"
+#~ msgstr "<b>Συστατικά</b>"
 
 #~ msgid "Add Channel"
 #~ msgstr "Προσθήκη Καναλιού"
@@ -1770,9 +1790,10 @@ msgstr "Λογισμικό μη συμβατό με DFSG"
 #~ msgid "Edit Channel"
 #~ msgstr "Επεξεργασία καναλιού"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "Προσ_θήκη καναλιού"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "Προσ_θήκη καναλιού"
+#~ msgstr[1] "Προσ_θήκη καναλιών"
 
 #~ msgid "_Custom"
 #~ msgstr "_Προσαρμοσμένο"
diff --git a/po/en_AU.po b/po/en_AU.po
index efcc4b91..f3bc426b 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -1,16 +1,16 @@
 # English (Australia) translation for update-manager
 # Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
 # This file is distributed under the same license as the update-manager package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+# David Symons <david.symons@liberatedcomputing.net>, 2006.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-26 21:06+0000\n"
-"Last-Translator: David Symons <david.symons@liberatedcomputing.net>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-09-11 09:53+0000\n"
+"Last-Translator: David Satchell <david@davidsatchell.net>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,9 +57,9 @@ msgstr "After %s days"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "_Install Updates"
+msgstr "%s updates"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -67,45 +67,44 @@ msgstr "_Install Updates"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Main server"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Server for %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Nearest server"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Custom servers"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Software Updates"
+msgstr "Software Channel"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Active"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(Source Code)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "Source Code"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -129,15 +128,12 @@ msgstr ""
 "The key you selected could not be removed. Please report this as a bug."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
-"<big><b>Error scaning the CD</b></big>\n"
-"\n"
-"%s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1096
 msgid "Please enter a name for the disc"
@@ -147,11 +143,11 @@ msgstr "Please enter a name for the disc"
 msgid "Please insert a disc in the drive:"
 msgstr "Please insert a disc in the drive:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Broken packages"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -159,36 +155,33 @@ 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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Can't upgrade required meta-packages"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "An essential package would have to be removed"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Could not calculate the upgrade"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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 occured while calculating the upgrade. Please report "
-"this as a bug. "
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Error authenticating some packages"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -198,12 +191,12 @@ msgstr ""
 "network problem. You may want to try again later. See below for a list of "
 "unauthenticated packages."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Can't install '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -212,12 +205,11 @@ msgstr ""
 "bug. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Can't guess meta-packag"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -225,16 +217,10 @@ msgid ""
 " 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."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Failed to fetch"
+msgstr "Failed to add the CD"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -245,28 +231,37 @@ msgid ""
 "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'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Reading cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Fetch data from the network for the upgrade?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "No valid mirror found"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -286,11 +281,11 @@ msgstr ""
 "If you select 'no' the update will cancel."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Generate default sources?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -303,11 +298,11 @@ msgstr ""
 "Should default entries for '%s' be added? If you select 'No' the update will "
 "cancel."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Repository information invalid"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -315,26 +310,22 @@ msgstr ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Third party sources disabled"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 souces.list where disabled. You can re-"
-"enable them after the upgrade with the 'software-properties' tool or with "
-"synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Error during update"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -342,11 +333,11 @@ msgstr ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Not enough free disk space"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -358,16 +349,15 @@ msgstr ""
 "'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Do you want to start the upgrade?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Could not install the upgrades"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -375,14 +365,17 @@ msgid ""
 "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 can be in an unusable state. A recovery "
-"was run (dpkg --configure -a)."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Could not download the upgrades"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -390,12 +383,11 @@ msgstr ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -403,29 +395,24 @@ msgid ""
 "If you have not enabled community maintained software (universe), 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. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Remove obsolete packages?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Skip This Step"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Error during commit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -434,32 +421,43 @@ msgstr ""
 "information. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Restoring original system state"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Checking package manager"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Updating repository information"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Invalid package information"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -467,23 +465,25 @@ msgid ""
 "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' can "
-"not be found anymore.\n"
-"This indicates a serious error, please report this as a bug."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Asking for confirmation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Upgrading"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Searching for obsolete software"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "System upgrade is complete."
 
@@ -494,25 +494,24 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "Please insert '%s' into the drive '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "Update is complete"
+msgstr "Fetching is complete"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr "Downloading file %li of %li at %s/s"
+msgstr "Fetching file %li of %li at %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "About %li minutes remaining"
+msgstr "About %s remaining"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
-msgstr "Downloading file %li of %li"
+msgstr "Fetching file %li of %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
@@ -531,22 +530,21 @@ 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."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"Replace configuration file\n"
-"\n"
-"'%s'?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -558,56 +556,58 @@ msgid "A fatal error occured"
 msgstr "A fatal error occured"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 ""
-"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"
+"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."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s package is going to be removed."
-msgstr[1] "%s packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d 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."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "%s package is going to be upgraded."
-msgstr[1] "%s packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "You have to download a total of %s."
+msgstr ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing 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."
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time during the process."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -615,7 +615,7 @@ msgstr "To prevent data loss close all open applications and documents."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Your system is up-to-date"
 
@@ -641,32 +641,32 @@ msgid "Upgrade %s"
 msgstr "Upgrade %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "About %li days %li hours %li minutes remaining"
+msgstr "%li days %li hours %li minutes"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "About %li hours %li minutes remaining"
+msgstr "%li hours %li minutes"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minutes"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li seconds"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -726,9 +726,8 @@ msgid "Difference between the files"
 msgstr "Difference between the files"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
-msgstr "Downloading and installing the upgrades"
+msgstr "Fetching and installing the upgrades"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -747,25 +746,37 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Keep"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Replace"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Report Bug"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Restart Now"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Resume Upgrade"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Could not find the release notes"
@@ -834,13 +845,10 @@ msgid "Verfication failed"
 msgstr "Verfication failed"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 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. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
@@ -855,130 +863,122 @@ msgstr ""
 "or with the server. "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Downloading file %li of %li with %s/s"
+msgstr ""
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Downloading file %li of %li with %s/s"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "The list of changes is not available yet. Please try again later."
+msgstr "The list of changes is not available"
 
-#: ../UpdateManager/UpdateManager.py:210
-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."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"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."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 Security Updates"
+msgstr "Important security updates"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Recommended updates"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "_Install Updates"
+msgstr "Proposed updates"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "_Resume Upgrade"
+msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "_Install Updates"
+msgstr "Other updates"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr "Downloading the list of changes..."
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "_Check"
+msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Download size: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 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"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Please wait, this can take some time."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Update is complete"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "_Install Updates"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "New version: %s (Size: %s)"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Version %s: \n"
+msgstr "Version %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Size: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Your distribution is not supported anymore"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -988,17 +988,17 @@ msgstr ""
 "a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
 "information on upgrading."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>New distribution release '%s' is available</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "Software index is broken"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1011,55 +1011,44 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "None"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, 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>You must check for updates manually</big></b>\n"
-"\n"
-"\n"
-"Your system does not check for updates automatically. You can configure this "
-"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>Keep your system up-to-date</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
 msgstr ""
-"<big><b>Error scaning the CD</b></big>\n"
-"\n"
-"%s"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Start the upgrade?</big></b>"
+msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1067,7 +1056,7 @@ msgstr "Changes"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Changes and description of the update"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1122,9 +1111,8 @@ msgid "_Check"
 msgstr "_Check"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "_Resume Upgrade"
+msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1135,31 +1123,28 @@ msgid "_Install Updates"
 msgstr "_Install Updates"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Changes"
+msgstr "changes"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "updates"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Internet updates</b>"
+msgstr "<b>Automatic updates</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CD-ROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Internet updates</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Internet updates</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1171,11 +1156,17 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "Add _Cdrom"
+msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
@@ -1186,9 +1177,8 @@ msgid "D_elete downloaded software files:"
 msgstr "D_elete downloaded software files:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "Download is complete"
+msgstr "Download from:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1216,34 +1206,32 @@ msgstr "Restore the default keys of your distribution"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Software Properties"
+msgstr "Software Sources"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
 msgid "Source code"
-msgstr ""
+msgstr "Source code"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Statistics"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Submit statistical information"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Third Party"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "_Check for updates automatically:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "_Download updates in the background, but do not install them"
+msgstr "_Download updates automatically, but do not install them"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1254,7 +1242,6 @@ msgid "_Install security updates without confirmation"
 msgstr "_Install security updates without confirmation"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1263,14 +1250,6 @@ msgid ""
 "\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."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
@@ -1293,7 +1272,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1301,11 +1279,6 @@ msgid ""
 "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 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>."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
@@ -1321,7 +1294,7 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
-msgstr ""
+msgstr "Edit Source"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
@@ -1329,7 +1302,7 @@ msgstr "Scanning CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
-msgstr ""
+msgstr "_Add Source"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1356,15 +1329,11 @@ msgid "Check for new distribution releases"
 msgstr "Check for new distribution releases"
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 ""
-"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."
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
@@ -1376,25 +1345,21 @@ msgstr "Show details of an update"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr "Stores the size of the update-manager dialog"
+msgstr "Stores the size of the update-manager dialogue"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 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"
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
 msgstr "The window size"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Configure software channels and internet updates"
+msgstr "Configure the sources for installable software and updates"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1404,87 +1369,78 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Community maintained (Universe)"
+msgstr "Community maintained"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Proprietary drivers for devices"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Non-free (Multiverse)"
+msgstr "Restricted software"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "CD-ROM with Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Community maintained (Universe)"
+msgstr "Community maintained (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Community maintained (Universe)"
+msgstr "Community maintained Open Source software"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Non-free (Multiverse)"
+msgstr "Non-free drivers"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Proprietary drivers for devices "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Non-free (Multiverse)"
+msgstr "Restricted software (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "CD-ROM with Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Backported updates"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1493,9 +1449,8 @@ msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD-ROM with Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1514,14 +1469,13 @@ msgstr "Ubuntu 5.10 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "CD-ROM with Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1530,27 +1484,23 @@ msgstr "Officially supported"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 Security Updates"
+msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.04 Updates"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 5.04 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1565,13 +1515,12 @@ msgstr "Non-free (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "CD-ROM with Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Some software no longer officially supported"
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1580,21 +1529,18 @@ msgstr "Restricted copyright"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 5.10 Security Updates"
+msgstr "Ubuntu 4.10 Security Updates"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 4.10 Updates"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 4.10 Backports"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1642,57 +1588,190 @@ msgstr "DFSG-compatible Software with Non-Free Dependencies"
 msgid "Non-DFSG-compatible Software"
 msgstr "Non-DFSG-compatible Software"
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Downloading file %li of %li with unknown speed"
+#~ msgid ""
+#~ "<big><b>Error scaning the CD</b></big>\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<big><b>Error scaning the CD</b></big>\n"
+#~ "\n"
+#~ "%s"
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "_Install Updates"
+#~ 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 "Cancel _Download"
-#~ msgstr "Cancel _Download"
+#~ 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."
 
-#, fuzzy
 #~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
+#~ "<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>"
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 Security Updates"
+#~ msgid "Downloading and installing the upgrades"
+#~ msgstr "Downloading and installing the upgrades"
 
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Upgrade to the latest version of Ubuntu"
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Upgrading Ubuntu"
 
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Cannot install all available updates"
+#~ 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 ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
+#~ "Failed to download the list of changes. Please check your Internet "
+#~ "connection."
 #~ msgstr ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
+#~ "Failed to download the list of changes. Please check your Internet "
+#~ "connection."
 
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "Officially supported"
+#~ msgid "Cannot install all available updates"
+#~ msgstr "Cannot install all available updates"
 
 #~ msgid ""
 #~ "Some updates require the removal of further software. Use the function "
@@ -1706,17 +1785,8 @@ msgstr "Non-DFSG-compatible Software"
 #~ msgid "The following updates will be skipped:"
 #~ msgstr "The following updates will be skipped:"
 
-#~ msgid "About %li seconds remaining"
-#~ msgstr "About %li seconds remaining"
-
-#~ msgid "Download is complete"
-#~ msgstr "Download is complete"
-
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "The upgrade aborts now. Please report this bug."
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Upgrading Ubuntu"
+#~ msgid "Downloading the list of changes..."
+#~ msgstr "Downloading the list of changes..."
 
 #~ msgid "Hide details"
 #~ msgstr "Hide details"
@@ -1724,6 +1794,9 @@ msgstr "Non-DFSG-compatible Software"
 #~ 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"
@@ -1733,40 +1806,128 @@ msgstr "Non-DFSG-compatible Software"
 #~ 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"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_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"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 86bc663c..11810e63 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:41+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:42+0000\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -147,30 +147,30 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -178,26 +178,26 @@ msgid ""
 "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. "
+"The key you selected could not be removed. Please report this as a bug."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -206,11 +206,11 @@ msgstr ""
 "The key you selected could not be removed. Please report this as a bug. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -237,11 +237,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -249,11 +249,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -266,11 +266,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -279,43 +279,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 #, fuzzy
 msgid "Error during update"
 msgstr "Error removing the key"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -324,15 +324,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -341,21 +341,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -364,55 +364,68 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Another package manager is running"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -422,20 +435,20 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 #, fuzzy
 msgid "Upgrading"
 msgstr "Upgrade finished"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr ""
 
@@ -494,8 +507,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -557,7 +570,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Your system is up-to-date!"
@@ -608,8 +621,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -684,27 +697,41 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "Upgrade finished"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 #, fuzzy
 msgid "_Replace"
 msgstr "Reload"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Upgrade finished"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "Upgrade finished"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -799,139 +826,143 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "There is a new release of Ubuntu available!"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr "There is a new release of Ubuntu available!"
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 #, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"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."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "_Install"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Ubuntu 5.04 Updates"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "Upgrade finished"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "_Install"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Cancel downloading the ChangeLog"
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Installing updates..."
 msgstr[1] "Installing updates..."
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "_Install"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "Version %s: \n"
+msgstr "Version %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Your distribution is no longer supported"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1100,7 +1131,7 @@ msgstr "Add _CD"
 #: ../data/glade/SoftwareProperties.glade.h:10
 #, fuzzy
 msgid "Authentication"
-msgstr "A_uthentication"
+msgstr "Authentication"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
@@ -1345,8 +1376,9 @@ msgstr "Ubuntu 5.04 Security Updates"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Community maintained (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1379,9 +1411,8 @@ msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "US export restricted software"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
@@ -1557,6 +1588,10 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, fuzzy
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "US export restricted software"
+
+#, fuzzy
 #~ msgid "Normal updates"
 #~ msgstr "_Install"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 809ea292..e35595ad 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:41+0000\n"
-"Last-Translator: Abigail Brady <morwen@evilmagic.org>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-06 04:33+0000\n"
+"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,49 +17,48 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:136
-#, fuzzy
 msgid "Daily"
-msgstr "<b>Details</b>"
+msgstr "Daily"
 
 #: ../SoftwareProperties/SoftwareProperties.py:137
 msgid "Every two days"
-msgstr ""
+msgstr "Every two days"
 
 #: ../SoftwareProperties/SoftwareProperties.py:138
 msgid "Weekly"
-msgstr ""
+msgstr "Weekly"
 
 #: ../SoftwareProperties/SoftwareProperties.py:139
 msgid "Every two weeks"
-msgstr ""
+msgstr "Every fortnight"
 
 #: ../SoftwareProperties/SoftwareProperties.py:144
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "Every %s days"
 
 #: ../SoftwareProperties/SoftwareProperties.py:167
 msgid "After one week"
-msgstr ""
+msgstr "After one week"
 
 #: ../SoftwareProperties/SoftwareProperties.py:168
 msgid "After two weeks"
-msgstr ""
+msgstr "After a fortnight"
 
 #: ../SoftwareProperties/SoftwareProperties.py:169
 msgid "After one month"
-msgstr ""
+msgstr "After one month"
 
 #: ../SoftwareProperties/SoftwareProperties.py:174
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "After %s days"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Installing updates..."
+msgstr "%s updates"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -67,51 +66,48 @@ msgstr "Installing updates..."
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Main server"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Server for %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Nearest server"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Custom servers"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Software Updates"
+msgstr "Software Channel"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Active"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr "Source"
+msgstr "(Source Code)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
-msgstr "Source"
+msgstr "Source Code"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
-msgstr ""
+msgstr "Import key"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
@@ -137,79 +133,89 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"<big><b>Error scanning the CD</b></big>\n"
+"\n"
+"%s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1096
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Please enter a name for the disc"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1112
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Please insert a disc in the drive:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
-msgstr ""
+msgstr "Broken packages"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Can't upgrade required meta-packages"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "An essential package would have to be removed"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Could not calculate the upgrade"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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. "
+"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."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Error authenticating some packages"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Can't install '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:313
 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. "
+"It was impossible to install a required package. Please report this as a "
+"bug. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Can't guess meta-package"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -217,10 +223,15 @@ msgid ""
 " 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."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
 msgid "Failed to add the CD"
-msgstr ""
+msgstr "Failed to add the CD"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -231,28 +242,37 @@ msgid ""
 "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'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
-msgstr ""
+msgstr "Reading cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Fetch data from the network for the upgrade?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
-msgstr ""
+msgstr "No valid mirror found"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -263,13 +283,20 @@ msgid ""
 "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."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
-msgstr ""
+msgstr "Generate default sources?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -277,61 +304,74 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Repository information invalid"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
-msgstr ""
+msgstr "Third party sources disabled"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
-msgstr "Error removing the key"
+msgstr "Error during update"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Not enough free disk space"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 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'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Do you want to start the upgrade?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Could not install the upgrades"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -339,22 +379,29 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Could not download the upgrades"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 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. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Support for some applications ended"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -362,56 +409,76 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "Remove obsolete packages?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
-msgstr ""
+msgstr "_Skip This Step"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
-msgstr ""
+msgstr "_Remove"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
-msgstr ""
+msgstr "Error during commit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 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. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
-msgstr ""
+msgstr "Restoring original system state"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "Fetching backport of '%s'"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
-msgstr "Another package manager is running"
+msgstr "Checking package manager"
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr "Preparing the upgrade failed"
 
 #: ../DistUpgrade/DistUpgradeControler.py:672
-msgid "Updating repository information"
+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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr "Updating repository information"
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
-msgstr ""
+msgstr "Invalid package information"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -420,69 +487,73 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
-msgstr "Checking system configuration"
+msgstr "Asking for confirmation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
-msgstr "Upgrade finished"
+msgstr "Upgrading"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Searching for obsolete software"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "System upgrade is complete."
 
 #. print "mediaChange %s %s" % (medium, drive)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Please insert '%s' into the drive '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
 msgid "Fetching is complete"
-msgstr ""
+msgstr "Fetching is complete"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr ""
+msgstr "Fetching file %li of %li at %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
 #, python-format
 msgid "About %s remaining"
-msgstr ""
+msgstr "About %s remaining"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
 msgid "Fetching file %li of %li"
-msgstr ""
+msgstr "Fetching file %li of %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
 #: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, fuzzy
 msgid "Applying changes"
-msgstr "Downloading changes..."
+msgstr "Applying changes"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Could not install '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:188
 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."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
@@ -491,20 +562,24 @@ msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
+"Replace the customised configuration file\n"
+"'%s'?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "The 'diff' command was not found"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
-msgstr ""
+msgstr "A fatal error occured"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
 msgid ""
@@ -513,6 +588,10 @@ msgid ""
 "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."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
@@ -520,22 +599,22 @@ msgstr ""
 #, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d package is going to be removed."
+msgstr[1] "%d packages are going to be removed."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
 #, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d new package is going to be installed."
+msgstr[1] "%d new packages are going to be installed."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
 #, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d package is going to be upgraded."
+msgstr[1] "%d packages are going to be upgraded."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
 #, python-format
@@ -544,82 +623,91 @@ msgid ""
 "\n"
 "You have to download a total of %s. "
 msgstr ""
+"\n"
+"\n"
+"You have to download a total of %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
-msgstr ""
+msgstr "To prevent data loss close all open applications and documents."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
-msgstr "Your system is up-to-date!"
+msgstr "Your system is up-to-date"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:519
 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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
 msgid "<b>Remove %s</b>"
-msgstr ""
+msgstr "<b>Remove %s</b>"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:537
 #, python-format
 msgid "Install %s"
-msgstr ""
+msgstr "Install %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:539
 #, python-format
 msgid "Upgrade %s"
-msgstr ""
+msgstr "Upgrade %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
 #, python-format
 msgid "%li days %li hours %li minutes"
-msgstr ""
+msgstr "%li days %li hours %li minutes"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
 #, python-format
 msgid "%li hours %li minutes"
-msgstr ""
+msgstr "%li hours %li minutes"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minutes"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li seconds"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"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"
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
-msgstr ""
+msgstr "Reboot required"
 
 #: ../DistUpgrade/DistUpgradeView.py:110
 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?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -637,327 +725,345 @@ msgid ""
 "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."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-msgstr ""
+msgstr "<b><big>Restart the system to complete the upgrade</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Start the upgrade?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Cleaning up"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
-msgstr "<b>Details</b>"
+msgstr "Details"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "Difference between the files"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Fetching and installing the upgrades"
-msgstr ""
+msgstr "Fetching and installing the upgrades"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Modifying the software channels"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Preparing the upgrade"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr ""
+msgstr "Restarting the system"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
-msgstr ""
+msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
-msgstr ""
+msgid "_Cancel Upgrade"
+msgstr "_Cancel Upgrade"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-#, fuzzy
-msgid "_Replace"
-msgstr "Reload"
+msgid "_Continue"
+msgstr "_Continue"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
-msgstr ""
+msgid "_Keep"
+msgstr "_Keep"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
-msgstr ""
+msgid "_Replace"
+msgstr "_Replace"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr "_Report Bug"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr "_Restart Now"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
-msgstr ""
+msgstr "_Resume Upgrade"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr "_Start Upgrade"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
-msgstr ""
+msgstr "Could not find the release notes"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "The server may be overloaded. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
 msgid "Could not download the release notes"
-msgstr ""
+msgstr "Could not download the release notes"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Please check your Internet connection."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
-msgstr ""
+msgstr "Could not run the upgrade tool"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:150
-#, 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."
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:171
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Downloading Changes"
+msgstr "Downloading the upgrade tool"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "The upgrade tool will guide you through the upgrade process."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Upgrade tool signature"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
-msgstr ""
+msgstr "Upgrade tool"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Failed to fetch"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "Fetching the upgrade failed. There may be a network problem. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
-msgstr ""
+msgstr "Failed to extract"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:215
 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. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
-msgstr ""
+msgstr "Verfication failed"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
 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. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
-#, fuzzy
 msgid "Authentication failed"
-msgstr "A_uthentication"
+msgstr "Authentication failed"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:229
 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. "
 
 #: ../UpdateManager/GtkProgress.py:108
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
+msgstr "Downloading file %(current)li of %(total)li with %(speed)s/s"
 
 #: ../UpdateManager/GtkProgress.py:113
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
+msgstr "Downloading file %(current)li of %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "There is a new release of Ubuntu available!"
+msgstr "The list of changes is not available"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+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."
 
-#: ../UpdateManager/UpdateManager.py:215
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"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."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 Security Updates"
+msgstr "Important security updates"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Recommended updates"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "Installing updates..."
+msgstr "Proposed updates"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Backports"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "Installing updates..."
+msgstr "Distribution updates"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Installing updates..."
+msgstr "Other updates"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr "Downloading Changes"
+msgstr "Downloading list of changes..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "_Untick All"
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr ""
+msgstr "_Tick All"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Download size: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Installing updates..."
-msgstr[1] "Installing updates..."
+msgstr[0] "You can install %s update"
+msgstr[1] "You can install %s updates"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Please wait, this can take some time."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr ""
+msgstr "Update is complete"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "Installing updates..."
+msgstr "Checking for updates"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr ""
+msgstr "From version %(old_version)s to %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Version %s: \n"
+msgstr "Version %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Size: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
-msgstr "Your distribution is no longer supported"
+msgstr "Your distribution is not supported anymore"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>New distribution release '%s' is available</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
-msgstr ""
+msgstr "Software index is broken"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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."
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "None"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 msgid ""
@@ -966,18 +1072,22 @@ msgid ""
 "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."
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Keep your system up-to-date</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
+msgstr "<big><b>Not all updates can be installed</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
 msgid "<big><b>Starting update manager</b></big>"
-msgstr ""
+msgstr "<big><b>Starting update manager</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -985,15 +1095,15 @@ msgstr "Changes"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Changes and description of the update"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
-msgstr ""
+msgstr "Chec_k"
 
 #: ../data/glade/UpdateManager.glade.h:10
 msgid "Check the software channels for new updates"
-msgstr ""
+msgstr "Check the software channels for new updates"
 
 #: ../data/glade/UpdateManager.glade.h:11
 msgid "Description"
@@ -1001,7 +1111,7 @@ msgstr "Description"
 
 #: ../data/glade/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Release Notes"
 
 #: ../data/glade/UpdateManager.glade.h:13
 msgid ""
@@ -1010,10 +1120,14 @@ msgid ""
 "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."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Show progress of single files"
 
 #: ../data/glade/UpdateManager.glade.h:17
 msgid "Software Updates"
@@ -1024,59 +1138,56 @@ msgid ""
 "Software updates correct errors, eliminate security vulnerabilities and "
 "provide new features."
 msgstr ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
-msgstr ""
+msgstr "U_pgrade"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Upgrade to the latest version of Ubuntu"
 
 #: ../data/glade/UpdateManager.glade.h:21
 msgid "_Check"
-msgstr ""
+msgstr "_Check"
 
 #: ../data/glade/UpdateManager.glade.h:22
 msgid "_Distribution Upgrade"
-msgstr ""
+msgstr "_Distribution Upgrade"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Hide this information in the future"
 
 #: ../data/glade/UpdateManager.glade.h:24
-#, fuzzy
 msgid "_Install Updates"
-msgstr "Installing updates..."
+msgstr "_Install Updates"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Changes"
+msgstr "changes"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "updates"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Internet Updates</b>"
+msgstr "<b>Automatic updates</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-#, fuzzy
 msgid "<b>Internet updates</b>"
-msgstr "<b>Internet Updates</b>"
+msgstr "<b>Internet updates</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Internet Updates</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1088,90 +1199,90 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "Add _CD"
+msgstr "Add _CDROM"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
-#, fuzzy
 msgid "Authentication"
-msgstr "A_uthentication"
+msgstr "Authentication"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "D_elete downloaded software files:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
 msgid "Download from:"
-msgstr ""
+msgstr "Download from:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "Remove the selected key from the trusted keyring."
+msgstr "Import the public key from a trusted software provider"
 
 #: ../data/glade/SoftwareProperties.glade.h:14
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>Internet Updates</b>"
+msgstr "Internet Updates"
 
 #: ../data/glade/SoftwareProperties.glade.h:15
 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"
 
 #: ../data/glade/SoftwareProperties.glade.h:16
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "Restore default keys"
+msgstr "Restore _Defaults"
 
 #: ../data/glade/SoftwareProperties.glade.h:17
-#, fuzzy
 msgid "Restore the default keys of your distribution"
-msgstr "Restore default keys"
+msgstr "Restore the default keys of your distribution"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Software Properties"
+msgstr "Software Sources"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
-msgstr "Source"
+msgstr "Source code"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Statistics"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Submit statistical information"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Third Party"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
-#, fuzzy
 msgid "_Check for updates automatically:"
-msgstr "Installing updates..."
+msgstr "_Check for updates automatically:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
 msgid "_Download updates automatically, but do not install them"
-msgstr ""
+msgstr "_Download updates automatically, but do not install them"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
-msgstr ""
+msgstr "_Import Key File"
 
 #: ../data/glade/SoftwareProperties.glade.h:26
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Install security updates without confirmation"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
 msgid ""
@@ -1182,15 +1293,20 @@ msgid ""
 "\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."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
 msgstr "<b>Comment:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
-#, fuzzy
 msgid "<b>Components:</b>"
-msgstr "<b>Components</b>"
+msgstr "<b>Components:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Distribution:</b>"
@@ -1205,7 +1321,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1213,12 +1328,11 @@ msgid ""
 "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"
+"<big><b>Enter the complete APT line of the repository that you want to add "
+"as source</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."
+"The APT line includes the type, location and components of a repository, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
@@ -1233,27 +1347,24 @@ msgstr ""
 "Source"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr "Source"
+msgstr "Edit Source"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Scanning CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr "Source"
+msgstr "_Add Source"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
-#, fuzzy
 msgid "_Reload"
-msgstr "Reload"
+msgstr "_Reload"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Show and install available updates"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -1264,10 +1375,12 @@ 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)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Check for new distribution releases"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1275,136 +1388,128 @@ msgid ""
 "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."
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Remind to reload the channel list"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr ""
+msgstr "Show details of an update"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Stores the size of the update-manager dialogue"
 
 #: ../data/update-manager.schemas.in.h:7
 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"
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
-msgstr ""
+msgstr "The window size"
 
 #: ../data/software-properties.desktop.in.h:1
 msgid "Configure the sources for installable software and updates"
-msgstr ""
+msgstr "Configure the sources for installable software and updates"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Community maintained (Universe)"
+msgstr "Community maintained"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Proprietary drivers for devices"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Contributed software"
+msgstr "Restricted software"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 5.04 Updates"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+msgid "Canonical supported Open Source software"
+msgstr "Canonical supported Open Source software"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Community maintained (Universe)"
+msgstr "Community maintained (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Community maintained (Universe)"
+msgstr "Community maintained Open Source software"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Non-free (Multiverse)"
+msgstr "Non-free drivers"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Proprietary drivers for devices "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Non-free (Multiverse)"
+msgstr "Restricted software (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "US export restricted software"
+msgid "Software restricted by copyright or legal issues"
+msgstr "Software restricted by copyright or legal issues"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 5.04 Updates"
+msgstr "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Backported updates"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1418,51 +1523,43 @@ msgstr "Ubuntu 5.10 Updates"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:145
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.10 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
-#, fuzzy
 msgid "Officially supported"
 msgstr "Officially supported"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 Security Updates"
+msgstr "Ubuntu 5.04 Security Updates"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.04 Updates"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.04 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1476,15 +1573,13 @@ msgstr "Non-free (Multiverse)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
-#, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Officially supported"
+msgstr "No longer officially supported"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1503,15 +1598,14 @@ msgstr "Ubuntu 4.10 Updates"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 4.10 Backports"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Debian.info.in:6
@@ -1521,81 +1615,71 @@ msgstr "Debian 3.1 \"Sarge\""
 #. BaseURI
 #: ../data/channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
 #. Description
 #: ../data/channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Debian Stable Security Updates"
+msgstr "Debian 3.1 \"Sarge\" Security Updates"
 
 #. Description
 #: ../data/channels/Debian.info.in:34
-#, fuzzy
 msgid "Debian \"Etch\" (testing)"
-msgstr "Debian Testing"
+msgstr "Debian \"Etch\" (testing)"
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
 #. Description
 #: ../data/channels/Debian.info.in:48
-#, fuzzy
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian Non-US (Unstable)"
+msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "DFSG-compatible Software with Non-Free Dependencies"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Non-DFSG-compatible Software"
+
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "By copyright or legal issues restricted software"
 
-#, fuzzy
 #~ msgid "Normal updates"
-#~ msgstr "Installing updates..."
+#~ msgstr "Normal updates"
 
-#, fuzzy
 #~ msgid "Your system has already been upgraded."
-#~ msgstr "Your system has broken packages!"
+#~ msgstr "Your system has already been upgraded."
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 Security Updates"
+#~ msgstr "Important security updates of Ubuntu"
 
 #, fuzzy
 #~ msgid "Oficially supported"
 #~ msgstr "Officially supported"
 
-#, fuzzy
 #~ msgid "The following updates will be skipped:"
-#~ msgstr "The following packages are not upgraded:"
+#~ msgstr "The following updates will be skipped:"
 
-#, 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."
+#~ msgstr "The upgrade aborts now. Please report this bug."
 
-#, fuzzy
 #~ msgid "Hide details"
-#~ msgstr "<b>Details</b>"
+#~ msgstr "Hide details"
 
-#, fuzzy
 #~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Details</b>"
+#~ msgstr "<b>Channels</b>"
 
-#, fuzzy
 #~ msgid "<b>Keys</b>"
-#~ msgstr "<b>Details</b>"
+#~ msgstr "<b>Keys</b>"
 
-#, fuzzy
 #~ msgid "Installation Media"
-#~ msgstr "Installing updates..."
+#~ msgstr "Installation Media"
 
 #~ msgid "Software Preferences"
 #~ msgstr "Software Preferences"
@@ -1603,9 +1687,8 @@ msgstr ""
 #~ msgid "     "
 #~ msgstr "     "
 
-#, fuzzy
 #~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Details</b>"
+#~ msgstr "<b>Channel</b>"
 
 #, fuzzy
 #~ msgid "<b>Components</b>"
@@ -1614,21 +1697,17 @@ msgstr ""
 #~ msgid "_Custom"
 #~ msgstr "_Custom"
 
-#, fuzzy
 #~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 5.10 Updates"
+#~ msgstr "Ubuntu 6.06 LTS"
 
-#, fuzzy
 #~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 5.04 Security Updates"
+#~ msgstr "Ubuntu 6.06 LTS Security Updates"
 
-#, fuzzy
 #~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 5.10 Updates"
+#~ msgstr "Ubuntu 6.06 LTS Updates"
 
-#, fuzzy
 #~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 5.10 Updates"
+#~ msgstr "Ubuntu 6.06 LTS Backports"
 
 #~ msgid "Repositories changed"
 #~ msgstr "Repositories changed"
diff --git a/po/eo.po b/po/eo.po
new file mode 100644
index 00000000..5e05fe52
--- /dev/null
+++ b/po/eo.po
@@ -0,0 +1,1518 @@
+# Esperanto translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-07-24 21:11+0000\n"
+"Last-Translator: Ed Glez <herzo2@gmail.com>\n"
+"Language-Team: Esperanto <eo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "Daily"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:137
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:138
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:139
+msgid "Every two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:144
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:167
+msgid "After one week"
+msgstr "Post unu semajno"
+
+#: ../SoftwareProperties/SoftwareProperties.py:168
+msgid "After two weeks"
+msgstr "Post du semajnoj"
+
+#: ../SoftwareProperties/SoftwareProperties.py:169
+msgid "After one month"
+msgstr "Post unu monato"
+
+#: ../SoftwareProperties/SoftwareProperties.py:174
+#, python-format
+msgid "After %s days"
+msgstr "Post %s tagoj"
+
+#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
+#: ../SoftwareProperties/SoftwareProperties.py:252
+#, python-format
+msgid "%s updates"
+msgstr ""
+
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
+msgid "Main server"
+msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:324
+msgid "Nearest server"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:345
+msgid "Custom servers"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
+msgid "Software Channel"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
+msgid "Active"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:714
+msgid "(Source Code)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:720
+msgid "Source Code"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:969
+msgid "Import key"
+msgstr "Importi sxlosilon"
+
+#: ../SoftwareProperties/SoftwareProperties.py:979
+msgid "Error importing selected file"
+msgstr "Eraro dum importado de elektita dosiero"
+
+#: ../SoftwareProperties/SoftwareProperties.py:980
+msgid "The selected file may not be a GPG key file or it might be corrupt."
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:992
+msgid "Error removing the key"
+msgstr "Eraro dum forigo de sxlosilo"
+
+#: ../SoftwareProperties/SoftwareProperties.py:993
+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."
+
+#: ../SoftwareProperties/SoftwareProperties.py:1039
+#, python-format
+msgid ""
+"<big><b>Error scanning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1096
+msgid "Please enter a name for the disc"
+msgstr "Bonvolu entajpi nomon por la disko"
+
+#: ../SoftwareProperties/SoftwareProperties.py:1112
+msgid "Please insert a disc in the drive:"
+msgstr "Bonvolu enmeti diskon en la diskingo:"
+
+#: ../DistUpgrade/DistUpgradeCache.py:91
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+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 ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:207
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:217
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:220
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:221
+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 ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:246
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:247
+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 ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:312
+#, python-format
+msgid "Can't install '%s'"
+msgstr "Ne eblis instalo de '%s'"
+
+#: ../DistUpgrade/DistUpgradeCache.py:313
+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. "
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:320
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:321
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:75
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "Reading cache"
+msgstr "Legado de kasxmemoro"
+
+#: ../DistUpgrade/DistUpgradeControler.py:155
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:156
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:248
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:249
+#, python-format
+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 ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:266
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:267
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:301
+msgid "Repository information invalid"
+msgstr "Deponeja informo ne valida"
+
+#: ../DistUpgrade/DistUpgradeControler.py:302
+#, 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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:308
+msgid "Third party sources disabled"
+msgstr "Aliulaj fontoj malsxaltitaj"
+
+#: ../DistUpgrade/DistUpgradeControler.py:309
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:358
+msgid "Error during update"
+msgstr "Eraro dum gxisdatigo"
+
+#: ../DistUpgrade/DistUpgradeControler.py:359
+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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:368
+msgid "Not enough free disk space"
+msgstr "Ne estas suficxa libera loko en disko"
+
+#: ../DistUpgrade/DistUpgradeControler.py:369
+#, python-format
+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 ""
+
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeControler.py:440
+msgid "Do you want to start the upgrade?"
+msgstr "Cxu vi volas komenci la promociadon?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:460
+msgid "Could not install the upgrades"
+msgstr "Ne eblis instali la promociojn"
+
+#: ../DistUpgrade/DistUpgradeControler.py:461
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:479
+msgid "Could not download the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:480
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:516
+msgid "Support for some applications ended"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:517
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:552
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:563
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:564
+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. "
+
+#. generate a new cache
+#: ../DistUpgrade/DistUpgradeControler.py:576
+msgid "Restoring original system state"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:632
+#, python-format
+msgid "Fetching backport of '%s'"
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
+msgid "Checking package manager"
+msgstr "Kontrolado de pakajxa direktisto"
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr "Gxisdatigo de deponeja informo"
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
+msgid "Invalid package information"
+msgstr "Nevalida pakajxa informo"
+
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:733
+msgid "Asking for confirmation"
+msgstr "Petado de konfirmo"
+
+#: ../DistUpgrade/DistUpgradeControler.py:737
+msgid "Upgrading"
+msgstr "Promociado"
+
+#: ../DistUpgrade/DistUpgradeControler.py:744
+msgid "Searching for obsolete software"
+msgstr "Sercxado de ne plu uzata programaro"
+
+#: ../DistUpgrade/DistUpgradeControler.py:749
+msgid "System upgrade is complete."
+msgstr "Sistema promocio estas kompleta."
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:249
+#, python-format
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, python-format
+msgid "Fetching file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+msgid "Applying changes"
+msgstr "Aplikado de sxangxoj"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
+#, python-format
+msgid "Could not install '%s'"
+msgstr "Ne eblis instali '%s'"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+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 ""
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#, python-format
+msgid ""
+"Replace the customized configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:203
+msgid ""
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
+msgid "The 'diff' command was not found"
+msgstr "La komando 'diff' ne estis trovata"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:356
+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 ""
+
+#. FIXME: make those two seperate lines to make it clear
+#. that the "%" applies to the result of ngettext
+#: ../DistUpgrade/DistUpgradeViewGtk.py:487
+#, python-format
+msgid "%d package is going to be removed."
+msgid_plural "%d packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
+#, python-format
+msgid "%d new package is going to be installed."
+msgid_plural "%d new packages are going to be installed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:498
+#, python-format
+msgid "%d package is going to be upgraded."
+msgid_plural "%d packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:503
+#, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
+msgid ""
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:512
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:518
+#: ../UpdateManager/UpdateManager.py:622
+msgid "Your system is up-to-date"
+msgstr "Via sistemo estas gxisdatigita"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:519
+msgid ""
+"There are no upgrades available for your system. The upgrade will now be "
+"canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:535
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:537
+#, python-format
+msgid "Install %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:539
+#, python-format
+msgid "Upgrade %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:31
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:32
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:38
+#, python-format
+msgid ""
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:109
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:110
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/glade/SoftwareProperties.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+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."
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr "<b><big>Rekomenci la sistemon por kompletigi la promocion</big></b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr "<b><big>Cxu komenci la promociadon?</big></b>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr "Purigado"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr "Detaloj"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr "Diferenco inter la dosieroj"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Fetching and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr "Rekomencado de la sistemo"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr "Konservi"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Replace"
+msgstr "Anstatauxigi"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr "Rekomenci Nun"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr "Bonvolu kontroli vian interretan konekton."
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:149
+msgid "Could not run the upgrade tool"
+msgstr "Ne eblis ruli la promocian ilon"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:150
+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"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:171
+msgid "Downloading the upgrade tool"
+msgstr "Elsxutado de la promocia ilo"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:180
+msgid "Upgrade tool signature"
+msgstr "Subskribo de promocia ilo"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:183
+msgid "Upgrade tool"
+msgstr "Promocia ilo"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:209
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid "Failed to extract"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:215
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid "Verfication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:222
+msgid ""
+"Verifying the upgrade failed.  There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid "Authentication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:229
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:108
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:113
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:206
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:217
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
+msgid "Important security updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
+msgid "Recommended updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
+msgid "Proposed updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:241
+msgid "Backports"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:242
+msgid "Distribution updates"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
+msgid "Other updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:478
+#, python-format
+msgid "Version %s: \n"
+msgstr "Versio %s: \n"
+
+#: ../UpdateManager/UpdateManager.py:539
+msgid "Downloading list of changes..."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:566
+msgid "_Uncheck All"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:572
+msgid "_Check All"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
+#, python-format
+msgid "Download size: %s"
+msgstr "Elsxuta grando: %s"
+
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid "Please wait, this can take some time."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:668
+msgid "Update is complete"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:719
+msgid "Checking for updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
+msgid "From version %(old_version)s to %(new_version)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:832
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:843
+msgid "Your distribution is not supported anymore"
+msgstr "Via distribuo ne estas plu subtenata"
+
+#: ../UpdateManager/UpdateManager.py:844
+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 ""
+
+#: ../UpdateManager/UpdateManager.py:863
+#, python-format
+msgid "<b>New distribution release '%s' is available</b>"
+msgstr "<b>Nova distribua eldono '%s' estas disponebla</b>"
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:898
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:899
+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 ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:1
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:4
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr "<big><b>Konservi vian sistemon gxisdatigita</b></big>"
+
+#: ../data/glade/UpdateManager.glade.h:5
+msgid "<big><b>Not all updates can be installed</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:6
+msgid "<big><b>Starting update manager</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:7
+msgid "Changes"
+msgstr "Sxangxoj"
+
+#: ../data/glade/UpdateManager.glade.h:8
+msgid "Changes and description of the update"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:9
+msgid "Chec_k"
+msgstr "Kontroli"
+
+#: ../data/glade/UpdateManager.glade.h:10
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:11
+msgid "Description"
+msgstr "Priskribo"
+
+#: ../data/glade/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:13
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:16
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:17
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:18
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:19
+msgid "U_pgrade"
+msgstr "Promocii"
+
+#: ../data/glade/UpdateManager.glade.h:20
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr "Promocii al lasta versio de Ubuntu"
+
+#: ../data/glade/UpdateManager.glade.h:21
+msgid "_Check"
+msgstr "Kontroli"
+
+#: ../data/glade/UpdateManager.glade.h:22
+msgid "_Distribution Upgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:23
+msgid "_Hide this information in the future"
+msgstr "Kasxi cxi tiujn informojn estonte"
+
+#: ../data/glade/UpdateManager.glade.h:24
+msgid "_Install Updates"
+msgstr "Instali Gxisdatigojn"
+
+#: ../data/glade/UpdateManager.glade.h:25
+msgid "changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:26
+msgid "updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:2
+msgid "<b>Automatic updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:3
+msgid "<b>CDROM/DVD</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:4
+msgid "<b>Internet updates</b>"
+msgstr "<b>Interretaj gxisdatigoj</b>"
+
+#: ../data/glade/SoftwareProperties.glade.h:5
+msgid "<b>Internet</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:6
+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 ""
+
+#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+msgid "Authentication"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
+msgid "Download from:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:13
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:16
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:17
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Sources"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:19
+msgid "Source code"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:20
+msgid "Statistics"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:21
+msgid "Submit statistical information"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:22
+msgid "Third Party"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:23
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:24
+msgid "_Download updates automatically, but do not install them"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:25
+msgid "_Import Key File"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:26
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Comment:</b>"
+msgstr "<b>Komento:</b>"
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Components:</b>"
+msgstr "<b>Elementoj:</b>"
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
+msgid "APT line:"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Duuma\n"
+"Fonto"
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr "Skanado de KD"
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Reload"
+msgstr "Resxargi"
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr "Vidigas kaj instalas disponeblajn gxisdatigojn"
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr "Gxisdatiga Direktisto"
+
+#: ../data/update-manager.schemas.in.h:1
+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)."
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+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 ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changes and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:8
+msgid "Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:13
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:17
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:19
+msgid "Restricted software"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:25
+msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:59
+msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:62
+msgid "Canonical supported Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:64
+msgid "Community maintained (universe)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:65
+msgid "Community maintained Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:67
+msgid "Non-free drivers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:68
+msgid "Proprietary drivers for devices "
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:70
+msgid "Restricted software (Multiverse)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:71
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:76
+msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:103
+msgid "Backported updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:110
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:123
+msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:135
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:140
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:145
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:152
+msgid "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:165
+msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr "Oficiale subtenata"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:177
+msgid "Ubuntu 5.04 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:182
+msgid "Ubuntu 5.04 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:187
+msgid "Ubuntu 5.04 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:193
+msgid "Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:199
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:201
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:206
+msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:209
+msgid "No longer officially supported"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:211
+msgid "Restricted copyright"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:218
+msgid "Ubuntu 4.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:223
+msgid "Ubuntu 4.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:228
+msgid "Ubuntu 4.10 Backports"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+
+#. Description
+#: ../data/channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 \"Sarge\""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index 25c9a9a5..84169464 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-26 09:38+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 21:00+0000\n"
 "Last-Translator: Ricardo Pérez López <ricardo@iesdonana.org>\n"
 "Language-Team: Spanish <traductores@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,9 +59,9 @@ msgstr "Después de %s días"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Instalando actualizaciones"
+msgstr "Actualizaciones de %s"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -69,47 +69,44 @@ msgstr "Instalando actualizaciones"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Servidor principal"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Servidor para %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Servidor maś cercano"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Servidores personalizados"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Actualizaciones de software"
+msgstr "Canal de software"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr "Fuente"
+msgstr "(Código fuente)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
-msgstr "Fuente"
+msgstr "Código fuente"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -117,12 +114,12 @@ msgstr "Importar clave"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
-msgstr "Hubo un error al importar el archivo seleccionado"
+msgstr "Hubo un error al importar el fichero seleccionado"
 
 #: ../SoftwareProperties/SoftwareProperties.py:980
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
-"Puede que el archivo seleccionado no sea un archivo de clave GPG o que esté "
+"Puede que el fichero seleccionado no sea un fichero de clave GPG o que esté "
 "corrupto."
 
 #: ../SoftwareProperties/SoftwareProperties.py:992
@@ -136,13 +133,13 @@ msgstr ""
 "como un fallo."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
-"<big><b>Error explorando el CD</b></big>\n"
+"<big><b>Error examinando el CD</b></big>\n"
 "\n"
 "%s"
 
@@ -154,11 +151,11 @@ 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:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -167,36 +164,35 @@ msgstr ""
 "software. Por favor, arréglelos primero usando Synaptic o apt-get antes de "
 "continuar."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "No se han podido actualizar los meta-paquetes requeridos"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Se ha tenido que desinstalar un paquete esencial"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "No se ha podido calcular la actualización"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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 resolver cuando se calculaba la "
-"actualización. Por favor, informe de ésto como un fallo. "
+"Ha ocurrido un problema imposible de corregir cuando se calculaba la "
+"actualización. Por favor, informe de ésto como un fallo."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Error autenticando algunos paquetes"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -206,12 +202,12 @@ msgstr ""
 "problema transitorio en la red. Pruebe de nuevo más tarde. Vea abajo una "
 "lista de los paquetes no autenticados."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "No se ha podido instalar «%s»"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -220,12 +216,11 @@ msgstr ""
 "como un fallo. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "No se ha podido determinar el meta-paquete"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -233,16 +228,15 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
-"Su sistema no contiene el paquete ubuntu-desktop, o kubuntu-desktop, o "
+"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."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Error al descargar"
+msgstr "Error al añadir el CD"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -253,28 +247,38 @@ msgid ""
 "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»"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Leyendo caché"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "¿Obtener datos desde la red para la actualización?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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»."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "No se ha encontrado un servidor espejo válido"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -295,11 +299,11 @@ msgstr ""
 "Si selecciona «No» se cancelará la actualización."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "¿Generar orígenes predeterminados?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -313,11 +317,11 @@ msgstr ""
 "¿Deben añadirse entradas predeterminadas para «%s»? Si selecciona «No» se "
 "cancelará la actualización."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Información de repositorio no válida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -325,26 +329,25 @@ msgstr ""
 "La actualización de la información del repositorio generó un archivo "
 "incorrecto. Por favor, informe de ésto como un error."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Orígenes de terceros desactivados"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 en su «sources.list». Puede "
-"volver a activarlas tras la actualización con la herramienta «Propiedades "
-"del software», o con Synaptic."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Error durante la actualización"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -353,11 +356,11 @@ msgstr ""
 "tipo de problema en la red, por lo que le recomendamos que compruebe su "
 "conexión de red y vuelva a intentarlo."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "No hay espacio suficiente en el disco"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -369,16 +372,15 @@ msgstr ""
 "de instalaciones anteriores tecleando «sudo apt-get clean» en una terminal."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "¿Desea comenzar la actualización?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "No se han podido instalar las actualizaciones"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -388,13 +390,17 @@ msgid ""
 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)."
+"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/."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "No se han podido descargar las actualizaciones"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -402,12 +408,11 @@ 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. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Algunas aplicaciones han dejado de tener soporte"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -415,29 +420,29 @@ msgid ""
 "If you have not enabled community maintained software (universe), these "
 "packages will be suggested for removal in the next step."
 msgstr ""
-"Estos paquetes instalados ya no están soportados oficialmente, y desde ahora "
-"sólo están soportados por la comunidad («universe»).\n"
+"Canonical Ltd. ya no soporta oficialmente los siguientes paquetes de "
+"software. Todavía podrá obtener soporte de la comunidad.\n"
 "\n"
-"Si no tiene activado el «universe», se le sugerirá que desinstale estos "
-"paquetes en el siguiente paso. "
+"Si no tiene habilitado el software mantenido por la comunidad («universe»), "
+"se le sugerirá que desinstale estos paquetes en el siguiente paso."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "¿Desinstalar los paquetes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Saltar este paso"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Error durante la confirmación"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -446,32 +451,47 @@ msgstr ""
 "inferior para más información. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Restaurando el estado original del sistema"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "Descargando «backport» de '%s'"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Comprobando gestor de paquetes"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr "Falló la preparación de la actualización"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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/."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Actualizando la información del repositorio"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Información de paquete no válida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -481,21 +501,23 @@ msgid ""
 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 esto como un fallo."
+"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/."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Solicitando confirmación"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Actualizando"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Buscando paquetes obsoletos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "La actualización del sistema se ha completado."
 
@@ -506,23 +528,22 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "Por favor, inserte «%s» en la unidad «%s»"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "La actualización se ha completado"
+msgstr "La descarga se ha completado"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
 msgstr "Descargando archivo %li de %li a %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Faltan %li minutos"
+msgstr "Faltan alrededor de %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
 msgstr "Descargando archivo %li de %li"
 
@@ -543,22 +564,27 @@ 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/."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"¿Desea reemplazar el archivo de configuración\n"
+"¿Desea sustituir el archivo de configuración modificado\n"
 "«%s»?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
@@ -569,7 +595,6 @@ msgid "A fatal error occured"
 msgstr "Ha ocurrido un error fatal"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 "
@@ -579,48 +604,50 @@ 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 guardó en /etc/apt/sources.list."
+"Su archivo «sources.list» original se ha guardado en /etc/apt/sources.list."
 "distUpgrade."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "Se va a desinstalar %s paquete."
-msgstr[1] "Se van a desinstalar %s paquetes."
+msgstr[0] "Se va a desinstalar %d paquete."
+msgstr[1] "Se van a desinstalar %d paquetes."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 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 %s paquete nuevo."
-msgstr[1] "Se van a instalar %s paquetes nuevos."
+msgstr[0] "Se va a instalar %d paquete nuevo."
+msgstr[1] "Se van a instalar %d paquetes nuevos."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "Se va a actualizar %s paquete."
-msgstr[1] "Se van a actualizar %s paquetes."
+msgstr[0] "Se va a actualizar %d paquete."
+msgstr[1] "Se van a actualizar %d paquetes."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Debe descargar un total de %s."
+msgstr ""
+"\n"
+"\n"
+"Debe descargar un total de %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
 msgstr ""
-"La actualización puede durar varias horas, y no podrá ser cancelada después "
-"en ningún momento."
+"Descargar e instalar la actualización puede llevar varias horas, y no se "
+"podrá cancelar después en ningún momento."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -630,7 +657,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Su sistema está actualizado"
 
@@ -639,6 +666,8 @@ 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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -656,33 +685,35 @@ msgid "Upgrade %s"
 msgstr "Actualizar %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Faltan %li dias %li horas %li minutos"
+msgstr "%li días %li horas %li minutos"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Faltan %li horas %li minutos"
+msgstr "%li horas %li minutos"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minutos"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li segundos"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"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."
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
@@ -726,7 +757,7 @@ msgstr "<b><big>¿Comenzar la actualización?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Actualizando Ubuntu a la versión 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -741,7 +772,6 @@ msgid "Difference between the files"
 msgstr "Diferencia entre los archivos"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
 msgstr "Descargando e instalando las actualizaciones"
 
@@ -762,25 +792,37 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr "_Cancelar la actualización"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr "_Continuar"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Conservar"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Sustituir"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Informar de un error"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Reiniciar ahora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Continuar actualización"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr "_Iniciar la actualización"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "No se han podido encontrar las notas de publicación"
@@ -854,13 +896,12 @@ msgid "Verfication failed"
 msgstr "Error de verificación"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 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 el servidor. "
+"la red o con el servidor. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
@@ -875,134 +916,126 @@ msgstr ""
 "la red o el servidor. "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Descargando archivo %li de %li a %s/s"
+msgstr "Descargando archivo %(current)li de %(total)li a %(speed)s/s"
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Descargando archivo %li de %li a %s/s"
+msgstr "Descargando archivo %(current)li de %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr ""
-"La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo "
-"más tarde."
+msgstr "La lista de cambios no se encuentra disponible."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
-"La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo "
-"más tarde."
+"La lista de cambios no está disponible aún.\n"
+"Por favor, inténtelo de nuevo más tarde."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
-"Hubo un fallo al descargar la lista de cambios. Por favor, compruebe su "
-"conexión a Internet."
+"Hubo un fallo al descargar la lista de cambios. \n"
+"Por favor, compruebe su conexión a Internet."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
+msgstr "Actualizaciones importantes de seguridad"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Actualizaciones recomendadas"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "Instalando actualizaciones"
+msgstr "Actualizaciones propuestas"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "«Backports»"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "_Continuar actualización"
+msgstr "Actualizaciones de la distribución"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Instalando actualizaciones"
+msgstr "Otras actualizaciones"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versión %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr "Descargando la lista de cambios..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "_Desmarcar todo"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "_Comprobar"
+msgstr "_Marcar todo"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Tamaño de descarga: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 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"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Por favor, espere; esto puede tardar un poco."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "La actualización se ha completado"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "Comprobar las actualizaciones disponibles"
+msgstr "Comprobando actualizaciones"
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "Nueva versión: %s (Tamaño: %s)"
+msgstr "De la versión %(old_version)s a la %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Versión %s: \n"
+msgstr "Versión %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Tamaño: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Su distribución ya no está soportada"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -1012,17 +1045,17 @@ msgstr ""
 "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."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Está disponible la nueva versión «%s» de la distribución</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "El índice de software está dañado"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1035,27 +1068,26 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Ninguno"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>You must check for updates manually</big></b>\n"
 "\n"
@@ -1065,25 +1097,20 @@ msgstr ""
 "<b><big>Debe comprobar las actualizaciones manualmente</big></b>\n"
 "\n"
 "Su sistema no comprueba las actualizaciones manualmente. Puede configurar "
-"este comportamiento en «Sistema» -> «Administración» -> «Propiedades del "
-"software»."
+"este comportamiento en <i>Orígenes del software</i>, en la solapa "
+"<i>Actualizaciones por Internet</i>."
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>Mantenga su sistema actualizado</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
-"<big><b>Error explorando el CD</b></big>\n"
-"\n"
-"%s"
+msgstr "<big><b>No se han podido instalar todas las actualizaciones</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>¿Comenzar la actualización?</big></b>"
+msgstr "<b><big>Iniciando el gestor de actualizaciones</big></b>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1091,7 +1118,7 @@ msgstr "Cambios"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Cambios y descripción de la actualización"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1116,6 +1143,11 @@ msgid ""
 "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."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
@@ -1146,9 +1178,8 @@ msgid "_Check"
 msgstr "_Comprobar"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "_Continuar actualización"
+msgstr "_Actualizar la distribución"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1159,31 +1190,28 @@ msgid "_Install Updates"
 msgstr "_Instalar actualizaciones"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Cambios"
+msgstr "cambios"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "actualizaciones"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Actualizaciones por Internet</b>"
+msgstr "<b>Actualizaciones automáticas</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Actualizaciones por Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Actualizaciones por Internet</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1195,24 +1223,30 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "Añadir _CD-ROM"
+msgstr "Añadir CD-ROM"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
-msgstr "Autenticación"
+msgstr "Autentificación"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
 msgstr "_Borrar archivos de software descargados:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "La descarga se ha completado"
+msgstr "Descargar desde:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1240,35 +1274,32 @@ msgstr "Restaurar las claves predeterminadas de su distribución"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Propiedades del software"
+msgstr "Orígenes del software"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
-msgstr "Fuente"
+msgstr "Código fuente"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Estadísticas"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Enviar información estadística"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Otros proveedores"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "_Comprobar actualizaciones automáticamente:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "_Descargar actualizaciones en segundo plano, pero sin instalarlas"
+msgstr "_Descargar actualizaciones automáticamente, pero sin instalarlas"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1279,7 +1310,6 @@ msgid "_Install security updates without confirmation"
 msgstr "_Instalar actualizaciones de seguridad sin requerir confirmación"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1288,13 +1318,14 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>La información de los canales está obsoleta</big></b>\n"
+"<b><big>La información acerca del software disponible está obsoleta</big></"
+"b>\n"
 "\n"
-"Debe recargar la información de los canales para poder instalar software y "
-"actualizaciones a partir de los canales recientemente añadidos o "
-"cambiados. \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."
+"Necesita una conexión a Internet para continuar."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
@@ -1317,7 +1348,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1325,11 +1355,11 @@ msgid ""
 "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 canal que quiera añadir</b></"
-"big>\n"
+"<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 "
-"canal, por ejemplo «<i>deb http://ftp.debian.org sarge main</i>»."
+"repositorio, por ejemplo «<i>deb http://ftp.debian.org sarge main</i>»."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
@@ -1344,18 +1374,16 @@ msgstr ""
 "Fuente"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr "Fuente"
+msgstr "Editar origen"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
 msgstr "Analizando el CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr "Fuente"
+msgstr "_Añadir origen"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1382,13 +1410,12 @@ msgid "Check for new distribution releases"
 msgstr "Comprobar si existen nuevas publicaciones de la distribución"
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 se desactiva la comprobación automática de actualizaciones, debe recargar "
+"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."
 
@@ -1405,7 +1432,6 @@ msgid "Stores the size of the update-manager dialog"
 msgstr "Almacena el tamaño de la ventana del gestor de actualizaciones"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changes and the "
 "description"
@@ -1418,9 +1444,9 @@ msgid "The window size"
 msgstr "El tamaño de la ventana"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Configura canales de software y actualizaciones por Internet"
+msgstr ""
+"Configura los orígenes para el software instalable y las actualizaciones"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1430,88 +1456,78 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Actualizaciones de Ubuntu 5.10"
+msgstr "Ubuntu 6.10 «Edgy Eft»"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Mantenido por la comunidad (Universe)"
+msgstr "Mantenido por la comunidad"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Controladores privativos para dispositivos"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Software contribuido"
+msgstr "Software restringido"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "CD-ROM con Ubuntu 6.10 «Edgy Eft»"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 «Dapper Drake»"
+msgstr "Ubuntu 6.06 LTS «Dapper Drake»"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+msgid "Canonical supported Open Source software"
+msgstr "Software libre soportado por Canonical"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Mantenido por la comunidad (Universe)"
+msgstr "Mantenido por la comunidad (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Mantenido por la comunidad (Universe)"
+msgstr "Software libre mantenido por la comunidad"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Software no libre (Multiverse)"
+msgstr "Controladores no libres"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Controladores privativos para dispositivos "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Software no libre (Multiverse)"
+msgstr "Software restringido (multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Software con restricciones de exportación estadounidenses"
+msgid "Software restricted by copyright or legal issues"
+msgstr "Software restringido por copyright o cuestiones legales"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 «Dapper Drake»"
+msgstr "CD-ROM con Ubuntu 6.06 LTS «Dapper Drake»"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Actualizaciones «backport»"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1520,9 +1536,8 @@ msgstr "Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 «Breezy Badger»"
+msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1541,15 +1556,13 @@ msgstr "«Backports» de Ubuntu 5.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
+msgstr "Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
+msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1558,27 +1571,23 @@ msgstr "Soportado oficialmente"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
+msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Actualizaciones de Ubuntu 5.10"
+msgstr "Actualizaciones de Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "«Backports» de Ubuntu 5.10"
+msgstr "«Backports» de Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 «Breezy Badger»"
+msgstr "Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1593,13 +1602,12 @@ msgstr "Software no libre (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Algunos programas ya no están soportados oficialmente"
+msgstr "Sin más soporte oficial"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1613,15 +1621,13 @@ msgstr "Ubuntu 4.10 Actualizaciones de seguridad"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Actualizaciones de Ubuntu 5.10"
+msgstr "Actualizaciones de Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "«Backports» de Ubuntu 5.10"
+msgstr "«Backports» de Ubuntu 4.10"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1669,12 +1675,14 @@ msgstr "Software compatible con la DFSG con dependencias no libres"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software no compatible con la DFSG"
 
+#~ 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"
 
-#, fuzzy
 #~ msgid "Normal updates"
-#~ msgstr "Instalando actualizaciones"
+#~ msgstr "Actualizaciones normales"
 
 #~ msgid "Cancel _Download"
 #~ msgstr "Cancelar _descarga"
@@ -1688,20 +1696,16 @@ msgstr "Software no compatible con la DFSG"
 #~ msgid "Your system has already been upgraded."
 #~ msgstr "Su sistema ya ha sido actualizado."
 
-#, fuzzy
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Actualizando a Ubuntu 6.06 LTS</"
-#~ "span>"
+#~ "<span weight=\"bold\" size=\"x-large\">Actualizando a Ubuntu 6.10</span>"
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Actualizaciones de seguridad de Ubuntu 5.10"
+#~ msgstr "Actualizaciones de seguridad importantes para Ubuntu"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Actualizar a la última versión de Ubuntu"
+#~ msgstr "Actualizaciones de Ubuntu"
 
 #~ msgid "Cannot install all available updates"
 #~ msgstr "No se han podido instalar todas las actualizaciones disponibles"
@@ -1774,7 +1778,7 @@ msgstr "Software no compatible con la DFSG"
 #~ msgstr "Soporte de la instalación"
 
 #~ msgid "Software Preferences"
-#~ msgstr "Preferencias del software"
+#~ msgstr "Preferencias de software"
 
 #~ msgid "     "
 #~ msgstr "     "
@@ -1791,9 +1795,10 @@ msgstr "Software no compatible con la DFSG"
 #~ msgid "Edit Channel"
 #~ msgstr "Cambiar un canal"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Añadir un canal"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Añadir un canal"
+#~ msgstr[1] "_Añadir canales"
 
 #~ msgid "_Custom"
 #~ msgstr "_Personalizado"
diff --git a/po/et.po b/po/et.po
new file mode 100644
index 00000000..42f76dd0
--- /dev/null
+++ b/po/et.po
@@ -0,0 +1,1505 @@
+# Estonian translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-06-10 17:42+0000\n"
+"Last-Translator: margus723 <margus723@hot.ee>\n"
+"Language-Team: Estonian <et@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "Daily"
+msgstr "Iga päev"
+
+#: ../SoftwareProperties/SoftwareProperties.py:137
+msgid "Every two days"
+msgstr "Iga kahe päeva tagant"
+
+#: ../SoftwareProperties/SoftwareProperties.py:138
+msgid "Weekly"
+msgstr "Iga nädal"
+
+#: ../SoftwareProperties/SoftwareProperties.py:139
+msgid "Every two weeks"
+msgstr "Iga kahe nädala tagant"
+
+#: ../SoftwareProperties/SoftwareProperties.py:144
+#, python-format
+msgid "Every %s days"
+msgstr "Iga %s päeva tagant"
+
+#: ../SoftwareProperties/SoftwareProperties.py:167
+msgid "After one week"
+msgstr "Peale ühte nädalat"
+
+#: ../SoftwareProperties/SoftwareProperties.py:168
+msgid "After two weeks"
+msgstr "Peale kahte nädalat"
+
+#: ../SoftwareProperties/SoftwareProperties.py:169
+msgid "After one month"
+msgstr "Peale ühte kuud"
+
+#: ../SoftwareProperties/SoftwareProperties.py:174
+#, python-format
+msgid "After %s days"
+msgstr "Peale %s päeva"
+
+#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
+#: ../SoftwareProperties/SoftwareProperties.py:252
+#, python-format
+msgid "%s updates"
+msgstr ""
+
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
+msgid "Main server"
+msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:324
+msgid "Nearest server"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:345
+msgid "Custom servers"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
+msgid "Software Channel"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
+msgid "Active"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:714
+msgid "(Source Code)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:720
+msgid "Source Code"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:969
+msgid "Import key"
+msgstr "Sissetoomisvõti"
+
+#: ../SoftwareProperties/SoftwareProperties.py:979
+msgid "Error importing selected file"
+msgstr "Valitud faili sissetoomisel ilmes viga"
+
+#: ../SoftwareProperties/SoftwareProperties.py:980
+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."
+
+#: ../SoftwareProperties/SoftwareProperties.py:992
+msgid "Error removing the key"
+msgstr "Võtme eemaldamisel tekkis viga"
+
+#: ../SoftwareProperties/SoftwareProperties.py:993
+msgid "The key you selected could not be removed. Please report this as a bug."
+msgstr "Valitud võtit pole võimalik eemaldada"
+
+#: ../SoftwareProperties/SoftwareProperties.py:1039
+#, python-format
+msgid ""
+"<big><b>Error scanning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1096
+msgid "Please enter a name for the disc"
+msgstr "Palun sisesta kettale nimi"
+
+#: ../SoftwareProperties/SoftwareProperties.py:1112
+msgid "Please insert a disc in the drive:"
+msgstr "Palun sisesta ketas masinasse:"
+
+#: ../DistUpgrade/DistUpgradeCache.py:91
+msgid "Broken packages"
+msgstr "Katkised paketid"
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+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."
+
+#: ../DistUpgrade/DistUpgradeCache.py:207
+msgid "Can't upgrade required meta-packages"
+msgstr "Ei suuda uuendada nõutud metapakette"
+
+#: ../DistUpgrade/DistUpgradeCache.py:217
+msgid "A essential package would have to be removed"
+msgstr "Hädavajalik pakett tuleks eemaldada"
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:220
+msgid "Could not calculate the upgrade"
+msgstr "Ei suuda uuendusi ette valmistada"
+
+#: ../DistUpgrade/DistUpgradeCache.py:221
+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 ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:246
+msgid "Error authenticating some packages"
+msgstr "Mõnede pakettide tuvastamisel tekkis viga."
+
+#: ../DistUpgrade/DistUpgradeCache.py:247
+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."
+
+#: ../DistUpgrade/DistUpgradeCache.py:312
+#, python-format
+msgid "Can't install '%s'"
+msgstr "Ei saa paigaldada '%s'"
+
+#: ../DistUpgrade/DistUpgradeCache.py:313
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:320
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:321
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:75
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "Reading cache"
+msgstr "Vahemälu lugemine"
+
+#: ../DistUpgrade/DistUpgradeControler.py:155
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:156
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:248
+msgid "No valid mirror found"
+msgstr "Ühtegi sobivat peeglit ei leitud"
+
+#: ../DistUpgrade/DistUpgradeControler.py:249
+#, python-format
+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 ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:266
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:267
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:301
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:302
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:308
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:309
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:358
+msgid "Error during update"
+msgstr "Uuendamise ajal ilmnes viga."
+
+#: ../DistUpgrade/DistUpgradeControler.py:359
+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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:368
+msgid "Not enough free disk space"
+msgstr "Kõvakettal pole piisavalt vaba ruumi."
+
+#: ../DistUpgrade/DistUpgradeControler.py:369
+#, python-format
+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 ""
+
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeControler.py:440
+msgid "Do you want to start the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:460
+msgid "Could not install the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:461
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:479
+msgid "Could not download the upgrades"
+msgstr "Ei suuda uuendusi alla laadida"
+
+#: ../DistUpgrade/DistUpgradeControler.py:480
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:516
+msgid "Support for some applications ended"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:517
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:552
+msgid "Remove obsolete packages?"
+msgstr "Eemalda iganenud paketid?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Skip This Step"
+msgstr "_Jäta see samm vahele"
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Remove"
+msgstr "_Eemalda"
+
+#: ../DistUpgrade/DistUpgradeControler.py:563
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:564
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. generate a new cache
+#: ../DistUpgrade/DistUpgradeControler.py:576
+msgid "Restoring original system state"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:632
+#, python-format
+msgid "Fetching backport of '%s'"
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
+msgid "Checking package manager"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
+msgid "Invalid package information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:733
+msgid "Asking for confirmation"
+msgstr "Kinnitamise küsimine"
+
+#: ../DistUpgrade/DistUpgradeControler.py:737
+msgid "Upgrading"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:744
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:749
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:249
+#, python-format
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, python-format
+msgid "Fetching file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+msgid "Applying changes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
+#, python-format
+msgid "Could not install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+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 ""
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#, python-format
+msgid ""
+"Replace the customized configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:203
+msgid ""
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
+msgid "The 'diff' command was not found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:356
+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 ""
+
+#. FIXME: make those two seperate lines to make it clear
+#. that the "%" applies to the result of ngettext
+#: ../DistUpgrade/DistUpgradeViewGtk.py:487
+#, python-format
+msgid "%d package is going to be removed."
+msgid_plural "%d packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
+#, python-format
+msgid "%d new package is going to be installed."
+msgid_plural "%d new packages are going to be installed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:498
+#, python-format
+msgid "%d package is going to be upgraded."
+msgid_plural "%d packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:503
+#, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
+msgid ""
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:512
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:518
+#: ../UpdateManager/UpdateManager.py:622
+msgid "Your system is up-to-date"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:519
+msgid ""
+"There are no upgrades available for your system. The upgrade will now be "
+"canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:535
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:537
+#, python-format
+msgid "Install %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:539
+#, python-format
+msgid "Upgrade %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:31
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:32
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:38
+#, python-format
+msgid ""
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:109
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:110
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/glade/SoftwareProperties.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+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 ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Fetching and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr ""
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:149
+msgid "Could not run the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:150
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:171
+msgid "Downloading the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:180
+msgid "Upgrade tool signature"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:183
+msgid "Upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:209
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid "Failed to extract"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:215
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid "Verfication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:222
+msgid ""
+"Verifying the upgrade failed.  There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid "Authentication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:229
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:108
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:113
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:206
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:217
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
+msgid "Important security updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
+msgid "Recommended updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
+msgid "Proposed updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:241
+msgid "Backports"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:242
+msgid "Distribution updates"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
+msgid "Other updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:478
+#, python-format
+msgid "Version %s: \n"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:539
+msgid "Downloading list of changes..."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:566
+msgid "_Uncheck All"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:572
+msgid "_Check All"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid "Please wait, this can take some time."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:668
+msgid "Update is complete"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:719
+msgid "Checking for updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
+msgid "From version %(old_version)s to %(new_version)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:832
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:843
+msgid "Your distribution is not supported anymore"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:844
+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 ""
+
+#: ../UpdateManager/UpdateManager.py:863
+#, python-format
+msgid "<b>New distribution release '%s' is available</b>"
+msgstr ""
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:898
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:899
+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 ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:1
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:4
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:5
+msgid "<big><b>Not all updates can be installed</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:6
+msgid "<big><b>Starting update manager</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:7
+msgid "Changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:8
+msgid "Changes and description of the update"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:9
+msgid "Chec_k"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:10
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:11
+msgid "Description"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:13
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:16
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:17
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:18
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:19
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:20
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:21
+msgid "_Check"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:22
+msgid "_Distribution Upgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:23
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:24
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:25
+msgid "changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:26
+msgid "updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:2
+msgid "<b>Automatic updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:3
+msgid "<b>CDROM/DVD</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:4
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:5
+msgid "<b>Internet</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:6
+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 ""
+
+#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+msgid "Authentication"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
+msgid "Download from:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:13
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:16
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:17
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Sources"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:19
+msgid "Source code"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:20
+msgid "Statistics"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:21
+msgid "Submit statistical information"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:22
+msgid "Third Party"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:23
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:24
+msgid "_Download updates automatically, but do not install them"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:25
+msgid "_Import Key File"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:26
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Components:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
+msgid "APT line:"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Reload"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+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 ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changes and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:8
+msgid "Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:13
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:17
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:19
+msgid "Restricted software"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:25
+msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:59
+msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:62
+msgid "Canonical supported Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:64
+msgid "Community maintained (universe)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:65
+msgid "Community maintained Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:67
+msgid "Non-free drivers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:68
+msgid "Proprietary drivers for devices "
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:70
+msgid "Restricted software (Multiverse)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:71
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:76
+msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:103
+msgid "Backported updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:110
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:123
+msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:135
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:140
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:145
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:152
+msgid "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:165
+msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:177
+msgid "Ubuntu 5.04 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:182
+msgid "Ubuntu 5.04 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:187
+msgid "Ubuntu 5.04 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:193
+msgid "Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:199
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:201
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:206
+msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:209
+msgid "No longer officially supported"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:211
+msgid "Restricted copyright"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:218
+msgid "Ubuntu 4.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:223
+msgid "Ubuntu 4.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:228
+msgid "Ubuntu 4.10 Backports"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
diff --git a/po/eu.po b/po/eu.po
new file mode 100644
index 00000000..3b20b887
--- /dev/null
+++ b/po/eu.po
@@ -0,0 +1,1513 @@
+# Basque translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-08-08 23:53+0000\n"
+"Last-Translator: Xabi Ezpeleta <xezpeleta@mendikute.com>\n"
+"Language-Team: Basque <eu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "Daily"
+msgstr "Egunero"
+
+#: ../SoftwareProperties/SoftwareProperties.py:137
+#, fuzzy
+msgid "Every two days"
+msgstr "Bi egunetan behin"
+
+#: ../SoftwareProperties/SoftwareProperties.py:138
+msgid "Weekly"
+msgstr "Astero"
+
+#: ../SoftwareProperties/SoftwareProperties.py:139
+#, fuzzy
+msgid "Every two weeks"
+msgstr "Bi astetan behin"
+
+#: ../SoftwareProperties/SoftwareProperties.py:144
+#, python-format
+msgid "Every %s days"
+msgstr "%s egunetan behin"
+
+#: ../SoftwareProperties/SoftwareProperties.py:167
+msgid "After one week"
+msgstr "Aste bat eta gero"
+
+#: ../SoftwareProperties/SoftwareProperties.py:168
+msgid "After two weeks"
+msgstr "Bi aste eta gero"
+
+#: ../SoftwareProperties/SoftwareProperties.py:169
+msgid "After one month"
+msgstr "HIlabete bat eta gero"
+
+#: ../SoftwareProperties/SoftwareProperties.py:174
+#, python-format
+msgid "After %s days"
+msgstr "%s egun eta gero"
+
+#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
+#: ../SoftwareProperties/SoftwareProperties.py:252
+#, python-format
+msgid "%s updates"
+msgstr ""
+
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
+msgid "Main server"
+msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:324
+msgid "Nearest server"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:345
+msgid "Custom servers"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
+msgid "Software Channel"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
+msgid "Active"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:714
+msgid "(Source Code)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:720
+msgid "Source Code"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:969
+#, fuzzy
+msgid "Import key"
+msgstr "Inportatu giltza"
+
+#: ../SoftwareProperties/SoftwareProperties.py:979
+#, fuzzy
+msgid "Error importing selected file"
+msgstr "Errore bat suertatu da aukeratutako fitxategiak inportatzerakoan"
+
+#: ../SoftwareProperties/SoftwareProperties.py:980
+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."
+
+#: ../SoftwareProperties/SoftwareProperties.py:992
+#, fuzzy
+msgid "Error removing the key"
+msgstr "Errorea giltza ezabatzerakoan"
+
+#: ../SoftwareProperties/SoftwareProperties.py:993
+#, 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."
+
+#: ../SoftwareProperties/SoftwareProperties.py:1039
+#, python-format
+msgid ""
+"<big><b>Error scanning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1096
+#, fuzzy
+msgid "Please enter a name for the disc"
+msgstr "Sartu diskarentzako izena"
+
+#: ../SoftwareProperties/SoftwareProperties.py:1112
+#, fuzzy
+msgid "Please insert a disc in the drive:"
+msgstr "Ezarri diskoa irakurgailuan:"
+
+#: ../DistUpgrade/DistUpgradeCache.py:91
+#, fuzzy
+msgid "Broken packages"
+msgstr "Hautistako paketeak"
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+#, 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."
+
+#: ../DistUpgrade/DistUpgradeCache.py:207
+#, fuzzy
+msgid "Can't upgrade required meta-packages"
+msgstr "Ezin izan dira berritu beharrezko meta-paketeak"
+
+#: ../DistUpgrade/DistUpgradeCache.py:217
+#, fuzzy
+msgid "A essential package would have to be removed"
+msgstr "Ezinbesteko pakete bat ezabatu beharko da"
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:220
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:221
+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 ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:246
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:247
+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 ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:312
+#, python-format
+msgid "Can't install '%s'"
+msgstr "Ezin da %s instalatu"
+
+#: ../DistUpgrade/DistUpgradeCache.py:313
+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. "
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:320
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:321
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:75
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "Reading cache"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:155
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:156
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:248
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:249
+#, python-format
+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 ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:266
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:267
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:301
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:302
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:308
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:309
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:358
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:359
+msgid ""
+"A problem occured during the update. This is usually some sort of network "
+"problem, please check your network connection and retry."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:368
+msgid "Not enough free disk space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:369
+#, python-format
+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 ""
+
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeControler.py:440
+msgid "Do you want to start the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:460
+msgid "Could not install the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:461
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:479
+msgid "Could not download the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:480
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:516
+msgid "Support for some applications ended"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:517
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:552
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:563
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:564
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. generate a new cache
+#: ../DistUpgrade/DistUpgradeControler.py:576
+msgid "Restoring original system state"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:632
+#, python-format
+msgid "Fetching backport of '%s'"
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
+msgid "Checking package manager"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
+msgid "Invalid package information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:733
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:737
+msgid "Upgrading"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:744
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:749
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:249
+#, python-format
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, python-format
+msgid "Fetching file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+msgid "Applying changes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
+#, python-format
+msgid "Could not install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+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 ""
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#, python-format
+msgid ""
+"Replace the customized configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:203
+msgid ""
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
+msgid "The 'diff' command was not found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:356
+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 ""
+
+#. FIXME: make those two seperate lines to make it clear
+#. that the "%" applies to the result of ngettext
+#: ../DistUpgrade/DistUpgradeViewGtk.py:487
+#, python-format
+msgid "%d package is going to be removed."
+msgid_plural "%d packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
+#, python-format
+msgid "%d new package is going to be installed."
+msgid_plural "%d new packages are going to be installed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:498
+#, python-format
+msgid "%d package is going to be upgraded."
+msgid_plural "%d packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:503
+#, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
+msgid ""
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:512
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:518
+#: ../UpdateManager/UpdateManager.py:622
+msgid "Your system is up-to-date"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:519
+msgid ""
+"There are no upgrades available for your system. The upgrade will now be "
+"canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:535
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:537
+#, python-format
+msgid "Install %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:539
+#, python-format
+msgid "Upgrade %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:31
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:32
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:38
+#, python-format
+msgid ""
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:109
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:110
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/glade/SoftwareProperties.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+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 ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Fetching and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr ""
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:149
+msgid "Could not run the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:150
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:171
+msgid "Downloading the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:180
+msgid "Upgrade tool signature"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:183
+msgid "Upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:209
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid "Failed to extract"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:215
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid "Verfication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:222
+msgid ""
+"Verifying the upgrade failed.  There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid "Authentication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:229
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:108
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:113
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:206
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:217
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
+msgid "Important security updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
+msgid "Recommended updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
+msgid "Proposed updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:241
+msgid "Backports"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:242
+msgid "Distribution updates"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
+msgid "Other updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:478
+#, python-format
+msgid "Version %s: \n"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:539
+msgid "Downloading list of changes..."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:566
+msgid "_Uncheck All"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:572
+msgid "_Check All"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid "Please wait, this can take some time."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:668
+msgid "Update is complete"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:719
+msgid "Checking for updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
+msgid "From version %(old_version)s to %(new_version)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:832
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:843
+msgid "Your distribution is not supported anymore"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:844
+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 ""
+
+#: ../UpdateManager/UpdateManager.py:863
+#, python-format
+msgid "<b>New distribution release '%s' is available</b>"
+msgstr ""
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:898
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:899
+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 ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:1
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:4
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:5
+msgid "<big><b>Not all updates can be installed</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:6
+msgid "<big><b>Starting update manager</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:7
+msgid "Changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:8
+msgid "Changes and description of the update"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:9
+msgid "Chec_k"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:10
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:11
+msgid "Description"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:13
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:16
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:17
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:18
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:19
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:20
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:21
+msgid "_Check"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:22
+msgid "_Distribution Upgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:23
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:24
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:25
+msgid "changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:26
+msgid "updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:2
+msgid "<b>Automatic updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:3
+msgid "<b>CDROM/DVD</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:4
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:5
+msgid "<b>Internet</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:6
+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 ""
+
+#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+msgid "Authentication"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
+msgid "Download from:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:13
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:16
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:17
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Sources"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:19
+msgid "Source code"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:20
+msgid "Statistics"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:21
+msgid "Submit statistical information"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:22
+msgid "Third Party"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:23
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:24
+msgid "_Download updates automatically, but do not install them"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:25
+msgid "_Import Key File"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:26
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Components:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
+msgid "APT line:"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Reload"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+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 ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changes and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:8
+msgid "Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:13
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:17
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:19
+msgid "Restricted software"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:25
+msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:59
+msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:62
+msgid "Canonical supported Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:64
+msgid "Community maintained (universe)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:65
+msgid "Community maintained Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:67
+msgid "Non-free drivers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:68
+msgid "Proprietary drivers for devices "
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:70
+msgid "Restricted software (Multiverse)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:71
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:76
+msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:103
+msgid "Backported updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:110
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:123
+msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:135
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:140
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:145
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:152
+msgid "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:165
+msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:177
+msgid "Ubuntu 5.04 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:182
+msgid "Ubuntu 5.04 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:187
+msgid "Ubuntu 5.04 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:193
+msgid "Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:199
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:201
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:206
+msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:209
+msgid "No longer officially supported"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:211
+msgid "Restricted copyright"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:218
+msgid "Ubuntu 4.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:223
+msgid "Ubuntu 4.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:228
+msgid "Ubuntu 4.10 Backports"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
diff --git a/po/fa.po b/po/fa.po
new file mode 100644
index 00000000..89d56969
--- /dev/null
+++ b/po/fa.po
@@ -0,0 +1,1494 @@
+# Persian translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-06-08 13:47+0000\n"
+"Last-Translator: Pedram Ganjeh Hadidi <pedram.ganjeh-hadidi@students.jku."
+"at>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "Daily"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:137
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:138
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:139
+msgid "Every two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:144
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:167
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:168
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:169
+msgid "After one month"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:174
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
+#: ../SoftwareProperties/SoftwareProperties.py:252
+#, python-format
+msgid "%s updates"
+msgstr ""
+
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
+msgid "Main server"
+msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:324
+msgid "Nearest server"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:345
+msgid "Custom servers"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
+msgid "Software Channel"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
+msgid "Active"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:714
+msgid "(Source Code)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:720
+msgid "Source Code"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:969
+msgid "Import key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:979
+msgid "Error importing selected file"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:980
+msgid "The selected file may not be a GPG key file or it might be corrupt."
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:992
+msgid "Error removing the key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:993
+msgid "The key you selected could not be removed. Please report this as a bug."
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1039
+#, python-format
+msgid ""
+"<big><b>Error scanning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1096
+msgid "Please enter a name for the disc"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1112
+msgid "Please insert a disc in the drive:"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:91
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+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 ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:207
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:217
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:220
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:221
+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 ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:246
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:247
+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 ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:312
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:313
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:320
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:321
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:75
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "Reading cache"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:155
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:156
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:248
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:249
+#, python-format
+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 ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:266
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:267
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:301
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:302
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:308
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:309
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:358
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:359
+msgid ""
+"A problem occured during the update. This is usually some sort of network "
+"problem, please check your network connection and retry."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:368
+msgid "Not enough free disk space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:369
+#, python-format
+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 ""
+
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeControler.py:440
+msgid "Do you want to start the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:460
+msgid "Could not install the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:461
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:479
+msgid "Could not download the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:480
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:516
+msgid "Support for some applications ended"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:517
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:552
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:563
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:564
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. generate a new cache
+#: ../DistUpgrade/DistUpgradeControler.py:576
+msgid "Restoring original system state"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:632
+#, python-format
+msgid "Fetching backport of '%s'"
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
+msgid "Checking package manager"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
+msgid "Invalid package information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:733
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:737
+msgid "Upgrading"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:744
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:749
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:249
+#, python-format
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, python-format
+msgid "Fetching file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+msgid "Applying changes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
+#, python-format
+msgid "Could not install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+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 ""
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#, python-format
+msgid ""
+"Replace the customized configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:203
+msgid ""
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
+msgid "The 'diff' command was not found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:356
+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 ""
+
+#. FIXME: make those two seperate lines to make it clear
+#. that the "%" applies to the result of ngettext
+#: ../DistUpgrade/DistUpgradeViewGtk.py:487
+#, python-format
+msgid "%d package is going to be removed."
+msgid_plural "%d packages are going to be removed."
+msgstr[0] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
+#, python-format
+msgid "%d new package is going to be installed."
+msgid_plural "%d new packages are going to be installed."
+msgstr[0] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:498
+#, python-format
+msgid "%d package is going to be upgraded."
+msgid_plural "%d packages are going to be upgraded."
+msgstr[0] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:503
+#, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
+msgid ""
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:512
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:518
+#: ../UpdateManager/UpdateManager.py:622
+msgid "Your system is up-to-date"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:519
+msgid ""
+"There are no upgrades available for your system. The upgrade will now be "
+"canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:535
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:537
+#, python-format
+msgid "Install %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:539
+#, python-format
+msgid "Upgrade %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:31
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:32
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:38
+#, python-format
+msgid ""
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:109
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:110
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/glade/SoftwareProperties.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+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 ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Fetching and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr ""
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:149
+msgid "Could not run the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:150
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:171
+msgid "Downloading the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:180
+msgid "Upgrade tool signature"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:183
+msgid "Upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:209
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid "Failed to extract"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:215
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid "Verfication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:222
+msgid ""
+"Verifying the upgrade failed.  There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid "Authentication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:229
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:108
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:113
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:206
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:217
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
+msgid "Important security updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
+msgid "Recommended updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
+msgid "Proposed updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:241
+msgid "Backports"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:242
+msgid "Distribution updates"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
+msgid "Other updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:478
+#, python-format
+msgid "Version %s: \n"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:539
+msgid "Downloading list of changes..."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:566
+msgid "_Uncheck All"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:572
+msgid "_Check All"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid "Please wait, this can take some time."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:668
+msgid "Update is complete"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:719
+msgid "Checking for updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
+msgid "From version %(old_version)s to %(new_version)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:832
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:843
+msgid "Your distribution is not supported anymore"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:844
+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 ""
+
+#: ../UpdateManager/UpdateManager.py:863
+#, python-format
+msgid "<b>New distribution release '%s' is available</b>"
+msgstr ""
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:898
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:899
+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 ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:1
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:4
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:5
+msgid "<big><b>Not all updates can be installed</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:6
+msgid "<big><b>Starting update manager</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:7
+msgid "Changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:8
+msgid "Changes and description of the update"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:9
+msgid "Chec_k"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:10
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:11
+msgid "Description"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:13
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:16
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:17
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:18
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:19
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:20
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:21
+msgid "_Check"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:22
+msgid "_Distribution Upgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:23
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:24
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:25
+msgid "changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:26
+msgid "updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:2
+msgid "<b>Automatic updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:3
+msgid "<b>CDROM/DVD</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:4
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:5
+msgid "<b>Internet</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:6
+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 ""
+
+#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+msgid "Authentication"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
+msgid "Download from:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:13
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:16
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:17
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Sources"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:19
+msgid "Source code"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:20
+msgid "Statistics"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:21
+msgid "Submit statistical information"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:22
+msgid "Third Party"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:23
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:24
+msgid "_Download updates automatically, but do not install them"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:25
+msgid "_Import Key File"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:26
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Components:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
+msgid "APT line:"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Reload"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+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 ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changes and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:8
+msgid "Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:13
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:17
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:19
+msgid "Restricted software"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:25
+msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:59
+msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:62
+msgid "Canonical supported Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:64
+msgid "Community maintained (universe)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:65
+msgid "Community maintained Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:67
+msgid "Non-free drivers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:68
+msgid "Proprietary drivers for devices "
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:70
+msgid "Restricted software (Multiverse)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:71
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:76
+msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:103
+msgid "Backported updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:110
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:123
+msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:135
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:140
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:145
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:152
+msgid "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:165
+msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:177
+msgid "Ubuntu 5.04 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:182
+msgid "Ubuntu 5.04 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:187
+msgid "Ubuntu 5.04 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:193
+msgid "Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:199
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:201
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:206
+msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:209
+msgid "No longer officially supported"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:211
+msgid "Restricted copyright"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:218
+msgid "Ubuntu 4.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:223
+msgid "Ubuntu 4.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:228
+msgid "Ubuntu 4.10 Backports"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 4c6655af..a4844337 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-25 18:26+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-06 07:42+0000\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "Joka toinen päivä"
 
 #: ../SoftwareProperties/SoftwareProperties.py:138
 msgid "Weekly"
-msgstr "Viikottain"
+msgstr "Viikoittain"
 
 #: ../SoftwareProperties/SoftwareProperties.py:139
 msgid "Every two weeks"
@@ -56,9 +56,9 @@ msgstr "%s päivän jälkeen"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Asennetaan päivityksiä"
+msgstr "%s päivitystä"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -66,26 +66,26 @@ msgstr "Asennetaan päivityksiä"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Pääpalvelin"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Palvelin maalle %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Lähin palvelin"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Määrittele palvelin"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
@@ -98,12 +98,10 @@ msgid "Active"
 msgstr "Aktiivinen"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr "Lähdekoodi"
+msgstr "(lähdekoodi)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
 msgstr "Lähdekoodi"
 
@@ -149,34 +147,33 @@ msgstr "Syötä nimi levylle"
 msgid "Please insert a disc in the drive:"
 msgstr "Aseta levy asemaan:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Rikkinäisiä paketteja"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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äsi sisältää rikkinäisiä paketteja, joita ei voitu korjata tällä "
-"ohjelmalla. Korjaa ne käyttämällä synapticia tai apt-get-komentoa ennen "
+"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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
-msgstr "Ei voida päivittää tarvittavia metapaketteja"
+msgstr "Tarvittavia metapaketteja ei voi päivittää"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Välttämätön paketti jouduttaisiin poistamaan"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
-msgstr "Ei voitu tehdä tarvittavia päivitykseen liittyviä tarkistuksia"
+msgstr "Tarvittavia päivitykseen liittyviä tarkistuksia ei voitu tehdä"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -184,14 +181,17 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Tehtäessä päivitykseen liittyviä tarkistuksia tapahtui virhe jota ei voitu "
-"korjata. Ilmoita tästä virheraportilla. "
+"korjata.\n"
+"\n"
+"Ilmoita tästä ohjelmavirheestä paketille \"update-manager\" ja sisällytä "
+"tiedostot hakemistosta /var/log/dist-upgrade raporttiin."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
-msgstr "Joitain paketteja todennettaessa tapahtui virhe"
+msgstr "Joitain paketteja varmennettaessa tapahtui virhe"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -201,25 +201,24 @@ msgstr ""
 "Voit yrittää myöhemmin uudelleen. Alla on luettelo todentamattomista "
 "paketeista."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Ei voitu asentaa pakettia \"%s\""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Pyydettyä pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheraportti. "
+"Vaadittua pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheraportti. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Ei voitu arvata metapakettia"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -227,16 +226,15 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
-"Järjestelmässäsi ei ole asennettuna ubuntu-desktop-, kubuntu-desktop- tai "
-"edubuntu-desktop-pakettia, eikä siten onnistuttu tunnistamaan mitä Ubuntun "
-"versiota käytät.\n"
-"Asenna jokin luetelluista paketeista synapticilla tai apt-get-ohjelmalla "
+"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."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Ei voitu noutaa"
+msgstr "Ei voitu lisätä CD-levyä"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -247,28 +245,37 @@ msgid ""
 "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\""
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
-msgstr "Luetaan kätköä"
+msgstr "Luetaan välimuistia"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Hae tiedot verkosta päivitystä varten?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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\"."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
-msgstr "Ei löytynyt sopivaa palvelinta"
+msgstr "Sopivaa peilipalvelinta ei löytynyt"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -280,20 +287,19 @@ msgid ""
 "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"
+"päivitystä varten. Tämä on mahdollista, jos käytät sisäistä peilipalvelinta "
+"tai palvelintiedot ovat vanhentuneet.\n"
 "\n"
-"Haluatko uudelleenkirjoittaa \"sources.list\"-tiedoston joka tapauksessa? "
-"Jos valitset \"Kyllä'\", kaikki \"%s\"-merkinnät muutetaan \"%s\"-"
-"merkinnöiksi.\n"
+"Haluatko silti kirjoittaa \"sources.list\"-tiedoston uudelleen? Jos valitset "
+"\"Kyllä'\", kaikki \"%s\"-merkinnät muutetaan \"%s\"-merkinnöiksi.\n"
 "Jos valitset \"Ei\", päivitys keskeytyy."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
-msgstr "Luo ja ota käyttöön oletusohjelmalähteet?"
+msgstr "Lisätäänkö oletusohjelmalähteet?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -306,38 +312,37 @@ msgstr ""
 "Otetaanko käyttöön \"%s\":n oletuslähteet? Jos valitset \"Ei\", päivitys "
 "keskeytyy."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Virhe ohjelmavarastotiedoissa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 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. Ilmoita "
-"tästä virheraportilla."
+"Ohjelmavarastotietojen päivittäminen johti epäkelpoon tiedostoon. Tee "
+"asiasta virheraportti."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
-msgstr "Kolmannen osapuolet ohjelmalähteet poissa käytöstä"
+msgstr "Kolmannen osapuolen ohjelmalähteet poissa käytöstä"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 \"ohjelma-"
-"asetukset\"-työkalulla tai Synaptic-ohjelmalla."
+"käytöstä. Voit ottaa ne uudelleen käyttöön päivityksen jälkeen "
+"\"Ohjelmalähteet\"-työkalulla tai Synaptic-ohjelmalla."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Virhe päivitettäessä"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -345,11 +350,11 @@ msgstr ""
 "Päivitettäessä tapahtui virhe. Tämä on yleensä jonkinlainen verkko-ongelma. "
 "Tarkista verkkoyhteytesi toiminta ja yritä uudelleen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Levytilaa ei ole riittävästi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -361,16 +366,15 @@ msgstr ""
 "komentoa 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
-msgstr "Haluatko aloittaaa päivityksen?"
+msgstr "Haluatko aloittaa päivityksen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
-msgstr "Ei voitu asentaa päivityksiä"
+msgstr "Päivityksiä ei voitu asentaa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -378,14 +382,17 @@ msgid ""
 "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 käyttökelvottomassa tilassa. "
-"Korjaustoimenpiteet suoritettiin (dpkg --configure -a)."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Päivityksiä ei voitu noutaa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -393,12 +400,11 @@ msgstr ""
 "Päivitys keskeytyy. Tarkista Internet-yhteytesi tai asennuslähteesi (esim. "
 "CD) toiminta ja yritä uudelleen. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Tuki joillekin sovelluksille on loppunut"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -406,63 +412,77 @@ msgid ""
 "If you have not enabled community maintained software (universe), these "
 "packages will be suggested for removal in the next step."
 msgstr ""
-"Seuraavia paketteja ei enää tueta virallisesti, vaan ovat nyt yhteisön "
-"ylläpitämiä ('universe'-ohjelmat).\n"
+"Canonical Ltd. ei enää tue seuraavia ohjelmapaketteja. Niitä tuetaan "
+"edelleen yhteisön puolesta.\n"
 "\n"
-"Jos sinulla ei ole 'universe'-ohjelmakanavaa otettuna käyttöön, nämä paketit "
-"suositellaan poistettaviksi seuraavassa kohdassa. "
+"Jos sinulla ei ole käytössä yhteisön ylläpitämien sovelluksien "
+"ohjelmalähdettä (\"universe\"), näitä paketteja suositellaan poistettaviksi "
+"seuraavassa kohdassa."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
-msgstr "Poista vanhentuneet paketit?"
+msgstr "Poistetaanko vanhentuneet paketit?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Ohita tämä kohta"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
-msgstr "Virhe suoritettaesa"
+msgstr "Virhe suoritettaessa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
-"Jokin ongelma tapahtui siistimisvaiheessa. Alla olevassa viestissä on "
-"lisätietoja. "
+"Siistimisvaiheessa ilmeni ongelma. Lisätietoja allaolevassa viestissä. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Palautetaan alkuperäistä järjestelmän tilaa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "Noudetaan paketin \"%s\" takaisinsovitusta"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Tarkistetaan pakettienhallintaa"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr "Päivityksen valmistelu epäonnistui"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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/."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Päivitetään ohjelmavarastotietoja"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Pakettitiedot viallisia"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -472,21 +492,23 @@ msgid ""
 msgstr ""
 "Pakettitietojen päivitysten jälkeen pakollista ohjelmapakettia \"%s\" ei "
 "enää löydetty.\n"
-"Tämä merkitsee vakavaa virhettä, ilmoita tästä virheraportilla."
+"Tämä merkitsee vakavaa virhetilannetta, tee tästä virheraportti paketille "
+"\"update-manager\" ja sisällytä tiedostot hakemistosta /var/log/dist-"
+"upgrade/ raporttiin."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Pyydetään vahvistusta"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Päivitetään"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
-msgstr "Etsitään vanhetuneita ohjelmia"
+msgstr "Etsitään vanhentuneita ohjelmistoja"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Järjestelmän päivitys on valmis."
 
@@ -494,26 +516,25 @@ msgstr "Järjestelmän päivitys on valmis."
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr "Laita '%s' asemaan '%s'"
+msgstr "Aseta \"%s\" asemaan \"%s\""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "Päivitys on valmis"
+msgstr "Nouto on valmis"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
 msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Noin %li minuuttia jäljellä"
+msgstr "Noin %s jäljellä"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
 msgstr "Noudetaan tiedostoa %li/%li"
 
@@ -522,34 +543,38 @@ msgstr "Noudetaan tiedostoa %li/%li"
 #. -> longer term, move this code into python-apt
 #: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
-msgstr "Toteutetaan muutoksia"
+msgstr "Muutoksia toteutetaan"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
-msgstr "Ei voituu asentaa: '%s'"
+msgstr "Pakettia \"%s\" ei voitu asentaa"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:188
 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/."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"Korvataanko asetustiedosto\n"
-"'%s'?"
+"Korvataanko alkuperäisestä muutettu asetustiedosto\n"
+"\"%s\"?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
@@ -557,10 +582,9 @@ msgstr "Komentoa 'diff' ei löytynyt"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
-msgstr "Vakava virhe tapahtui"
+msgstr "Tapahtui vakava virhe"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 "
@@ -568,46 +592,51 @@ msgid ""
 "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.log ja /var/log/dist-upgrade-apt.log. Päivitys keskeytyy nyt."
+"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."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s paketti poistetaan"
-msgstr[1] "%s pakettia poistetaan"
+msgstr[0] "%d paketti poistetaan."
+msgstr[1] "%d pakettia poistetaan."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] "%s uusi paketti asennetaan"
-msgstr[1] "%s uutta pakettia asennetaan"
+msgstr[0] "%d uusi paketti asennetaan."
+msgstr[1] "%d uutta pakettia asennetaan."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "%s paketti päivitetään"
-msgstr[1] "%s pakettia päivitetään"
+msgstr[0] "%d paketti päivitetään."
+msgstr[1] "%d pakettia päivitetään."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Noudettavaa yhteensä %s."
+msgstr ""
+"\n"
+"\n"
+"Noudettavaa yhteensä %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
 msgstr ""
-"Päivitys voi kestää useita tunteja, eikä sitä voi keskeyttää enää myöhemmin."
+"Päivityksen noutaminen ja asennus voi kestää useita tunteja, eikä sitä voi "
+"keskeyttää enää myöhemmin."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -616,7 +645,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Järjestelmäsi on ajan tasalla"
 
@@ -624,7 +653,7 @@ msgstr "Järjestelmäsi on ajan tasalla"
 msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
-msgstr ""
+msgstr "Päivityksiä ei ole saatavilla järjestelmälle. Päivitys keskeytyy."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -642,37 +671,37 @@ msgid "Upgrade %s"
 msgstr "Päivitä %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Noin %li päivää, %li tuntia, %li minuuttia jäljellä"
+msgstr "%li päivää %li tuntia %li minuuttia"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Noin %li tuntia, %li minuuttia jäljellä"
+msgstr "%li tuntia %li minuuttia"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minuuttia"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li sekuntia"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
-msgstr ""
+"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"
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
-msgstr "Uudellenkäynnistys vaaditaan"
+msgstr "Uudelleenkäynnistys vaaditaan"
 
 #: ../DistUpgrade/DistUpgradeView.py:110
 msgid ""
@@ -709,11 +738,11 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr "<b><big>Aloita päivitys?</big/</b>"
+msgstr "<b><big>Aloitetaanko päivitys?</big/</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Päivitetään Ubuntu versioon 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -728,7 +757,6 @@ msgid "Difference between the files"
 msgstr "Tiedostojen väliset erot"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
 msgstr "Noudetaan ja asennetaan päivityksiä"
 
@@ -749,25 +777,37 @@ msgid "Terminal"
 msgstr "Pääte"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr "_Peru päivitys"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr "_Jatka"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Pidä"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Tee virheraportti"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Uudelleenkäynnistä nyt"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Jatka päivitystä"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr "_Aloita päivitys"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Julkaisutietoja ei löytynyt"
@@ -782,12 +822,12 @@ msgstr "Ei voitu noutaa julkaisutietoja"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr "Tarkista Internet-yhteytesti toimivuus."
+msgstr "Tarkista Internet-yhteytesi toimivuus."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
-msgstr "Ei voitu suorittaa päivitystyökalua"
+msgstr "Päivitystyökalua ei voitu suorittaa"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
@@ -806,15 +846,15 @@ msgstr "Päivitystyökalu ohjaa päivityksen suorittamisessa."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
-msgstr "Päivitä työkalun allekirjoitus"
+msgstr "Päivitystyökalun allekirjoitus"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
-msgstr "Päivitä työkalu"
+msgstr "Päivitystyökalu"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
-msgstr "Ei voitu noutaa"
+msgstr "Nouto epäonnistui"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
@@ -823,7 +863,7 @@ msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
-msgstr "Ei voitu purkaa"
+msgstr "Purku epäonnistui"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
@@ -838,7 +878,6 @@ msgid "Verfication failed"
 msgstr "Tarkistus epäonnistui"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
@@ -859,129 +898,126 @@ msgstr ""
 "verkkoyhteydessä tai palvelimessa. "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s"
+msgstr "Noudetaan tiedostoa %(current)li/%(total)li nopeudella %(speed)s/s"
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s"
+msgstr "Noudetaan tiedostoa %(current)li/%(total)li"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen."
+msgstr "Muutosluettelo ei ole saatavilla."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
-msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen."
+#: ../UpdateManager/UpdateManager.py:212
+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."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
-"Muutosluettelon nouto epäonnistui. Tarkista Internet-yhteytesi toimivuus."
+"Muutosluettelon nouto epäonnistui. \n"
+"Tarkista Internet-yhteytesi toimivuus."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
+msgstr "Tärkeät turvallisuuspäivitykset"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Suositellut päivitykset"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "Asennetaan päivityksiä"
+msgstr "Ehdotetut päivitykset"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Takaisinsovitukset"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "_Jatka päivitystä"
+msgstr "Jakelupäivitykset"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Asennetaan päivityksiä"
+msgstr "Muut päivitykset"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
-msgstr "Versio: %s: \n"
+msgstr "Versio %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr "Noudetaan muutosluetteloa..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "Poista _valinnat"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "_Tarkista"
+msgstr "_Tarkista kaikki"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "%s täytyy noutaa"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 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ä"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Odota, tämä voi kestää jonkun aikaa."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Päivitys on valmis"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "Tarkista saatavilla olevat päivitykset"
+msgstr "Tarkistetaan päivityksiä"
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "Uusi versio: %s (koko: %s)"
+msgstr "Versiosta %(old_version)s versioon %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Versio: %s: \n"
+msgstr "Versio %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Koko: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Jakeluasi ei enää tueta"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -991,17 +1027,17 @@ msgstr ""
 "Päivitä uudempaan versioon Ubuntu Linuxista. Katso lisätietoja "
 "päivittämisestä osoitteesta http://www.ubuntu.com/"
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Uusi jakelujulkaisu \"%s\" on saatavilla</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "Ohjelmaluettelo on rikkinäinen"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1013,56 +1049,52 @@ msgstr ""
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
-#, fuzzy
 msgid "None"
-msgstr "Ei-vapaa"
+msgstr "Ei mitään"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 kB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f kB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, 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>Sinun täytyy tarkistaa päivitykset itse</big></b>\n"
-"Sinun järjestelmäsi ei tutki päivityksiä automaattisesti. Voit muuttaa näitä "
-"asetuksia kohdasta \"Järjestelmä\" -> \"Ylläpito\" -> \"Ohjelmien asetukset"
-"\"."
+"<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ä."
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>Pidä järjestelmäsi ajan tasalla</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
 msgstr ""
-"<big><b>Virhe luettaessa CD-levyä</b></big>\n"
-"\n"
+"<big><b>Kaikkia päivityksiä ei voi asentaa</b></big>\r\n"
+"\r\n"
 "%s"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Aloita päivitys?</big/</b>"
+msgstr "<b><big>Käynnistetään pakettienhallintaa</big></b>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1070,7 +1102,7 @@ msgstr "Muutokset"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Päivityksen muutokset ja kuvaus"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1095,6 +1127,11 @@ msgid ""
 "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ä."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
@@ -1109,8 +1146,8 @@ msgid ""
 "Software updates correct errors, eliminate security vulnerabilities and "
 "provide new features."
 msgstr ""
-"Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat uusia "
-"ominaisuuksia."
+"Ohjelmapäivitykset korjaavat ohjelmavirheitä ja mahdollisia turva-aukkoja, "
+"sekä tarjoavat uusia ominaisuuksia."
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
@@ -1125,9 +1162,8 @@ msgid "_Check"
 msgstr "_Tarkista"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "_Jatka päivitystä"
+msgstr "_Jakelupäivitys"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1138,31 +1174,28 @@ msgid "_Install Updates"
 msgstr "_Asenna päivitykset"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Muutokset"
+msgstr "muutokset"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "päivitykset"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Internet-päivitykset</b>"
+msgstr "<b>Automaattiset päivitykset</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Internet-päivitykset</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Internet-päivitykset</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1174,24 +1207,28 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "Lisää _CD"
+msgstr "Lisää CD"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
-msgstr "Todennus"
+msgstr "Varmennus"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
 msgstr "_Poista noudetut ohjelmatiedostot:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "Lataus on valmis"
+msgstr "Hae lähteestä:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1219,35 +1256,32 @@ msgstr "Palauta jakelusi oletusavaimet"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "<b>Ohjelmalähteet</b>"
+msgstr "Ohjelmalähteet"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
 msgstr "Lähdekoodi"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Tilastot"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Lähetä tilastotietoja"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Kolmas osapuoli"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "_Tarkista päivitykset automaattisesti:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "_Lataa päivitykset taustalla, mutta älä asenna niitä"
+msgstr "_Lataa päivitykset automaattisesti, mutta älä asenna niitä"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1258,7 +1292,6 @@ msgid "_Install security updates without confirmation"
 msgstr "_Asenna turvallisuuspäivitykset kysymättä"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1267,10 +1300,10 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>Kanavatiedot ovat vanhentuneita</big></b>\n"
+"<b><big>Tiedot saatavilla olevista ohjelmista ovat vanhentuneita</big></b>\n"
 "\n"
-"Kanavatiedot täytyy ladata uudelleen ohjelmien tai päivitysten asentamiseksi "
-"uusista tai muuttuneista kanavista. \n"
+"Tiedot saatavilla ohjelmista ohjelmista täytyy ladata uudelleen ohjelmien "
+"tai päivitysten asentamiseksi uusista tai muuttuneista ohjelmalähteistä.\n"
 "\n"
 "Tarvitset toiminnassa olevan Internet-yhteyden jatkaaksesi."
 
@@ -1295,7 +1328,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1303,7 +1335,7 @@ msgid ""
 "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 kanavan koko APT-rivi</b></big>\n"
+"<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>."
@@ -1321,18 +1353,16 @@ msgstr ""
 "Lähdekoodi"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr "Lähdekoodi"
+msgstr "Muokkaa lähdettä"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
 msgstr "Luetaan CD-levyä"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr "Lähdekoodi"
+msgstr "L_isää lähde"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1356,22 +1386,21 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr "Tarkista onko uusia julkaisuja jakelusta"
+msgstr "Tarkista, onko jakelusta uusia julkaisuja"
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 ""
 "Jos automaattinen päivitysten tarkistaminen on poissa käytöstä, täytyy "
-"kanavaluettelo ladata käsin. Tämä valinta mahdollistaa tämän muistutuksen "
+"ohjelmaluettelot ladata käsin. Tämä valinta mahdollistaa tämän muistutuksen "
 "piilottamisen."
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
-msgstr "Muistuta kanavaluettelon uudelleenlataamisesta"
+msgstr "Muistuta kanavaluettelon uudelleen lataamisesta"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
@@ -1382,7 +1411,6 @@ msgid "Stores the size of the update-manager dialog"
 msgstr "Tallentaa päivitystenhallintaikkunan koon"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changes and the "
 "description"
@@ -1394,9 +1422,8 @@ msgid "The window size"
 msgstr "Ikkunan koko"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Muokkaa ohjelmakanavia ja Internet-päivitysten asetuksia"
+msgstr "Muokkaa asennettavien ohjelmien ja päivitysten lähteitä"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1406,99 +1433,88 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 päivitykset"
+msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Yhteisön ylläpitämät (universe)"
+msgstr "Yhteisön ylläpitämät"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Suljetut laiteajurit"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Muiden tarjoamat ohjelmat"
+msgstr "Rajoitetut ohjelmistot"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Ubuntu 6.10 \"Edgy Eft\" -CD-levy"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+msgid "Canonical supported Open Source software"
+msgstr "Canonicalin tukemat avoimen lähdekoodin ohjelmat"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Yhteisön ylläpitämät (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Yhteisön ylläpitämät (universe)"
+msgstr "Yhteisön ylläpitämät avoimen lähdekoodin ohjelmistot"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Ei-vapaat ohjelmat (multiverse)"
+msgstr "Ei-vapaat ajurit"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Suljetut laiteajurit "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Ei-vapaat ohjelmat (multiverse)"
+msgstr "Rajoitetut ohjelmat (multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "USA:sta vientirajoitetut ohjelmat"
+msgid "Software restricted by copyright or legal issues"
+msgstr "Tekijänoikeus- tai lakiasioilla rajoitetut ohjelmistot"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Ubuntu 6.06 LTS \"Dapper Drake\" -CD-levy"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Takaisinsovitetut päivitykset"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.10 \"Breezy Badger\" -CD-levy"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1517,15 +1533,13 @@ msgstr "Ubuntu 5.10 takaisinsovitukset"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Ubuntu 5.04 \"Hoary Hedgehog\" -CD-levy"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1534,27 +1548,23 @@ msgstr "Virallisesti tuettu"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
+msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 päivitykset"
+msgstr "Ubuntu 5.04 päivitykset"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 takaisinsovitukset"
+msgstr "Ubuntu 5.04 takaisinsovitukset"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1569,13 +1579,12 @@ msgstr "Ei-vapaat ohjelmat (multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Ubuntu 4.10 \"Warty Warthog\" -CD-levy"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja"
+msgstr "Ei enää virallisesti tuettu"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1589,15 +1598,13 @@ msgstr "Ubuntu 4.10 turvallisuuspäivitykset"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 5.10 päivitykset"
+msgstr "Ubuntu 4.10 päivitykset"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 takaisinsovitukset"
+msgstr "Ubuntu 4.10 takaisinsovitukset"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1646,12 +1653,14 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSG-epäyhteensopivat ohjelmat"
 
+#~ 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"
 
-#, fuzzy
 #~ msgid "Normal updates"
-#~ msgstr "Asennetaan päivityksiä"
+#~ msgstr "Normaalit päivitykset"
 
 #~ msgid "Cancel _Download"
 #~ msgstr "Peruuta _nouto"
@@ -1665,20 +1674,17 @@ msgstr "DFSG-epäyhteensopivat ohjelmat"
 #~ msgid "Your system has already been upgraded."
 #~ msgstr "Järjestelmäsi on jo päivitetty."
 
-#, fuzzy
 #~ 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.06 "
-#~ "LTS</span>"
+#~ "<span weight=\"bold\" size=\"x-large\">Päivitetään jakeluun Ubuntu 6.10</"
+#~ "span>"
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 turvallisuuspäivitykset"
+#~ msgstr "Ubuntun tärkeät turvallisuuspäivitykset"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Päivitä Ubuntun viimeisimpään versioon"
+#~ msgstr "Ubuntun päivitykset"
 
 #~ msgid "Cannot install all available updates"
 #~ msgstr "Ei voida asentaa kaikkia saatavilla olevia päivityksiä"
@@ -1744,7 +1750,7 @@ msgstr "DFSG-epäyhteensopivat ohjelmat"
 #~ msgstr "Asennuslähteet"
 
 #~ msgid "Software Preferences"
-#~ msgstr "Ohjelma-asetukset"
+#~ msgstr "Asetukset"
 
 #~ msgid "_Download updates in the background, but do not install them"
 #~ msgstr "_Nouda päivitykset taustalla, mutta älä asenna niitä"
@@ -1764,15 +1770,16 @@ msgstr "DFSG-epäyhteensopivat ohjelmat"
 #~ msgid "Edit Channel"
 #~ msgstr "Muokkaa kanavaa"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Lisää kanava"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Lisää kanava"
+#~ msgstr[1] "_Lisää kanavia"
 
 #~ msgid "_Custom"
 #~ msgstr "_Muu"
 
 #~ msgid "Software Properties"
-#~ msgstr "Ohjelma-asetukset"
+#~ msgstr "Asetukset"
 
 #~ msgid "Ubuntu 6.06 LTS"
 #~ msgstr "Ubuntu 6.06 LTS"
diff --git a/po/fr.po b/po/fr.po
index b3c8b740..8603e1f8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.37.2\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-26 21:09+0000\n"
-"Last-Translator: Claude Paroz <paroz@email.ch>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-06 17:26+0000\n"
+"Last-Translator: E.Malandain <etienne.malandain@free.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,9 +57,9 @@ msgstr "Après %s jours"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Installation des mises à jour"
+msgstr "Mises à jour %s"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -67,47 +67,44 @@ msgstr "Installation des mises à jour"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Serveur principal"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Serveur pour %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Serveur le plus proche"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Serveurs personnalisés"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Mises à jour des logiciels"
+msgstr "Source de mise à jour"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Actif"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr "Source"
+msgstr "(Code Source)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
-msgstr "Source"
+msgstr "Code Source"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -115,7 +112,7 @@ msgstr "Importer la clé"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
-msgstr "Erreur lors de l'importation du fichier sélectionné"
+msgstr "Erreur lors du chargement du fichier sélectionné"
 
 #: ../SoftwareProperties/SoftwareProperties.py:980
 msgid "The selected file may not be a GPG key file or it might be corrupt."
@@ -134,7 +131,7 @@ msgstr ""
 "ce bogue."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
@@ -152,11 +149,11 @@ msgstr "Veuillez saisir un nom pour le disque"
 msgid "Please insert a disc in the drive:"
 msgstr "Veuillez insérer un disque dans le lecteur :"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Paquets défectueux"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -165,36 +162,37 @@ msgstr ""
 "ce logiciel. Veuillez d'abord les réparer à l'aide de Synaptic ou d'apt-get "
 "avant de continuer."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Les meta-paquets désirés n'ont pu être mis à jour"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Un paquet essentiel devrait être enlevé"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Impossible de calculer la mise à jour"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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 ""
-"Un problème insoluble est apparu lors du calcul de la mise à jour. Merci "
-"rapporter ce bogue. "
+"Un problème insoluble est apparu lors du calcul de la mise à jour.\n"
+"\n"
+"Merci de rapporter ce bogue du paquet « update-manager » et d'inclure les "
+"fichiers de /var/log/dist-upgrade/ dans le rapport de bogue."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Erreur lors de l'authentification de certains paquets"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -204,12 +202,12 @@ msgstr ""
 "problème temporaire du réseau. Vous voudrez sans doute réessayer plus tard. "
 "Vous trouverez ci-dessous une liste des paquets non authentifiés."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Impossible d'installer « %s »"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -218,12 +216,11 @@ msgstr ""
 "rapporter ce bogue. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Impossible de déterminer le méta-paquet"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -231,16 +228,15 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
-"Votre système ne contient pas de paquet ubuntu-desktop, kubuntu-desktop ou "
+"Votre système ne contient aucun paquet ubuntu-desktop, kubuntu-desktop ou "
 "edubuntu-desktop, et il n'a par conséquent pas été possible de détecter la "
 "version d'Ubuntu que vous utilisez.\n"
 " Veuillez d'abord installer l'un des paquets ci-dessus, en utilisant "
 "Synaptic ou apt-get, avant de continuer."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Impossible d'établir la connexion"
+msgstr "Impossible d'ajouter le CD"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -251,28 +247,39 @@ msgid ""
 "The error message was:\n"
 "'%s'"
 msgstr ""
+"Une erreur est survenue lors de l'ajout du CD, la mise a jour va être "
+"annulée. Veuillez signaler ce bogue si le CD utilisé est un CD Ubuntu.\n"
+"\n"
+"Le message d'erreur est :\n"
+"« %s »"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Lecture du cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
+"Télécharger les données depuis le réseau pour effectuer la mise à jour ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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 mise à jour peut, par le réseau, rechercher les dernières mises à jour "
+"disponibles et télécharger les paquets qui ne sont pas sur le CD.\n"
+"Si vous avez une connexion internet rapide ou bon marché, vous devriez "
+"répondre « oui ». Par contre, si votre connexion internet est lente ou trop "
+"chère, répondez « non »."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
-msgstr "Aucun mirroir valide n'a pu être trouvé"
+msgstr "Aucun mirroir valide trouvé"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -288,16 +295,16 @@ msgstr ""
 "utilisez un mirroir interne ou si les informations du mirroir sont "
 "obsolètes.\n"
 "\n"
-"Souhaitez-vous que votre « sources.list'» soit malgré tout réécrit ? Si oui, "
-"cela mettra à jour « %s » des « %s » entrées.\n"
+"Souhaitez-vous que votre « sources.list » soit malgré tout réécrit ? Si oui, "
+"cela mettra à jour toutes les entrées « %s » vers « %s ».\n"
 "Sinon, la mise à jour sera annulée."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Générer les sources par défaut ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -306,16 +313,16 @@ msgid ""
 "cancel."
 msgstr ""
 "Après analyse de votre « sources.list », aucune entrée valide pour « %s » "
-"n'est pu être trouvée.\n"
+"n'a pu être trouvée.\n"
 "\n"
 "Les entrées par défaut pour « %s » doivent-elles être ajoutées ? Si vous "
 "sélectionnez « Non », la mise à jour sera annulée."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
-msgstr "Informations sur le dépôt invalides"
+msgstr "Information sur le dépôt invalide"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -323,26 +330,25 @@ msgstr ""
 "La mise à jour des informations du dépôt a créé un fichier invalide. Merci "
 "de rapporter ce bogue."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Sources provenant de tiers désactivées"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
-"Certaines entrées de votre sources.list provenant de tiers ont été "
+"Certaines entrées de votre fichier sources.list provenant de tiers ont été "
 "désactivées. Vous pouvez les réactiver après la mise à jour avec l'outil « "
 "Gestionnaire de canaux logiciels » ou avec Synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Erreur lors de la mise à jour"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -351,33 +357,31 @@ msgstr ""
 "un problème de réseau. Veuillez vérifier votre connexion au réseau et "
 "réessayer."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
-msgstr "Il n'y a pas assez d'espace libre sur le disque"
+msgstr "Pas assez d'espace libre sur le disque"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 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 ""
-"Le processus de mise à jour va maintenant prendre fin. Veuillez libérer au "
-"moins %s d'espace disque sur %s. Videz la corbeille et supprimez les paquets "
-"temporaires des installations effectuées en utilisant la commande 'sudo apt-"
-"get clean'."
+"Abandon de la mise à jour. Veuillez libérer au moins %s d'espace disque sur %"
+"s. Videz la corbeille et supprimez les paquets temporaires des installations "
+"effectuées en utilisant la commande « sudo apt-get clean »."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Voulez-vous commencer la mise à jour ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Les mises à jour n'ont pu être installées"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -386,13 +390,17 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Abandon de la mise à jour. Votre système est peut-être inutilisable. Une "
-"recupération a été lancée (dpkg --configure -a)."
+"récupération a été lancée (dpkg --configure -a).\n"
+"\n"
+"Veuillez signaler ceci comme un bogue du paquet « update-manager » et "
+"joindre les fichiers du répertoire /var/log/dist-upgrade dans le rapport de "
+"bogue."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Les mises à jour n'ont pu être téléchargées"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -400,12 +408,11 @@ msgstr ""
 "Abandon de la mise à jour. Veuillez vérifier votre connexion Internet ou "
 "votre médium d'installation puis réessayez. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "La prise en charge de certaines applications a pris fin"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -413,29 +420,30 @@ msgid ""
 "If you have not enabled community maintained software (universe), these "
 "packages will be suggested for removal in the next step."
 msgstr ""
-"Ces paquets installées ne sont plus supportés officiellement. Ils sont "
-"maintenant seulement supportées par la communauté ('universe').\n"
+"Canonical Ltd. ne fournit plus de support pour les paquets logiciels "
+"suivants. Ils sont maintenant seulement supportées par la communauté (« "
+"universe »).\n"
 "\n"
-"Si vous n'avez pas activé le dépot 'universe', la suppression de ces paquets "
-"vous sera suggérée lors de la prochaine étape. "
+"Si vous n'avez pas activé le dépôt « universe », la suppression de ces "
+"paquets vous sera suggérée lors de la prochaine étape."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Enlever les paquets obsolètes ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Passer cette étape"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Erreur pendant la soumission"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -444,32 +452,46 @@ msgstr ""
 "ci-dessous pour plus d'informations. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Restaurer le système dans son état d'origine"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "Recherche du backport (rétro-portage) de « %s »"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Vérification du gestionnaire de paquets"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr "Échec lors de la préparation de la mise à jour"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+"Échec lors de la préparation de la mise à jour du système. Merci de faire "
+"remonter ce bug concernant le paquet 'update manager' et d'inclure les "
+"fichiers contenus dans le dossier /var/log/dist-upgrade/ à votre rapport."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Mise à jour des informations sur les dépôts en cours"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
-msgstr "Information sur les paquet invalides"
+msgstr "Information sur le paquet invalide"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -479,22 +501,23 @@ msgid ""
 msgstr ""
 "Après la mise à jour des informations de votre paquet, le paquet « %s », "
 "pourtant requis, n'a pu être trouvé.\n"
-"Ceci est indique qu'une erreur important s'est produite, veuillez rapporter "
-"ce bogue."
+"Ceci indique qu'une erreur importante s'est produite, veuillez signaler ceci "
+"comme un bogue du paquet « update-manager » et joindre les fichiers du "
+"répertoire /var/log/dist-upgrade dans le rapport de bogue."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Demande de confirmation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Mise à jour en cours"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Recherche de logiciels obsolètes"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "La mise à jour du système est terminée."
 
@@ -505,25 +528,24 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "Veuillez insérer « %s » dans le lecteur « %s »"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "La mise à jour est terminée"
+msgstr "La récupération des fichiers est terminée"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr "Téléchargement du fichier %li sur %li à %s/s"
+msgstr "Téléchargement du fichier %li sur %li en cours à %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Environ %li minutes restantes"
+msgstr "Environ %s restantes"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
-msgstr "Téléchargement du fichier %li sur %li"
+msgstr "Téléchargement du fichier %li sur %li en cours"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
@@ -542,22 +564,27 @@ 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 mise à jour va être interrompue maintenant. Veuillez signaler ceci comme "
+"un bogue du paquet « update-manager » et joindre les fichiers du répertoire /"
+"var/log/dist-upgrade/ dans le rapport de bogue."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"Remplacer le fichier de configuration\n"
+"Remplacer le fichier de configuration personnalisé\n"
 "« %s » ?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
+"Toutes les modifications apportées à ce fichier de configuration seront "
+"perdues si vous décidez de le remplacer par une version plus récente."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
@@ -568,7 +595,6 @@ msgid "A fatal error occured"
 msgstr "Une erreur fatale est survenue"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 "
@@ -576,50 +602,52 @@ msgid ""
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
 "Veuillez signaler ce bogue et joindre les fichiers /var/log/dist-upgrade.log "
-"et /var/log/dist-upgrade-apt.log à votre rapport. La mise à jour est "
+"et /var/log/dist-upgrade/apt.log à votre rapport. La mise à jour est "
 "annulée.\n"
-"Votre sources.list d'origine a été sauvé dans /etc/apt/source.list."
-"distUpgrade."
+"Votre fichier sources.list d'origine a été enregistré dans /etc/apt/sources."
+"list.distUpgrade."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "Le paquet %s va être supprimé."
-msgstr[1] "Les paquets %s vont être supprimés."
+msgstr[0] "%d paquet va être supprimé."
+msgstr[1] "%d paquets vont être supprimés."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] "Le paquet %s va être installé."
-msgstr[1] "Les paquets %s vont être installés."
+msgstr[0] "%d nouveau paquet va être installé."
+msgstr[1] "%d nouveaux paquets vont être installés."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "Le paquet %s va être mis à jour."
-msgstr[1] "Les paquets %s vont être mis à jour."
+msgstr[0] "%d paquet va être mis à jour."
+msgstr[1] "%d paquets vont être mis à jour."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Vous devez télécharger un total de %s."
+msgstr ""
+"\n"
+"\n"
+"Vous avez à télécharger un total de %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
 msgstr ""
-"La mise à jour peut prendre plusieurs heures et ne peut être annulée "
-"ultérieurement."
+"La récupération et l'installation de la mise à jour peuvent prendre "
+"plusieurs heures et l'opération ne peut être annulée ultérieurement."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -629,7 +657,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Votre système est à jour"
 
@@ -638,6 +666,8 @@ msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
 msgstr ""
+"Il n'y a pas de mises à niveau disponibles pour votre système. La mise à "
+"niveau va maintenant être annulée."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -655,33 +685,35 @@ msgid "Upgrade %s"
 msgstr "Mettre à jour %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Environ %li jours %li heures %li minutes restantes"
+msgstr "%li jours %li heures %li minutes"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Environ %li heures %li minutes restantes"
+msgstr "%li heures %li minutes"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minutes"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li secondes"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
+"Ce téléchargement prendra environ %s avec une connexion Dsl 1 Mbits et "
+"environ %s avec un modem 56k"
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
@@ -692,7 +724,7 @@ msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
 "La mise à jour est terminée et le redémarrage de l'ordinateur est requis. "
-"Voulez-vous y procéder maintenant ?"
+"Voulez-vous le faire dès maintenant ?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -726,7 +758,7 @@ msgstr "<b><big>Démarrer la mise à jour ?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Mise à jour d'Ubuntu vers la version 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -741,9 +773,8 @@ msgid "Difference between the files"
 msgstr "Différence entre les fichiers"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
-msgstr "Téléchargement et installation des mises à jour"
+msgstr "Téléchargement et installation des mises à jour en cours"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -762,25 +793,37 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr "_Annuler la mise à jour"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr "_Continuer"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Conserver"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Rapporter un bogue"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Redémarrer Maintenant"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Reprendre la mise à jour"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr "_Démarrer la mise à jour"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Impossible de trouver les informations de version"
@@ -852,12 +895,11 @@ msgid "Verfication failed"
 msgstr "Échec de la vérification"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
 msgstr ""
-"La vérification de la mise à jour à échoué. Il y a peut-être un problème "
+"La vérification de la mise à jour a échoué. Il y a peut-être un problème "
 "avec le réseau ou avec le serveur. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
@@ -873,154 +915,146 @@ msgstr ""
 "avec le réseau ou avec le serveur "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Téléchargement du fichier %li sur %li à %s/s"
+msgstr "Téléchargement du fichier %(current)li sur %(total)li à %(speed)s/s"
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Téléchargement du fichier %li sur %li à %s/s"
+msgstr "Téléchargement du fichier %(current)li sur %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr ""
-"La liste des modifications n'est pas encore disponible. Veuillez réessayer "
-"plus tard."
+msgstr "La liste des modifications n'est pas disponible"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 "La liste des modifications n'est pas encore disponible. Veuillez réessayer "
 "plus tard."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
-"Échec du téléchargement de la liste des modifications. Veuillez vérifier que "
-"votre connexion Internet est activée."
+"Échec lors du téléchargement de la liste des modifications. \n"
+"Veuillez vérifier votre connexion Internet."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Mises à jour de sécurité pour Ubuntu 5.10"
+msgstr "Mises à jour de sécurité"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Mises à jour recommandées"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "Installation des mises à jour"
+msgstr "Mises à jour suggérées"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "« Backports »"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "_Reprendre la mise à jour"
+msgstr "Mises à jour de la distribution"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Installation des mises à jour"
+msgstr "Autres mises à jour"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s : \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr "Téléchargement de la liste des nouveautés…"
+msgstr "Téléchargement de la liste des modifications…"
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "_Tout décocher"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "_Vérifier"
+msgstr "Tout _vérifier"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Taille du téléchargement : %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Vous pouvez installer %s mise à jour"
 msgstr[1] "Vous pouvez installer %s mises à jour"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Veuillez patienter, cela peut prendre du temps."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "La mise à jour est terminée"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "Rechercher les mises à jour disponibles"
+msgstr "Recherche des mises à jour disponibles en cours"
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "Nouvelle version : %s (taille : %s)"
+msgstr "De la version %(old_version)s vers la version %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Version %s : \n"
+msgstr "Version %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Taille : %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Votre distribution n'est plus supportée"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
-"Vous ne pouvez plus obtenir de mises à jour critiques ou de securité . Vous "
+"Vous ne pouvez plus obtenir de mises à jour critiques ou de securité. Vous "
 "devez passer à une version plus récente d'Ubuntu Linux. Rendez-vous sur "
 "http://www.ubuntu.com pour de plus amples informations à ce sujet."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Une nouvelle version « %s » est disponible</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "La liste des logiciels est corrompue"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1033,27 +1067,26 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Aucun(e)"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 Ko"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f Ko"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f Mo"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>You must check for updates manually</big></b>\n"
 "\n"
@@ -1064,25 +1097,20 @@ msgstr ""
 "big></b>\n"
 "\n"
 "Votre système ne vérifie pas les mises à jour automatiquement. Vous pouvez "
-"configurer ce comportement dans « Système » -> « Administration » -> « "
-"Gestionnaire de canaux logiciels »"
+"configurer ce comportement dans <i>Sources logicielles</i> qui se trouve "
+"dans l'onglet <i>Mises à jour par Internet</i>."
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>Maintenir votre système à jour</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
-"<big><b>Erreur lors de l'analyse du CD</b></big>\n"
-"\n"
-"%s"
+msgstr "<big><b>Certaines mises à jour n'ont pu être installées</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Démarrer la mise à jour ?</big></b>"
+msgstr "<b><big>Démarrage du gestionnaire de mise à jour ?</big></b>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1090,7 +1118,7 @@ msgstr "Changements"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Changements et description de la mise à jour"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1115,10 +1143,15 @@ msgid ""
 "This can be caused by an uncompleted upgrade, unofficial software packages "
 "or by running a development version."
 msgstr ""
+"Effectuez une mise à niveau de la distribution pour installer autant de "
+"mises à jour que possible.\n"
+"\n"
+"Ce problème peut être dû à une mise à niveau incomplète, à des paquets non "
+"officiels ou à l'utilisation d'une version de développement."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
-msgstr "Afficher l'avancement des fichiers individuels"
+msgstr "Afficher la progression de chaque fichier"
 
 #: ../data/glade/UpdateManager.glade.h:17
 msgid "Software Updates"
@@ -1130,7 +1163,7 @@ msgid ""
 "provide new features."
 msgstr ""
 "Les mises à jour de logiciels peuvent corriger des erreurs, éliminer des "
-"problèmes de sécurité et apporter de nouvelles fonctionalités."
+"problèmes de sécurité et apporter de nouvelles fonctionnalités."
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
@@ -1145,9 +1178,8 @@ msgid "_Check"
 msgstr "_Vérifier"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "_Reprendre la mise à jour"
+msgstr "_Mise à jour de la distribution"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1158,31 +1190,28 @@ msgid "_Install Updates"
 msgstr "_Installer les mises à jour"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Changements"
+msgstr "changements"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "mises à jour"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Mises à jour par Internet</b>"
+msgstr "<b>Mises à jour automatiques</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CD-ROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Mises à jour par Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Mises à jour par Internet</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1194,11 +1223,18 @@ msgid ""
 "The results are used to improve the support for popular applications and to "
 "rank applications in the search results.</i>"
 msgstr ""
+"<i>Pour améliorer l'expérience utilisateur dans Ubuntu, veuillez participer "
+"au sondage de popularité. Si vous le faites, la liste des logiciels "
+"installés et leur fréquence d'utilisation sera collectée et envoyé de façon "
+"anonyme au projet Ubuntu de manière hebdomadaire.\n"
+"\n"
+"Les résultats sont utilisés pour améliorer le support des applications les "
+"plus utilisées et pour classer les applications dans les résultats des "
+"recherches.</i>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "Ajouter un _CD-ROM"
+msgstr "Ajouter un CD-ROM"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
@@ -1209,9 +1245,8 @@ msgid "D_elete downloaded software files:"
 msgstr "_Effacer les fichiers des logiciels téléchargés :"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "Le téléchargement est terminé"
+msgstr "Télécharger depuis :"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1240,36 +1275,34 @@ msgstr "Restaurer les clés par défaut de votre distribution"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Gestionnaire de canaux logiciels"
+msgstr "Sources de mise à jour"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
-msgstr "Source"
+msgstr "Code source"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Statistiques"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Soumettre des statistiques sur l'utilisation des paquets"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Tierces parties"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "_Rechercher des mises à jour automatiquement :"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
 msgstr ""
-"Télécharger les mises à jour en arrière-plan, mais ne pas les installer"
+"_Télécharger automatiquement les mises à jour en arrière-plan, mais ne pas "
+"les installer"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1280,7 +1313,6 @@ msgid "_Install security updates without confirmation"
 msgstr "_Installer les mises à jour de sécurité sans confirmation"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1289,14 +1321,14 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>Les informations des canaux logiciels sont obsolètes</big></b>\n"
+"<b><big>Les informations sur les logiciels disponibles sont obsolètes</big></"
+"b>\n"
 "\n"
-"Vous devez recharger les informations des canaux logiciels pour installer de "
-"nouveaux logiciels ou des mises à jour à partir des canaux logiciels "
-"modifiés ou nouvellement ajoutés.\n"
+"Pour installer de nouveaux logiciels ou des mises à jour à partir des canaux "
+"logiciels modifiés ou nouvellement ajoutés, vous devez recharger ces "
+"informations.\n"
 "\n"
-"Vous devez disposer d'une connexion fonctionnelle à Internet avant de "
-"continuer."
+"Une connexion internet fonctionnelle sera nécessaire."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
@@ -1319,7 +1351,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI :</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1327,11 +1358,11 @@ msgid ""
 "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>Saisissez la ligne APT complète du canal logiciel que vous souhaitez "
-"ajouter</b></big>\n"
+"<big><b>Saisissez la ligne APT complète du dépôt que vous souhaitez ajouter "
+"à vos sources</b></big>\n"
 "\n"
-"La ligne APT contient le type, la source et le contenu d'un canal logiciel, "
-"par exemple <i> « deb http://ftp.debian.org sarge main »</i>."
+"La ligne APT contient le type, l'adresse et le contenu d'un dépôt, par "
+"exemple <i>« deb http://ftp.debian.org sarge main »</i>."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
@@ -1346,18 +1377,16 @@ msgstr ""
 "Source"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr "Source"
+msgstr "Modifier la source de mise à jour"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
 msgstr "Examen du CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr "Source"
+msgstr "_Ajouter une source de mise à jour"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1384,13 +1413,12 @@ msgid "Check for new distribution releases"
 msgstr "Vérifier les nouvelles versions de la distribution"
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 la recherche automatique des mises à jour est désactivée, vous devrez "
+"Si la recherche automatique des mises à jour est désactivée, vous devez "
 "recharger manuellement la liste des canaux logiciels. Cette option permet de "
 "cacher la notification qui apparaît dans ce cas."
 
@@ -1407,12 +1435,11 @@ msgid "Stores the size of the update-manager dialog"
 msgstr "Enregistre la taille de la fenêtre du gestionnaire de mises à jour"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changes and the "
 "description"
 msgstr ""
-"Enregistre l'état de développement de la liste des changements et des "
+"Enregistre l'état de développement de la liste des changements et les "
 "descriptions"
 
 #: ../data/update-manager.schemas.in.h:8
@@ -1420,9 +1447,10 @@ msgid "The window size"
 msgstr "La taille de la fenêtre"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Configurer les canaux logiciels et les mises à jour via Internet"
+msgstr ""
+"Configurer les canaux logiciels (sources de mise à jour) et les mises à jour "
+"via Internet"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1432,99 +1460,88 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Mises à jour pour Ubuntu 5.10"
+msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Maintenu par la communauté (Universe)"
+msgstr "Maintenu par la communauté"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Pilotes propriétaires de périphériques"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Logiciel contribué"
+msgstr "Logiciel non libre"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "CD-ROM contenant Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu Dapper Drake 6.06"
+msgstr "Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+msgid "Canonical supported Open Source software"
+msgstr "Logiciel libre supporté par Canonical"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Maintenu par la communauté (Universe)"
+msgstr "Maintenu par la communauté (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Maintenu par la communauté (Universe)"
+msgstr "Logiciel libre maintenu par la communauté"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Non-libre (Multiverse)"
+msgstr "Pilotes non libres"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Pilotes propriétaires de périphériques "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Non-libre (Multiverse)"
+msgstr "Logiciel non libre (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Logiciel restreint à l'export (USA)"
+msgid "Software restricted by copyright or legal issues"
+msgstr "Logiciel soumis au droit d'auteur ou à des restrictions légales"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu Dapper Drake 6.06"
+msgstr "CD-ROM contenant Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Mises à jour backportées"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu Breezy Badger 5.10"
+msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu Breezy Badger 5.10"
+msgstr "CD-ROM contenant Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1543,44 +1560,38 @@ msgstr "« Backports » pour Ubuntu 5.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 Mises à jour de sécurité"
+msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 Mises à jour de sécurité"
+msgstr "CD-ROM contenant Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
-msgstr "Supportés officiellement"
+msgstr "Supporté officiellement"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Mises à jour de sécurité pour Ubuntu 5.10"
+msgstr "Mises à jour de sécurité pour Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Mises à jour pour Ubuntu 5.10"
+msgstr "Mises à jour pour Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "« Backports » pour Ubuntu 5.10"
+msgstr "« Backports » pour Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu Breezy Badger 5.10"
+msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1590,18 +1601,17 @@ msgstr "Maintenu par la communauté (Universe)"
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:201
 msgid "Non-free (Multiverse)"
-msgstr "Non-libre (Multiverse)"
+msgstr "Non libre (Multiverse)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "CD-ROM contenant Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Certains logiciels ne sont plus supportés officiellement"
+msgstr "Support officiel terminé"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1611,19 +1621,17 @@ msgstr "Copyright restreint"
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 4.10 Mises à jour de sécurité"
+msgstr "Mises à jour de sécurité pour Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Mises à jour pour Ubuntu 5.10"
+msgstr "Mises à jour pour Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "« Backports » pour Ubuntu 5.10"
+msgstr "« Backports » pour Ubuntu 4.10"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1634,7 +1642,7 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 #. Description
 #: ../data/channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr "Debian « Sarge » 3.1"
+msgstr "Debian 3.1 \"Sarge\""
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:19
@@ -1644,12 +1652,12 @@ msgstr "http://security.debian.org/"
 #. Description
 #: ../data/channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Mises à jour de sécurité pour Debian « Sarge » 3.1"
+msgstr "Mises à jour de sécurité pour Debian 3.1 \"Sarge\""
 
 #. Description
 #: ../data/channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr "Debian « Etch » (en test)"
+msgstr "Debian \"Etch\" (testing)"
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:47
@@ -1659,7 +1667,7 @@ msgstr "http://http.us.debian.org/debian/"
 #. Description
 #: ../data/channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian « Sid » (instable)"
+msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:54
@@ -1673,12 +1681,14 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
 
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "Logiciel restreint pour des raisons légales ou de copyright"
+
 #~ msgid "Downloading file %li of %li with unknown speed"
 #~ msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue"
 
-#, fuzzy
 #~ msgid "Normal updates"
-#~ msgstr "Installation des mises à jour"
+#~ msgstr "Mises à jour habituelles"
 
 #~ msgid "Cancel _Download"
 #~ msgstr "_Annuler le téléchargement"
@@ -1692,20 +1702,16 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
 #~ msgid "Your system has already been upgraded."
 #~ msgstr "Votre système a déjà été mis à jour."
 
-#, fuzzy
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Mise à jour vers Ubuntu 6.06 LTS</"
-#~ "span>"
+#~ "<span weight=\"bold\" size=\"x-large\">Mise à jour vers Ubuntu 6.10</span>"
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Mises à jour de sécurité pour Ubuntu 5.10"
+#~ msgstr "Mises à jour de sécurité pour Ubuntu"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Mettre à jour vers la version la plus récente d'Ubuntu"
+#~ msgstr "Mises à jour d'Ubuntu"
 
 #~ msgid "Cannot install all available updates"
 #~ msgstr "Impossible d'installer toutes les mises à jour disponibles"
@@ -1775,7 +1781,7 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
 #~ msgstr "Médium d'installation"
 
 #~ msgid "Software Preferences"
-#~ msgstr "Gestionnaire de canaux logiciels"
+#~ msgstr "Préférences du logiciel"
 
 #~ msgid "     "
 #~ msgstr "     "
@@ -1792,12 +1798,13 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)"
 #~ msgid "Edit Channel"
 #~ msgstr "Modifier un canal logiciel"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Ajouter un canal logiciel"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Ajouter un canal logiciel"
+#~ msgstr[1] "_Ajouter des canaux logiciels"
 
 #~ msgid "_Custom"
-#~ msgstr "_Personnaliser"
+#~ msgstr "_Personnalisé"
 
 #~ msgid "Ubuntu 6.06 LTS"
 #~ msgstr "Ubuntu 6.06 LTS"
diff --git a/po/fur.po b/po/fur.po
index b80b99e6..fbf9b393 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-30 14:37+0000\n"
-"Last-Translator: marcuz <marcuz@linux.it>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-08-25 05:55+0000\n"
+"Last-Translator: Marco <marcuz@linux.it>\n"
 "Language-Team: Friulian <fur@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -142,30 +142,30 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -174,34 +174,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -228,11 +228,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -240,11 +240,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -257,11 +257,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -270,42 +270,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -314,15 +314,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -331,21 +331,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -354,54 +354,65 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -411,19 +422,19 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr ""
 
@@ -481,8 +492,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -544,7 +555,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr ""
 
@@ -594,8 +605,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -614,7 +625,7 @@ msgstr ""
 #: ../DistUpgrade/DistUpgrade.glade.h:1
 #: ../data/glade/SoftwareProperties.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -669,25 +680,37 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
+msgid "_Continue"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
+msgid "_Replace"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -778,128 +801,130 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
 msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, python-format
 msgid "Version %s"
 msgstr ""
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1282,7 +1307,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1312,7 +1337,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
diff --git a/po/gl.po b/po/gl.po
index cc611a5c..6e2f5b3b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,66 +1,67 @@
-# translation of gl.po to Galego
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2005.
+# translation of gl.po to galician
+# translation of update-manager-gl.po to galician
+# This file is distributed under the same license as the update-manager package.
+#  Copyright (c) 2004 Canonical
+#                2004 Michiel Sikkes
+# Mar Castro <mariamarcp@gmail.com>, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:42+0000\n"
-"Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
-"Language-Team: Galego\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-09-25 21:24+0000\n"
+"Last-Translator: Xosé <ubuntu@galizaweb.net>\n"
+"Language-Team: galician\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:136
-#, fuzzy
 msgid "Daily"
-msgstr "<b>Detalles</b>"
+msgstr "Unha vez ao día"
 
 #: ../SoftwareProperties/SoftwareProperties.py:137
 msgid "Every two days"
-msgstr ""
+msgstr "Cada dous días"
 
 #: ../SoftwareProperties/SoftwareProperties.py:138
 msgid "Weekly"
-msgstr ""
+msgstr "Unha vez á semana"
 
 #: ../SoftwareProperties/SoftwareProperties.py:139
 msgid "Every two weeks"
-msgstr ""
+msgstr "Cada dúas semanas"
 
 #: ../SoftwareProperties/SoftwareProperties.py:144
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "Cada %s días"
 
 #: ../SoftwareProperties/SoftwareProperties.py:167
 msgid "After one week"
-msgstr ""
+msgstr "Logo dunha semana"
 
 #: ../SoftwareProperties/SoftwareProperties.py:168
 msgid "After two weeks"
-msgstr ""
+msgstr "Logo de dúas semanas"
 
 #: ../SoftwareProperties/SoftwareProperties.py:169
 msgid "After one month"
-msgstr ""
+msgstr "Logo dun mes"
 
 #: ../SoftwareProperties/SoftwareProperties.py:174
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "Logo de %s días"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Instalando actualizacións..."
+msgstr "actualizacións de %s"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -68,71 +69,68 @@ msgstr "Instalando actualizacións..."
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Servidor principal"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Servidor desde %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Servidor máis próximo"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Servidores personalizados"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Actualizacións de software"
+msgstr "Canal de Software"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr "Fonte"
+msgstr "(Código Fonte)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
-msgstr "Fonte"
+msgstr "Código Fonte"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
-msgstr ""
+msgstr "Importar clave"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
-msgstr "Erro importando o ficheiro seleccionado"
+msgstr "Houbo un erro ao importar o ficheiro seleccionado"
 
 #: ../SoftwareProperties/SoftwareProperties.py:980
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
-"O ficheiro seleccionado pode que non sexa un ficheiro de clave GPG ou que "
-"esté corrupto."
+"Poida que o ficheiro seleccionado non sexa un ficheiro de clave GPG ou que "
+"estea corrupto."
 
 #: ../SoftwareProperties/SoftwareProperties.py:992
 msgid "Error removing the key"
-msgstr "Erro ao quitar a clave"
+msgstr "Houbo un erro ao borrar a clave"
 
 #: ../SoftwareProperties/SoftwareProperties.py:993
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
-"Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un "
-"erro."
+"Non se pode borrar a clave que seleccionou. Por favor, avise disto como un "
+"fallo."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
 #, python-format
@@ -141,81 +139,90 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"<big><b>Erro ao examinar o CD</b></big>\n"
+"\n"
+"%s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1096
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Por favor, introduza un nome para o disco"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1112
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Por favor, inserte un disco na unidade:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
-msgstr ""
+msgstr "Paquetes rotos"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Non se puideron actualizar os meta-paquetes necesarios"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Tívose que desinstalar un paquete esencial"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Non se puido calcular a actualización"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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 ""
-"Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un "
-"erro. "
+"Produciuse un erro imposíbel de resolver ao calcular a actualización.\n"
+"\n"
+"Informa deste erro do pacote \"update-manager\" e inclúe os ficheiros que "
+"hai en /var/log/dist-upgrade/ no informe."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Erro autenticando algúns paquetes"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Non se puido instalar '%s»"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un "
-"erro. "
+"Non foi posible instalar un paquete necesario. Por favor, informe disto como "
+"un fallo. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Non se puido determinar o meta-paquete"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -223,10 +230,15 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
+"O teu sistema non contén os pacotes ubuntu-desktop, kubuntu-desktop ou "
+"edubuntu-desktop e non foi posíbel detectar cal é a versión de ubuntu que se "
+"está a executar.\n"
+" Instala un dos pacotes mencionados usando synaptic ou apt-get antes de "
+"continuar."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
 msgid "Failed to add the CD"
-msgstr ""
+msgstr "Non se puido engadir o CD"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -237,28 +249,37 @@ msgid ""
 "The error message was:\n"
 "'%s'"
 msgstr ""
+"Produciuse un erro ao engadir o CD, hai que cancelar a actualización. "
+"Informa deste erro se se trata dun CD válido de Ubuntu.\n"
+"\n"
+"A mensaxe de erro foi:\n"
+"\"%s\""
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
-msgstr ""
+msgstr "A ler a caché"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Procurar datos desde a rede para a actualización?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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 descarregar pacotes que non se atopan no CD.\n"
+"Se dispós dde acceso rápido ou barato á rede deberías respostar \"Si\" aquí. "
+"Se che custa caro, escolle \"Non\"."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
-msgstr ""
+msgstr "Non se atopou un servidor espello válido"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -269,13 +290,21 @@ msgid ""
 "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."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
-msgstr ""
+msgstr "Xerar orixes predeterminadas?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -283,61 +312,76 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Información de depósito non válida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"A actualización da información do depósito xerou un ficheiro incorrecto. Por "
+"favor, informe disto como un erro."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
-msgstr ""
+msgstr "Orixes de terceiros desactivadas"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 teu sources.list. "
+"Pódelas volver a activar coa ferramenta \"software-properteis\" ou con "
+"synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
-msgstr "Erro ao quitar a clave"
+msgstr "Erro durante a actualización"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Non hai espazo suficiente no disco"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 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."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Desexa comezar a actualización?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Non se puideron instalar as actualizacións"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -345,22 +389,29 @@ msgid ""
 "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 teu sistema podería ficar nun estado "
+"que non permita ser usado. Procedeuse a recuperalo (dpkg --configure -a).\n"
+"\n"
+"Informa desde fallo do pacote \"update-manager\" e inclúe os ficheiros en /"
+"var/log/dist-upgrade/ no informe."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Non se puideron descargar as actualizacións"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 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. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Rematou o soporte para algunhas aplicacións"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -369,55 +420,67 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "Desinstalar os paquetes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
-msgstr ""
+msgstr "_Saltar este paso"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
-msgstr ""
+msgstr "_Borrar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
-msgstr ""
+msgstr "Erro durante a confirmación"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 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. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
-msgstr ""
+msgstr "A retornar ao estado orixinal do sistema"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
-msgstr "Xa hai outro xestor de paquetes en execución"
+msgstr "Comprobando xestor de paquetes"
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:672
-msgid "Updating repository information"
+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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr "Actualizando a información do repositorio"
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
-msgstr ""
+msgstr "Información de paquete non válida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -426,68 +489,74 @@ msgid ""
 "manager' package and include the files in /var/log/dist-upgrade/ in the "
 "bugreport."
 msgstr ""
+"Após actualizar a información sobre os pacotes, o pacote \"%s\", que é "
+"esencial, xa non se dá atopado.\n"
+"Isto indica un erro serio.\n"
+"\n"
+"Informa desde fallo do pacote \"update-manager\" e inclúe os ficheiros en /"
+"var/log/dist-upgrade/ no informe."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Solicitando confirmación"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
-msgstr "Actualización rematada"
+msgstr "Actualizando"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Buscando paquetes obsoletos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Comletouse a actualización do sistema."
 
 #. print "mediaChange %s %s" % (medium, drive)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Por favor, inserte '%s' na unidade '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
 msgid "Fetching is complete"
-msgstr ""
+msgstr "Rematou a descarga"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr ""
+msgstr "A baixar o ficheiro %li de %li en %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
 #, python-format
 msgid "About %s remaining"
-msgstr ""
+msgstr "Falta aproximadamente %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
 msgid "Fetching file %li of %li"
-msgstr ""
+msgstr "A baixar o ficheiro %li de %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
 #: ../DistUpgrade/DistUpgradeViewGtk.py:163
-#, fuzzy
 msgid "Applying changes"
-msgstr "Descargando cambios..."
+msgstr "Aplicando os cambios"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Non se puido instalar '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:188
 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. Informa desde fallo do pacote \"update-"
+"manager\" e inclúe os ficheiros en /var/log/dist-upgrade/ no informe."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
@@ -496,20 +565,22 @@ msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
+"Substituir o ficheiro de configuración personalizado\n"
+"\"%s\"?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "Non se atopou o comando 'diff'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Ocorreu un erro fatal"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
 msgid ""
@@ -518,6 +589,11 @@ msgid ""
 "now.\n"
 "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
 msgstr ""
+"Informa desde fallo do pacote \"update-manager\" e inclúe os ficheiros en /"
+"var/log/dist-upgrade/ main.log e /var/log/dist-upgrade/apt.log no informe. "
+"Vaise cancelar a actualización agora.\n"
+"O teu ficheiro sources.list orixinal gardouse en /etc/apt/sources.list."
+"distUpgrade."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
@@ -525,22 +601,22 @@ msgstr ""
 #, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vaise eliminar o pacote %d"
+msgstr[1] "Vanse eliminar os pacotes %d"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
 #, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vaise instalar o pacote novo %d"
+msgstr[1] "Vanse instalar os pacotes novos %d"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
 #, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vaise actualizar o pacote %d"
+msgstr[1] "Vanse actualizar os pacotes %d"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
 #, python-format
@@ -549,82 +625,89 @@ msgid ""
 "\n"
 "You have to download a total of %s. "
 msgstr ""
+"\n"
+"\n"
+"Baixache un total de %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
 msgstr ""
+"Descarregar e instalar a actualización pode levar varias horas e non se pode "
+"cancelar posteriormente."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
-msgstr ""
+msgstr "Para previr a perda de datos peche todas as aplicacións e documentos."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
-msgstr "O seu sistema está actualizado!"
+msgstr "O seu sistema está actualizado"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:519
 msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
 msgstr ""
+"Non hai actualizacións disponíbeis par o teu sistema. Cancelamos a "
+"actualización."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
 msgid "<b>Remove %s</b>"
-msgstr ""
+msgstr "<b>Desinstalar %s</b>"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:537
 #, python-format
 msgid "Install %s"
-msgstr ""
+msgstr "Instalar %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:539
 #, python-format
 msgid "Upgrade %s"
-msgstr ""
+msgstr "Actualizar %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
 #, python-format
 msgid "%li days %li hours %li minutes"
-msgstr ""
+msgstr "%li días %li horas %li minutos"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
 #, python-format
 msgid "%li hours %li minutes"
-msgstr ""
+msgstr "%li houras %li minutos"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minutos"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li segundos"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
-msgstr ""
+msgstr "Compre reiniciar o equipo"
 
 #: ../DistUpgrade/DistUpgradeView.py:110
 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. Desexa facelo agora?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -642,157 +725,175 @@ msgid ""
 "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."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-msgstr ""
+msgstr "<b><big>Reinicie o sistema para completar a actualización</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Comezar a actualización?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Actualizar Ubuntu para a versión 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Limpando"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
-msgstr "<b>Detalles</b>"
+msgstr "Detalles"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "Diferenza entre os ficheiros"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Fetching and installing the upgrades"
-msgstr ""
+msgstr "A descarregar e instalar as actualizacións"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Modificando as canles de software"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Preparando a actualización"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr ""
+msgstr "Reiniciando o sistema"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
-msgstr ""
+msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-#, fuzzy
-msgid "_Replace"
-msgstr "Recargar"
+msgid "_Continue"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
-msgstr ""
+msgid "_Keep"
+msgstr "_Conservar"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
-msgstr ""
+msgid "_Replace"
+msgstr "_Substituír"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr "_Informar dun fallo"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr "_Reiniciar agora"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
+msgstr "_Continuar actualización"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
 msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
-msgstr ""
+msgstr "Non se puideron atopar as notas da versión"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Poida que o servidor estea sobrecargado. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
 msgid "Could not download the release notes"
-msgstr ""
+msgstr "Non se puideron descargar as notas da versión"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Por favor, comprobe a súa conexión a Internet."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
-msgstr ""
+msgstr "Non se puido executar a ferramenta de actualización"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:150
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un "
-"erro."
+"Isto parece ser un fallo na ferramenta de actualización. Por favor, informe "
+"disto como un fallo"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:171
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "Descargando cambios"
+msgstr "Descargando a ferramenta de actualización"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
+"A ferramenta de actualización guiaralle a través do proceso de actualización."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Sinatura da ferramenta de actualización"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
-msgstr ""
+msgstr "Ferramenta de actualización"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Erro ao descargar"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "Fallou a descarga da actualización. Pode haber un problema coa rede. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
-msgstr ""
+msgstr "Erro ao extraer"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:215
 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. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
-msgstr ""
+msgstr "Erro de verificación"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
 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 que haxa algún problema coa "
+"rede ou co servidor. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
-#, fuzzy
 msgid "Authentication failed"
-msgstr "Autenticación"
+msgstr "Erro de autenticación"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:229
 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. Debe haber un problema coa rede ou "
+"o servidor. "
 
 #: ../UpdateManager/GtkProgress.py:108
 #, python-format
@@ -804,166 +905,163 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "Hai unha versión nova de Ubuntu dispoñible!"
+msgstr "Non se dispón da listaxe coas mudanzas"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
-"Fallou ao descargar o informe de cambios. Comprobe se ten algunha conexión "
-"activa."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Actualizacións de seguranza de Ubuntu 5.10"
+msgstr "Actualizacións de seguranza importantes"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Actualizacións recomendadas"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "Instalando actualizacións..."
+msgstr "Actualizacións suxeridas"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Backports"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "Instalando actualizacións..."
+msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Instalando actualizacións..."
+msgstr "Outras actualizacións"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versión %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr "Descargando cambios"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "_Quitarlle a Selección a Todo"
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr ""
+msgstr "_Seleccionalo Todo"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Tamaño de descarga: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Instalando actualizacións..."
-msgstr[1] "Instalando actualizacións..."
+msgstr[0] "Pode instalar %s actualización"
+msgstr[1] "Pode instalar %s actualizacións"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Por favor, espere; isto pode tardar un pouco."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr ""
+msgstr "Completouse a actualización"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "Instalando actualizacións..."
+msgstr "A examinar as actualizacións"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Versión %s: \n"
+msgstr "Versión %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Tamaño: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "A súa distribución xa non está soportada"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 correcciones 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."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>Está dispoñible a nova versión '%s' da distribución</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
-msgstr ""
+msgstr "O índice de software está danado"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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."
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Nengún"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 msgid ""
@@ -975,15 +1073,15 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Manteña o seu sistema actualizado</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
+msgstr "<big><b>Non se poden instalar todas as actualizacións</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
 msgid "<big><b>Starting update manager</b></big>"
-msgstr ""
+msgstr "<big><b>A iniciar o xestor de actualizacións</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -991,15 +1089,15 @@ msgstr "Cambios"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Mudanzas e descrición da actualización"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
-msgstr ""
+msgstr "_Comprobar"
 
 #: ../data/glade/UpdateManager.glade.h:10
 msgid "Check the software channels for new updates"
-msgstr ""
+msgstr "Comprobar se hai novas actualizacións nas canles de software"
 
 #: ../data/glade/UpdateManager.glade.h:11
 msgid "Description"
@@ -1007,7 +1105,7 @@ msgstr "Descrición"
 
 #: ../data/glade/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Notas da versión"
 
 #: ../data/glade/UpdateManager.glade.h:13
 msgid ""
@@ -1016,10 +1114,16 @@ msgid ""
 "This can be caused by an uncompleted upgrade, unofficial software packages "
 "or by running a development version."
 msgstr ""
+"Executa unha actualización da distribución para instalar tantas "
+"actualizacións como sexa posíbel.\n"
+"\n"
+"Isto pode ser causado por unha actualización de distribución incompleta, "
+"pacotes de software non oficiais ou por estares a executar unha versión en "
+"desenvolvemento."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Mostrar o progreso de cada ficheiro individual"
 
 #: ../data/glade/UpdateManager.glade.h:17
 msgid "Software Updates"
@@ -1030,59 +1134,56 @@ 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."
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
-msgstr ""
+msgstr "A_ctualizar"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Actualizar á última versión de Ubuntu"
 
 #: ../data/glade/UpdateManager.glade.h:21
 msgid "_Check"
-msgstr ""
+msgstr "_Comprobar"
 
 #: ../data/glade/UpdateManager.glade.h:22
 msgid "_Distribution Upgrade"
-msgstr ""
+msgstr "Actualización da _Distribución"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Ocultar esta información no futuro"
 
 #: ../data/glade/UpdateManager.glade.h:24
-#, fuzzy
 msgid "_Install Updates"
-msgstr "Instalando actualizacións..."
+msgstr "_Instalar actualizacións"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Cambios"
+msgstr "mudanzas"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "actualizacións"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Actualizacións por Internet</b>"
+msgstr "<b>Actualizacións automáticas</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-#, fuzzy
 msgid "<b>Internet updates</b>"
 msgstr "<b>Actualizacións por Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Actualizacións por Internet</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1094,6 +1195,13 @@ msgid ""
 "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 de Ubuntu participa no concurso de "
+"popularidade. Se  che parece ben, cada semana se enviará anonimamente ao "
+"proxecto Ubunto unha listaxe coas aplicacións que tes instaladas e a "
+"frecuencia coa que as usas.\n"
+"\n"
+"Os resultados empréganse para mellorar o soporte das aplicacións máis "
+"populares e para resaltalas nos resultados das procuras.</li>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
 msgid "Add Cdrom"
@@ -1105,77 +1213,72 @@ msgstr "Autenticación"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "_Borrar arquivos de software descargados:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
 msgid "Download from:"
-msgstr ""
+msgstr "Descargar desde:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "Eliminar a clave seleccionada do anel de confianza."
+msgstr "Importar a clave pública dende un provedor de confianza"
 
 #: ../data/glade/SoftwareProperties.glade.h:14
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>Actualizacións por Internet</b>"
+msgstr "Actualizacións por Internet"
 
 #: ../data/glade/SoftwareProperties.glade.h:15
 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"
 
 #: ../data/glade/SoftwareProperties.glade.h:16
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "Restaurar predeterminados"
+msgstr "Restaurar valores predeterminados"
 
 #: ../data/glade/SoftwareProperties.glade.h:17
-#, fuzzy
 msgid "Restore the default keys of your distribution"
-msgstr "Restaurar as claves predeterminadas"
+msgstr "Restaurar as claves predeterminadas da súa distribución"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Propiedades de software"
+msgstr "Fontes de Software"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
-msgstr "Fonte"
+msgstr "Código fonte"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Estatísticas"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Enviar información estatística"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Terceira Parte"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
-#, fuzzy
 msgid "_Check for updates automatically:"
-msgstr "Comprobar se hai actualizacións cada"
+msgstr "_Comprobar actualizacións automaticamente:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
 msgid "_Download updates automatically, but do not install them"
-msgstr ""
+msgstr "_Descarregar as actualizacións automaticamentes, mais non instalalas"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
-msgstr ""
+msgstr "_Importar clave"
 
 #: ../data/glade/SoftwareProperties.glade.h:26
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Instalar actualizacións de seguridade sen requerir confirmación"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
 msgid ""
@@ -1186,15 +1289,20 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
+"<b><big>A información sobre o software disponíbel está anticuada</big></b>\n"
+"\n"
+"Para instalar software e actualizacións de fontes engadidas hai pouco ou "
+"modificadas terás que recargar a información sobre o software disponíbel.\n"
+"\n"
+"Precisarás dunha conexión á internet para continuar."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
 msgstr "<b>Comentario:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
-#, fuzzy
 msgid "<b>Components:</b>"
-msgstr "<b>Compoñentes</b>"
+msgstr "<b>Compoñentes:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Distribution:</b>"
@@ -1209,7 +1317,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1217,12 +1324,11 @@ msgid ""
 "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 completa do repositorio APT que quere engadir</b></"
-"big>\n"
+"<big><b>Introduce a liña APT completa do depósito que queres engadir como "
+"fonte</b></big>\n"
 "\n"
-"A liña de APT contén o tipo, ubicación e contido dun repositorio, por "
-"exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>. Pode atopar unha "
-"descrición detallada da sintase na documentación."
+"A liña APT inclúe o tipo, localización e componentes dun depósito, por "
+"exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
@@ -1237,27 +1343,24 @@ msgstr ""
 "Fonte"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr "Fonte"
+msgstr "Modificar a Fonte"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Analizando o CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr "Fonte"
+msgstr "_Engadir Fonte"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
-#, fuzzy
 msgid "_Reload"
-msgstr "Recargar"
+msgstr "_Recargar"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Mostra e instala as actualizacións dispoñibles"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -1268,10 +1371,12 @@ 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)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Comprobar se existen novas versións da distribución"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1279,194 +1384,177 @@ msgid ""
 "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ás que "
+"recargar a lista de canais manualmente. Esta opción permite agochar o "
+"recordatorio que se mostra neste caso."
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Recorde recargar a lista de canles"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr ""
+msgstr "Mostrar detalles dunha actualización"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Almacena o tamaño da ventá do xestor de actualizacións"
 
 #: ../data/update-manager.schemas.in.h:7
 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 mudanzas e a descrición"
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
-msgstr ""
+msgstr "O tamaño da ventá"
 
 #: ../data/software-properties.desktop.in.h:1
 msgid "Configure the sources for installable software and updates"
-msgstr ""
+msgstr "Configurar as fontes para programas e actualizacións instalábeis"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Actualizacións de Ubuntu 5.10"
+msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Mantido pola comunidade (Universe)"
+msgstr "Mantido pola Comunidade"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Controladores propietarios de dispositivos"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Software contribuido"
+msgstr "Aplicacións restrinxidas"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr "CD con Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Cdrom con Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Actualizacións de Ubuntu 5.04"
+msgstr "Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Mantido pola comunidade (Universe)"
+msgstr "Mantido pola Comunidade (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Mantido pola comunidade (Universe)"
+msgstr "Software de Código Aberto mantido pola Comunidade"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Non libre (Multiverse)"
+msgstr "Controladores non libres"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Controladores propietarios para dispositivos "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Non libre (Multiverse)"
+msgstr "Software restrinxido (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Software con restriccións de exportación estadounidense"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Actualizacións de Ubuntu 5.04"
+msgstr "Cdrom con Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Actualizacións de backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "CD con Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "CD con Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Cdrom con Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Actualizacións de seguranza de Ubuntu 5.10"
+msgstr "Actualizacións de Seguranza para Ubuntu 5.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:140
 msgid "Ubuntu 5.10 Updates"
-msgstr "Actualizacións de Ubuntu 5.10"
+msgstr "Actualizacións para Ubuntu 5.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:145
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Actualizacións de Ubuntu 5.10"
+msgstr "Backports de Ubuntu 5.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Cdrom con Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
-#, fuzzy
 msgid "Officially supported"
-msgstr "Soporte oficial"
+msgstr "Soportado oficialmente"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Actualizacións de seguranza de Ubuntu 5.10"
+msgstr "Actualizacións de Seguranza para Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Actualizacións de Ubuntu 5.10"
+msgstr "Actualizacións para Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Actualizacións de Ubuntu 5.10"
+msgstr "Backports para Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "CD con Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1476,46 +1564,43 @@ msgstr "Mantido pola comunidade (Universe)"
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:201
 msgid "Non-free (Multiverse)"
-msgstr "Non libre (Multiverse)"
+msgstr "Software non libre (Multiverse)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
-#, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr "CD con Ubuntu 4.10 \"Warty Warthog\""
+msgstr "Cdrom con Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Soporte oficial"
+msgstr "Xa non se mantén oficialmente"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
 msgid "Restricted copyright"
-msgstr "Dereito de copia restrinxido"
+msgstr "Copyright restrinxido"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Actualizacións de seguranza de Ubuntu 4.10"
+msgstr "Actualizacións de Seguranza para Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
 msgid "Ubuntu 4.10 Updates"
-msgstr "Actualizacións de Ubuntu 4.10"
+msgstr "Actualizacións para Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Actualizacións de Ubuntu 5.10"
+msgstr "Backports para Ubuntu 4.10"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Debian.info.in:6
@@ -1525,344 +1610,388 @@ msgstr "Debian 3.1 \"Sarge\""
 #. BaseURI
 #: ../data/channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
 #. Description
 #: ../data/channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Actualizacións de seguranza de Debian estable"
+msgstr "Actualizacións de seguridade de Debian 3.1 \"Sarge\""
 
 #. Description
 #: ../data/channels/Debian.info.in:34
-#, fuzzy
 msgid "Debian \"Etch\" (testing)"
-msgstr "Debian de probas"
+msgstr "Debian \"Etch\" (probas)"
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
 #. Description
 #: ../data/channels/Debian.info.in:48
-#, fuzzy
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian Non-US (Inestable)"
+msgstr "Debian \"Sid\" (inestable)"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "Software compatible coa DFSG con dependencias non libres"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "Instalando actualizacións..."
+msgstr "Software non compatible coa DFSG"
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Actualizacións de seguranza de Ubuntu 5.10"
-
-#, fuzzy
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Comprobando se hai actualizacións..."
+#~ msgid ""
+#~ "<big><b>Error scaning the CD</b></big>\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<big><b>Erro explorando o CD</b></big>\n"
+#~ "\n"
+#~ "%s"
 
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "Soporte oficial"
+#~ 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. "
 
-#, fuzzy
-#~ msgid "The upgrade aborts now. Please report this 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 ""
-#~ "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma "
-#~ "un erro."
+#~ "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."
 
-#, fuzzy
-#~ msgid "Hide details"
-#~ msgstr "<b>Detalles</b>"
+#~ 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."
 
-#, fuzzy
-#~ msgid "<b>Channels</b>"
-#~ msgstr "<b>Claves</b>"
+#~ 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 "<b>Keys</b>"
-#~ msgstr "<b>Claves</b>"
+#~ msgid "Some software no longer officially supported"
+#~ msgstr "Algúns programas xa non están soportados oficialmente"
 
-#~ msgid "Installation Media"
-#~ msgstr "Soportes de instalación"
+#~ 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 "Software Preferences"
-#~ msgstr "Preferencias de software"
+#~ msgid "Restoring originale system state"
+#~ msgstr "Restaurando o estado orixinal do sistema"
 
-#~ msgid "     "
-#~ 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 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."
 
-#, fuzzy
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>Claves</b>"
+#~ msgid "About %li days %li hours %li minutes remaining"
+#~ msgstr "Faltan %li dias %li horas %li minutos"
 
-#, fuzzy
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Compoñentes</b>"
+#~ msgid "About %li hours %li minutes remaining"
+#~ msgstr "Faltan %li horas %li minutos"
 
-#~ msgid "_Custom"
-#~ msgstr "_Personalizar"
+#~ msgid "About %li minutes remaining"
+#~ msgstr "Faltan %li minutos"
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Actualizacións de Ubuntu 5.10"
+#~ msgid "About %li seconds remaining"
+#~ msgstr "Faltan %li segundos"
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Actualizacións de seguranza de Ubuntu 5.04"
+#~ msgid "Download is complete"
+#~ msgstr "Completouse a descarga"
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Actualizacións de Ubuntu 5.10"
+#~ msgid "Downloading file %li of %li at %s/s"
+#~ msgstr "Descargando ficheiro %li de %li a %s/s"
 
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Actualizacións de Ubuntu 5.10"
+#~ msgid "Downloading file %li of %li"
+#~ msgstr "Descargando ficheiro %li de %li"
 
-#, fuzzy
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>Seccións:</b>"
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr ""
+#~ "A actualización cancelarase agora. Por favor, informe disto como un fallo."
 
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Seccións:</b>"
+#~ msgid ""
+#~ "Replace configuration file\n"
+#~ "'%s'?"
+#~ msgstr ""
+#~ "Desexa reemplazar o ficheiro de configuración\n"
+#~ "'%s'?"
 
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "Recargar a información do paquete desde o servidor."
+#~ 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 ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-#~ "\n"
-#~ "Need to get the changes from the central server"
+#~ "The upgrade can take several hours and cannot be canceled at any time "
+#~ "later."
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Descargando informe de trocos</"
-#~ "span>\n"
-#~ "\n"
-#~ "Necesítanse descargar os trocos do servidor actual"
+#~ "A actualización pode levar varias horas e non poderá ser cancelada "
+#~ "despois en ningún momento."
 
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Amosar actualización dispoñibles e escoller cales instalar"
+#~ msgid "Could not find any upgrades"
+#~ msgstr "Non se puido atopar ningunha actualización"
 
-#, fuzzy
-#~ msgid "Error fetching the packages"
-#~ msgstr "Erro ao quitar a clave"
+#~ msgid "Your system has already been upgraded."
+#~ msgstr "O seu sistema xa foi actualizado."
 
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Editar fontes de software e preferencias"
+#~ 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 "<b>Sources</b>"
-#~ msgstr "<b>Fontes</b>"
+#~ msgid "Downloading and installing the upgrades"
+#~ msgstr "Descargando e instalando as actualizacións"
 
-#~ msgid "day(s)"
-#~ msgstr "día(s)"
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Actualizando Ubuntu"
 
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Repositorio</b>"
+#~ 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 "<b>Temporary files</b>"
-#~ msgstr "<b>Ficheiros temporais</b>"
+#~ msgid "Downloading file %li of %li with %s/s"
+#~ msgstr "Descargando ficheiro %li de %li a %s/s"
 
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Interface de usuario</b>"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Descargando ficheiro %li de %li a velocidade descoñecida"
 
-#~ 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."
+#~ msgid "The list of changes is not available yet. Please try again later."
 #~ msgstr ""
-#~ "<big><b>Claves de autenticación</b></big>\n"
-#~ "\n"
-#~ "Pode engadir e quitar claves de autenticación desde este diálogo. Unha "
-#~ "clave fai posible verificar a integridade do software que descarga."
+#~ "A lista de cambios non está dispoñible aínda. Por favor, ténteo de novo "
+#~ "máis tarde."
 
 #~ 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. "
+#~ "Failed to download the list of changes. Please check your Internet "
+#~ "connection."
 #~ msgstr ""
-#~ "Engadir un novo ficheiro de clave de anel de confianza. Asegúrese de que "
-#~ "obtivo a clave a través dun canle seguro e que confía no propietario. "
-
-#~ msgid "Add repository..."
-#~ msgstr "Engadir repositorio..."
-
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "Comprobar automaticamente as _actualizacións de software."
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Limpar _temporalmente os ficheiros de paquetes"
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Intervalo de limpeza en días: "
+#~ "Fallou a descarga da lista de cambios. Por favor, comprobe a súa conexión "
+#~ "a Internet."
 
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Borrar os paquetes _antigos da caché de paquetes"
-
-#~ msgid "Edit Repository..."
-#~ msgstr "Editar repositorio..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Idade máxima en días:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Tamaño máximo en MB:"
+#~ msgid "Cannot install all available updates"
+#~ msgstr "Non se puideron instalar todas as actualizacións dispoñibles"
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "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 ""
-#~ "Recupera as claves entregadas orixinalmente coa distribución. Isto non "
-#~ "cambiará as claves instaladas polo usuario."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Establecer tamaño _máximo para a caché de paquetes"
+#~ "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 "Settings"
-#~ msgstr "Preferencias"
+#~ msgid "The following updates will be skipped:"
+#~ msgstr "Pasaranse por alto as seguintes actualizacións:"
 
-#~ msgid "Show detailed package versions"
-#~ msgstr "Amosar versións detalladas do paquete"
+#~ msgid "Downloading the list of changes..."
+#~ msgstr "Descargando a lista de cambios..."
 
-#~ msgid "Show disabled software sources"
-#~ msgstr "Amosar fontes de software desactivado"
+#~ msgid "Hide details"
+#~ msgstr "Ocultar detalles"
 
-#~ msgid "Update interval in days: "
-#~ msgstr "Intervalo de actualización en días: "
+#~ msgid "Show details"
+#~ msgstr "Mostrar detalles"
 
-#~ msgid "_Add Repository"
-#~ msgstr "_Engadir repositorio"
+#~ msgid "New version: %s   (Size: %s)"
+#~ msgstr "Nova versión: %s   (Tamaño: %s)"
 
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Descargar paquetes actualizables"
+#~ 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 "<b>Status:</b>"
-#~ msgstr "<b>Estado:</b>"
+#~ 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 ""
-#~ "<big><b>Available Updates</b></big>\n"
+#~ "<b><big>You must check for updates manually</big></b>\n"
 #~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
+#~ "Your system does not check for updates automatically. You can configure "
+#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties"
+#~ "\"."
 #~ msgstr ""
-#~ "<big><b>Actualizacións dispoñibles</b></big>\n"
+#~ "<b><big>Debe comprobar as actualizacións manualmente</big></b>\n"
 #~ "\n"
-#~ "O xestor de actualizacións atopou os seguintes paquetes actualizables. "
-#~ "Pode actualizalos usando o botón Instalar."
-
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "Cancelar a descarga do informe de cambios"
+#~ "O seu sistema non comproba as actualizacións automatimente. Pode "
+#~ "configurar este comportamento en \"Sistema\" -> \"Administración\" -> "
+#~ "\"Propiedades do software\"."
 
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Necesita ser root para executar este programa"
+#~ 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 "Binary"
-#~ msgstr "Binario"
+#~ msgid "Cancel _Download"
+#~ msgstr "Cancelar _descarga"
 
-#~ msgid "Non-free software"
-#~ msgstr "Software non libre"
+#~ msgid "<b>Channels</b>"
+#~ msgstr "<b>Canles</b>"
 
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian 3.0 \"Woody\""
+#~ msgid "<b>Keys</b>"
+#~ msgstr "<b>Claves</b>"
 
-#~ msgid "Debian Stable"
-#~ msgstr "Debian estable"
+#~ msgid "Add _Cdrom"
+#~ msgstr "Engadir _CD-ROM"
 
-#~ msgid "Debian Unstable \"Sid\""
-#~ msgstr "Debian inestable \"Sid\""
+#~ msgid "Installation Media"
+#~ msgstr "Soporte da instalación"
 
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Debian Non-US (Estable)"
+#~ msgid "Software Preferences"
+#~ msgstr "Preferencias do software"
 
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian Non-US (Probas)"
+#~ msgid "_Download updates in the background, but do not install them"
+#~ msgstr "_Descargar actualizacións en segundo plano, pero sen instalalas"
 
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr ""
-#~ "Clave de asinado automático do ficheiro de Ubuntu <ftpmaster@ubuntu.com>"
+#~ msgid "     "
+#~ msgstr "     "
 
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
+#~ 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 ""
-#~ "Clave de asinado automático das imaxes de CD de Ubuntu <cdimage@ubuntu."
-#~ "com>"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "Escolla un ficheiro de clave"
+#~ "<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 "There is one package available for updating."
-#~ msgstr "Hai un paquete dispoñible para ser actualizado."
+#~ msgid "<b>Channel</b>"
+#~ msgstr "<b>Canles</b>"
 
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "Hai %s paquetes dispoñibles para ser actualizados."
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Compoñentes</b>"
 
-#~ msgid "There are no updated packages"
-#~ msgstr "Non hai paquetes actualizados"
+#~ 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 "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 seleccionou ningún %s paquete actualizable"
-#~ msgstr[1] "Non seleccionou ningún dos %s paquetes actualizables"
+#~ msgid "Add Channel"
+#~ msgstr "Engadir unha canle"
 
-#~ msgid "You have selected %s updated package, size %s"
-#~ msgid_plural "You have selected all %s updated packages, total size %s"
-#~ msgstr[0] "Seleccionou %s paquete actualizable, tamaño %s"
-#~ msgstr[1] "Seleccionou %s paquetes actualizables, de tamaño total %s"
+#~ msgid "Edit Channel"
+#~ msgstr "Cambiar unha canle"
 
-#~ 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] "Seleccionou %s paquete actualizable de %s, de tamaño %s"
-#~ msgstr[1] "Seleccionou %s paquetes actualizables de %s, de tamaño total %s"
+#~ msgid "_Add Channel"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Engadir unha canle"
+#~ msgstr[1] "_Engadir canles"
 
-#~ msgid "The updates are being applied."
-#~ msgstr "Estanse aplicando as actualizacións."
+#~ msgid "_Custom"
+#~ msgstr "_Personalizado"
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "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 ""
-#~ "Só pode executar unha aplicación de xestión de paquetes ao mesmo tempo. "
-#~ "Por favor peche a outra aplicación primeiro."
+#~ "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 "Updating package list..."
-#~ msgstr "Actualizando a lista de paquetes..."
+#~ 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 "There are no updates available."
-#~ msgstr "Non hai actualizacións dispoñibles."
+#~ msgid "Configure software channels and internet updates"
+#~ msgstr "Configura canles de software e actualizacións por Internet"
 
-#~ msgid "New version:"
-#~ msgstr "Nova versión:"
+#~ msgid "Software Properties"
+#~ msgstr "Propiedades do software"
 
-#~ 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 actualícese a unha versión de Ubuntu linux. A versión que está "
-#~ "usando non obterá máis actualizacións de seguranza nin outras "
-#~ "actualizacións críticas. Visite http://www.ubuntulinux.org para máis "
-#~ "información acerca de como actualizar."
+#~ msgid "Ubuntu 6.06 LTS"
+#~ msgstr "Ubuntu 6.06 LTS"
 
-#~ msgid ""
-#~ "A new release with the codename '%s' is available. Please see http://www."
-#~ "ubuntulinux.org/ for upgrade instructions."
-#~ msgstr ""
-#~ "Está dispoñible unha nova versión co nome '%s'. Por favor visite http://"
-#~ "www.ubuntulinux.org  para recibir instruccións de como actualizar."
+#~ msgid "Ubuntu 6.06 LTS Security Updates"
+#~ msgstr "Actualizacións de seguridade de Ubuntu 6.06 LTS"
 
-#~ msgid "Never show this message again"
-#~ msgstr "Non amosar máis esta mensaxe"
+#~ msgid "Ubuntu 6.06 LTS Updates"
+#~ msgstr "Actualizacións de Ubuntu 6.06 LTS"
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr ""
-#~ "Non se atopou o informe de cambios, pode que o servidor non esté "
-#~ "actualizado aínda."
+#~ msgid "Ubuntu 6.06 LTS Backports"
+#~ msgstr "«Backports» de Ubuntu 6.06 LTS"
diff --git a/po/he.po b/po/he.po
index 761d9293..3199ed27 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-30 11:15+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-09-30 14:09+0000\n"
 "Last-Translator: Yaniv Abir <yanivabir@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,6 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:136
-#, fuzzy
 msgid "Daily"
 msgstr "מידי יום"
 
@@ -71,22 +70,22 @@ msgstr "מתקין עדכונים..."
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "שרת ראשי"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "השרת ב%s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "השרת הקרוב ביותר"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
@@ -101,21 +100,19 @@ msgstr "עדכוני תוכנה"
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "פעיל"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr "מקור"
+msgstr "(קוד מקור)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
-msgstr "מקור"
+msgstr "קוד מקור"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
-msgstr ""
+msgstr "יבוא מפתח"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
@@ -146,17 +143,17 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:1096
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "אנא הזן שם לדיסק"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1112
 msgid "Please insert a disc in the drive:"
 msgstr "אנא הכניסו תקליטור לכונן:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "חבילות פגומות"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -164,20 +161,20 @@ msgstr ""
 "במערכת שלך נמצאות חבילות פגומות שתוכנה זו לא יכולה לתקן. אנא תקן אותן "
 "באמצעות synaptic או apt-get לפני שתמשיך."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "לא ניתן לשדרג את חבילות העל הנדרשות"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "חבילה חיונית תוסר בלית ברירה"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "לא ניתן לחשב את השדרוג"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -189,34 +186,34 @@ msgstr ""
 "כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "שגיאה באימות חלק מן החבילות"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "לא ניתן להתקין את \"%s\""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "לא ניתן להתקין חבילה הכרחית. אנא דווחו על זה כבאג. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "לא ניתן לקבוע חבילת על"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -230,7 +227,7 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
 msgid "Failed to add the CD"
-msgstr ""
+msgstr "הוספת התקליטור נכשלה"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -241,16 +238,21 @@ msgid ""
 "The error message was:\n"
 "'%s'"
 msgstr ""
+"אירעה שגיאה בהוספת התקליטור, לכן השדרוג בוטל. אנא דווחו על כך כבאג אם מדובר "
+"בתקליטור אובונטו תקני.\n"
+"\n"
+"הודעת השגיאה הייתה:\n"
+"\"%s\""
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
-msgstr ""
+msgstr "קורא מטמון"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "להוריד מידע מהאינטרנט לצורך השדרוג?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -258,11 +260,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
-msgstr ""
+msgstr "לא נמצא אתר מראה תקני"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -273,13 +275,20 @@ msgid ""
 "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"
+"בחירה ב\"לא\" תבטל את העדכון."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
-msgstr ""
+msgstr "לייצר מקורות ברירת מחדל?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -287,33 +296,36 @@ msgid ""
 "Should default entries for '%s' be added? If you select 'No' the update will "
 "cancel."
 msgstr ""
+"לאחר סריקת רשימת המקורות שלך (sources.list) לא נמצא רישום מתאים ל\"%s\".\n"
+"\n"
+"האם לקבוע את ברירת המחדל כרישום ל\"%s\"? בחירה ב\"לא\" תבטל את העדכון."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
-msgstr ""
+msgstr "מידע מאגרים לא תקין"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
-msgstr ""
+msgstr "עדכון מידע המאגרים יצר קובץ לא תקין. אנא דווחו על כך כבאג."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
-msgstr ""
+msgstr "מקורות של ספקי צד שלישי בוטלו"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "שגיאה במהלך העדכון"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -321,28 +333,30 @@ msgstr ""
 "הייתה בעיה בתהליך העידכון. בדרך כלל זוהי בעיית רשת, אנא בדקו את חיבור הרשת "
 "שלכם ונסו שנית."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "אין מספיק שטח בדיסק הקשיח"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 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\"."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "האם ברצונך להתחיל את השדרוג?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "לא ניתן להתקין את השדרוג"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -351,22 +365,22 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "לא ניתן להוריד את השדרוג"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 "השדרוג בוטל. אנא בדקו את החיבור לאינטרנט או את מדיית ההתקנה ונסו שנית. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "המיכה בכמה תוכנות הסתיימה"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -375,55 +389,66 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "להסיר חבילות שאינן בתוקף?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_דלג על השלב"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_הסר"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
-msgstr ""
+msgstr "שגיאה בעת ביצוע"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
-msgstr ""
+msgstr "מספר בעיות נתגלו במהלך הניקוי. אנא הסתכל בהודעות מטה למידע נוסף. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 #, fuzzy
 msgid "Restoring original system state"
 msgstr "מאתחל את המערכת"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
+msgstr "בודק את מנהל החבילות"
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:672
-msgid "Updating repository information"
+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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr "מעדכן מידע מאגרים"
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
-msgstr ""
+msgstr "מידע חבילה לא תקין"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -435,19 +460,19 @@ msgstr ""
 "לאחר שהמידע על החבילות עודכן החבילה ההכרחית \"%s\" לא נמצא.\n"
 "כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "משדרג"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "שדרוג המערכת הושלם."
 
@@ -489,7 +514,7 @@ msgstr "מוריד שינויים..."
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "לא ניתן להתקין את \"%s\""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:188
 msgid ""
@@ -507,8 +532,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -517,7 +542,7 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
-msgstr ""
+msgstr "ארעה שגיאה חמורה"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
 msgid ""
@@ -551,19 +576,23 @@ msgstr[0] "חבילה %s תשודרג."
 msgstr[1] "%s חבילות ישודרגו."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "יש להוריד %s בסה\"כ."
+msgstr ""
+"\n"
+"\n"
+"יש להוריד %s בסה\"כ. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
-msgstr "השדרוג עשוי לקחת מספר שעות, ולא ניתן לבטלו בשלב מאוחר יותר."
+msgstr ""
+"הורדת והתקנת השדרוג עשויה לארוך מספר שעות. לא ניתן לבטל את התהליך בשלב מאוחר "
+"יותר."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -571,16 +600,15 @@ msgstr "כדי למנוע אובדן מידע אנא סגרו על תוכנית
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
-msgstr "המערכת שלך מעודכנת!"
+msgstr "המערכת שלך מעודכנת"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:519
 msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
-msgstr ""
+msgstr "אין שדרוגים זמינים למערכת שלך. השדרוג יתבטל כעת."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -598,42 +626,42 @@ msgid "Upgrade %s"
 msgstr "שדרג %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "נותרו בערך %li ימים, %li שעות ו-%li דקות."
+msgstr "%li ימים, %li שעות ו-%li דקות"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "נותרו בערך %li שעות ו-%li דקות."
+msgstr "%li שעות ו-%li דקות"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li דקות"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%liשניות"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
-msgstr ""
+msgstr "נדרשת הפעלה מחדש"
 
 #: ../DistUpgrade/DistUpgradeView.py:110
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
-msgstr ""
+msgstr "השדרוג הסתיים ונדרשת הפעלה מחדש. האם ברצונך לעשות זאת כעת?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -651,36 +679,38 @@ msgid ""
 "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"
+"המערכת עלולה להיות בלתי שמישה אם תבטלו את השדרוג. מומלץ ביותר להמשיך את מהלך "
+"השדרוג."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-msgstr ""
+msgstr "<b><big>להפעיל מחדש את המערכת כדי להשלים את השדרוג?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>להתחיל את השדרוג?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>משדרג את אובונטו לגרסה 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "מסדר ומנקה"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
-msgstr "<b>פרטים</b>"
+msgstr "פרטים"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "ההבדל בין הרבצים"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
-msgstr "לא ניתן להתקין את השדרוג"
+msgstr "מוריד ומתקין את השדרוג"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -699,60 +729,70 @@ msgid "Terminal"
 msgstr "מסוף"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_שמור"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_החלף"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_דווח על באג"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_אתחל עכשיו"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_המשך בשידרוג"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
-msgstr ""
+msgstr "לא ניתן למצוא הערות שיחרור גירסה"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "השרת עלול להיות עמוס מדי. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
 msgid "Could not download the release notes"
-msgstr ""
+msgstr "לא ניתן להוריד הערות שחרור גירסה."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "אנא בדקו את החיבור לאינטרנט."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
-msgstr ""
+msgstr "לא ניתן להריץ את כלי השדרוג"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:150
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
-msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
+msgstr "זהו כנראה באג בכלי השדרוג. אנא דווחו על זה כבאג."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:171
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "מוריד שינוייים"
+msgstr "מוריד את כלי השדרוג"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "כלי השדרוג ינחה אותך בתהליך השדרוג."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
@@ -764,28 +804,27 @@ msgstr "כלי שדרוג"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
-msgstr ""
+msgstr "ההורדה נכשלה"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "הורדת השדרוג נכשלה. עלולה להיות בעיית רשת. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
-msgstr ""
+msgstr "החילוץ נכשל"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
-msgstr ""
+msgstr "חילוץ השדרוג נכשל. עלולה להיות בעיה עם הרשת או השרת. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
-msgstr ""
+msgstr "האימות נכשל"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
@@ -802,152 +841,148 @@ msgid ""
 msgstr "אימות השדרוג נכשל. עלולה להיות בעיה עם הרשת או עם השרת. "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה"
+msgstr ""
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "גרסה חדשה של אובונטו זמינה!"
+msgstr "רשימת השינויים אינה זמינה"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
-msgstr "נכשל בהורדת השינויים. אנא בדוק אם החיבור לאינטרנט עובד."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "עדכוני אבטחה - אובונטו 5.10"
+msgstr "עדכוני אבטחה חשובים"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "עדכונים מומלצים"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "מתקין עדכונים..."
+msgstr "עדכונים מוצעים"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "_המשך בשידרוג"
+msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "מתקין עדכונים..."
+msgstr "עדכונים אחרים"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "גרסה %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr "מוריד שינוייים"
+msgstr "מוריד רשימת שינויים..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "גודל ההורדה: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "מתקין עדכונים..."
 msgstr[1] "מתקין עדכונים..."
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "אנא חכו, התהליך לארוך זמן מה."
 
-#: ../UpdateManager/UpdateManager.py:650
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr "ההורדה הושלמה"
+msgstr "העדכון הושלם"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "מתקין עדכונים..."
+msgstr "מחפש עדכונים"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "גרסה %s: \n"
+msgstr "גרסה %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(גודל: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
-msgstr "ההפצה שלך כבר לא נתמכת, סליחה."
+msgstr "גרסת ההפצה שלך אינה נתמכת יותר"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 למידע נוסף על שידרוג המערכת."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>גירסה חדשה של ההפצה, \"%s\", זמינה</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
-msgstr ""
+msgstr "אינדקס התוכנות פגום"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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\" במסוף כדי לתקן בעיה זו."
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
@@ -984,20 +1019,12 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
-"<big><b>שגיאה בסריקת התקליטור</b></big>\n"
-"\n"
-"%s"
+msgstr "<big><b>לא ניתן להתקין את כל העדכונים</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr ""
-"<big><b>שגיאה בסריקת התקליטור</b></big>\n"
-"\n"
-"%s"
+msgstr "<big><b>פותח את מנהל העדכונים</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1005,15 +1032,15 @@ msgstr "שינויים"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "שינויים ותיאור העדכון"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
-msgstr ""
+msgstr "בדו_ק"
 
 #: ../data/glade/UpdateManager.glade.h:10
 msgid "Check the software channels for new updates"
-msgstr ""
+msgstr "בדיקת המצאות עדכונים במאגרי התוכנה"
 
 #: ../data/glade/UpdateManager.glade.h:11
 msgid "Description"
@@ -1021,7 +1048,7 @@ msgstr "תיאור"
 
 #: ../data/glade/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "הערות שחרור גירסה"
 
 #: ../data/glade/UpdateManager.glade.h:13
 msgid ""
@@ -1033,7 +1060,7 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
-msgstr ""
+msgstr "הראה התקדמות כל קובץ"
 
 #: ../data/glade/UpdateManager.glade.h:17
 msgid "Software Updates"
@@ -1043,19 +1070,19 @@ msgstr "עדכוני תוכנה"
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities and "
 "provide new features."
-msgstr ""
+msgstr "עדכוני תוכנה מתקנים שגיאות ופרצות אבטחה ומוסיפים תכונות חדשות."
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
-msgstr ""
+msgstr "ש_דרג"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "שדרוג המערכת לגירסה החדשה של אובונטו."
 
 #: ../data/glade/UpdateManager.glade.h:21
 msgid "_Check"
-msgstr ""
+msgstr "_בדוק"
 
 #: ../data/glade/UpdateManager.glade.h:22
 #, fuzzy
@@ -1064,7 +1091,7 @@ msgstr "_המשך בשידרוג"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_הסתר מידע זה בעתיד"
 
 #: ../data/glade/UpdateManager.glade.h:24
 #, fuzzy
@@ -1072,32 +1099,28 @@ msgid "_Install Updates"
 msgstr "מתקין עדכונים..."
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
 msgstr "שינויים"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "עדכונים"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>עדכוני אינטרנט</b>"
+msgstr "<b>עדכונים אוטומטיים</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>תקליטור/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-#, fuzzy
 msgid "<b>Internet updates</b>"
 msgstr "<b>עדכוני אינטרנט</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>עדכוני אינטרנט</b>"
+msgstr "<b>אינטרנט</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1109,10 +1132,16 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
 msgid "Add Cdrom"
-msgstr ""
+msgstr "הוסף תקליטור"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
@@ -1123,9 +1152,8 @@ msgid "D_elete downloaded software files:"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "ההורדה הושלמה"
+msgstr "הורד מ:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 #, fuzzy
@@ -1133,20 +1161,18 @@ msgid "Import the public key from a trusted software provider"
 msgstr "הסר את המפתח הנבחר מרשימת המפתחות שאתה בוטח בהם."
 
 #: ../data/glade/SoftwareProperties.glade.h:14
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>עדכוני אינטרנט</b>"
+msgstr "עדכוני אינטרנט"
 
 #: ../data/glade/SoftwareProperties.glade.h:15
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
 "automatically"
-msgstr ""
+msgstr "רק עדכוני אבטחה משרתי אובונטו הרשמיים יותקנו באופן אוטומטי."
 
 #: ../data/glade/SoftwareProperties.glade.h:16
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "שחזר ברירת מחדל"
+msgstr "שחזר _ברירת מחדל"
 
 #: ../data/glade/SoftwareProperties.glade.h:17
 #, fuzzy
@@ -1155,35 +1181,32 @@ msgstr "שחזר מפתחות ברירת מחדל"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "מאפייני תוכנה"
+msgstr "מקורות תוכנה"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
-msgstr "מקור"
+msgstr "קוד מקור"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "סטטיסטיקה"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "שלח מידע סטטיסטי"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "צד שלישי"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
-#, fuzzy
 msgid "_Check for updates automatically:"
-msgstr "בדוק לעדכונים כל"
+msgstr "_חפש עדכונים אוטומטית:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
 msgid "_Download updates automatically, but do not install them"
-msgstr ""
+msgstr "_הורד עדכונים באופן אוטומטי, אך אל תתקין אותם"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1191,7 +1214,7 @@ msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:26
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_התקן עדכוני אבטחה ללא הודעה"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
 msgid ""
@@ -1258,7 +1281,7 @@ msgstr "מקור"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "סורק תקליטור"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 #, fuzzy
@@ -1272,7 +1295,7 @@ msgstr "טען מחדש"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "הצג והתקן העדכונים הזמינים"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -1282,11 +1305,11 @@ msgstr "מנהל עדכונים"
 msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
-msgstr ""
+msgstr "בדוק אוטומטית אם גירסה חדשה של הפצה זו זמינה, והצע לשדרג (אם ניתן)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "חפש גירסאות חדשות להפצה"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1301,7 +1324,7 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr ""
+msgstr "הצג פרטי עדכונים"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
@@ -1315,17 +1338,17 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
-msgstr ""
+msgstr "גודל החלון"
 
 #: ../data/software-properties.desktop.in.h:1
 msgid "Configure the sources for installable software and updates"
-msgstr ""
+msgstr "הגדרת מקורות התוכנות להתקנה והעדכונים"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
@@ -1335,14 +1358,13 @@ msgstr "עדכונים - אובונטו 5.10"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "מתוחזק ע\"י קהילה (Universe("
+msgstr "מתוחזק ע\"י הקהילה"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "דרייברים קניינים להתקנים"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
@@ -1364,20 +1386,18 @@ msgstr "עדכונים - אובונטו 5.04"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "מתוחזק ע\"י קהילה (Universe("
+msgstr "מתוחזק ע\"י הקהילה (Universe("
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "מתוחזק ע\"י קהילה (Universe("
+msgstr "תוכנות קוד פתוח המתוחזקות ע\"י הקהילה"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
@@ -1398,9 +1418,8 @@ msgstr "לא-חופשי (Multiverse("
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "תוכנה מוגבלת בארה\"ב"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
@@ -1530,7 +1549,7 @@ msgstr "עדכונים - אובונטו 5.10"
 #: ../data/channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Debian.info.in:6
@@ -1540,7 +1559,7 @@ msgstr "דביאן 3.1 \"סארג'\""
 #. BaseURI
 #: ../data/channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
 #. Description
 #: ../data/channels/Debian.info.in:20
@@ -1557,7 +1576,7 @@ msgstr "דביאן בדיקה"
 #. BaseURI
 #: ../data/channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
 #. Description
 #: ../data/channels/Debian.info.in:48
@@ -1575,13 +1594,64 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
+#~ 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 Canonical supported Open Source software"
+#~ msgstr "תוכנות קוד פתוח הנתמכות ע\"י Canonical"
+
+#~ 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 במהירות לא ידועה"
 
-#, fuzzy
 #~ msgid "Normal updates"
-#~ msgstr "מתקין עדכונים..."
+#~ 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 "לא ניתן למצוא שדרוג זמין"
diff --git a/po/hi.po b/po/hi.po
index 8a95c9a7..a23f976b 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:46+0000\n"
-"Last-Translator: Rosetta Administrators <rosetta@launchpad.net>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-08-01 15:30+0000\n"
+"Last-Translator: Gaurav Mishra <gauravtechie@gmail.com>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,41 +19,41 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:136
 msgid "Daily"
-msgstr ""
+msgstr "प्रतिदिन"
 
 #: ../SoftwareProperties/SoftwareProperties.py:137
 msgid "Every two days"
-msgstr ""
+msgstr "हर दो दिन"
 
 #: ../SoftwareProperties/SoftwareProperties.py:138
 msgid "Weekly"
-msgstr ""
+msgstr "साप्ताहिक"
 
 #: ../SoftwareProperties/SoftwareProperties.py:139
 msgid "Every two weeks"
-msgstr ""
+msgstr "हर दो हफ्तों में"
 
 #: ../SoftwareProperties/SoftwareProperties.py:144
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "हर %s दिन में"
 
 #: ../SoftwareProperties/SoftwareProperties.py:167
 msgid "After one week"
-msgstr ""
+msgstr "एक हफ्ते बाद"
 
 #: ../SoftwareProperties/SoftwareProperties.py:168
 msgid "After two weeks"
-msgstr ""
+msgstr "दो हफ्ते बाद"
 
 #: ../SoftwareProperties/SoftwareProperties.py:169
 msgid "After one month"
-msgstr ""
+msgstr "एक महीने बाद"
 
 #: ../SoftwareProperties/SoftwareProperties.py:174
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "%s दिन बाद"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
@@ -108,11 +108,11 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
-msgstr ""
+msgstr "कुंजी आयात करें"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
-msgstr ""
+msgstr "चुने हुये दस्तावेज को आयात करने में त्रुटि"
 
 #: ../SoftwareProperties/SoftwareProperties.py:980
 msgid "The selected file may not be a GPG key file or it might be corrupt."
@@ -142,30 +142,30 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -174,34 +174,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -228,11 +228,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -240,11 +240,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -257,11 +257,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -270,42 +270,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -314,15 +314,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -331,21 +331,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -354,54 +354,65 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -411,19 +422,19 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr ""
 
@@ -481,8 +492,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -544,7 +555,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr ""
 
@@ -594,8 +605,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -669,25 +680,37 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
+msgid "_Continue"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
+msgid "_Replace"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -778,128 +801,130 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
 msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, python-format
 msgid "Version %s"
 msgstr ""
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1282,7 +1307,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1312,7 +1337,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
diff --git a/po/hr.po b/po/hr.po
index e38d5605..154fd296 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-24 20:54+0000\n"
-"Last-Translator: Ante Karamatić <ivoks@ubuntu.com>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:38+0000\n"
+"Last-Translator: Ante Karamatić <ivoks@grad.hr>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,9 +58,9 @@ msgstr "Nakon %s dana"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "_Instaliraj nadogradnje"
+msgstr "%s nadogradnje"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -68,45 +68,44 @@ msgstr "_Instaliraj nadogradnje"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Glavni poslužitelj"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Poslužitelj za %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Najbliži poslužitelj"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Osobni poslužitelji"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Nadogradnje programa"
+msgstr "Softverski repozitorij"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Aktivno"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(Izvorni kod)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "Izvorni kod"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -148,11 +147,11 @@ msgstr "Upišite ime za disk"
 msgid "Please insert a disc in the drive:"
 msgstr "Ubacite CD u uređaj:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Pokvareni paketi"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -160,20 +159,20 @@ msgstr ""
 "Vaš sistem sadrži pokvarene pakete koji nisu mogli biti popravljeni sa ovim "
 "programom. Popravite ih koristeći synaptic ili apt-get prije nastavljanja."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Ne mogu nadograditi potrebne meta-pakete"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Bitan paket bi morao biti uklonjen"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Nisam mogao riješiti nadogradnju"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -182,14 +181,14 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Neriješiv problem se pojavio prilikom rješavanja nadogradnje. Molimo "
-"prijavite ovo kao grešku. "
+"prijavite ovo kao grešku."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Greška prilikom identificiranja nekih paketa"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -199,12 +198,12 @@ msgstr ""
 "problem sa mrežom i trebali biste kasnije pokušati ponovo. Pogledajte popis "
 "neidentificiranih paketa."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Ne mogu instalirati '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -213,11 +212,11 @@ msgstr ""
 "grešku. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Nisam mogao odrediti meta-paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -232,9 +231,8 @@ msgstr ""
 "koristeći synaptic ili apt-get."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Preuzimanje nije uspjelo"
+msgstr "Dodavanje CDa nije uspjelo"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -245,28 +243,37 @@ msgid ""
 "The error message was:\n"
 "'%s'"
 msgstr ""
+"Došlo je do greške prilikom dodavanja CDa 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'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Čitam spremnik"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Preuzeti podatke za nadogradnju putem mreže?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Nisam našao ispravan zrcalni poslužitelj"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -286,11 +293,11 @@ msgstr ""
 "Ako odaberete 'ne' nadogradnja će se prekinuti."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Kreirati uobičajene izvore?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -303,11 +310,11 @@ msgstr ""
 "Treba li dodati uobičajene unose za '%s' ? Ako odaberete 'Ne' nadogradnja će "
 "prekinuti."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Podaci repozitorija neispravni"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -315,11 +322,11 @@ msgstr ""
 "Nadogradnja podataka repozitorija je rezultirala neispravnom datotekom. "
 "Molim, prijavite ovo kao bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Izvori trećih strana su isključeni"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, fuzzy
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
@@ -330,11 +337,11 @@ msgstr ""
 "ih uključiti nakon nadogradnje sa 'software-properties' alatom ili sa "
 "synapticom."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Greška prilikom nadogradnje"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -342,11 +349,11 @@ 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Nema dovoljno praznog mjesta na disku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -358,16 +365,15 @@ msgstr ""
 "koristeći 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Želite li pokrenuti nadogradnju?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Nisam mogao instalirati nadogradnje"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -376,13 +382,16 @@ msgid ""
 "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)."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Nisam mogao preuzeti nadogradnje"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -390,11 +399,11 @@ msgstr ""
 "Nadogradnja se prekida. Molim provjerite vašu internet vezu ili "
 "instalacijski medij i pokušajte ponovo. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -407,25 +416,25 @@ msgstr ""
 "repozitoriju kojeg održava zajednica ('Universe').\n"
 "\n"
 "Ako nemate omogućen 'universe' repozitorij, ovi paketi biti će predloženi za "
-"uklanjanje. "
+"uklanjanje."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Ukloniti zastarjele pakete?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Preskoči ovaj korak"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Greška prilikom čina"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -434,32 +443,47 @@ msgstr ""
 "više informacija. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Vraćam u početno stanje"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Provjeravam upravitelja paketima"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Pripremam nadogradnju"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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 ""
+"Neriješiv problem se pojavio prilikom rješavanja nadogradnje. Molimo "
+"prijavite ovo kao grešku."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Nadograđujem podatke repozitorija"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Neispravni podaci paketa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -469,21 +493,23 @@ msgid ""
 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 bug."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Pitam za potvrdu"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Nadograđujem"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Tražim zastarjele programe"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Nadogradnja sustava je završena."
 
@@ -494,9 +520,8 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "Molim, ubacite '%s' u uređaj '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "Nadogradnja je gotova"
+msgstr "Preuzimanje je završeno"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, fuzzy, python-format
@@ -505,9 +530,9 @@ msgstr "Preuzimam datoteku %li od %li pri %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Otprilike je ostalo %li minuta"
+msgstr "Otprilike je ostalo %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, fuzzy, python-format
@@ -531,6 +556,8 @@ 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."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
@@ -544,8 +571,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -557,15 +584,14 @@ msgid "A fatal error occured"
 msgstr "Pojavila se ozbiljna greška"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 ""
-"Molim, prijavite ovo kao bug i uključite datoteke /var/log/dist-upgrade.log "
-"i /var/log/dist-upgrade-apt.log u vaše izvješće. Nadogradnja se sada "
+"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."
@@ -602,7 +628,10 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Morate preuzeti ukupno %s."
+msgstr ""
+"\n"
+"\n"
+"Morate preuzeti ukupno %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy
@@ -619,7 +648,7 @@ msgstr "Da spriječite gubitak podataka zatvorite sve programe i datoteke."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Vaš sustav sadrži posljednje nadogradnje"
 
@@ -645,32 +674,32 @@ msgid "Upgrade %s"
 msgstr "Nadogradi %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Otprilike je ostalo %li dana %li say i %li minuta"
+msgstr "%li dana %li sati i %li minuta"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Otprilike je ostalo %li sati i %li minuta"
+msgstr "%li sati i %li minuta"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minuta"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li sekundi"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -753,25 +782,39 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_Nastavi nadogradnju"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Zadrži"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "Za_mijeni"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Prijavi bug"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "Ponovno pok_reni računalo"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Nastavi nadogradnju"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_Nastavi nadogradnju"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Nisam mogao naći bilješke izdanja"
@@ -871,83 +914,83 @@ msgstr "Preuzimam datoteku %li od %li pri %s/s"
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Preuzimam datoteku %li od %li pri %s/s"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr ""
-"Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije."
+msgstr "Popis promjena nije dostupan."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 "Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "Preuzimanje popisa promjena nije uspjelo. Molim, provjerite svoju internet "
 "vezu."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
+msgstr "Važne sigurnosne nadogradnje"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Preporučene nadogradnje"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "_Instaliraj nadogradnje"
+msgstr "Predložene nadogradnje"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 backporti"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "_Nastavi nadogradnju"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "_Instaliraj nadogradnje"
+msgstr "Druge nadogradnje"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Verzija %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Preuzimam popis promjena..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "Pro_vjeri"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Veličina preuzimanja: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -955,40 +998,40 @@ msgstr[0] "Možete instalirati %s nadogradnju"
 msgstr[1] "Možete instalirati %s nadogradnje"
 msgstr[2] "Možete instalirati %s nadogradnji"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Molim pričekajte, ovo može potrajati."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Nadogradnja je gotova"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "_Instaliraj nadogradnje"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Nova verzija: %s (Veličina: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Verzija %s: \n"
+msgstr "Verzija %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Veličina: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Vaša distibucija više nije podržana"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -998,17 +1041,17 @@ msgstr ""
 "na noviju verziju Ubuntu Linuxa. Pogledajte na http://www.ubuntu.com za više "
 "detalja o nadogradnji."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>Novo izdanje distribucije, '%s', je dostupno</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "Popis programa je oštećen"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1021,24 +1064,24 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Ništa"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 #, fuzzy
@@ -1076,7 +1119,7 @@ msgstr "Promjene"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Promjene i opis nadogradnje"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1144,31 +1187,28 @@ msgid "_Install Updates"
 msgstr "_Instaliraj nadogradnje"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Promjene"
+msgstr "promjene"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "nadogradnje"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Internet nadogradnje</b>"
+msgstr "<b>Automatske nadogradnje</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD<b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Internet nadogradnje</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Internet nadogradnje</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1180,6 +1220,12 @@ msgid ""
 "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, lista 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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
 #, fuzzy
@@ -1195,9 +1241,8 @@ msgid "D_elete downloaded software files:"
 msgstr "_Obriši dobavljene datoteke programa:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "Preuzimanje je završeno"
+msgstr "Preuzimanje sa:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1225,34 +1270,32 @@ msgstr "Vrati uobičajene ključeve vaše distribucije"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Postavke nadogradnje"
+msgstr "Softver repozitoriji"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
 msgid "Source code"
-msgstr ""
+msgstr "Izvorni kod"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Statistike"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Pošalji statističke informacije"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Treća strana"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "_Provjeri postojanje nadogradnji automatski:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "P_reuzmi nadogradnje u pozadini, ali ih ne instaliraj"
+msgstr "P_reuzmi nadogradnje automatski, ali ih ne instaliraj"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1328,7 +1371,7 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
-msgstr ""
+msgstr "Uredi izvor"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
@@ -1336,7 +1379,7 @@ msgstr "Pretražujem CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
-msgstr ""
+msgstr "_Dodaj izvor"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1397,9 +1440,8 @@ msgid "The window size"
 msgstr "Veličina prozora"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Podesi repozitorije i internet nadogradnje"
+msgstr "Podesi repozitorije i nadogradnje"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1409,87 +1451,79 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 osvježenja"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Održavani od strane zajednice (Universe)"
+msgstr "Održavani od strane zajednice"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Neslobodni upogonitelji za uređaje"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Neslobodni (Multiverse)"
+msgstr "Neslobodni softver"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "CDROM sa Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Održavani od strane zajednice (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Održavani od strane zajednice (Universe)"
+msgstr "Održavani od strane zajednice (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Održavani od strane zajednice (Universe)"
+msgstr "Softver održavan od strane zajednice"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Neslobodni (Multiverse)"
+msgstr "Neslobodni pogonski programi"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Neslobodni upogonitelji za uređaje "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Neslobodni (Multiverse)"
+msgstr "Ograničeni softver (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "CDROM s Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Backport nadogradnje"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1498,9 +1532,8 @@ msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CDROM s Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1519,14 +1552,13 @@ msgstr "Ubuntu 5.10 backporti"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Cdrom sa Ubuntu 5.04 ' Hoary Hedgehog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1535,27 +1567,23 @@ msgstr "Službeno podržani"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
+msgstr "Ubuntu 5.04 sigurnosne nadogradnje"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 osvježenja"
+msgstr "Ubuntu 5.04 nadogradnje"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 backporti"
+msgstr "Ubuntu 5.04 backporti"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 4.10 'Wart Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1570,7 +1598,7 @@ msgstr "Neslobodni (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Cdrom sa Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
@@ -1585,21 +1613,18 @@ msgstr "Ograničeno autorsko pravo"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
+msgstr "Ubuntu 4.10 sigurnosne nadogradnje"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 5.10 osvježenja"
+msgstr "Ubuntu 4.10 osvježenja"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 backporti"
+msgstr "Ubuntu 4.10 backports"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1666,20 +1691,16 @@ msgstr "DFSG-nekompatibilni programi"
 #~ msgid "Your system has already been upgraded."
 #~ msgstr "Vaš sustav je već nadograđen."
 
-#, fuzzy
 #~ 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.06 LTS</"
-#~ "span>"
+#~ "<span weight=\"bold\" size=\"x-large\">Nadograđujem na Ubuntu 6.10</span>"
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 sigurnosne nadogradnje"
+#~ msgstr "Uvezi sigurnosne nadogradnje za Ubuntu"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Nadogradi na zadnju verziju Ubuntua"
+#~ msgstr "Ubuntu nadogradnje"
 
 #~ msgid "Cannot install all available updates"
 #~ msgstr "Ne mogu instalirati sve dostupne nadogradnje"
@@ -1764,9 +1785,11 @@ msgstr "DFSG-nekompatibilni programi"
 #~ msgid "Edit Channel"
 #~ msgstr "Uredi repozitorij"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Dodaj repozitorij"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Dodaj repozitorij"
+#~ msgstr[1] "_Dodaj repoztorije"
+#~ msgstr[2] "_Dodaj repozotrije"
 
 #~ msgid "_Custom"
 #~ msgstr "_Prilagođeno"
diff --git a/po/hu.po b/po/hu.po
index 75c9d3f6..2e1c6b18 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-28 21:22+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-06 10:07+0000\n"
 "Last-Translator: Gabor Kelemen <kelemengabor@linuxforum.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
@@ -57,9 +57,9 @@ msgstr "%s nap után"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "_Telepítés"
+msgstr "%s frissítés"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -67,45 +67,44 @@ msgstr "_Telepítés"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Fő kiszolgáló"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Kiszolgáló a következőhöz: %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Legközelebbi kiszolgáló"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Egyéni kiszolgálók"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Szoftverfrissítések"
+msgstr "Szoftvercsatorna"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Aktív"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(Forráskód)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "Forráskód"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -126,7 +125,7 @@ msgstr "Hiba a kulcs eltávolítása közben"
 #: ../SoftwareProperties/SoftwareProperties.py:993
 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."
+"Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
 #, fuzzy, python-format
@@ -147,11 +146,11 @@ 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:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Törött csomagok"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -160,36 +159,37 @@ msgstr ""
 "javíthatóak. Kérem, először javítsa ki őket a synaptic vagy az apt-get "
 "segítségével."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "A szükséges meta-csomagok nem frissíthetőek"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Egy alapvető csomag eltávolításra kerülne"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Nem tudom megtervezni a frissítés menetét"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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. Kérem, "
-"jelentse ezt hibaként. "
+"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."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Hiba történt néhány csomag hitelesítése közben"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -199,24 +199,23 @@ msgstr ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "'%s' nem telepíthető"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 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. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Nem tudom megállapítani a meta-csomagot"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -227,13 +226,12 @@ 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"
-" Kérem, előbb telepítse a fenti csomagok egyikét a synaptic vagy az apt-get "
-"használatával."
+" A folytatás előtt telepítse a fenti csomagok egyikét a synaptic vagy az apt-"
+"get használatával."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "A letöltés meghiúsult"
+msgstr "A CD hozzáadsa meghiúsult"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -244,28 +242,37 @@ msgid ""
 "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\""
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Gyorsítótár beolvasása"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Letölt adatokat a hálózatról a frissítéshez?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "nem található érvényes tükör"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -286,11 +293,11 @@ msgstr ""
 "A \"Nem\" kiválasztása megszakítja a frissítést."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Alapértelmezett források ismételt előállítása?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -304,11 +311,11 @@ msgstr ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Érvénytelen csomagtároló információ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -316,26 +323,25 @@ msgstr ""
 "A csomagtároló információ frissítése hibás fájlt eredményezett. Kérem, "
 "jelentse ezt hibaként."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "A külső források letiltva"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 külső forrása le lett tiltva. Újraengedélyezheti őket "
-"a frissítés után a Szoftvertulajdonságok eszközzel, vagy a Synaptic "
-"csomagkezelővel."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Hiba történt a frissítés közben"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -343,11 +349,11 @@ 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Nincs elég szabad hely a merevlemezen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -359,16 +365,15 @@ msgstr ""
 "fájljait a \"sudo apt-get clean\" parancs kiadásával."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Biztosan el szeretné kezdeni a frissítést?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "A frissítések nem telepíthetők"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -377,13 +382,16 @@ msgid ""
 "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)."
+"á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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "A frissítések nem tölthetők le"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -391,11 +399,11 @@ 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. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Egyes alkalmazások támogatása megszűnt"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -408,25 +416,25 @@ msgstr ""
 "közösség által (\"universe\").\n"
 "\n"
 "Ha nincs engedélyezve a \"universe\" tároló, akkor ezek a csomagok a "
-"következő lépésben ki lesznek jelölve eltávolításra. "
+"következő lépésben ki lesznek jelölve eltávolításra."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Eltávolítja az elavult csomagokat?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "Ezen lé_pés kihagyása"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Hiba a módosítások rögzítése közben"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -435,32 +443,47 @@ msgstr ""
 "információkat tartalmaz a hibára vonatkozóan. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "A rendszer eredeti állapotának helyreállítása"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "\"%s\" visszaportolt változatának letöltése"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Csomagkezelő ellenőrzése"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Frissítés előkészítése"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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 ""
+"A frissítés megtervezése közben feloldhatatlan probléma lépett fel. Kérem, "
+"jelentse ezt hibaként."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
-msgstr "Csomagtároló információ frissítése"
+msgstr "Csomagtároló-információk frissítése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Érvénytelen csomaginformációk"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -470,21 +493,23 @@ msgid ""
 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 hibaként."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Megerősítés kérése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Frissítés folyamatban"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Elavult szoftverek keresése"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "A rendszer frissítése befejeződött."
 
@@ -495,20 +520,19 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "Helyezze be a következő médiát: '%s', ebbe a meghajtóba: '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "A frissítés befejeződött"
+msgstr "A letöltés befejeződött"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr "Fájlok letöltése (%li, összesen: %li), sebesség: %s/s"
+msgstr "Fájl letöltése (%li., összesen: %li), sebesség: %s/mp"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Kb. %li perc van hátra"
+msgstr "Kb. %s van hátra"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, fuzzy, python-format
@@ -532,23 +556,27 @@ 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."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"Lecseréli a(z)\n"
+"Lecseréli a személyre szabott\n"
 "\"%s\"\n"
 "konfigurációs fájlt?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
@@ -559,15 +587,14 @@ msgid "A fatal error occured"
 msgstr "Végzetes hiba történt"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 ""
-"Kérem, jelentse ezt hibaként és a hibajelentéshez mellékelje a /var/log/dist-"
-"upgrade.log és /va/log/dist-upgrade-apt.log fájlokat. A frissítés most "
+"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."
@@ -575,22 +602,22 @@ msgstr ""
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s csomag el lesz távolítva."
+msgstr[0] "%d csomag el lesz távolítva."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] "%s új csomag kerül telepítésre."
+msgstr[0] "%d új csomag kerül telepítésre."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "%s csomag frissítve lesz."
+msgstr[0] "%d csomag frissítve lesz."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
 #, fuzzy, python-format
@@ -598,16 +625,18 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Összes letöltendő adatmennyiség: %s."
+msgstr ""
+"\n"
+"\n"
+"Összes letöltendő adatmennyiség: %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
 msgstr ""
-"A frissítés több órát is igénybe vehet és a későbbiek során nem lehet "
-"bármikor megszakítani."
+"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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -617,7 +646,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "A rendszere naprakész"
 
@@ -626,6 +655,8 @@ 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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -643,33 +674,35 @@ msgid "Upgrade %s"
 msgstr "%s frissítése"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Kb. %li nap, %li óra és %li perc van hátra"
+msgstr "%li nap, %li óra és %li perc van hátra"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Kb. %li óra és %li perc van hátra"
+msgstr "Kb. %li óra és %li perc"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li perc"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li másodperc"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"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"
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
@@ -713,7 +746,7 @@ msgstr "<b><big>Megkezdi a frissítést?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Az Ubuntu frissítése a 6.10-es változatra.</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -749,25 +782,39 @@ msgid "Terminal"
 msgstr "Terminál"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "Frissítés _folytatása"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr "Folytatás"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Megtartás"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Csere"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Hibabejelentés"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "Újrain_dítás most"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "Frissítés _folytatása"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "Frissítés _folytatása"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Nem érhetők el a kiadási megjegyzések"
@@ -868,120 +915,118 @@ msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp"
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "A módosítások listája még nem érhető el. Próbálkozzon később."
+msgstr "A módosítások listája nem érhető el"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+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. Próbálkozzon később."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"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. Ellenőrizze az "
 "internetkapcsolatát."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 biztonsági frissítések"
+msgstr "Fontos biztonsági frissítések"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Ajánlott frissítések"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "_Telepítés"
+msgstr "Javasolt frissítések"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Visszaportolt csomagok"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "Frissítés _folytatása"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "_Telepítés"
+msgstr "Egyéb frissítések"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "%s verzió: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Módosítások listájának letöltése..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "_Kijelölések törlése"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "_Ellenőrzés"
+msgstr "Összes _ellenőrzése"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Letöltés mérete: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "%s frissítést telepíthet"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Kis türelmet, ez eltarthat egy ideig."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "A frissítés befejeződött"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "_Telepítés"
+msgstr "Frissítések keresése"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Új verzió: %s (Méret: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "%s verzió: \n"
+msgstr "%s verzió"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Méret: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "A terjesztés már nem támogatott"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -991,17 +1036,17 @@ msgstr ""
 "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."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>A disztribúció új \"%s\" kiadása elérhető</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "A szoftverindex sérült"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1014,24 +1059,24 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Nincs"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 #, fuzzy
@@ -1053,17 +1098,15 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>Tartsa naprakészen a rendszerét</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
 msgstr ""
-"<big><b>Hiba történt a CD beolvasása közben</b></big>\n"
-"\n"
+"<big><b>Nem minden frissítés telepíthető</b></big>\r\n"
+"\r\n"
 "%s"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Megkezdi a frissítést?</big></b>"
+msgstr "<b><big>Frissítéskezelő indítása</big></b>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1071,7 +1114,7 @@ msgstr "Módosítások"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "A frissítés módosításai és leírása"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1096,6 +1139,11 @@ msgid ""
 "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."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
@@ -1126,9 +1174,8 @@ msgid "_Check"
 msgstr "_Ellenőrzés"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "Frissítés _folytatása"
+msgstr "_Disztribúció frissítése"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1139,31 +1186,28 @@ msgid "_Install Updates"
 msgstr "_Telepítés"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Módosítások"
+msgstr "módosítás"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "frissítés"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Hálózati frissítések</b>"
+msgstr "<b>Automatikus frissítések</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CD-ROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Hálózati frissítések</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Hálózati frissítések</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1175,6 +1219,13 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
 #, fuzzy
@@ -1190,9 +1241,8 @@ msgid "D_elete downloaded software files:"
 msgstr "L_etöltött csomagok törlése:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "A letöltés befejeződött"
+msgstr "Letöltés innen:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1220,34 +1270,32 @@ msgstr "A disztribúcióra jellemző alapértelmezett kulcsok visszaállítása"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Szoftvertulajdonságok"
+msgstr "Szoftverforrások"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
 msgid "Source code"
-msgstr ""
+msgstr "Forráskód"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Statisztika"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Statisztikai információk beküldése"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Harmadik fél"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "_Frissítések automatikus keresése:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "Frissítések _letöltése a háttérben, telepítés nélkül"
+msgstr "Frissítések automatikus _letöltése, a telepítésük nélkül"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1258,7 +1306,6 @@ msgid "_Install security updates without confirmation"
 msgstr "_Biztonsági frissítések telepítése megerősítés nélkül"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1267,10 +1314,12 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>A csatornainformáció elévült</big></b>\n"
+"<b><big>Az elérhető szoftverekkel kapcsolatos információk elévültek</big></"
+"b>\n"
 "\n"
-"Új szoftverek telepítéséhez vagy frissítéséhez újra kell tölteni az újonnan "
-"hozzáadott vagy módosított csatornák információit. \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."
 
@@ -1295,7 +1344,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1303,9 +1351,10 @@ msgid ""
 "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 felvenni kívánt csatorna teljes APT sorát</b></big>\n"
+"<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 csatorna típusát, helyét és összetevőit, például <i>"
+"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>."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
@@ -1322,7 +1371,7 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
-msgstr ""
+msgstr "Forrás szerkesztése"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
@@ -1330,7 +1379,7 @@ msgstr "CD-ROM átvizsgálása"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
-msgstr ""
+msgstr "_Forrás hozzáadása"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1357,15 +1406,14 @@ msgid "Check for new distribution releases"
 msgstr "Új disztribúciókiadások keresése"
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 ""
-"Ha a frissítések automatikus keresése le van tiltva, a csatornalistát kézzel "
-"kell újratölteni. Ezzel a beállítással elrejtheti az ilyen helyzetekben "
-"megjelenő emlékeztetőt."
+"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."
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
@@ -1393,9 +1441,8 @@ msgid "The window size"
 msgstr "Az ablak mérete"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Szoftvercsatornák és internetes frissítések beállítása"
+msgstr "Telepíthető szoftverek és frissítések forrásának beállítása"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1405,87 +1452,79 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 frissítések"
+msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Közösségi karbantartású (Universe)"
+msgstr "Közösségi karbantartású"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Szabadalmazott eszközmeghajtók"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Nem-szabad (Multiverse)"
+msgstr "Nem-szabad"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Az Ubuntu 6.10 \"Edgy Eft\" CD-ROM"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 \"Dapper Drake\""
+msgstr "Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Közösségi karbantartású (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Közösségi karbantartású (Universe)"
+msgstr "Közösségi karbantartású (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Közösségi karbantartású (Universe)"
+msgstr "Közösségi karbantartású nyílt forrású szoftverek"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Nem-szabad (Multiverse)"
+msgstr "Nem-szabad meghajtók"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Szabadalmazott eszközmeghajtók "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Nem-szabad (Multiverse)"
+msgstr "Nem-szabad szoftverek (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
-msgstr ""
+msgid "Software restricted by copyright or legal issues"
+msgstr "Szerzői vagy egyéb jogi problémák miatt korlátozott szoftver"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 \"Dapper Drake\""
+msgstr "Az Ubuntu 6.06 LTS \"Dapper Drake\"-et tartalmazó CD-ROM"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Visszaportolt frissítések"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1494,9 +1533,8 @@ msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Az Ubuntu 5.10 \"Breezy Badger\"-t tartalmazó CD-ROM"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1515,14 +1553,13 @@ msgstr "Ubuntu 5.10 visszaportolt csomagok"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Az Ubuntu 5.04 \"Hoary Hedgehog\"-ot tartalmazó CD-ROM"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1531,27 +1568,23 @@ msgstr "Hivatalosan támogatott"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 biztonsági frissítések"
+msgstr "Ubuntu 5.04 biztonsági frissítések"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 frissítések"
+msgstr "Ubuntu 5.04 frissítések"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 visszaportolt csomagok"
+msgstr "Ubuntu 5.04 visszaportolt csomagok"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1566,13 +1599,12 @@ msgstr "Nem-szabad (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Az Ubuntu 4.10 \"Warty Warthog\"-ot tartalmazó CD-ROM"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Néhány szoftver már nincs hivatalosan támogatva"
+msgstr "Hivatalosan már nem támogatott"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1581,21 +1613,18 @@ msgstr "Szerzői jogi korlátozás alatt"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 5.10 biztonsági frissítések"
+msgstr "Ubuntu 4.10 biztonsági frissítések"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 5.10 frissítések"
+msgstr "Ubuntu 4.10 frissítések"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 visszaportolt csomagok"
+msgstr "Ubuntu 4.10 visszaportolt csomagok"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1646,9 +1675,8 @@ msgstr "Nem DFSG-kompatibilis szoftver"
 #~ msgid "Downloading file %li of %li with unknown speed"
 #~ msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel"
 
-#, fuzzy
 #~ msgid "Normal updates"
-#~ msgstr "_Telepítés"
+#~ msgstr "Normális frissítések"
 
 #~ msgid "Cancel _Download"
 #~ msgstr "Letöltés _megszakítása"
@@ -1662,20 +1690,17 @@ msgstr "Nem DFSG-kompatibilis szoftver"
 #~ msgid "Your system has already been upgraded."
 #~ msgstr "Az Ön rendszere már frissítve lett."
 
-#, fuzzy
 #~ 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.06 LTS "
+#~ "<span weight=\"bold\" size=\"x-large\">Frissítés az Ubuntu 6.10 "
 #~ "változatra</span>"
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 biztonsági frissítések"
+#~ msgstr "Az Ubuntu fontos biztonsági frissítései"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Frissítés az Ubuntu legújabb változatára"
+#~ msgstr "Az Ubuntu frissítései"
 
 #~ msgid "Cannot install all available updates"
 #~ msgstr "Nem telepíthető minden rendelkezésre álló frissítés"
@@ -1763,7 +1788,8 @@ msgstr "Nem DFSG-kompatibilis szoftver"
 #~ msgstr "Csatorna szerkesztése"
 
 #~ msgid "_Add Channel"
-#~ msgstr "Csatorna hozzá_adása"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "Csatorna hozzá_adása"
 
 #~ msgid "_Custom"
 #~ msgstr "_Egyéni"
diff --git a/po/id.po b/po/id.po
index 6928cfba..210d7c10 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-28 18:46+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:38+0000\n"
 "Last-Translator: Andy Apdhani <imtheface@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -147,11 +147,11 @@ msgstr "Silakan masukkan nama untuk cakram"
 msgid "Please insert a disc in the drive:"
 msgstr "Silakan masukan cakram ke dalam penggerak"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Paket rusak"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -160,20 +160,20 @@ msgstr ""
 "perangkat lunak ini. Silakan perbaiki terlebih dahulu dengan menggunakan "
 "synaptic atau apt-get sebelum melanjutkan hal ini."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Tidak dapat memutakhirkan meta-paket yang dibutuhkan"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Paket esensial akan dihapus"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Tidak dapat menghitung pemutakhiran"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -182,14 +182,14 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Terjadi masalah saat menghitung pemutakhiran. Silakan laporkan ini sebagai "
-"bug. "
+"bug."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Kesalahan membuktikan keabsahan beberapa paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -199,12 +199,12 @@ msgstr ""
 "mungkin karena masalah pada jaringan. Anda dapat mencobanya beberapa saat "
 "lagi. Lihat senarai dari paket yang belum terbukti keabsahnya dibawah ini."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Tidak dapat menginstal '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -213,11 +213,11 @@ msgstr ""
 "ini sebagai bug. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Tidak dapat menebak meta-paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -251,11 +251,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Membaca cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -263,11 +263,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Tidak menemukan mirror yang valid"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -287,11 +287,11 @@ msgstr ""
 "Jika anda pilih 'no' pemutakhiran akan dibatalkan."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Membuat sumber baku?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -304,11 +304,11 @@ msgstr ""
 "Haruskah entri baku untuk '%s' ditambahkan? Jika anda pilih 'No' "
 "pemutakhiran akan dibatalkan."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Informasi gudang tidak valid"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -316,11 +316,11 @@ msgstr ""
 "Meng-upgrade informasi gudang berakhir di dalam berkas yang tidak benar. "
 "Silakan laporkan ini sebagai bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Sumber dari pihak ketiga dilumpukan"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, fuzzy
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
@@ -331,11 +331,11 @@ msgstr ""
 "dapat mengaktifkan kembali setelah upgrade dengan alat 'software-properties' "
 "atau dengan synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Kesalahan pada waktu pemutakhiran"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -343,11 +343,11 @@ msgstr ""
 "Terjadi masalah pada waktu pemutakhiran. Ini biasanya karena masalah "
 "jaringan, silakan periksa koneksi jaringan anda dan ulangi."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Kapasitas cakram tidak mencukupi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -359,15 +359,15 @@ msgstr ""
 "instalasi terdahulu dengan menggunakan 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Apakah anda ingin memulai pemutakhiran?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Tidak dapat menginstal pemutakhiran"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
@@ -379,11 +379,11 @@ msgstr ""
 "Upgrade dibatalkan sekarang. Sistem anda dapat menjadi tidak dapat "
 "digunakan. Perbaikan sedang berjalan (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Tidak dapat mengunduh pemutakhiran"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -391,11 +391,11 @@ msgstr ""
 "Upgrade dibatalkan sekarang. Silakan periksa koneksi internet anda atau "
 "media instalasi dan coba lagi nanti. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -408,25 +408,25 @@ msgstr ""
 "disokong melalui komunitas ('universe').\n"
 "\n"
 "Jika anda tidak mengaktifkan komponen 'universe' paket ini akan diajurkan "
-"untuk penghapusan dalam langkah selanjutnya. "
+"untuk penghapusan dalam langkah selanjutnya."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Hapus paket usang?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Lewati Langkah Ini"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Hapus"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Kesalahan pada waktu commit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -435,31 +435,46 @@ msgstr ""
 "bawah untuk informasi lebih lanjut. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Sistem dikembalikan ke keadaan awal"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Memeriksa manajer paket"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Menyiapkan upgrade"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Memutakhirkan informasi gudang"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Informasi paket tidak valid"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -473,19 +488,19 @@ msgstr ""
 "Ini mengindikasikan adanya kesalahan serius, silakan laporkan ini sebagai "
 "bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Menanyakan konfigurasi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Meng-upgrade"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Mencari perangkat lunak usang"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Upgrade sistem telah selesai."
 
@@ -546,8 +561,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -597,7 +612,10 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Anda harus mengunduh sebanyak %s."
+msgstr ""
+"\n"
+"\n"
+"Anda harus mengunduh sebanyak %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy
@@ -615,7 +633,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Sistem anda telah up-to-date"
 
@@ -665,8 +683,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -747,25 +765,39 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_Lanjutkan Upgrade"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Simpan"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Ganti"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Laporkan Bug"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Mulai Ulang Sekarang"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Lanjutkan Upgrade"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_Lanjutkan Upgrade"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Tidak dapat menemukan catatan luncuran"
@@ -864,120 +896,125 @@ msgstr "Mengunduh berkas %li dari %li dengan %s/s"
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Mengunduh berkas %li dari %li dengan %s/s"
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, 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."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "Gagal mengunduh senarai dari perubahan. Silakan periksa koneksi Internet "
 "anda."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Pemutakhiran lewat Internet"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "_Instal Update"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Ubuntu 6.06 LTS Backports"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "_Lanjutkan Upgrade"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "_Instal Update"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versi %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Mengunduh senarai dari perubahan..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "_Periksa"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Ukuran unduh: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Anda dapat instal %s pemutakhiran"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Silakan tunggu, hal ini membutuhkan beberapa waktu."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Pemutakhiran selesai"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "_Instal Update"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Versi baru: %s   (Ukuran: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "Versi %s: \n"
+msgstr "Versi %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Distribusi anda tidak disokong lagi"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -987,17 +1024,17 @@ msgstr ""
 "lebih lanjut. Upgrade ke versi berikut dari Ubuntu Linux. Lihat http://www."
 "ubuntu.com untuk informasi lebih lanjut."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Luncuran distribusi baru '%s' telah tersedia</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "Indeks perangkat lunak telah rusak"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1433,8 +1470,9 @@ msgstr "Ubuntu 6.06 LTS Updates"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Dikelola oleh komunitas (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1467,7 +1505,7 @@ msgstr "Tidak-bebas (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
@@ -1760,7 +1798,8 @@ msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG"
 #~ msgstr "Edit Kanal"
 
 #~ msgid "_Add Channel"
-#~ msgstr "_Tambah Kanal"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Tambah Kanal"
 
 #~ msgid "_Custom"
 #~ msgstr "_Custom"
diff --git a/po/it.po b/po/it.po
index 19ee6648..90005ae0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-24 14:01+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-06 12:46+0000\n"
 "Last-Translator: Luca Ferretti <elle.uca@libero.it>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -58,9 +58,9 @@ msgstr "Dopo %s giorni"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Installazione degli aggiornamenti"
+msgstr "%s aggiornamenti"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -68,47 +68,44 @@ msgstr "Installazione degli aggiornamenti"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Server principale"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Server in %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Server più vicino"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Server personalizzati"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Aggiornamenti Software"
+msgstr "Canale software"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Attivo"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr "Sorgente"
+msgstr "(codice sorgente)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
-msgstr "Sorgente"
+msgstr "Codice sorgente"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -135,7 +132,7 @@ msgstr ""
 "bug."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
@@ -153,34 +150,33 @@ msgstr "Inserire un nome per il disco"
 msgid "Please insert a disc in the drive:"
 msgstr "Inserire un disco nell'unità:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
-msgstr "Pacchetti non integri"
+msgstr "Pacchetti danneggiati"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 "
+"Il sistema contiene pacchetti danneggiati che non possono essere aggiustati "
 "con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-get"
-"\" per risolvere il probelma."
+"\" per risolvere il problema."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Impossibile aggiornare i meta-pacchetti richiesti"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Un pacchetto essenziale dovrebbe essere rimosso"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Impossibile calcolare l'aggiornamento"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -188,29 +184,32 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Si è verificato un problema irrisolvibile durante il calcolo "
-"dell'aggiornamento. Notificare questo evento come bug. "
+"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»."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Errore nell'autenticare alcuni pacchetti"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
+"un problema di rete passeggero, riprovare più tardi. Segue l'elenco dei "
 "pacchetti non autenticati."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
-msgstr "Impossibile installare \"%s\""
+msgstr "Impossibile installare «%s»"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -219,12 +218,11 @@ msgstr ""
 "evento come bug. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Impossibile indovinare il meta-pacchetto"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -235,13 +233,12 @@ 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 "
+" Prima di procedere, usare \"synaptic\" o \"apt-get\" per installare uno dei "
 "pacchetti sopra menzionati."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Prelievo fallito"
+msgstr "Aggiunta del CD fallita"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -252,28 +249,37 @@ msgid ""
 "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\""
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Lettura della cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Recuperare dalla rete i dati per l'aggiornamento?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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\"."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Non è stato trovato alcun mirror valido"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -284,21 +290,21 @@ msgid ""
 "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 "
+"Durante la scansione delle informazioni sui repository in uso non è stata "
 "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."
+"Riscrivere lo stesso il proprio file «sources.list»? Scegliendo di «Sì», "
+"tutte le voci «%s» verranno aggiornate a «%s»\n"
+"Scegliendo «No» l'aggiornamento verrà annullato."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Generare le sorgenti predefinite?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -306,17 +312,17 @@ msgid ""
 "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"
+"Dopo la scansione del proprio file «sources.list», non è stata trovata "
+"alcuna voce valida per «%s».\n"
 "\n"
 "Aggiungere le voci predefinite per «%s»? Selezionando «No», l'aggiornamento "
 "verrà annullato."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Informazioni sul repository non valide"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -324,26 +330,25 @@ msgstr ""
 "L'aggiornamento delle informazioni sul repository ha generato un file non "
 "valido. Notificare questo evento come bug."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Sorgenti di terze parti disabilitate"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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». È possibilie abilitarle di nuovo dopo l'aggiornamento con lo "
-"strumento «software-properties» o con synaptic."
+"list». È possibile abilitarle di nuovo dopo l'aggiornamento con lo strumento "
+"«software-properties» o con synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Errore durante l'aggiornamento"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -351,11 +356,11 @@ msgstr ""
 "Si è verificato un problema durante l'aggiornamento. Solitamente si tratta "
 "di problemi di rete, controllare la connessione di rete e riprovare."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Spazio libero su disco insufficiente"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -367,16 +372,15 @@ msgstr ""
 "usando \"sudo apt-get clean\"."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Iniziare l'aggiornamento?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Impossibile installare gli aggiornamenti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -386,13 +390,16 @@ msgid ""
 msgstr ""
 "Interruzione immediata dell'aggiornamento. Il sistema potrebbe trovarsi in "
 "uno stato inutilizzabile. È stato eseguito un ripristino (dpkg --configure -"
-"a)."
+"a).\n"
+"\n"
+"Riportare questo bug per il pacchetto 'update-manager' includendo i file in /"
+"var/log/dist-upgrade/ nel rapporto."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Impossibile scaricare gli aggiornamenti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -400,12 +407,11 @@ msgstr ""
 "Interruzione immediata dell'aggiornamento. Controllare la connessione a "
 "internet o il supporto di installazione e riprovare. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Supporto terminato per alcune applicazioni"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -413,30 +419,30 @@ msgid ""
 "If you have not enabled community maintained software (universe), these "
 "packages will be suggested for removal in the next step."
 msgstr ""
-"Questi pacchetti, pur essendo installati, non sono più supportati "
-"ufficialmente; ora sono semplicemente mantenuti dalla comunità "
-"(«universe»).\n"
+"Canonical Ltd. non fornisce più supporto per i seguenti pacchetti software. "
+"È comunque possibile avere supporto dalla comunità.\n"
 "\n"
-"Se non è abilitato il repository «universe», verrà suggerita la rimozione di "
-"questi pacchetti al prossimo passo. "
+"Se non è abilitato il repository del software mantenuto dalla comunità "
+"(«universe»), verrà suggerita la rimozione di questi pacchetti al prossimo "
+"passo."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Rimuovere i pacchetti obsoleti?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Salta questo passo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Errore durante il commit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -445,32 +451,46 @@ msgstr ""
 "seguente per maggiori informazioni. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
-msgstr "Ripristino stato originale del sistema"
+msgstr "Ripristino dello stato originale del sistema"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "Recupero del backport di «%s»"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
-msgstr "Controllo gestore dei pacchetti"
+msgstr "Controllo del gestore di pacchetti"
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr "Preparazione dell'aggiornamento fallito"
 
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Aggiornamento delle informazione sui repository"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Informazioni di pacchetto non valide"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -478,23 +498,25 @@ msgid ""
 "manager' package and include the files in /var/log/dist-upgrade/ in the "
 "bugreport."
 msgstr ""
-"Dopo l'aggiornamento delle di pacchetto informazioni non è più possibile "
+"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."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Richiesta di conferma"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Aggiornamento"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Ricerca di software obsoleto"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "L'aggiornamento del sistema è stato completato."
 
@@ -502,28 +524,27 @@ msgstr "L'aggiornamento del sistema è stato completato."
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr "Inserire \"%s\" nell'unità \"%s\""
+msgstr "Inserire «%s» nell'unità «%s»"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "Aggiornamento completato"
+msgstr "Il recupero è stato completato"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr "Scaricamento del file %li di %li a %s/s"
+msgstr "Recupero del file %li di %li a %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Circa %li minuti rimanenti"
+msgstr "Circa %s minuti rimanenti"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
-msgstr "Scaricamento del file %li di %li"
+msgstr "Recupero del file %li di %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
@@ -535,29 +556,34 @@ msgstr "Applicazione dei cambiamenti"
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
-msgstr "Impossibile installare \"%s\""
+msgstr "Impossibile installare «%s»"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:188
 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 bug per il pacchetto "
+"'update-manager' e di includere i file in /var/log/dist-upgrade/ nella "
+"segnalazione."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"Sostituire il file di configurazione\n"
-"\"%s\"?"
+"Sostituire il file di configurazione personalizzato\n"
+"«%s»?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
@@ -568,7 +594,6 @@ msgid "A fatal error occured"
 msgstr "Si è verificato un errore fatale"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 "
@@ -576,68 +601,72 @@ msgid ""
 "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.log e /var/log/dist-upgrade-apt.log. L'aggiornamento viene "
-"interrotto.\n"
-"Il file sorces.list originale è stato salvato in /etc/apt/sources.list."
+"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."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s pacchetto sta per essere rimosso."
-msgstr[1] "%s pacchetti stanno per essere rimossi."
+msgstr[0] "%d pacchetto sta per essere rimosso."
+msgstr[1] "%d pacchetti stanno per essere rimossi."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] "%s nuovo pacchetto sta per essere installato."
-msgstr[1] "%s nuovi pacchetti stanno per essere installati."
+msgstr[0] "%d nuovo pacchetto sta per essere installato."
+msgstr[1] "%d nuovi pacchetti stanno per essere installati."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "%s pacchetto sta per essere aggiornato."
-msgstr[1] "%s pacchetti stanno per essere aggiornati."
+msgstr[0] "%d pacchetto sta per essere aggiornato."
+msgstr[1] "%d pacchetti stanno per essere aggiornati."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "È necessario scaricare un totale di %s."
+msgstr ""
+"\n"
+"\n"
+"È necessario scaricare un totale di %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
 msgstr ""
-"L'aggiornamento può richiedere diverse ore e non può essere annullato in "
-"nessun momento successivo."
+"Il recupero e l'installazione degli aggiornamenti può richiedere diverse ore "
+"e non può essere annullato in un momento successivo."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 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."
+"Per prevenire la perdita di dati, chiudere tutte le applicazioni e i "
+"documenti aperti."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
-msgstr "Il sistema è aggiornato!"
+msgstr "Il sistema è aggiornato"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:519
 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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -655,37 +684,39 @@ msgid "Upgrade %s"
 msgstr "Aggiornare %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Circa %li giorni, %li ore e %li minuti rimanenti"
+msgstr "%li giorni %li ore %li minuti"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Circa %li ore e %li minuti rimanenti"
+msgstr "%li ore %li minuti"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minuti"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li secondi"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"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"
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
-msgstr "Riavvio richiesto"
+msgstr "Richiesto riavvio"
 
 #: ../DistUpgrade/DistUpgradeView.py:110
 msgid ""
@@ -723,7 +754,7 @@ msgstr "<b><big>Avviare l'aggiornamento?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Aggiornamento di Ubuntu alla versione 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -738,9 +769,8 @@ msgid "Difference between the files"
 msgstr "Differenze tra i file"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
-msgstr "Scaricamento e installazione degli aggiornamenti"
+msgstr "Recupero e installazione degli aggiornamenti"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -759,25 +789,37 @@ msgid "Terminal"
 msgstr "Terminale"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr "A_nnula aggiornamento"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr "_Continua"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Mantieni"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Notifica bug"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Riavvia ora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Riprendi aggiornamento"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr "_Avvia aggiornamento"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Impossibile trovare le note di rilascio"
@@ -826,12 +868,12 @@ msgstr "Strumento di aggiornamento"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
-msgstr "Prelievo fallito"
+msgstr "Recupero fallito"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
-"Fallito il prelievo dell'aggiornamento. Potrebbe dipendere da un problema di "
+"Recupero dell'aggiornamento fallito. Potrebbe dipendere da un problema di "
 "rete. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
@@ -844,14 +886,13 @@ msgid ""
 "with the server. "
 msgstr ""
 "Fallita l'estrazione dell'aggiornamento. Potrebbe dipendere da un problema "
-"con la connesione di rete o con il server. "
+"con la connessione di rete o con il server. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
 msgstr "Verifica fallita"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
@@ -872,132 +913,128 @@ msgstr ""
 "problema con la connessione di rete o con il server. "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Scaricamento del file %li di %li a %s/s"
+msgstr "Scaricamento del file %(current)li di %(total)li a %(speed)s/s"
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Scaricamento del file %li di %li a %s/s"
+msgstr "Scaricamento del file %(current)li di %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr ""
-"L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi."
+msgstr "L'elenco dei cambiamenti non è disponibile"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
-"L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi."
+"L'elenco dei cambiamenti non è ancora disponibile.\n"
+"Riprovare più tardi."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
-"Fallito lo scaricamento dell'elenco dei cambiamenti. Verificare la "
-"connessione ad Internet."
+"Fallito lo scaricamento dell'elenco dei cambiamenti. \n"
+"Verificare la connessione a Internet."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10"
+msgstr "Aggiornamenti di sicurezza importanti"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Aggiornamenti raccomandati"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "Installazione degli aggiornamenti"
+msgstr "Aggiornamenti proposti"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Backport"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "_Riprendi aggiornamento"
+msgstr "Aggiornamenti della distribuzione"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Installazione degli aggiornamenti"
+msgstr "Altri aggiornamenti"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versione %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr "Scaricamento dell'elenco dei cambiamenti..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
+#, fuzzy
 msgid "_Uncheck All"
-msgstr ""
+msgstr "_Decontrassegnare tutti"
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
-msgstr "_Verifica"
+msgstr "_Contrassengare tutti"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Dati da scaricare: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 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"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
-msgstr "Attendere, l'operazione potrebbere richiedere del tempo."
+msgstr "Attendere, l'operazione potrebbe richiedere del tempo."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr "Aggiornamento completato"
+msgstr "L'aggiornamento è stato completato"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
 msgstr "Verifica degli aggiornamenti..."
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "Nuova versione: %s (Dimensione: %s)"
+msgstr "Dalla versione %(old_version)s alla %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Versione %s: \n"
+msgstr "Versione %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Dimensione: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "La distribuzione in uso non è più supportata"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -1005,52 +1042,51 @@ msgid ""
 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"
+"consultare http://www.ubuntu.com."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>È disponibile il nuovo rilascio «%s» della distribuzione</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
-msgstr "L'indice dei programmi è rovinato"
+msgstr "L'indice del software è danneggiato"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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."
+"dei pacchetti \"Synaptic\" o eseguire in un terminale \"sudo apt-get install "
+"-f\" per risolvere il problema."
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Niente"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 kB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f kB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>You must check for updates manually</big></b>\n"
 "\n"
@@ -1060,25 +1096,21 @@ 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 \"Sistema\" -> "
-"\"Amministrazione\" -> \"Proprietà software\"."
+"possibile configurare questo comportamento in <i>Sorgenti software</i> nella "
+"scheda <i>Aggiornamenti internet</i>."
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>Mantenere aggiornato il sistema</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
 msgstr ""
-"<big><b>Errore nella scansione del CD</b></big>\n"
-"\n"
-"%s"
+"<big><b>Non tutti gli aggiornamenti possono essere installati</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Avviare l'aggiornamento?</big></b>"
+msgstr "<b><big>Avvio del gestore di aggiornamenti</big></b>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1086,7 +1118,7 @@ msgstr "Cambiamenti"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Cambiamenti e descrizione dell'aggiornamento"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1094,7 +1126,7 @@ msgstr "_Verifica"
 
 #: ../data/glade/UpdateManager.glade.h:10
 msgid "Check the software channels for new updates"
-msgstr "Verifica la presenza  di nuovi aggiornamenti nei canali software"
+msgstr "Verifica la presenza di nuovi aggiornamenti nei canali software"
 
 #: ../data/glade/UpdateManager.glade.h:11
 msgid "Description"
@@ -1111,6 +1143,11 @@ msgid ""
 "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."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
@@ -1141,9 +1178,8 @@ msgid "_Check"
 msgstr "_Verifica"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "_Riprendi aggiornamento"
+msgstr "Aggiorna _distribuzione"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1154,31 +1190,28 @@ msgid "_Install Updates"
 msgstr "I_nstalla aggiornamenti"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Cambiamenti"
+msgstr "cambiamenti"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "aggiornamenti"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Aggiornamenti internet</b>"
+msgstr "<b>Aggiornamenti automatici</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CD-ROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Aggiornamenti internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Aggiornamenti internet</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1190,11 +1223,17 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "Aggiungi C_D-ROM"
+msgstr "Aggiungi CD-ROM"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
@@ -1205,9 +1244,8 @@ msgid "D_elete downloaded software files:"
 msgstr "_Elimina i file di software scaricati:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "Scaricamento completato"
+msgstr "Scaricare da:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1222,7 +1260,7 @@ 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 "
+"Solo gli aggiornamenti di sicurezza dai server ufficiali di Ubuntu saranno "
 "installati automaticamente"
 
 #: ../data/glade/SoftwareProperties.glade.h:16
@@ -1235,35 +1273,32 @@ msgstr "Ripristina le chiavi predefinite della distribuzione in uso"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Proprietà software"
+msgstr "Sorgenti software"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
-msgstr "Sorgente"
+msgstr "Codice sorgente"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Statistiche"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Inviare informazioni statistiche"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Terze parti"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "_Verificare aggiornamenti automaticamente:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "_Scaricare gli aggiornamenti in background, ma non installarli"
+msgstr "_Scaricare gli aggiornamenti automaticamente, ma non installarli"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1274,7 +1309,6 @@ msgid "_Install security updates without confirmation"
 msgstr "I_nstallare gli aggiornamenti di sicurezza senza richiedere conferma"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1283,12 +1317,13 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>Le informazioni sul canale non sono aggiornate</big></b>\n"
+"<b><big>Le informazioni sul software disponibile sono scadute</big></b>\n"
 "\n"
-"È necessario ricaricare le informazioni sul canale per installare software e "
-"aggiornamenti provenienti dai canali aggiunti o modificati di recente. \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 è neccessaria una connessione a internet funzionante."
+"Per continuare è necessaria una connessione a internet funzionante."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
@@ -1311,7 +1346,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1319,11 +1353,11 @@ msgid ""
 "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 canale che si vuole aggiungere</"
-"b></big>\n"
+"<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 canale, per "
-"esempio <i>\"deb http://ftp.debian.org sarge main\"</i>."
+"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>."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
@@ -1338,18 +1372,16 @@ msgstr ""
 "Sorgenti"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr "Sorgente"
+msgstr "Modifica sorgente"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
 msgstr "Scansione CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr "Sorgente"
+msgstr "_Aggiungi sorgente"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1361,7 +1393,7 @@ msgstr "Mostra e installa gli aggiornamenti disponibili"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
-msgstr "Gestore aggiornamenti"
+msgstr "Gestione aggiornamenti"
 
 #: ../data/update-manager.schemas.in.h:1
 msgid ""
@@ -1377,7 +1409,6 @@ msgid "Check for new distribution releases"
 msgstr "Controlla nuovi rilasci della distribuzione"
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 "
@@ -1400,12 +1431,11 @@ msgid "Stores the size of the update-manager dialog"
 msgstr "Salva la dimensione della finestra dell'update-manager"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changes and the "
 "description"
 msgstr ""
-"Salva lo stato dell'espansore che contiene l'elenco dei cambiamenti e la "
+"Memorizza lo stato dell'espansore che contiene l'elenco dei cambiamenti e la "
 "descrizione"
 
 #: ../data/update-manager.schemas.in.h:8
@@ -1413,9 +1443,9 @@ msgid "The window size"
 msgstr "Dimensione della finestra"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Configura i canali software gli aggiornamenti da internet"
+msgstr ""
+"Configura le sorgenti per gli aggiornamenti e per il software installabile"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1425,100 +1455,88 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Aggiornamenti di Ubuntu 5.10"
+msgstr "Ubuntu 6.10 «Edgy Eft»"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Mantenuto dalla comunità (Universe)"
+msgstr "Mantenuto dalla comunità"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Driver proprietari per i dispositivi"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Software contribuito"
+msgstr "Software con restrizioni"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\""
+msgstr "CD-ROM con Ubuntu 6.10 «Edgy Eft»"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 \"Dapper Drake\""
+msgstr "Ubuntu 6.06 LTS «Dapper Drake»"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+msgid "Canonical supported Open Source software"
+msgstr "Software open source supportato da Canonical"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Mantenuto dalla comunità (Universe)"
+msgstr "Mantenuto dalla comunità (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Mantenuto dalla comunità (Universe)"
+msgstr "Software open source mantenuto dalla comunità"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Non libero (Multiverse)"
+msgstr "Driver non liberi"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Driver proprietari per dispositivi "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Non libero (Multiverse)"
+msgstr "Software con restrizioni (multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Software non esportabile dagli USA"
+msgid "Software restricted by copyright or legal issues"
+msgstr "Software con restrizioni per copyright o motivi legali"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 \"Dapper Drake\""
+msgstr "CD-ROM con Ubuntu 6.06 LTS «Drapper Drake»"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Aggiornamenti di backport"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "CD-ROM con Ubuntu 5.10 «Breezy Badger»"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1528,73 +1546,65 @@ msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10"
 #. Description
 #: ../data/channels/Ubuntu.info.in:140
 msgid "Ubuntu 5.10 Updates"
-msgstr "Aggiornamenti di Ubuntu 5.10"
+msgstr "Aggiornamenti per Ubuntu 5.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:145
 msgid "Ubuntu 5.10 Backports"
-msgstr "Backport di Ubuntu 5.10"
+msgstr "Backport per Ubuntu 5.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\""
+msgstr "Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\""
+msgstr "CD-ROM con Ubuntu 5.04 «Hoary Hedgehog»"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
-msgstr "Supportato ufficialmente"
+msgstr "Supportati ufficialmente"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10"
+msgstr "Aggiornamenti di sicurezza per Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Aggiornamenti di Ubuntu 5.10"
+msgstr "Aggiornamenti per Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Backport di Ubuntu 5.10"
+msgstr "Backport per Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\""
+msgstr "Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
 msgid "Community maintained (Universe)"
-msgstr "Mantenuto dalla comunità (Universe)"
+msgstr "Mantenuti dalla comunità (universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:201
 msgid "Non-free (Multiverse)"
-msgstr "Non libero (Multiverse)"
+msgstr "Non libero (multiverse)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
-#, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\""
+msgstr "CD-ROM con Ubuntu 4.10 «Warty Warthog»"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
 msgstr "Software non più supportato ufficialmente"
 
@@ -1611,13 +1621,12 @@ msgstr "Aggiornamenti di sicurezza per Ubuntu 4.10"
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
 msgid "Ubuntu 4.10 Updates"
-msgstr "Aggiornamenti di Ubuntu 4.10"
+msgstr "Aggiornamenti per Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Backport di Ubuntu 5.10"
+msgstr "Backport per Ubuntu 4.10"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1628,7 +1637,7 @@ msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 #. Description
 #: ../data/channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 «Sarge»"
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:19
@@ -1638,12 +1647,12 @@ msgstr "http://security.debian.org/"
 #. Description
 #: ../data/channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Aggiornamenti di sicurezza per Debian 3.1 \"Sarge\""
+msgstr "Aggiornamenti di sicurezza per Debian 3.1 «Sarge»"
 
 #. Description
 #: ../data/channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian «Etch» (testing)"
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:47
@@ -1653,7 +1662,7 @@ msgstr "http://http.us.debian.org/debian/"
 #. Description
 #: ../data/channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian \"Sid\" (Unstable)"
+msgstr "Debian «Sid» (unstable)"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:54
@@ -1665,12 +1674,42 @@ msgstr "Software compatibile con le DFSG con dipendenze non libere"
 msgid "Non-DFSG-compatible Software"
 msgstr "Software non compatibile con le DFSG"
 
+#~ 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"
 
-#, fuzzy
 #~ msgid "Normal updates"
-#~ msgstr "Installazione degli aggiornamenti"
+#~ msgstr "Aggiornamenti normali"
 
 #~ msgid "Cancel _Download"
 #~ msgstr "Annulla _scaricamento"
@@ -1684,20 +1723,16 @@ msgstr "Software non compatibile con le DFSG"
 #~ msgid "Your system has already been upgraded."
 #~ msgstr "Il sistema è già stato aggiornato."
 
-#, fuzzy
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Aggiornamento a Ubuntu 6.06 LTS</"
-#~ "span>"
+#~ "<span weight=\"bold\" size=\"x-large\">Aggiornamento a Ubuntu 6.10</span>"
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10"
+#~ msgstr "Importanti aggiornamenti di sicurezza per Ubuntu"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Aggiorna all'ultima versione di Ubuntu"
+#~ msgstr "Aggiornamenti per Ubuntu"
 
 #~ msgid "Cannot install all available updates"
 #~ msgstr "Impossibile installare tutti gli aggiornamenti disponibili"
@@ -1787,9 +1822,10 @@ msgstr "Software non compatibile con le DFSG"
 #~ msgid "Edit Channel"
 #~ msgstr "Modifica canale"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Aggiungi canale"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Aggiungi canale"
+#~ msgstr[1] "_Aggiungi canali"
 
 #~ msgid "_Custom"
 #~ msgstr "_Personalizzato"
diff --git a/po/ja.po b/po/ja.po
index 1a4d0e71..bbd32963 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.42.4\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-24 07:06+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:39+0000\n"
 "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n"
 "Language-Team: Ubuntu Japanese Team <ubuntu-ja-users@freeml.com>\n"
 "MIME-Version: 1.0\n"
@@ -68,26 +68,26 @@ msgstr "アップデートをインストール中"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "メインサーバ"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "%s のサーバ"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "最も近いサーバ"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "カスタムサーバ"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
@@ -98,7 +98,7 @@ msgstr "ソフトウェアのアップデート"
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "有効"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 #, fuzzy
@@ -150,11 +150,11 @@ msgstr "ディスク名を入力してください"
 msgid "Please insert a disc in the drive:"
 msgstr "ディスクをドライブに挿入してください:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "壊れたパッケージ"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -162,34 +162,34 @@ msgstr ""
 "システムにはこのソフトウェアでは修復できない壊れたパッケージが含まれていま"
 "す。 Synaptic や apt-get を使って最初に修正してください。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "要求されたメタパッケージがアップグレードできません"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "必須パッケージが削除されます"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "アップグレードが算定できません"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, 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 "算定中に解決できない問題がおきました。バグとして報告してください。 "
+msgstr "算定中に解決できない問題がおきました。バグとして報告してください。"
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "いくつかのパッケージが認証されませんでした"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -199,12 +199,12 @@ msgstr ""
 "クの問題でしょう。あとで再び試してみてください。下に認証できなかったパッケー"
 "ジが表示されます。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "'%s' がインストールできません"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -212,11 +212,11 @@ msgstr ""
 "要求されたパッケージのインストールができません。バグとして報告してください。 "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "メタパッケージを推測できません"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -250,11 +250,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr "キャッシュを読み込み中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "アップグレードをするためにネットワーク経由でデータを取得しますか？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -262,11 +262,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "正しいミラーが見つかりません"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -285,11 +285,11 @@ msgstr ""
 "キャンセルします。"
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "標準のソースを生成しますか？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -302,11 +302,11 @@ msgstr ""
 "'%s' のデフォルトエントリを追加しますか？ 'いいえ' を選択するとアップデートを"
 "キャンセルします。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "リポジトリ情報が無効です"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -314,11 +314,11 @@ msgstr ""
 "リポジトリ情報をアップグレード中に無効なファイルを生成しました。バグとして報"
 "告してください。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "公式ではないソースが無効になりました"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, fuzzy
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
@@ -329,11 +329,11 @@ msgstr ""
 "アップグレード後に 'ソフトウェアのプロパティ' ツールか Synaptic を使用してく"
 "ださい。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "アップデート中にエラー発生"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -341,11 +341,11 @@ msgstr ""
 "アップデート中に問題が発生しました。おそらくある種のネットワークの問題です。"
 "ネットワーク接続をチェックし、再びアップデートしてください。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "ディスクの空き領域が足りません"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -357,15 +357,15 @@ msgstr ""
 "た一時パッケージを削除してください。"
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "アップグレードを開始しますか？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "アップグレードをインストールできません"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
@@ -377,11 +377,11 @@ msgstr ""
 "アップグレードを中断しました。システムが使用できない状態になっている可能性が"
 "あります。ただいま修正を実行中です (dpkg --configure -a)。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "アップグレードをダウンロードできません"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -389,11 +389,11 @@ msgstr ""
 "アップグレードを中断しました。インターネット接続またはインストールメディア"
 "(CD-ROMなど)をチェックし。再試行してください。 "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -406,25 +406,25 @@ msgstr ""
 "コミュニティサポートになっています('universe')。\n"
 "\n"
 "'universe' を有効にしないと、これらのパッケージは次のステップで削除することを"
-"提案します。 "
+"提案します。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "不要なパッケージを削除しますか？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "このステップをスキップ(_S)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "コミット中にエラー"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -433,31 +433,44 @@ msgstr ""
 "ください。 "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "システムを元に戻し中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "パッケージマネージャをチェック中"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "アップグレードの準備中"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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 "算定中に解決できない問題がおきました。バグとして報告してください。"
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "リポジトリ情報をアップデート"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "無効なパッケージ情報"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -469,19 +482,19 @@ msgstr ""
 "パッケージ情報のアップデートのあと、重要パッケージ '%s' が見つかりません。\n"
 "このメッセージは深刻なエラーです。バグとして報告してください。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "確認する"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "アップグレード中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "古いソフトウェアを検索する"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "システムのアップグレードが完了しました。"
 
@@ -542,8 +555,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -593,7 +606,10 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "全部で %s つのパッケージをダウンロードする必要があります。"
+msgstr ""
+"\n"
+"\n"
+"全部で %s つのパッケージをダウンロードする必要があります。 "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy
@@ -610,7 +626,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "システムは最新の状態です!"
 
@@ -648,20 +664,20 @@ msgstr "およそ残り %li 時間 %li 分"
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li 分"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li 秒"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -705,7 +721,7 @@ msgstr "<b><big>アップグレードを開始しますか？</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Ubuntu to version 6.10 にアップグレード中</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -741,25 +757,39 @@ msgid "Terminal"
 msgstr "端末"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "アップグレードを再開する(_R)"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "そのまま(_K)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "置き換える(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "バグを報告する(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "すぐに再起動(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "アップグレードを再開する(_R)"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "アップグレードを再開する(_R)"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "リリースノートが見つかりません"
@@ -857,120 +887,125 @@ msgstr "ダウンロード中: %li のうち %li 速度 %s/秒"
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "ダウンロード中: %li のうち %li 速度 %s/秒"
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "変更点がまだ取得できません。あとで試してください。"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr "変更点がまだ取得できません。あとで試してください。"
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "変更点の取得に失敗しました。インターネットに接続されているか確認してくださ"
 "い。"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 セキュリティアップデート"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "アップデートをインストール中"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Ubuntu 6.04 バックポート"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "アップグレードを再開する(_R)"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "アップデートをインストール中"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "バージョン %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "変更点を取得中..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "すべてのチェックをはずす(_U)"
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "チェック(_C)"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "ダウンロードサイズ: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "%s 個のアップデートがインストールされます"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "しばらくお待ちください。少々時間がかかります。"
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "アップデートが完了しました"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "インストールできるアップデートをチェック"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "新しいバージョン: %s (サイズ: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "バージョン %s: \n"
+msgstr "バージョン %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(サイズ: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "このディストリビューションはすでにサポート対象外です"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -980,17 +1015,17 @@ msgstr ""
 "Ubuntu Linux にアップグレードしてください。\r\n"
 "アップグレードに関する詳細な情報は http://www.ubuntu.com をご覧ください。"
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>新しいディストリビューション '%s' にアップグレードできます</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "ソフトウェアのインデックスが壊れています"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1003,24 +1038,24 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "なし"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 #, fuzzy
@@ -1055,11 +1090,11 @@ msgstr "<b><big>アップグレードを開始しますか？</big></b>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
-msgstr "変更点"
+msgstr "変更"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "アップデートの変更点と詳細"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1071,7 +1106,7 @@ msgstr "新しいアップデートの調査のためにソフトウェアチャ
 
 #: ../data/glade/UpdateManager.glade.h:11
 msgid "Description"
-msgstr "説明"
+msgstr "詳細"
 
 #: ../data/glade/UpdateManager.glade.h:12
 msgid "Release Notes"
@@ -1133,7 +1168,7 @@ msgstr "変更点"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "アップデート"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
 #, fuzzy
@@ -1142,7 +1177,7 @@ msgstr "<b>インターネットアップデート</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
@@ -1227,7 +1262,7 @@ msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "サードパーティ"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
@@ -1277,7 +1312,7 @@ msgstr "<b>ディストリビューション:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Type:</b>"
-msgstr "<b>種類:</b>"
+msgstr "<b>タイプ:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
 msgid "<b>URI:</b>"
@@ -1333,7 +1368,7 @@ msgstr "インストールできるアップデートを表示し、インスト
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
-msgstr "アップデートマネージャ"
+msgstr "アップデートマネージャー"
 
 #: ../data/update-manager.schemas.in.h:1
 msgid ""
@@ -1406,7 +1441,7 @@ msgstr "コミュニティによるメンテナンス (Universe)"
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "デバイス用のプロプライエタリなドライバ"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
@@ -1417,7 +1452,7 @@ msgstr "寄贈ソフトウェア"
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Ubuntu 6.10 'Edgy Eft' のCD-ROM"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
@@ -1427,8 +1462,9 @@ msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "コミュニティによるメンテナンス (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1451,7 +1487,7 @@ msgstr "非フリー (Multiuniverse)"
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "デバイス用のプロプライエタリなドライバ "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
@@ -1461,9 +1497,8 @@ msgstr "非フリー (Multiuniverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "アメリカ合衆国外への輸出が禁止されているソフトウェア"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
@@ -1474,7 +1509,7 @@ msgstr "Ubuntu 6.06 'Dapper Drake'"
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "バックポートされたアップデート"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1517,7 +1552,7 @@ msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\""
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
-msgstr "公式サポート"
+msgstr "Officially supported"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
@@ -1546,17 +1581,17 @@ msgstr "Ubuntu·5.10·'Breezy·Badger'"
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
 msgid "Community maintained (Universe)"
-msgstr "コミュニティによるメンテナンス (Universe)"
+msgstr "Community maintained (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:201
 msgid "Non-free (Multiverse)"
-msgstr "非フリー (Multiuniverse)"
+msgstr "Non-free (Multiuniverse)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Ubuntu 4.10 'Warty Warthog' のCD-ROM"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
@@ -1567,7 +1602,7 @@ msgstr "いくつかのソフトウェアはもう公式にサポートされま
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
 msgid "Restricted copyright"
-msgstr "限定的な著作権(Restricted)"
+msgstr "Restricted copyright"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
@@ -1632,6 +1667,10 @@ msgstr "非フリーな依存関係のあるDFSG適合ソフトウェア"
 msgid "Non-DFSG-compatible Software"
 msgstr "DFSGに適合しないソフトウェア"
 
+#, fuzzy
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "アメリカ合衆国外への輸出が禁止されているソフトウェア"
+
 #~ msgid "Downloading file %li of %li with unknown speed"
 #~ msgstr "ダウンロード中: 速度不明で %li のうち %li"
 
@@ -1755,10 +1794,11 @@ msgstr "DFSGに適合しないソフトウェア"
 #~ msgstr "チャンネルを編集"
 
 #~ msgid "_Add Channel"
-#~ msgstr "チャンネルを追加(_A)"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "チャンネルを追加(_A)"
 
 #~ msgid "_Custom"
-#~ msgstr "カスタム(_C)"
+#~ msgstr "カスタム(C)"
 
 #~ msgid "Ubuntu 6.06 LTS"
 #~ msgstr "Ubuntu 6.06 LTS"
diff --git a/po/ka.po b/po/ka.po
index 2beae0f1..53b668c7 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:19+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:39+0000\n"
 "Last-Translator: Vladimer Sichinava <alinux@siena.linux.it>\n"
 "Language-Team: Georgian <geognome@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -151,11 +151,11 @@ msgstr "შეიყვანეთ დისკის სახელი"
 msgid "Please insert a disc in the drive:"
 msgstr "მოათავსეთ დისკი დისკწამყვანში:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "გაფუჭებული პაკეტები"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -164,22 +164,22 @@ msgstr ""
 "პროგრამით. ჯერ გამართეთ გაფუჭებული პაკეტები synaptic ან apt-get პროგრამით და "
 "შემდეგ გააგრძელეთ."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "საჭჳრო მეტა-პაკეტების განახლება ვერ მოხერხდა"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 #, fuzzy
 msgid "A essential package would have to be removed"
 msgstr "A არსებითი -სკენ"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 #, fuzzy
 msgid "Could not calculate the upgrade"
 msgstr "არა"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -187,15 +187,14 @@ msgid ""
 "Please report this bug against the 'update-manager' package and include the "
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
-"მოხდა დაუდგენელი შეცდომა განახლების დათვლისას. შეატყობინეთ ეს როგორხ "
-"ხარვეზი. "
+"მოხდა დაუდგენელი შეცდომა განახლების დათვლისას. შეატყობინეთ ეს როგორხ ხარვეზი."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "ზოგიერთი პაკეტის ავთენთიფიკაციის შეცდომა"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -205,23 +204,23 @@ msgstr ""
 "ბრაკი. იქნებ მოგვიანბით კიდევ ერთხელ სცადოთ. ქვევით იხილეთ არა-"
 "ავთენთიფიცერული პაკეტების სია."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "'%s' ვერ დაყენდა"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "საჭირო პაკეტის დაყენება ვერ მოხერხდა. შეატყობინეთ ეს როგორხ ხარვეზი. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "მეტა-პაკეტი ვერ გამოვიცანით"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -252,11 +251,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr "მიმდინარეობს ქეშის წაკითხვა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -264,11 +263,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "არავითარი გამოსადეგი სერვერის ანარეკლი"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -281,12 +280,12 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 #, fuzzy
 msgid "Generate default sources?"
 msgstr "გენერაცია ნაგულისხმევი?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -295,11 +294,11 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "რეპოზიტორიების ინფორმაცია არასწორეა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -307,12 +306,12 @@ msgstr ""
 "რეპოზიტორიების განახლების შედეგად დაზიანდა ფაილი. შეატყობინეთ ეს როგორხ "
 "ხარვეზი."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 #, fuzzy
 msgid "Third party sources disabled"
 msgstr "გამორთული"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, fuzzy
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
@@ -320,11 +319,11 @@ msgid ""
 "synaptic."
 msgstr "-ში სია გამორთული თქვენ პარამეტრები ან."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "განახლებისას მოხდა შეცდომა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -332,11 +331,11 @@ msgstr ""
 "განახლებისას მოხდა შეცდომა. ეს როგროც წესი არის კავშირის პრობლემა, შეამოწმეთ "
 "თქვენი კავშირი და ცადეთ კიდევ ერთხელ."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "დისკზე არ არის საკმარისი თავისუფალი ადგილი"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -345,16 +344,16 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "გნებავთ განახლების დაწყება?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 #, fuzzy
 msgid "Could not install the upgrades"
 msgstr "არა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
@@ -364,23 +363,23 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr "ახლა -ში A a."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 #, fuzzy
 msgid "Could not download the upgrades"
 msgstr "არა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr "ახლა ან და "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -388,26 +387,26 @@ msgid ""
 "\n"
 "If you have not enabled community maintained software (universe), these "
 "packages will be suggested for removal in the next step."
-msgstr "არა და ახლა n t ჩართული -თვის -ში ნაბიჯი "
+msgstr "არა და ახლა n t ჩართული -თვის -ში ნაბიჯი"
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "წავშალო მოძველებული პაკეტები?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "ნაბიჯის გა_მოტოვება"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_წაშლა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 #, fuzzy
 msgid "Error during commit"
 msgstr "შეცდომა"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 #, fuzzy
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
@@ -415,31 +414,45 @@ msgid ""
 msgstr "-თვის ინფორმაცია "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "ვამოწმებ პროგრამულ მენეჯერს"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "განახლების ჩადგმის მომზადება"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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 ""
+"მოხდა დაუდგენელი შეცდომა განახლების დათვლისას. შეატყობინეთ ეს როგორხ ხარვეზი."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "რეპოზტორიის ინფორმაციის განახლება"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "გაფუჭებული პაკეტის შესახებ ინფორმაცია"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -449,21 +462,21 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 #, fuzzy
 msgid "Asking for confirmation"
 msgstr "-თვის"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "მიმდინარეობს განახლებების ჩაყენება"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 #, fuzzy
 msgid "Searching for obsolete software"
 msgstr "ვეძებ -თვის"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 #, fuzzy
 msgid "System upgrade is complete."
 msgstr "სისტემა ტოლია სრული."
@@ -523,8 +536,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -588,7 +601,7 @@ msgstr "ვის დახურვა ყველა გახსნა დ�
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "თქვენი სისტემა განახლებულია"
 
@@ -638,8 +651,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -720,25 +733,39 @@ msgid "Terminal"
 msgstr "ტერმინალი"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "განახლება _გაგრძელება"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_დატოვე"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_ჩაანაცვლე"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_შეცდომის-ოქმის გაგავნა"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_მყისვე გადატვირთვა"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "განახლება _გაგრძელება"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "განახლება _გაგრძელება"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "ვერ ვპოულობ ვერსიის შენიშვნებს"
@@ -839,121 +866,125 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr ""
 "ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 "ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 #, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr "ვერ განხორციელდა -სკენ სია ის ინტერნეტი."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 უსაფრთხოების განახლება"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "განახლებების _დაყენება"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 დამატებითი პროგრამები"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "განახლება _გაგრძელება"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "განახლებების _დაყენება"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "ვერსია %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "მიმდინარეობს ჩამოქაჩვა სია ის."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "შ_ემოწმება"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "ჩამოსატვირთის ზომა: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "თქვენ შეგიძლიათ %s განახლების ჩადგმა"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "გთხოვთ მოითმინოთ, მიმდინარე პროცესს საკმაო დრო ესაჭიორება."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "განახლება გასრულებულია"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "განახლებების _დაყენება"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "ახალი ვერსია: %s   (ზომა: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "ვერსია %s: \n"
+msgstr "ვერსია %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "თქვენი დისტრიბუტივს აღარ გააჩნია მხარდაჭერა"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 #, fuzzy
 msgid ""
 "You will not get any further security fixes or critical updates. Upgrade to "
@@ -963,17 +994,17 @@ msgstr ""
 "თქვენ არა ნებისმიერი ან კრიტიკული განახლება -სკენ a ვერსია ის ლინუქსი "
 "იხილეთhttp://www.ubuntu.com -თვის ინფორმაცია ჩართულია."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "პროგრამების სიის ინდექსი დაზიანებულია"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 #, fuzzy
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
@@ -1406,7 +1437,7 @@ msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1438,7 +1469,7 @@ msgstr "არათავისუფალი (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
@@ -1722,7 +1753,8 @@ msgstr "პროგრამა"
 
 #, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "დამატება არხი"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "დამატება არხი"
 
 #~ msgid "_Custom"
 #~ msgstr "_პირადი"
diff --git a/po/ko.po b/po/ko.po
index 9f8df151..2ee4468a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,16 +1,15 @@
 # Korean translation for update-manager
 # Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
 # This file is distributed under the same license as the update-manager package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+# darehanl <darehanl@gmail.com>, 2006.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-28 15:14+0000\n"
-"Last-Translator: darehanl <darehanl@gmail.com>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-06 11:33+0000\n"
+"Last-Translator: Eungkyu Song <eungkyu@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +22,7 @@ msgstr "매일"
 
 #: ../SoftwareProperties/SoftwareProperties.py:137
 msgid "Every two days"
-msgstr "이틀 마다"
+msgstr "이틀마다"
 
 #: ../SoftwareProperties/SoftwareProperties.py:138
 msgid "Weekly"
@@ -31,35 +30,35 @@ msgstr "매주"
 
 #: ../SoftwareProperties/SoftwareProperties.py:139
 msgid "Every two weeks"
-msgstr "두 주 마다"
+msgstr "이주일마다"
 
 #: ../SoftwareProperties/SoftwareProperties.py:144
 #, python-format
 msgid "Every %s days"
-msgstr "%s 일 마다"
+msgstr "%s일마다"
 
 #: ../SoftwareProperties/SoftwareProperties.py:167
 msgid "After one week"
-msgstr "한 주 후에"
+msgstr "일주일 후에"
 
 #: ../SoftwareProperties/SoftwareProperties.py:168
 msgid "After two weeks"
-msgstr "두 주 후에"
+msgstr "이주일 주 후에"
 
 #: ../SoftwareProperties/SoftwareProperties.py:169
 msgid "After one month"
-msgstr "한 달 후에"
+msgstr "한달 후에"
 
 #: ../SoftwareProperties/SoftwareProperties.py:174
 #, python-format
 msgid "After %s days"
-msgstr "%s 일 후에"
+msgstr "%s일 후에"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "업데이트를 설치(_I)"
+msgstr "%s 업데이트"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -67,45 +66,44 @@ msgstr "업데이트를 설치(_I)"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "주 서버"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "%s 서버"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "가장 가까운 서버"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "사용자 정의 서버"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "소프트웨어 업데이트"
+msgstr "소프트웨어 채널"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "사용중"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(소스 코드)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "소스 코드"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -117,7 +115,7 @@ msgstr "선택한 파일 가져오기 오류"
 
 #: ../SoftwareProperties/SoftwareProperties.py:980
 msgid "The selected file may not be a GPG key file or it might be corrupt."
-msgstr "선택된 파일은 GPG 키 파일이 아니거나 잘못된 것입니다."
+msgstr "선택된 파일은 GPG 키 파일이 아니거나 잘못되었습니다."
 
 #: ../SoftwareProperties/SoftwareProperties.py:992
 msgid "Error removing the key"
@@ -125,10 +123,10 @@ msgstr "키 삭제 오류"
 
 #: ../SoftwareProperties/SoftwareProperties.py:993
 msgid "The key you selected could not be removed. Please report this as a bug."
-msgstr "선택한 키를 지울 수 없습니다. 버그 리포팅 하십시오."
+msgstr "선택한 키를 지울 수 없습니다. 버그를 보고하십시오."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
@@ -146,74 +144,75 @@ msgstr "디스크에 사용할 이름을 입력하십시오."
 msgid "Please insert a disc in the drive:"
 msgstr "드라이브에 디스크를 넣으십시오:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
-msgstr "망가진 꾸러미"
+msgstr "망가진 패키지"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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을 사용하여 복구하십시오."
+"이 소프트웨어로 고칠 수 없는 망가진 패키지가 있습니다. 진행하기 전에 먼저 시"
+"냅틱이나 apt-get을 사용하여 복구하십시오."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
-msgstr "요청된 메타 꾸러미를 업그레이드 할 수 없습니다"
+msgstr "요청한 메타 패키지를 업그레이드 할 수 없습니다"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
-msgstr "필수 꾸러미를 지워야만 합니다."
+msgstr "필수적인 패키지를 제거해야만 합니다."
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "업그레이드에 필요한 의존성을 계산할 수 없습니다."
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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/에 있는 파일을 포함하여 주십시오."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
-msgstr "꾸러미 인증 오류"
+msgstr "패키지 인증 오류"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
-"인증하는데 실패한 꾸러미가 있습니다. 일시적인 네트워크 문제일 수 있으니 나중"
-"에 다시 시도하십시오. 인증에 실패한 꾸러미의 목록은 다음과 같습니다."
+"인증할 수 없는 패키지가 있습니다. 일시적인 네트워크 문제일 수 있으니 이 경우"
+"라면 나중에 다시 시도하십시오. 인증되지 않은 패키지의 목록은 다음과 같습니다."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
-msgstr "'%s'을(를) 설치할 수 없습니다."
+msgstr "'%s'을(를) 설치할 수 없습니다"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr "요청된 꾸러미를 설치할 수 없습니다. 버그로 보고하여 주십시오. "
+msgstr "요청한 패키지를 설치할 수 없습니다. 버그를 보고하여 주십시오. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
-msgstr "메타 꾸러미를 추측할 수 없습니다."
+msgstr "메타 패키지를 추측할 수 없습니다"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -221,15 +220,14 @@ msgid ""
 " 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을 이용해서 먼저 설치하시기 바랍니"
+"시스템에 ubuntu-desktop이나 kubuntu-desktop 또는 edubuntu-desktop 패키지가 없"
+"으며, 현재 실행중인 우분투의 버전을 알아낼 수 없습니다.\n"
+" 위의 패키지 중 하나를 시냅틱이나 apt-get을 이용해서 먼저 설치하시기 바랍니"
 "다."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "가져오기가 실패했습니다."
+msgstr "CD 추가하기 실패"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -240,28 +238,37 @@ msgid ""
 "The error message was:\n"
 "'%s'"
 msgstr ""
+"CD를 더할 때 오류가 발생하였기 때문에 업그레이드는 중단될 것입니다. 올바른 우"
+"분투 CD를 사용하고 있었다면 이 버그를 보고해 주십시오.\n"
+"\n"
+"오류 메시지:\n"
+"'%s'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
-msgstr "캐시를 읽는 중"
+msgstr "캐시를 읽고 있습니다"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "업그레이드할 때 네트워크에서 자료를 받을까요?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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"
+"빠르고 값싼 네트워크를 이용하고 있다면 '예'를 선택하는 것이 좋습니다. 네트워"
+"크를 이용하는 것이 값싸지 않다면 '아니오'를 선택하십시오."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "적합한 미러 서버를 찾지 못했습니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -272,20 +279,20 @@ msgid ""
 "here it will update all '%s' to '%s' entries.\n"
 "If you select 'no' the update will cancel."
 msgstr ""
-"저장소 정보를 검색하는 동안 업그레이드를 하기 위한 미러 서버 항목을 하나도 찾"
-"지 못했습니다. 이 문제는 내부 미러 서버를 실행중이거나 미러 서버 정보가 오래"
-"됐을 때 일어날 수 있습니다.\n"
+"업그레이드를 하기 위해 저장소 정보를 검색할 때 미러 서버 항목을 찾지 못했습니"
+"다. 내부 미러 서버를 운영하고 있거나 미러 서버 정보가 오래됐을 때 이러한 문제"
+"가 일어날 수 있습니다.\n"
 "\n"
-"'sources.list' 파일을 다시 작성하시겠습니까? '예'를 고른다면 모든 '%s'을(를) "
-"'%s' 항목으로 업데이트 합니다.\n"
-"'아니오'를 고르면 업데이트가 취소됩니다."
+"'sources.list' 파일을 다시 작성하시겠습니까? '예'를 선택하면 '%s' 전체를 '%"
+"s' 항목으로 업데이트 합니다.\n"
+"'아니오'를 선택하면 업데이트가 취소됩니다."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "기본 설정된 소스 목록을 만듭니까?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -295,41 +302,40 @@ msgid ""
 msgstr ""
 "'sources.list'를 검색했지만 '%s'에 적합한 항목을 찾지 못했습니다.\n"
 "\n"
-"'%s'에 대한 기본 항목을 추가하시겠습니까? '아니오'를 고르면 업데이트가 취소됩"
-"니다."
+"'%s'에 대한 기본 항목을 추가하시겠습니까? '아니오'를 선택하면 업데이트가 취소"
+"됩니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "저장소 정보가 올바르지 않습니다"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
-"저장소 정보를 업그레이드하는 것이 잘못된 파일로 만들어졌습니다. 버그를 보고하"
-"여 주십시오."
+"저장소 정보를 업그레이드했는데 잘못된 파일이 만들어졌습니다. 버그를 보고하여 "
+"주십시오."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "써드 파티 소스는 이용할 수 없습니다"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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-"
+"souces.list에서 써드 파티 목록의 일부는 이용할 수 없게 되었습니다. 'software-"
 "properties' 도구나 시냅틱으로 업그레이드 한 후에 다시 사용가능하게 할 수 있습"
 "니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "업데이트 중 오류"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -337,32 +343,31 @@ msgstr ""
 "업데이트를 하는 동안에 문제가 발생했습니다. 보통 네트워크 문제인 경우가 많습"
 "니다. 네트워크의 연결 상태를 확인하시고 다시 시도하십시오."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "디스크 여유 공간이 충분하지 않습니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 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에 확보하시기 "
+"업그레이드가 중단되었습니다. 적어도 %s 정도의 디스크 공간을 %s에 확보하시기 "
 "바랍니다. 휴지통을 비우시고 'sudo apt-get clean' 명령으로 이전 설치 과정 중"
-"에 사용했던 임시 꾸러미들을 삭제하시기 바랍니다."
+"에 사용했던 임시 패키지들을 삭제하시기 바랍니다."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "업그레이드를 시작하시겠습니까?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "업그레이드를 설치하지 못했습니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -370,27 +375,29 @@ msgid ""
 "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)를 실행하여 복구하십시오."
+"업그레이드가 중단되었습니다. 시스템을 이용할 수 없는 상태일 수 있습니다. "
+"(dpkg --configure -a)를 실행하여 복구하십시오.\n"
+"\n"
+"'update-manager' 패키지의 버그를 보고하여 주십시오. 그리고 버그 보고에 /var/"
+"log/dist-upgrade/에 있는 파일을 포함하여 주십시오."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
-msgstr "업그레이드 파일을 다운로드 할 수 없습니다."
+msgstr "업그레이를 다운로드 할 수 없습니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
-"업그레이드가 중지되었습니다. 인터넷 연결과 설치 미디어를 확인하시고 다시 시도"
+"업그레이드가 중단되었습니다. 인터넷 연결과 설치 미디어를 확인하시고 다시 시도"
 "하십시오. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "일부 프로그램의 지원이 종료되었습니다"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -398,63 +405,74 @@ msgid ""
 "If you have not enabled community maintained software (universe), these "
 "packages will be suggested for removal in the next step."
 msgstr ""
-"이 소프트웨어들은 더 이상 공식적으로 지원하지 않으며, 이제 Universe 계열에 해"
-"당합니다.\n"
+"Canonical Ltd.는 다음의 소프트웨어 패키지를 더 이상 지원하지 않습니다. 커뮤니"
+"티를 통해서 여전히 지원받을 수 있습니다.\n"
 "\n"
-"'Universe' 저장소를 활성화하지 않았다면 다음 단계에서 이 꾸러미들을 삭제할 "
-"수 있습니다. "
+"커뮤니티 관리 소프트웨어를 (universe) 활성화하지 않았다면, 다음 단계에서 이 "
+"패키지들을 삭제하도록 제안할 것입니다."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
-msgstr "못쓰게 된 꾸러미를 삭제하시겠습니까?"
+msgstr "구식 패키지를 삭제하시겠습니까?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "이 단계 건너뛰기(_S)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
-msgstr "삭제(_R)"
+msgstr "제거(_R)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "커밋 도중 오류 발생"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
-"필요없는 패키지를 지우는 동안에 오류가 발생했습니다. 아래의 글에서 더 많은 정"
-"보를 얻으실 수 있습니다. "
+"정리하는 도중에 문제가 발생하였습니다. 다음의 메시지에서 더 많은 정보를 확인"
+"할 수 있습니다. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
-msgstr "시스템을 원상태로 복구하는 중"
+msgstr "시스템을 원래의 상태로 복구하고 있습니다"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "'%s'의 백포트를 받고 있습니다"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
-msgstr "꾸러미 관리자 확인 중"
+msgstr "패키지 관리자를 확인하고 있습니다"
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
-msgstr "저장소 정보 업데이트 중"
+msgstr "저장소 정보를 업데이트하고 있습니다"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
-msgstr "잘못된 꾸러미 정보"
+msgstr "잘못된 패키지 정보"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -462,50 +480,49 @@ msgid ""
 "manager' package and include the files in /var/log/dist-upgrade/ in the "
 "bugreport."
 msgstr ""
-"꾸러미 정보가 업데이트 된 후에 필수 꾸러미 '%s'를 어디에서도 찾을 수 없습니"
-"다.\n"
-"심각한 오류입니다. 버그를 보고하여 주십시오."
+"패키지 정보를 업데이트한 다음에 필수 패키지 '%s'를 더이상 찾을 수 없습니다.\n"
+"심각한 오류입니다. 'update-manager' 패키지의 버그를 보고하여 주십시오. 그리"
+"고 버그 보고에 /var/log/dist-upgrade/에 있는 파일을 포함하여 주십시오."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
-msgstr "확인을 요청하는 중"
+msgstr "확인을 요청하고 있습니다"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
-msgstr "업그레이드 하는 중"
+msgstr "업그레이드하고 있습니다"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
-msgstr "못 쓰게 된 소프트웨어를 검색하는 중"
+msgstr "구식 소프트웨어를 검색하고 있습니다"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
-msgstr "시스템 업그레이드가 끝났습니다."
+msgstr "완전히 시스템을 업그레이드하였습니다."
 
 #. print "mediaChange %s %s" % (medium, drive)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr "'%s'(을)를 드라이브 '%s'에 넣으십시오."
+msgstr "'%s'을(를) 드라이브 '%s'에 넣으십시오."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "업데이트가 끝났습니다."
+msgstr "완전히 받았습니다"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
 msgstr "내려받는 중, %li의 %li 파일, 속도 %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "%li 분 정도 남았음"
+msgstr "%s분 정도 남음"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
 msgstr "%li의 %li 파일 내려받는 중"
 
@@ -514,33 +531,36 @@ msgstr "%li의 %li 파일 내려받는 중"
 #. -> longer term, move this code into python-apt
 #: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
-msgstr "변경 사항을 적용하는 중"
+msgstr "변경 사항을 적용하고 있습니다"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
-msgstr "'%s'(을)를 설치할 수 없습니다."
+msgstr "'%s'을(를) 설치할 수 없음"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:188
 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/에 있는 파일을 포함하여 주십시"
+"오."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"설정 파일을 바꾸시겠습니까?\n"
-"'%s'"
+"바뀐 설정 파일 '%s'을(를)\n"
+"교체하시겠습니까?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -552,51 +572,55 @@ msgid "A fatal error occured"
 msgstr "심각한 오류 발생"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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"
+"이 버그를 보고하여 주십시오. 그리고 버그 보고에 /var/log/dist-upgrade/main."
+"log 파일과 /var/log/dist-upgrade/apt.log 파일을 포함하여 주십시오. 업그레이드"
+"가 중단되었습니다.\n"
 "원래의 sources.list는 /etc/apt/sources.list.distUpgrade에 저장되어 있습니다."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "꾸러미 %s 개가 삭제될 것입니다."
+msgstr[0] "패키지 %d개를 삭제할 것입니다."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] "새로운 꾸러미가 %s 개 설치될 것입니다."
+msgstr[0] "새로운 패키지 %d개를 설치할 것입니다."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "꾸러미가 %s 개 업그레이드 될 것입니다."
+msgstr[0] "패키지 %d개를 업그레이드할 것입니다."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "총 %s개의 꾸러미를 다운로드 합니다."
+msgstr ""
+"\n"
+"\n"
+"총 %s개의 패키지를 다운로드해야 합니다. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
-msgstr "업그레이드는 여러 시간이 걸릴 수 있고, 어떤 때에도 취소될 수 없습니다."
+msgstr ""
+"업그레이드를 받아 설치하는 것은 여러 시간이 걸릴 수 있으며, 이후 어떤 경우에"
+"도 취소할 수 없습니다."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -604,7 +628,7 @@ msgstr "데이터 손실을 막으려면 열려있는 모든 프로그램과 문
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "시스템이 최신의 상태입니다."
 
@@ -612,12 +636,12 @@ msgstr "시스템이 최신의 상태입니다."
 msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
-msgstr ""
+msgstr "시스템에 업그레이드할 것이 없습니다. 업그레이드를 취소합니다."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>%s 삭제</b>"
+msgstr "<b>%s 제거</b>"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:537
 #, python-format
@@ -630,43 +654,42 @@ msgid "Upgrade %s"
 msgstr "%s 업그레이드"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "%li 일 %li 시간 %li 분 정도 남았음"
+msgstr "%li일 %li시간 %li분"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "%li 시간 %li 분 정도 남았음"
+msgstr "%li시간 %li분"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li분"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li초"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
-msgstr "재부팅이 필요합니다."
+msgstr "다시 시작해야 합니다"
 
 #: ../DistUpgrade/DistUpgradeView.py:110
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
-msgstr ""
-"업그레이드가 끝났습니다. 재부팅이 필요합니다. 지금 재부팅 하시겠습니까?"
+msgstr "업그레이드가 끝났으며 다시 시작해야 합니다. 지금 하시겠습니까?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -686,12 +709,12 @@ msgid ""
 msgstr ""
 "<b><big>실행 중인 업그레이드를 취소하시겠습니까?</big></b>\n"
 "\n"
-"업그레이드를 취소하면 시스템이 사용하기 어려운 상태가 될 수 있습니다. 업그레"
-"이드를 계속 하시는 쪽을 강력히 추천합니다."
+"업그레이드를 취소하면 시스템이 사용할 수 없는 상태가 될 수 있습니다. 업그레이"
+"드를 계속 하시기를 강력히 건의합니다."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-msgstr "<b><big>업그레이드가 완료되어 시스템을 재시작합니다.</big></b>"
+msgstr "<b><big>업그레이드를 완료하기 위해 시스템을 다시 시작합니다.</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
@@ -699,60 +722,71 @@ msgstr "<b><big>업그레이드를 시작하시겠습니까?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>우분투를 버전 6.10으로 업그레이드하고 있습니다</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr "지우는 중"
+msgstr "정리하고 있습니다"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 msgid "Details"
-msgstr "자세히"
+msgstr "자세한 정보"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr "파일의 차이점"
+msgstr "파일 간의 차이점"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
-msgstr "업그레이드를 다운로드하고 설치하는 중"
+msgstr "업그레이드를 받아서 설치하고 있습니다"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr "소프트웨어 채널을 수정하는 중"
+msgstr "소프트웨어 채널을 수정하고 있습니다"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr "업그레이드를 준비하는 중"
+msgstr "업그레이드를 준비하고 있습니다"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr "시스템을 재시작하는 중"
+msgstr "시스템을 다시 시작하고 있습니다"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
 msgstr "터미널"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "유지(_K)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "바꾸기(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "버그 보고(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
-msgstr "지금 바로 재시작(_R)"
+msgstr "지금 다시 시작(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
-msgstr "업그레이드 계속(_R)"
+msgstr "계속 업그레이드(_R)"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
@@ -778,12 +812,11 @@ msgstr "업그레이드 도구를 실행할 수 없습니다."
 #: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
-msgstr ""
-"업그레이드 도구에 버그가 있을 가능성이 높습니다. 버그를 보고하여 주십시오."
+msgstr "업그레이드 도구에 버그가 있는 것 같습니다. 버그를 보고하여 주십시오."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
-msgstr "업그레이드 도구를 다운로드하는 중"
+msgstr "업그레이드 도구를 다운로드하고 있습니다"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
@@ -799,12 +832,11 @@ msgstr "업그레이드 도구"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
-msgstr "가져오기가 실패했습니다."
+msgstr "받기 실패"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
-"업그레이드를 가져오는데 실패했습니다. 네트워크에 문제가 있을 수 있습니다. "
+msgstr "업그레이드를 받는데 실패했습니다. 네트워크에 문제가 있을 수 있습니다. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
@@ -820,16 +852,15 @@ msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
-msgstr "검사 실패"
+msgstr "확인 실패"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
 msgstr ""
-"업그레이드를 검사하는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 있습니"
-"다. "
+"업그레이드를 확인하는데 실패했습니다.  네트워크나 서버에 문제가 있을 수 있습"
+"니다. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
@@ -840,132 +871,126 @@ msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
-"업그레이드를 인증하는데 실패했습니다.네트워크나 서버에 문제가 있을 수 있습니"
+"업그레이드를 인증하는데 실패했습니다. 네트워크나 서버에 문제가 있을 수 있습니"
 "다. "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "%li 의 %li 파일 내려 받는 중, 속도 %s/s"
+msgstr ""
+"%(total)li개중 %(current)li번째 파일을 %(speed)s/s의 속도로 받고 있습니다"
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "%li 의 %li 파일 내려 받는 중, 속도 %s/s"
+msgstr "%(total)li개중 %(current)li번째 파일을 받고 있습니다"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다."
+msgstr "변경 사항 목록이 없습니다"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
-msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
-"바뀐 목록을 다운로드하는데 실패했습니다. 인터넷 연결을 확인해 주십시오."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "우분투 5.10 보안 업데이트"
+msgstr "중요한 보안 업데이트"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "추천하는 업데이트"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "업데이트를 설치(_I)"
+msgstr "제안하는 업데이트"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Backports"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "업그레이드 계속(_R)"
+msgstr "배포판 업데이트"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "업데이트를 설치(_I)"
+msgstr "기타 업데이트"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "버전 %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr "바뀐 목록을 다운로드 하는 중..."
+msgstr "변경 사항 목록을 다운로드하고 있습니다..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "전체 선택 취소(_U)"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "점검(_C)"
+msgstr "전체 선택(_C)"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "다운로드 크기: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "%s 개의 업데이트를 설치할 수 있습니다."
+msgstr[0] "업데이트 %s개를 설치할 수 있습니다."
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "잠시만 기다리십시오. 이 작업은 약간의 시간이 걸립니다."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr "업데이트가 끝났습니다."
+msgstr "완전히 업데이트하였습니다."
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "업데이트를 설치(_I)"
+msgstr "업데이트 확인"
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "새 버전: %s (크기: %s)"
+msgstr "버전 %(old_version)s에서 %(new_version)s(으)로"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "버전 %s: \n"
+msgstr "버전 %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(크기: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "더 이상 지원되지 않는 배포판입니다."
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -975,17 +1000,17 @@ msgstr ""
 "그레이드 하십시오. 업그레이드에 대한 더 많은 정보는 http://www.ubuntu.com에"
 "서 보실 수 있습니다."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr "<b>새 배포판 '%s'를 이용할 수 있습니다</b>"
+msgstr "<b>새 배포판 '%s'을(를) 설치할 수 있습니다</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "소프트웨어 목록이 망가졌습니다."
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -997,54 +1022,48 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "없음"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, 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"
+"<b><big>업데이트 확인을 직접 해야 합니다.</big></b>\n"
 "\n"
-"현재 자동으로 업데이트를 확인하지 않습니다. \"시스템\" -> \"관리 도구\" -> "
-"\"Software Properties\"에서 설정할 수 있습니다."
+"업데이트 확인이 자동으로 되지 않습니다. 이 동작은 <i>인터넷 업데이트</i> 탭"
+"의 <i>소프트웨어 소스</i>에서 설정할 수 있습니다."
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>시스템을 최신으로 유지하십시오.</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
-"<big><b>CD 검색 오류</b></big>\n"
-"\n"
-"%s"
+msgstr "<big><b>설치하지 못한 업데이트가 있습니다</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>업그레이드를 시작하시겠습니까?</big></b>"
+msgstr "<b><big>업그레이드 관리자를 시작합니다</big></b>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1052,11 +1071,11 @@ msgstr "변경 사항"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "업데이트의 변경 사항과 설명"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
-msgstr "점검(_k)"
+msgstr "확인(_k)"
 
 #: ../data/glade/UpdateManager.glade.h:10
 msgid "Check the software channels for new updates"
@@ -1077,6 +1096,10 @@ msgid ""
 "This can be caused by an uncompleted upgrade, unofficial software packages "
 "or by running a development version."
 msgstr ""
+"배포판 업그레이드를 수행하여 가능한 많은 업데이트를 설치합니다. \n"
+"\n"
+"이것은 완료되지 않은 업그레이드나 비공식 소프트웨어 패키지, 또는 개발버전에"
+"서 실행했기 때문일 수 있습니다."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
@@ -1100,16 +1123,15 @@ msgstr "업그레이드(_p)"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr "우분투 최신 버젼으로 업그레이드 합니다."
+msgstr "우분투 최신 버전으로 업그레이드 합니다."
 
 #: ../data/glade/UpdateManager.glade.h:21
 msgid "_Check"
-msgstr "점검(_C)"
+msgstr "확인(_C)"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "업그레이드 계속(_R)"
+msgstr "배포판 업그레이드(_D)"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1117,34 +1139,31 @@ msgstr "앞으로 이 정보 숨김(_H)"
 
 #: ../data/glade/UpdateManager.glade.h:24
 msgid "_Install Updates"
-msgstr "업데이트를 설치(_I)"
+msgstr "업데이트 설치(_I)"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
 msgstr "변경 사항"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "업데이트"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>인터넷 업데이트</b>"
+msgstr "<b>자동 업데이트</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>씨디롬/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>인터넷 업데이트</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>인터넷 업데이트</b>"
+msgstr "<b>인터넷</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1156,11 +1175,16 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "CD롬 추가(_C)"
+msgstr "씨디롬 추가"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
@@ -1168,16 +1192,15 @@ msgstr "인증"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
-msgstr "다운로드 받은 소프트웨어 파일 삭제(_e):"
+msgstr "다운로드한 소프트웨어 파일 삭제(_E):"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "다운로드가 끝났습니다."
+msgstr "다운로드 위치:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
-msgstr "믿을 만한 소프트웨어 제공자로부터 공개 키를 가져옵니다."
+msgstr "믿을 수 있는 소프트웨어 제공자로부터 공개 키를 가져옵니다."
 
 #: ../data/glade/SoftwareProperties.glade.h:14
 msgid "Internet Updates"
@@ -1187,57 +1210,54 @@ msgstr "인터넷 업데이트"
 msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
 "automatically"
-msgstr "공식 우분투 서버의 보안 업데이트만 자동으로 설치됩니다."
+msgstr "공식 우분투 서버의 보안 업데이트만 자동으로 설치합니다."
 
 #: ../data/glade/SoftwareProperties.glade.h:16
 msgid "Restore _Defaults"
-msgstr "기본값 불러오기(_D)"
+msgstr "기본값으로 되돌리기(_D)"
 
 #: ../data/glade/SoftwareProperties.glade.h:17
 msgid "Restore the default keys of your distribution"
-msgstr "배포판의 기본 키 불러오기"
+msgstr "배포판의 기본 키로 되돌리기"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "소프트웨어 설정"
+msgstr "소프트웨어 소스"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
 msgid "Source code"
-msgstr ""
+msgstr "소스 코드"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "통계"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "통계 정보 제출"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "써드 파티"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "업데이트를 자동으로 확인(_C):"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "백그라운드에서 업데이트 다운로드하되, 설치는 하지 않음(_D)"
+msgstr "업데이트를 자동으로 다운로드하지만 설치는 하지 않습니다(_D)"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
-msgstr "키 가져오기(_I)"
+msgstr "키 파일 가져오기(_I)"
 
 #: ../data/glade/SoftwareProperties.glade.h:26
 msgid "_Install security updates without confirmation"
-msgstr "확인없이 보안 업데이트 설치(_I)"
+msgstr "보안 업데이트는 확인 없이 설치(_I)"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1246,20 +1266,20 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>채널 정보가 오래되었습니다.</big></b>\n"
+"<b><big>이용할 수 있는 소프트웨어에 대한 정보가 오래되었습니다.</big></b>\n"
 "\n"
-"새로 추가되었거나 변경된 채널에서 소프트웨어를 설치하거나 업데이트를 설치하"
-"기 위해서는 채널 정보를 새로 불러와야 합니다. \n"
+"새로 추가하거나 변경한 소스로부터 소프트웨어를 설치하거나 업데이트하려면, 이"
+"용할 수 있는 소프트웨어에 대한 정보를 다시 읽어야 합니다.\n"
 "\n"
 "계속하기 위해서는 인터넷 연결이 필요합니다."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
-msgstr "<b>참고:</b>"
+msgstr "<b>설명:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
 msgid "<b>Components:</b>"
-msgstr "<b>구성요소:</b>"
+msgstr "<b>구성 요소:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Distribution:</b>"
@@ -1274,7 +1294,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1282,7 +1301,8 @@ msgid ""
 "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"
+"<big><b>추가하고자 하는 소스 저장소의 APT 줄을 완전히 입력하십시오.</b></"
+"big>\n"
 "\n"
 "APT 줄은 다음 예와 같이 채널의 종류, 위치, 구성요소를 포함합니다. <i>\"deb "
 "http://ftp.debian.org sarge main\"</i>"
@@ -1301,23 +1321,23 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
-msgstr ""
+msgstr "소스 편집"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
-msgstr "CD-ROM을 읽는 중"
+msgstr "씨디롬을 검색하고 있습니다"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
-msgstr ""
+msgstr "소스 추가(_A)"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
-msgstr "새로고침(_R)"
+msgstr "다시 읽기(_R)"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr "설치할 수 있는 업데이트를 보여주고, 설치합니다."
+msgstr "가능한 업데이트를 보여주고, 설치합니다."
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -1328,49 +1348,46 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
-"현재 버전보다 새 버전이 있고, 업그레이드 가능한 지를 자동으로 확인합니다."
+"현재 배포판에 새로운 버전이 있어서 업그레이드가 가능한지 자동으로 확인합니다."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr "새로운 배포판을 확인합니다."
+msgstr "새로운 배포판 발표를 확인합니다."
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 ""
-"자동으로 업데이트 확인하는 기능을 사용하지 않는다면 채널 목록을 수동으로 새"
-"로 고침해야 합니다. 이 설정은 이 경우에 알림 기능이 나타나지 않도록 합니다."
+"자동 업데이트 확인 기능을 사용하지 않으면, 채널 목록을 수동으로 다시 읽어야 "
+"합니다. 이 옵션은 이 경우에 알림 기능이 나타나지 않도록 합니다."
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
-msgstr "채널 목록을 새로고침할 것을 알려줍니다."
+msgstr "채널 목록을 다시 읽도록 알려줍니다."
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr "업데이트의 세부사항을 보여줍니다."
+msgstr "업데이트의 자세한 정보를 보여줍니다."
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr "업데이트 관리자 대화상자의 크기를 저장합니다."
+msgstr "업데이트 관리자 창의 크기 저장"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changes and the "
 "description"
-msgstr "변경과 설명의 목록을 가지는 확장자의 상태를 저장합니다."
+msgstr "변경 사항과 설명의 목록을 포함하는 확장자의 상태를 저장합니다."
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
 msgstr "창 크기"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "소프트웨어 채널과 인터넷 업데이트를 설정합니다."
+msgstr "설치할 수 있는 소프트웨어와 업데이트를 위한 소스를 설정"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1380,87 +1397,78 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "우분투 5.10 업데이트"
+msgstr "우분투 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "커뮤니티에서 관리유지함 (Universe)"
+msgstr "커뮤니티에서 관리"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "장치의 독점 드라이버"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "자유소프트웨어 아님 (Multiverse)"
+msgstr "제한된 소프트웨어"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "우분투 6.10 'Edgy Eft' 씨디롬"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "우분투 6.06 'Dapper Drake'"
+msgstr "우분투 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "커뮤니티에서 관리유지함 (Universe)"
+msgstr "커뮤니티에서 관리 (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "커뮤니티에서 관리유지함 (Universe)"
+msgstr "커뮤니티에서 관리하는 오픈 소스 소프트웨어"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "자유소프트웨어 아님 (Multiverse)"
+msgstr "비자유 드라이버"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "장치의 독점 드라이버 "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "자유소프트웨어 아님 (Multiverse)"
+msgstr "제한된 소프트웨어 (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "우분투 6.06 'Dapper Drake'"
+msgstr "우분투 6.06 LTS 'Dapper Drake' 씨디롬"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Backport 업데이트"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1469,9 +1477,8 @@ msgstr "우분투 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "우분투 5.10 'Breezy Badger'"
+msgstr "우분투 5.10 'Breezy Badger' 씨디롬"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1490,87 +1497,78 @@ msgstr "우분투 5.10 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "우분투 5.10 'Breezy Badger'"
+msgstr "우분투 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "우분투 5.04 'Hoary Hedgehog' 씨디롬"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
-msgstr "공식적으로 지원됨"
+msgstr "공식적으로 지원함"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "우분투 5.10 보안 업데이트"
+msgstr "우분투 5.04 보안 업데이트"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "우분투 5.10 업데이트"
+msgstr "우분투 5.04 업데이트"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "우분투 5.10 Backports"
+msgstr "우분투 5.04 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "우분투 5.10 'Breezy Badger'"
+msgstr "우분투 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
 msgid "Community maintained (Universe)"
-msgstr "커뮤니티에서 관리유지함 (Universe)"
+msgstr "커뮤니티에서 관리 (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:201
 msgid "Non-free (Multiverse)"
-msgstr "자유소프트웨어 아님 (Multiverse)"
+msgstr "비자유 (Multiverse)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "우분투 4.10 'Warty Warthog' 씨디롬"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다."
+msgstr "더 이상 공식적으로 지원하지 않음"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
 msgid "Restricted copyright"
-msgstr "저작권 제한됨"
+msgstr "저작권이 제한됨"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "우분투 5.10 보안 업데이트"
+msgstr "우분투 4.10 보안 업데이트"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "우분투 5.10 업데이트"
+msgstr "우분투 4.10 업데이트"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "우분투 5.10 Backports"
+msgstr "우분투 4.10 Backports"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1611,144 +1609,39 @@ msgstr "데비안 \"Sid\" (unstable)"
 #. CompDescription
 #: ../data/channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr "DFSG 호환이지만 자유소프트웨어가 아닌 의존성이 있는 소프트웨어"
+msgstr "DFSG 호환이 되지만 비자유 소프트웨어에 의존하는 소프트웨어"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr "DFSG와 호환이 안되는 소프트웨어"
-
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "%li 의 %li 파일 내려 받는 중, 속도 알 수 없음"
-
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "업데이트를 설치(_I)"
-
-#~ msgid "Cancel _Download"
-#~ msgstr "다운로드 취소(_D)"
-
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다."
+msgstr "DFSG와 호환이 되지 않는 소프트웨어"
 
-#~ 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>"
+#~ "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 ""
-#~ "<span weight=\"bold\" size=\"x-large\">우분투 6.06 LTS로 업그레이드하는 중"
-#~ "</span>"
-
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "우분투 5.10 보안 업데이트"
-
-#, 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."
+#~ "This download will take about %s with a 56k modem and about %s with a "
+#~ "1Mbit DSL connection"
 #~ msgstr ""
-#~ "<big><b>시스템 검사 중</b></big>\n"
-#~ "\n"
-#~ "소프트웨어 업데이트는 에러를 고치고, 보안 문제를 제거하며 새로운 기능을 제"
-#~ "공합니다."
+#~ "이것을 다운로드하려면 56k 모뎀으로는 약 %s이(가) 걸리고 1Mbit DSL 연결로"
+#~ "는 약 %s이(가) 걸립니다."
 
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "공식적으로 지원됨"
+#~ msgid "The list of changes is not available yet. Please 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."
+#~ "Failed to download the list of changes. Please check your Internet "
+#~ "connection."
 #~ 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 "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'나 '시냅틱'과 같은 다른 프로그램을 먼저 닫으십시오."
-
-#~ 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"
-#~ msgstr "채널 추가(_A)"
-
-#~ msgid "_Custom"
-#~ msgstr "사용자 정의(_C)"
-
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "우분투 6.06 LTS"
-
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "우분투 6.06 LTS 보안 업데이트"
-
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "우분투 6.06 LTS 업데이트"
+#~ msgid "By Canonical supported Open Source software"
+#~ msgstr "Canonical이 지원하는 오픈 소스 소프트웨어"
 
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "우분투 6.06 LTS 백포트"
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "저작권나 법적 문제가 제한된 소프트웨어"
diff --git a/po/ku.po b/po/ku.po
index 31740c00..6f6e1835 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:43+0000\n"
-"Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-04 06:52+0000\n"
+"Last-Translator: ElîxanLoran <elixanloran@hotmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +59,7 @@ msgstr "Piştî %s roj"
 #: ../SoftwareProperties/SoftwareProperties.py:252
 #, python-format
 msgid "%s updates"
-msgstr ""
+msgstr "%s rojanekirin"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -67,64 +67,68 @@ msgstr ""
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Pêşkêşkera Mak"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Pêşkêşkera %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Pêşkêşkera herî nêzîk"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Pêşkêşkera taybet"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
 msgid "Software Channel"
-msgstr ""
+msgstr "Qanala Nivîsbariyê"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Çalak"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(Koda Çavkanî)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "Koda Çavkaniyê"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
-msgstr ""
+msgstr "Mifteyê veguhezîne"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
-msgstr ""
+msgstr "Di dema veguheztina dosyeya hilbijartî de çewtî"
 
 #: ../SoftwareProperties/SoftwareProperties.py:980
 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."
 
 #: ../SoftwareProperties/SoftwareProperties.py:992
 msgid "Error removing the key"
-msgstr ""
+msgstr "Di dema rakirina mifteyan de çewtî"
 
 #: ../SoftwareProperties/SoftwareProperties.py:993
 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ê yekê weke "
+"çewtiyekê ragihîne."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
 #, python-format
@@ -133,75 +137,89 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"<big><b>Di venihêrina CDyê de çewtî</b></big>\n"
+"\n"
+"%s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1096
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Ji kerema xwe navê ji bo diskê binivîse"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1112
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Ji kerema xwe re dîskekê têxe ajokar:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Paketên şikestî"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 re van bernameyan bi "
+"synaptic an jî i apt-get sererast bikî"
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Pakêtên agahiyan yên pêwist nayên rojanekirin"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Divê pakêteke pêwist jê were rakirin"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Rojanekirin nikaribû were hesabkirin"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Di piştrastkirina çend paketan de çewtî derket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Nikarî '%s' saz bike"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 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. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Pakêta-meta nehate kifşkirin"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -209,10 +227,15 @@ msgid ""
 " 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."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
 msgid "Failed to add the CD"
-msgstr ""
+msgstr "Dema têxistina CDyê de çewtî"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -223,28 +246,37 @@ msgid ""
 "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'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
-msgstr ""
+msgstr "Pêşbîr tê xwendin"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Ji bo bilindkirinê bila dane ji toreyê were daxistin?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
-msgstr ""
+msgstr "Şewqdereke derbasdar nehate dîtin."
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -255,13 +287,21 @@ msgid ""
 "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."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
-msgstr ""
+msgstr "Bile çavkaniyên rawêjî pêk bên?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -269,60 +309,72 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Agahiya depoyê ne derbasdar e"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"Karê rojanekirina agahiya depoyê, dosyeyeke nederbasdar çêkir. Ji kerema xwe "
+"re vê çewtiyê ragihîne."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
-msgstr ""
+msgstr "Ji çavkaniyên partiyên sêyemîn têkilî hate birîn."
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
-msgstr ""
+msgstr "Di rojanekirinê de çewtî derket"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Cihê vala yê diskê têr nake"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 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 û bi 'sudo apt-get clean' pakêtên derbasdar yên "
+"sazkirinên berê rake."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Tu dixwazî dest bi bilindkirinê bikî?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Sazkirina hemû bilindkirinan biserneket"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -330,22 +382,29 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Daxistina bilindkirinan serneket"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 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. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Ji bo hin sepanan piştrastkirin qediya"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -354,54 +413,67 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "Bila pakêtên ku nayên bikaranîn werine rakirin?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
-msgstr ""
+msgstr "Vê gavê derbas bike"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Jê bibe"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
-msgstr ""
+msgstr "Di dema xebatê de çewtî"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 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. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
-msgstr ""
+msgstr "Vedigere rewşa pergala orjînal"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
+msgstr "Bireveberiya paketan tê kontrol kirin"
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:672
-msgid "Updating repository information"
+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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr "Agahiyên depoyê tê rojanekirin"
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
-msgstr ""
+msgstr "Agahiya paketê nederbasdar e"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -410,20 +482,25 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Pirsa piştrastkirinê"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Tê bilindkirin"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Li nivîsbariya kevin tê gerandin"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Bilindkirina sîstemê temam bû."
 
@@ -431,7 +508,7 @@ msgstr "Bilindkirina sîstemê temam bû."
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Ji kerema xwe '%s' bixe nav ajokera '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
 #, fuzzy
@@ -447,7 +524,7 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
 #, python-format
 msgid "About %s remaining"
-msgstr ""
+msgstr "Nêzîka %s ma"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
@@ -464,13 +541,16 @@ msgstr "Guherandin tê bi kar anîn"
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Nikaribû '%s' saz bike"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:188
 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."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
@@ -479,20 +559,22 @@ msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
+"Pelgeha veavakirinan ya hatiye taybetkirin ya\n"
+"'%s' bila were guherandin?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "Fermana 'diff' nehatiye dîtin"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Çewtiyeke giran derket"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
 msgid ""
@@ -501,6 +583,11 @@ msgid ""
 "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."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
@@ -531,21 +618,26 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Pêwîst e tu bi tevahî %s daxî."
+msgstr ""
+"\n"
+"\n"
+"Pêwîst e tu bi tevahî %s daxî. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
-msgstr ""
+msgstr "Ji bo ku dane winda nebin hemû sepan û pelgeyên ku vekirî ne bigire"
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Sîstema te rojane ye"
 
@@ -554,6 +646,8 @@ 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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -573,40 +667,41 @@ msgstr "%s bilind bike"
 #: ../DistUpgrade/DistUpgradeView.py:27
 #, python-format
 msgid "%li days %li hours %li minutes"
-msgstr ""
+msgstr "%li roj %li saet %li xulek"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
 #, python-format
 msgid "%li hours %li minutes"
-msgstr ""
+msgstr "%li saet %li xulek"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li xulek"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li çirke"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
-msgstr ""
+msgstr "Destpêkirina nû pêwîst e"
 
 #: ../DistUpgrade/DistUpgradeView.py:110
 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î?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -624,10 +719,15 @@ msgid ""
 "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."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 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>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
@@ -635,7 +735,7 @@ msgstr "<b><big>Dest bi bilindkirinê were kirin?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Ubuntu li guhertoya 6.10 tê bilindkirin</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -647,287 +747,315 @@ msgstr "Hûragahî"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "Cudahiyên navbera dosiyan"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Fetching and installing the upgrades"
-msgstr ""
+msgstr "Bilindkirin nehatne sazkirin"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Kanalên nivîsbariyê tên guherandin"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Bilinkirin amade dibe"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr ""
+msgstr "Pergal tê nûdestpêkirin"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
 msgstr "Termînal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
-msgstr "Bi_parêze"
+msgid "_Cancel Upgrade"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
+msgid "_Continue"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
-msgstr ""
+msgid "_Keep"
+msgstr "Bi_parêze"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
-msgstr ""
+msgid "_Replace"
+msgstr "Bide _ser"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr "Çewtiyê _Ragihîne"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr "Niha _ji nû ve bide destpêkirin"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
+msgstr "Bilindkirinan _Bidomînî"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
 msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
-msgstr ""
+msgstr "Nîşeyên weşandinê nayên dîtin"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Dibe ku barê pêşkêşkerê pir zêde be "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
 msgid "Could not download the release notes"
-msgstr ""
+msgstr "Nîşeyên weşanê nehate daxistin"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Ji kerema xwe girêdana înternetê kontrol bike."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
-msgstr ""
+msgstr "Amûra bilindkirinê nikaribû bimeşîne"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:150
 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"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
-msgstr ""
+msgstr "Amûra bilindkirinê tê daxistin"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "Amûra bilindkirinê te ber bi pêvajoya bilindkirinê dibe."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Destnîşana amûra bilindkirinê"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
-msgstr ""
+msgstr "Amûra bilindkirinê"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Anîn biserneket"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "Anîna bilindkirinê biserneket. Dibe ku pirsgirêkeke torê hebe. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
-msgstr ""
+msgstr "Derxistin biserneket"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:215
 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. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
-msgstr ""
+msgstr "Piştrastkirin biserneket."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
 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 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
-msgstr ""
+msgstr "Naskirin lê nehat"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:229
 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. "
 
 #: ../UpdateManager/GtkProgress.py:108
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr ""
+msgstr "Pelgeha %(current)li ji %(total)li bi %(speed)s/ç tê daxistin"
 
 #: ../UpdateManager/GtkProgress.py:113
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr ""
+msgstr "Pelgeha %(current)li ji %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr ""
+msgstr "Lîsteya guherînan ne gihiştbar e"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr ""
+msgstr "Rojanekirinên ewlekariyê yên girîng"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Rojanekirinên têne pêşniyarkirin"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr ""
+msgstr "Rojanekirinên hatine pêşniyarkirin"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr ""
+msgstr "Rojanekirinên dîstrîbusiyonê"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr ""
+msgstr "Rojanekirinên din"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
-msgstr "Guhertoya %s: \n"
+msgstr "Guherto %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr ""
+msgstr "Lîsteya guhartinan tê daxistin..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "Yekê Jî _Hilnebijêre"
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr ""
+msgstr "Hemûyan _Hilbijêrî"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Mezinahiya daxistinê: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 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î"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Divê raweste, dibe ku ev hinekî demdijêj be."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Rojanekirin temam bû"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr ""
+msgstr "Rojanekirin têne venihartin."
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Guhertoya nû: %s (Mezinahî: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Guhertoya %s: \n"
+msgstr "Guherto %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Mezinahî:%s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
-msgstr ""
+msgstr "Belavkariya ku tu bikar tîne nayê destekirin"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>Weşana belavkariya nû dikare bigihêje '%s'</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
-msgstr ""
+msgstr "Pêrista nivîsbariyê xera bûye"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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.\r\n"
+"\r\n"
+"— By ElîxanLoran on 2006-08-25 06:29:14 UTC (2 more)"
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Ne yek jî"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 msgid ""
@@ -939,11 +1067,11 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Pergala xwe rojane hilîne</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
+msgstr "<big><b>Di lênihertina CDyê de çewtî</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
 #, fuzzy
@@ -956,23 +1084,24 @@ msgstr "Guhartin"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Daxuyaniya guherîn û rojanekirinan"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
-msgstr ""
+msgstr "_Kontrol bike"
 
 #: ../data/glade/UpdateManager.glade.h:10
 msgid "Check the software channels for new updates"
-msgstr ""
+msgstr "Ji bo rojanekirinên nû qanalên nivîsbariyê kontrol bike"
 
 #: ../data/glade/UpdateManager.glade.h:11
 msgid "Description"
 msgstr "Daxuyanî"
 
 #: ../data/glade/UpdateManager.glade.h:12
+#, fuzzy
 msgid "Release Notes"
-msgstr ""
+msgstr "Nîşeyên Weşanê"
 
 #: ../data/glade/UpdateManager.glade.h:13
 msgid ""
@@ -981,70 +1110,74 @@ msgid ""
 "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."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Pêşketina dosiyan yek bi yek nîşan bide"
 
 #: ../data/glade/UpdateManager.glade.h:17
 msgid "Software Updates"
-msgstr ""
+msgstr "Rojanekirinên Nivîsbariyê"
 
 #: ../data/glade/UpdateManager.glade.h:18
 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."
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
-msgstr ""
+msgstr "_Bilindkirin"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Ber bi guhertoya dawî ya Ubuntu bilind bike"
 
 #: ../data/glade/UpdateManager.glade.h:21
 msgid "_Check"
-msgstr ""
+msgstr "_Kontrol bike"
 
 #: ../data/glade/UpdateManager.glade.h:22
 msgid "_Distribution Upgrade"
-msgstr ""
+msgstr "Bilindkirina _Belavkirinê"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "Di pêşerojê de vê agahiyê _veşêre"
 
 #: ../data/glade/UpdateManager.glade.h:24
 msgid "_Install Updates"
-msgstr ""
+msgstr "Rojanekirinan _Saz bike"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Guhartin"
+msgstr "guhertin"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "rojanekirin"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
 msgid "<b>Automatic updates</b>"
-msgstr ""
+msgstr "<b>Rojanekirina bixweber</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
-msgstr ""
+msgstr "<b>Rojanekirinên înternetê</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Kanal</b>"
+msgstr "<b>Înternet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1059,15 +1192,15 @@ msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:9
 msgid "Add Cdrom"
-msgstr ""
+msgstr "Cdrom lê zêde bike"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
-msgstr ""
+msgstr "Erêkirina Nasnameyê"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "Dosiyên nivîsbariyê yên daxistî _jê bibe:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
 #, fuzzy
@@ -1076,25 +1209,27 @@ msgstr "Daxistin hatiye temam kirin"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
-msgstr ""
+msgstr "Ji peydakereke ku tu pê ewle yî, mifteyeke vekirî veguhezîne hundir"
 
 #: ../data/glade/SoftwareProperties.glade.h:14
 msgid "Internet Updates"
-msgstr ""
+msgstr "Rojanekirinên Înternetê"
 
 #: ../data/glade/SoftwareProperties.glade.h:15
 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."
 
 #: ../data/glade/SoftwareProperties.glade.h:16
 msgid "Restore _Defaults"
-msgstr ""
+msgstr "Vegerîne ser Nirxên _Destpêke"
 
 #: ../data/glade/SoftwareProperties.glade.h:17
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "Mifteyên peşdanasînî yên belavkariya te paş de vedigerîne"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
@@ -1104,35 +1239,35 @@ msgstr "Taybetmendiyên Nivîsbariyê"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
 msgid "Source code"
-msgstr ""
+msgstr "Koda çavkanî"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Îstatîstîk"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Agahiyên Îstatîskî Ragihîne"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Aliyê Sêyemîn"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "Xwebixwe li rojanekirinan bi_gerîne:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
 msgid "_Download updates automatically, but do not install them"
-msgstr ""
+msgstr "Rojanekirinan bixweber _daxe lê saz neke"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
-msgstr ""
+msgstr "Dosyeya mifteyan _veguhezîne hundir"
 
 #: ../data/glade/SoftwareProperties.glade.h:26
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "Bêpesendkirin rojaneyên ewlehiyê _saz bike"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
 msgid ""
@@ -1150,11 +1285,11 @@ msgstr "<b>Şîrove:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
 msgid "<b>Components:</b>"
-msgstr ""
+msgstr "<b>Parçe:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Distribution:</b>"
-msgstr ""
+msgstr "<b>Belavkirin:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Type:</b>"
@@ -1182,40 +1317,44 @@ msgid ""
 "Binary\n"
 "Source"
 msgstr ""
+"Dubendî (Binary)\n"
+"Çavkanî (Source)"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
-msgstr ""
+msgstr "Sererastkirina Çavkaniyê"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Li CD-ROM tê gerîn"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
-msgstr ""
+msgstr "Çavkaniyekê _Têxê"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
-msgstr ""
+msgstr "_Rojane bike"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Rojanekirinên amade nîşan bide û saz bike"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
-msgstr "Gerînendeyê Rojanekirinan"
+msgstr "Rêveberiya Rojanekirinê"
 
 #: ../data/update-manager.schemas.in.h:1
 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."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Li derketina belavkirina nû bigerîne"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1226,15 +1365,15 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Ji nû ve barkirina lîsteya kanalan bi bîr bixe"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr ""
+msgstr "Hûragahiyên rojanekirinekê nîşan bide"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Mezinahiya paceya rêveberê rojanekirinan hiltîne."
 
 #: ../data/update-manager.schemas.in.h:7
 msgid ""
@@ -1244,27 +1383,27 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
-msgstr ""
+msgstr "Mezinahiyê paceyê"
 
 #: ../data/software-properties.desktop.in.h:1
 msgid "Configure the sources for installable software and updates"
-msgstr ""
+msgstr "Ji bo nivîsbarî û rojanekirinên têne sazkirin çavkaniyan veava bike"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
 msgid "Community maintained"
-msgstr ""
+msgstr "Yên ji aliyê komekê ber çav hatiye derbaskirin"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
@@ -1280,7 +1419,7 @@ msgstr "Neazad (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Cdroma Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
@@ -1290,7 +1429,7 @@ msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1322,13 +1461,13 @@ msgstr "Neazad (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
+msgstr "Cdroma Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
@@ -1338,12 +1477,12 @@ msgstr ""
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Cdroma Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1365,7 +1504,7 @@ msgstr ""
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
@@ -1375,7 +1514,7 @@ msgstr ""
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
-msgstr "Bi piştgirtiya fermî"
+msgstr "Bi piştgiriya fermî"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
@@ -1385,9 +1524,8 @@ msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Rojanekirinên Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
@@ -1397,17 +1535,17 @@ msgstr ""
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
 msgid "Community maintained (Universe)"
-msgstr ""
+msgstr "Yên ji aliyê koman ve lê tê nihêrîn (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:201
 msgid "Non-free (Multiverse)"
-msgstr "Neazad (Multiverse)"
+msgstr "Ne-azad (Multiverse)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
@@ -1423,19 +1561,17 @@ msgstr "Bi piştgirtiya fermî"
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
 msgid "Restricted copyright"
-msgstr ""
+msgstr "Mafê kopîkrinê yê sînorkirî"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Rojanekirinên Ubuntu 4.10 yên Ewlekariyê"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Rojanekirinên Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
@@ -1446,7 +1582,7 @@ msgstr ""
 #: ../data/channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Debian.info.in:6
@@ -1461,7 +1597,7 @@ msgstr "http://security.debian.org/"
 #. Description
 #: ../data/channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\" Rojanekirinên Ewlekariyê"
 
 #. Description
 #: ../data/channels/Debian.info.in:34
@@ -1471,7 +1607,7 @@ msgstr "Debian \"Etch\" (testing)"
 #. BaseURI
 #: ../data/channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
 #. Description
 #: ../data/channels/Debian.info.in:48
@@ -1494,9 +1630,8 @@ msgstr ""
 #~ msgid "Your system has already been upgraded."
 #~ msgstr "Sîstema xwe berê hat bilindkirin."
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Ubuntu tê bilindkirin"
+#~ msgstr "Rojanekirinên Ubuntu"
 
 #, fuzzy
 #~ msgid "Oficially supported"
diff --git a/po/lt.po b/po/lt.po
index bd7f8252..4ba906c9 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-28 20:07+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:39+0000\n"
 "Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
@@ -147,11 +147,11 @@ msgstr "Įveskite disko pavadinimą"
 msgid "Please insert a disc in the drive:"
 msgstr "Įdėkite diską į įrenginį:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Sugadinti paketai"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -160,20 +160,20 @@ msgstr ""
 "programa. Prieš tęsdami pirmiausia sutaisykite juos naudodamiesi „synaptic“ "
 "arba „apt-get“."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Negalima atnaujinti reikiamų metapaketų"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Turėtų būti pašalintas esminis paketas"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Nepavyko paskaičiuoti atnaujinimo"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -182,14 +182,14 @@ msgid ""
 "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ą. "
+"tai kaip klaidą."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Klaida autentikuojant keletą paketų"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -198,12 +198,12 @@ 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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Negalima įdiegti „%s“"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -211,12 +211,12 @@ msgstr ""
 "Buvo neįmanoma įdiegti reikalingo paketo. Praneškite apie tai, kaip klaidą. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 #, fuzzy
 msgid "Can't guess meta-package"
 msgstr "Negalima nuspėti meta paketo"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -250,11 +250,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Nuskaitoma talpykla"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -262,12 +262,12 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 #, fuzzy
 msgid "No valid mirror found"
 msgstr "Nerasta tinkamo įrašo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -280,11 +280,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Ar sukurti numatytųjų šaltinių sąrašą?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -293,11 +293,11 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Saugyklų informacija netinkama"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -305,11 +305,11 @@ msgstr ""
 "Saugyklos informacijos atnaujinimo rezultatas buvo sugadinta byla. "
 "Praneškite apie tai kaip klaidą."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Trečiųjų šalių šaltiniai išjungti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, fuzzy
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
@@ -320,11 +320,11 @@ msgstr ""
 "Juos galėsite vėl įjungti, kai baigsite atnaujinimą su „programų savybių“ "
 "įrankiu arba „Synaptic“ paketų tvarkykle."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Klaida atnaujinant"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -332,11 +332,11 @@ msgstr ""
 "Atnaujinant iškilo problema. Tai greičiausiai kokia nors tinklo problema, "
 "todėl iš naujo patikrinkite tinklo jungtis ir bandykite dar."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Diske nepakanka laisvos vietos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -345,15 +345,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "At norite pradėti atnaujinimą?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Nepavyko įdiegti atnaujinimų"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
@@ -365,11 +365,11 @@ msgstr ""
 "Atnaujinimas dabar bus nutrauktas. Jūsų sistema gali būti netinkama naudoti. "
 "Dabar bus vykdomas atkūrimas (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Nepavyko atsiųsti atnaujinimų"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -377,11 +377,11 @@ msgstr ""
 "Atnaujinimas dabar bus nutrauktas. Patikrinkite Interneto ryšį arba įdiegimo "
 "laikmeną ir bandykite dar. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -394,25 +394,25 @@ msgstr ""
 "bendruomenė („universe“).\n"
 "\n"
 "Jei nesate įjungę „universe“ skyriaus, šie paketai bus siūlomi pašalinimui "
-"kitame žingsnyje. "
+"kitame žingsnyje."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Pašalinti pasenusius paketus?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Praleisti šį žingsnį"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "P_ašalinti"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -421,31 +421,46 @@ msgstr ""
 "pranešime. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Perkraunama sistema"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Tikrinama paketų valdyklė"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Ruošiamas atnaujinimas"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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ą."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Atnaujinama saugyklų informacija"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Netinkama paketo informacija"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -458,19 +473,19 @@ msgstr ""
 "paketo „%s“.\n"
 "Tai labai rimta problema, praneškite apie tai kaip klaidą."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Klausiama patvirtinimo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Atnaujinama"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Ieškoma pasenusios programinės įrangos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Sistemos atnaujinimas baigtas."
 
@@ -531,8 +546,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -589,7 +604,10 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Turite atsisiųsti viso %s."
+msgstr ""
+"\n"
+"\n"
+"Turite atsisiųsti viso %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy
@@ -607,7 +625,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Jūsų sistema atnaujinta"
 
@@ -657,8 +675,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -741,25 +759,39 @@ msgid "Terminal"
 msgstr "Terminalas"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_Tęsti atnaujinimą"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Palikti"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "Pa_keisti"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Pranešti apie klaidą"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Perkrauti dabar"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Tęsti atnaujinimą"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_Tęsti atnaujinimą"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 #, fuzzy
 msgid "Could not find the release notes"
@@ -860,79 +892,84 @@ msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu"
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu"
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr "Nepavyko atsiųsti pakeitimų sąrašo. Patikrinkite Interneto ryšį."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 saugumo atnaujinimai"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Diegiami atnaujinimai"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 atnaujinimai"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "_Tęsti atnaujinimą"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "Diegiami atnaujinimai"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versija %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Atsiunčiamas pakeitimų sąrašas..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "_Patikrinti"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Atsiuntimo dydis: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -940,40 +977,40 @@ msgstr[0] "Rodyti ir įdiegti galimus atnaujinimus"
 msgstr[1] "Rodyti ir įdiegti galimus atnaujinimus"
 msgstr[2] "Rodyti ir įdiegti galimus atnaujinimus"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Palaukite, tai gali užtrukti."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Atnaujinimas užbaigtas"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "Diegiami atnaujinimai"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Nauja versija: %s (Dydis: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "Versija %s: \n"
+msgstr "Versija %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Jūsų distribucija daugiau nebepalaikoma"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -983,17 +1020,17 @@ msgstr ""
 "Atnaujinkite į naujausią „Ubuntu Linux“ versiją. Daugiau informacijos apie "
 "atnaujinimą rasite http://www.ubuntu.com ."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "Programinės įrangos turinys sugadintas"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1431,8 +1468,9 @@ msgstr "Ubuntu 6.06 „Dapper Drake“"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Prižiūrima bendruomenės (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1465,7 +1503,7 @@ msgstr "Ne Laisva (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
@@ -1750,9 +1788,11 @@ msgstr "Su DFSG nesuderinama programinė įranga"
 #~ msgid "Edit Channel"
 #~ msgstr "Keisti kanalą"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Pridėti kanalą"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Pridėti kanalą"
+#~ msgstr[1] "_Pridėti kanalus"
+#~ msgstr[2] "_Pridėti kanalų"
 
 #~ msgid "_Custom"
 #~ msgstr "_Kita"
diff --git a/po/lv.po b/po/lv.po
new file mode 100644
index 00000000..5b5b8394
--- /dev/null
+++ b/po/lv.po
@@ -0,0 +1,1509 @@
+# translation of lp-upd-manager-lv.po to Latvian
+# Latvian translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+#
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+# Raivis Dejus <orvils@gmail.com>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: lp-upd-manager-lv\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 19:12+0000\n"
+"Last-Translator: mixat <miks.latvis@gmail.com>\n"
+"Language-Team: Latvian <locale@laka.lv>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
+"X-Generator: KBabel 1.11.2\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "Daily"
+msgstr "Ikdienas"
+
+#: ../SoftwareProperties/SoftwareProperties.py:137
+msgid "Every two days"
+msgstr "Reizi divās dienās"
+
+#: ../SoftwareProperties/SoftwareProperties.py:138
+msgid "Weekly"
+msgstr "Nedēļas izdevums"
+
+#: ../SoftwareProperties/SoftwareProperties.py:139
+msgid "Every two weeks"
+msgstr "Reizi divās nedēļās"
+
+#: ../SoftwareProperties/SoftwareProperties.py:144
+#, python-format
+msgid "Every %s days"
+msgstr "Reizi %s dienās"
+
+#: ../SoftwareProperties/SoftwareProperties.py:167
+msgid "After one week"
+msgstr "Pēc vienas nedēļas"
+
+#: ../SoftwareProperties/SoftwareProperties.py:168
+msgid "After two weeks"
+msgstr "Pēc divām nedēļām"
+
+#: ../SoftwareProperties/SoftwareProperties.py:169
+msgid "After one month"
+msgstr "Pēc viena mēneša"
+
+#: ../SoftwareProperties/SoftwareProperties.py:174
+#, python-format
+msgid "After %s days"
+msgstr "Pēc %s dienām"
+
+#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
+#: ../SoftwareProperties/SoftwareProperties.py:252
+#, python-format
+msgid "%s updates"
+msgstr "%s atjauninājumi"
+
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
+msgid "Main server"
+msgstr "Galvenais serveris"
+
+#. TRANSLATORS: %s is a country
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:324
+msgid "Nearest server"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:345
+msgid "Custom servers"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
+msgid "Software Channel"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
+msgid "Active"
+msgstr "Aktīvs"
+
+#: ../SoftwareProperties/SoftwareProperties.py:714
+msgid "(Source Code)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:720
+msgid "Source Code"
+msgstr "Izejas kods"
+
+#: ../SoftwareProperties/SoftwareProperties.py:969
+msgid "Import key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:979
+msgid "Error importing selected file"
+msgstr "Kļūda importējot izvēlēto failu"
+
+#: ../SoftwareProperties/SoftwareProperties.py:980
+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."
+
+#: ../SoftwareProperties/SoftwareProperties.py:992
+msgid "Error removing the key"
+msgstr "Kļūda aizvācot atslēgu"
+
+#: ../SoftwareProperties/SoftwareProperties.py:993
+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."
+
+#: ../SoftwareProperties/SoftwareProperties.py:1039
+#, python-format
+msgid ""
+"<big><b>Error scanning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1096
+msgid "Please enter a name for the disc"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1112
+msgid "Please insert a disc in the drive:"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:91
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+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 ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:207
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:217
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:220
+msgid "Could not calculate the upgrade"
+msgstr "Nevar aprēķināt atjauninājumu"
+
+#: ../DistUpgrade/DistUpgradeCache.py:221
+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 ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:246
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:247
+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 ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:312
+#, python-format
+msgid "Can't install '%s'"
+msgstr "Nevar instalēt '%s'"
+
+#: ../DistUpgrade/DistUpgradeCache.py:313
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:320
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:321
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:75
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "Reading cache"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:155
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:156
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:248
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:249
+#, python-format
+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 ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:266
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:267
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:301
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:302
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:308
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:309
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:358
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:359
+msgid ""
+"A problem occured during the update. This is usually some sort of network "
+"problem, please check your network connection and retry."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:368
+msgid "Not enough free disk space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:369
+#, python-format
+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 ""
+
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeControler.py:440
+msgid "Do you want to start the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:460
+msgid "Could not install the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:461
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:479
+msgid "Could not download the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:480
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:516
+msgid "Support for some applications ended"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:517
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:552
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Remove"
+msgstr "_Izņemt"
+
+#: ../DistUpgrade/DistUpgradeControler.py:563
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:564
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. generate a new cache
+#: ../DistUpgrade/DistUpgradeControler.py:576
+msgid "Restoring original system state"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:632
+#, python-format
+msgid "Fetching backport of '%s'"
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
+msgid "Checking package manager"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
+msgid "Invalid package information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:733
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:737
+msgid "Upgrading"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:744
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:749
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:249
+#, python-format
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, python-format
+msgid "Fetching file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+msgid "Applying changes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
+#, python-format
+msgid "Could not install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+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 ""
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#, python-format
+msgid ""
+"Replace the customized configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:203
+msgid ""
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
+msgid "The 'diff' command was not found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:356
+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 ""
+
+#. FIXME: make those two seperate lines to make it clear
+#. that the "%" applies to the result of ngettext
+#: ../DistUpgrade/DistUpgradeViewGtk.py:487
+#, python-format
+msgid "%d package is going to be removed."
+msgid_plural "%d packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
+#, python-format
+msgid "%d new package is going to be installed."
+msgid_plural "%d new packages are going to be installed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:498
+#, python-format
+msgid "%d package is going to be upgraded."
+msgid_plural "%d packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:503
+#, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
+msgid ""
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:512
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:518
+#: ../UpdateManager/UpdateManager.py:622
+msgid "Your system is up-to-date"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:519
+msgid ""
+"There are no upgrades available for your system. The upgrade will now be "
+"canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:535
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:537
+#, python-format
+msgid "Install %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:539
+#, python-format
+msgid "Upgrade %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:31
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:32
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:38
+#, python-format
+msgid ""
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:109
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:110
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/glade/SoftwareProperties.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+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 ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr "Detaļas"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Fetching and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr "Terminālis"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Replace"
+msgstr "_Aizvietot"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr ""
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:149
+msgid "Could not run the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:150
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:171
+msgid "Downloading the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:180
+msgid "Upgrade tool signature"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:183
+msgid "Upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:209
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid "Failed to extract"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:215
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid "Verfication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:222
+msgid ""
+"Verifying the upgrade failed.  There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid "Authentication failed"
+msgstr "Autentifikācija neveiksmīga"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:229
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:108
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:113
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:206
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:217
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
+msgid "Important security updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
+msgid "Recommended updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
+msgid "Proposed updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:241
+msgid "Backports"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:242
+msgid "Distribution updates"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
+msgid "Other updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:478
+#, python-format
+msgid "Version %s: \n"
+msgstr "Versija %s: \n"
+
+#: ../UpdateManager/UpdateManager.py:539
+msgid "Downloading list of changes..."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:566
+msgid "_Uncheck All"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:572
+msgid "_Check All"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid "Please wait, this can take some time."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:668
+msgid "Update is complete"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:719
+msgid "Checking for updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
+msgid "From version %(old_version)s to %(new_version)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:832
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:843
+msgid "Your distribution is not supported anymore"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:844
+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 ""
+
+#: ../UpdateManager/UpdateManager.py:863
+#, python-format
+msgid "<b>New distribution release '%s' is available</b>"
+msgstr ""
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:898
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:899
+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 ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr "Nekas"
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
+
+#: ../data/glade/UpdateManager.glade.h:1
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:4
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:5
+msgid "<big><b>Not all updates can be installed</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:6
+msgid "<big><b>Starting update manager</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:7
+msgid "Changes"
+msgstr "Izmaiņas"
+
+#: ../data/glade/UpdateManager.glade.h:8
+msgid "Changes and description of the update"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:9
+msgid "Chec_k"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:10
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:11
+msgid "Description"
+msgstr "Apraksts"
+
+#: ../data/glade/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:13
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:16
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:17
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:18
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:19
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:20
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:21
+msgid "_Check"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:22
+msgid "_Distribution Upgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:23
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:24
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:25
+msgid "changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:26
+msgid "updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:2
+msgid "<b>Automatic updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:3
+msgid "<b>CDROM/DVD</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:4
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:5
+msgid "<b>Internet</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:6
+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 ""
+
+#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+msgid "Authentication"
+msgstr "Autentifikācija"
+
+#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
+msgid "Download from:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:13
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:16
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:17
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Sources"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:19
+msgid "Source code"
+msgstr "Izejas kods"
+
+#: ../data/glade/SoftwareProperties.glade.h:20
+msgid "Statistics"
+msgstr "Statistika"
+
+#: ../data/glade/SoftwareProperties.glade.h:21
+msgid "Submit statistical information"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:22
+msgid "Third Party"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:23
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:24
+msgid "_Download updates automatically, but do not install them"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:25
+msgid "_Import Key File"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:26
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Comment:</b>"
+msgstr "<b>Komentārs:</b>"
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Components:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Distribution:</b>"
+msgstr "<b>Distributīvs:</b>"
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Type:</b>"
+msgstr "<b>Tips:</b>"
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
+msgid "APT line:"
+msgstr "APT rindiņa:"
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binārais\n"
+"Pirmkoda"
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Reload"
+msgstr "_Pārlādēt"
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+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 ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changes and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:8
+msgid "Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:13
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:17
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:19
+msgid "Restricted software"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:25
+msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:59
+msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:62
+msgid "Canonical supported Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:64
+msgid "Community maintained (universe)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:65
+msgid "Community maintained Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:67
+msgid "Non-free drivers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:68
+msgid "Proprietary drivers for devices "
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:70
+msgid "Restricted software (Multiverse)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:71
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:76
+msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:103
+msgid "Backported updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:110
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:123
+msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:135
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:140
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:145
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:152
+msgid "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:165
+msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr "Oficiāli atbalstītie"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:177
+msgid "Ubuntu 5.04 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:182
+msgid "Ubuntu 5.04 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:187
+msgid "Ubuntu 5.04 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:193
+msgid "Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:199
+msgid "Community maintained (Universe)"
+msgstr "Sabiedrības uzturētie (Universe)"
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:201
+msgid "Non-free (Multiverse)"
+msgstr "Maksas (Multiverse)"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:206
+msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:209
+msgid "No longer officially supported"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:211
+msgid "Restricted copyright"
+msgstr "Saistītie autortiesību"
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:218
+msgid "Ubuntu 4.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:223
+msgid "Ubuntu 4.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:228
+msgid "Ubuntu 4.10 Backports"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
+
+#~ msgid "Select _All"
+#~ msgstr "Izvēlēties _Visu"
diff --git a/po/mk.po b/po/mk.po
index 06b8b8bb..f9f85504 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:43+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:39+0000\n"
 "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
 "MIME-Version: 1.0\n"
@@ -20,41 +20,41 @@ msgstr ""
 #: ../SoftwareProperties/SoftwareProperties.py:136
 #, fuzzy
 msgid "Daily"
-msgstr "<b>Детали</b>"
+msgstr "Дневно"
 
 #: ../SoftwareProperties/SoftwareProperties.py:137
 msgid "Every two days"
-msgstr ""
+msgstr "Секои два дена"
 
 #: ../SoftwareProperties/SoftwareProperties.py:138
 msgid "Weekly"
-msgstr ""
+msgstr "Неделно"
 
 #: ../SoftwareProperties/SoftwareProperties.py:139
 msgid "Every two weeks"
-msgstr ""
+msgstr "Секои две недели"
 
 #: ../SoftwareProperties/SoftwareProperties.py:144
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "Секои %s дена"
 
 #: ../SoftwareProperties/SoftwareProperties.py:167
 msgid "After one week"
-msgstr ""
+msgstr "После една недела"
 
 #: ../SoftwareProperties/SoftwareProperties.py:168
 msgid "After two weeks"
-msgstr ""
+msgstr "После две недели"
 
 #: ../SoftwareProperties/SoftwareProperties.py:169
 msgid "After one month"
-msgstr ""
+msgstr "После еден месец"
 
 #: ../SoftwareProperties/SoftwareProperties.py:174
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "После %s дена"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
@@ -112,7 +112,7 @@ msgstr "Изворен код"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
-msgstr ""
+msgstr "Внеси клуч"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
@@ -143,36 +143,38 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:1096
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Ве молам внесете име за дискот"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1112
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Ве молам внесете диск во уредот:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
-msgstr ""
+msgstr "Оштетени пакети"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 пред да продолжите."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Не може да се надградат потребните мета пакети"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Важен пакет мора да се отстрани"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Не може да се одреди надградбата"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -181,26 +183,28 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
-"како бубачка. "
+"како бубачка."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Грешка при автентикација на некои пакети"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
+"Не можат да се автентицираат некои пакети. Може да има мрежни пречки. "
+"Обидете се повторно. Видете подолу за листа на неавтентицирани пакети."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Не може да се инсталира %s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -210,11 +214,11 @@ msgstr ""
 "како бубачка. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Не може да се погоди мета пакетот"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -239,13 +243,13 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
-msgstr ""
+msgstr "Читање на кешот"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -253,11 +257,12 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
+#, fuzzy
 msgid "No valid mirror found"
-msgstr ""
+msgstr "Не е пронајден валиден помошен сервер"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -268,14 +273,21 @@ msgid ""
 "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"
+"Ако изберете „не“, надградбата ќе прекине."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 #, fuzzy
 msgid "Generate default sources?"
 msgstr "Врати ги стандардните клучеви"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -283,61 +295,73 @@ msgid ""
 "Should default entries for '%s' be added? If you select 'No' the update will "
 "cancel."
 msgstr ""
+"По скенирањето на вашиот 'sources.list' не е пронајден валиден запис за '%"
+"s'.\n"
+"\n"
+"Дали треба стандардните записи за '%s' да бидат додадени? Ако изберете „Не“, "
+"надградувањето ќе прекини."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Информациите за складиштето се невалидни"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"Од надградувањето на информациите за складиштето произлезе невалидна "
+"датотека. Ве молам пријавете го ова како бубачка."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
-msgstr ""
+msgstr "Додатните извори се оневозможени"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 #, fuzzy
 msgid "Error during update"
 msgstr "Грешка при отстранување на клучот"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
+"Се случи проблем при надградбата. Ова е обично некој проблем со мрежата и Ве "
+"молиме да ја проверете Вашата мрежна врска и да се обидете повторно."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Нема доволно место на дискот"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 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'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "Дали сакате да ја започнете надградбата?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "Не можам да ги инсталирам надградбите"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -346,21 +370,23 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "Не можам да ги симнам надградбите"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
+"Надградбата сега прекинува. Проверете ја Вашата интернет врска или медиумот "
+"за инсталација и обидете се повторно. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -369,55 +395,73 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "Да ги отстранам застарените пакети?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
-msgstr ""
+msgstr "_Прескокни го овој чекор"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
-msgstr ""
+msgstr "_Отстрани"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
+#, fuzzy
 msgid "Error during commit"
-msgstr ""
+msgstr "Грешка во извршувањето"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
+"Се случи некој проблем при расчистувањето. Видете ја пораката подолу за "
+"повеќе информации. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Веќе работи друг менаџер за пакети"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Преземам промени"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
-msgid "Updating repository information"
+#, 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 ""
+"Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
+"како бубачка."
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr "Ги ажурирам информациите за складиштето"
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
-msgstr ""
+msgstr "Невалидни информации за пакетот"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -427,28 +471,28 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Прашувам за потврда"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 #, fuzzy
 msgid "Upgrading"
 msgstr "Надградбата е завршена"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Барам застарен софтвер"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Надградбата на системот е завршена."
 
 #. print "mediaChange %s %s" % (medium, drive)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Внесете '%s' во драјвот '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
 msgid "Fetching is complete"
@@ -481,7 +525,7 @@ msgstr "Преземам промени..."
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Не можам да инсталирам '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:188
 msgid ""
@@ -499,17 +543,17 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "Командата „diff“ не беше пронајдена"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Се случи фатална грешка"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
 msgid ""
@@ -562,10 +606,12 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"За да спречите загуба на податоци, затворете ги сите отворени апликации и "
+"документи."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Вашиот систем е надграден!"
@@ -579,17 +625,17 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
 msgid "<b>Remove %s</b>"
-msgstr ""
+msgstr "<b>Отстрани %s</b>"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:537
 #, python-format
 msgid "Install %s"
-msgstr ""
+msgstr "Инсталирај %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:539
 #, python-format
 msgid "Upgrade %s"
-msgstr ""
+msgstr "Надгради %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
 #, python-format
@@ -616,18 +662,20 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
-msgstr ""
+msgstr "Потребно е рестартирање"
 
 #: ../DistUpgrade/DistUpgradeView.py:110
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
+"Надградбата е завршена и потребно е рестартирање. Дали сакате да го "
+"направите сега?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -645,14 +693,19 @@ msgid ""
 "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"
+"Системот може да е во неупотреблива состојба ако ја прекинете надградбата. "
+"Строго препорачливо е да надградбата да продолжи."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr ""
+"<b><big>Рестартирајте го системот за да ја завршите надградбата</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Да ја започнам надградбата?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
@@ -660,7 +713,7 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Расчистувам"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 #, fuzzy
@@ -669,7 +722,7 @@ msgstr "<b>Детали</b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "Разлика помеѓу датотеките"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Fetching and installing the upgrades"
@@ -677,61 +730,73 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Ги модифицирам софтверските канали"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Ја подготвувам надградбата"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr ""
+msgstr "Го рестартирам системот"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
-msgstr ""
+msgstr "Терминал"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr "_Чувај"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 #, fuzzy
 msgid "_Replace"
 msgstr "Освежи"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
-msgstr ""
+msgstr "_Пријави бубачка"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
-msgstr ""
+msgstr "_Рестартирај сега"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
+msgstr "_Продолжи со надградбата"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
 msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
-msgstr ""
+msgstr "Не можам да ги најдам белешките за изданието"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Серверот може да е преоптоварен. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
 msgid "Could not download the release notes"
-msgstr ""
+msgstr "Не можам да ги преземам белешките за изданието"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Ве молам проверете ја Вашата интернет врска."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
-msgstr ""
+msgstr "Не можам да ја извршам алатката за надградба"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:150
 #, fuzzy
@@ -748,37 +813,39 @@ msgstr "Преземам промени"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "Алатката за надградба ќе Ве води низ процесот на надградба."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Потпис на алатката за надградба"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
-msgstr ""
+msgstr "Алатка за надградба"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Не можам да симнам"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "Симнувањето на надградбите не успеа. Можеби има проблем со мрежата. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
-msgstr ""
+msgstr "Не можам да отпакувам"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
+"Отпакувањето на надградбата не успеа. Можеби има проблем со мрежата или "
+"серверот. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
-msgstr ""
+msgstr "Проверката не успеа"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
@@ -796,6 +863,8 @@ msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
+"Проверката на автентичност на надградбата не успеа. Можеби има проблем со "
+"мрежата или серверот. "
 
 #: ../UpdateManager/GtkProgress.py:108
 #, python-format
@@ -807,81 +876,85 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Достапна е нова верзија на Убунту!"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr "Достапна е нова верзија на Убунту!"
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 #, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "Не успеав да ги преземам промените. Ве молам проверете дали Вашата интернет "
 "врска е активна."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Безбедносни надградби за Debian Stable"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Инсталирам надградби..."
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Надградби за Убунту 5.10"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "Инсталирам надградби..."
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "Инсталирам надградби..."
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Верзија %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Преземам промени"
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, fuzzy, python-format
 msgid "Download size: %s"
 msgstr "Преземам промени"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -889,63 +962,69 @@ msgstr[0] "Инсталирам надградби..."
 msgstr[1] "Инсталирам надградби..."
 msgstr[2] "Инсталирам надградби..."
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Ве молам, почекајте, ова може да потрае."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr ""
+msgstr "Надградбата е завршена"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "Проверувам за надградби..."
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "Верзија %s: \n"
+msgstr "Верзија %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Вашата дистрибуција повеќе не е поддржана"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 за повеќе информации за надградувањето."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>Новото издание на дистрибуцијата, '%s', е достапно</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
-msgstr ""
+msgstr "Индексот на софтвер е расипан"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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“ во "
+"терминал за да го надминете овој проблем."
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
@@ -979,7 +1058,7 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Чувајте го Вашиот систем надграден</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
 msgid "<big><b>Not all updates can be installed</b></big>"
@@ -999,11 +1078,11 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
-msgstr ""
+msgstr "Провер_и"
 
 #: ../data/glade/UpdateManager.glade.h:10
 msgid "Check the software channels for new updates"
-msgstr ""
+msgstr "Провери ги софтверските канали за нови надградби"
 
 #: ../data/glade/UpdateManager.glade.h:11
 msgid "Description"
@@ -1011,7 +1090,7 @@ msgstr "Опис"
 
 #: ../data/glade/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Белешки за изданието"
 
 #: ../data/glade/UpdateManager.glade.h:13
 msgid ""
@@ -1023,7 +1102,7 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Покажувај го напредокот поединечно"
 
 #: ../data/glade/UpdateManager.glade.h:17
 msgid "Software Updates"
@@ -1034,18 +1113,20 @@ msgid ""
 "Software updates correct errors, eliminate security vulnerabilities and "
 "provide new features."
 msgstr ""
+"Надградбата на софтверот ги поправа грешките, ги елиминира сигурносните "
+"пропусти и овозможува нови карактеристики."
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
-msgstr ""
+msgstr "Н_адгради"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Надгради во најновата верзија на Ubuntu"
 
 #: ../data/glade/UpdateManager.glade.h:21
 msgid "_Check"
-msgstr ""
+msgstr "_Провери"
 
 #: ../data/glade/UpdateManager.glade.h:22
 msgid "_Distribution Upgrade"
@@ -1053,7 +1134,7 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Криј ги овие информации во иднина"
 
 #: ../data/glade/UpdateManager.glade.h:24
 #, fuzzy
@@ -1109,7 +1190,7 @@ msgstr "Проверка"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "И_збриши ги преземените софтверски датотеки:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
 #, fuzzy
@@ -1131,6 +1212,8 @@ msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
 "automatically"
 msgstr ""
+"Само безбедносните надградби од официјалните Ubuntu сервери ќе бидат "
+"инсталирани автоматски"
 
 #: ../data/glade/SoftwareProperties.glade.h:16
 #, fuzzy
@@ -1176,11 +1259,11 @@ msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
-msgstr ""
+msgstr "_Внеси датотека-клуч"
 
 #: ../data/glade/SoftwareProperties.glade.h:26
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Инсталирај ги безбедносните ажурирања без потврдување"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
 msgid ""
@@ -1248,7 +1331,7 @@ msgstr "Изворен код"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Скенирам CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 #, fuzzy
@@ -1262,7 +1345,7 @@ msgstr "Освежи"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Прикажи и инсталирај ги достапните надградби"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -1273,10 +1356,12 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
+"Провери автоматски дали е достапна нова верзија на дистрибуцијата и понуди "
+"надградба (ако е возможно)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Провери за нови изданија од дистрибуцијата"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1287,15 +1372,15 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Потсети за одново вчитување на листата со канали"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr ""
+msgstr "Прикажи детали за надградбата"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Ја зачувува големината на дијалогот на update-manager"
 
 #: ../data/update-manager.schemas.in.h:7
 msgid ""
@@ -1305,7 +1390,7 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
-msgstr ""
+msgstr "Големината на прозорецот"
 
 #: ../data/software-properties.desktop.in.h:1
 msgid "Configure the sources for installable software and updates"
@@ -1315,7 +1400,7 @@ msgstr ""
 #: ../data/channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
@@ -1354,8 +1439,9 @@ msgstr "Надградби за Убунту 5.04"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Оддржувано од заедницата (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1388,9 +1474,8 @@ msgstr "Неслободно (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Забранет софтвер во САД"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
@@ -1517,7 +1602,7 @@ msgstr "Надградби за Убунту 5.10"
 #: ../data/channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Debian.info.in:6
@@ -1527,7 +1612,7 @@ msgstr "Debian 3.1 \"Sarge\""
 #. BaseURI
 #: ../data/channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
 #. Description
 #: ../data/channels/Debian.info.in:20
@@ -1544,7 +1629,7 @@ msgstr "Debian Testing"
 #. BaseURI
 #: ../data/channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
 #. Description
 #: ../data/channels/Debian.info.in:48
@@ -1555,12 +1640,16 @@ msgstr "Debian Non-US (Unstable)"
 #. CompDescription
 #: ../data/channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "DFSG-компатибилен софтвер со неслободни зависности"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Не-DFSG-компатибилен софтвер"
+
+#, fuzzy
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "Забранет софтвер во САД"
 
 #, fuzzy
 #~ msgid "Normal updates"
diff --git a/po/ms.po b/po/ms.po
index 6c9c8b03..71e50743 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-30 13:49+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:40+0000\n"
 "Last-Translator: azlinux <azlinux@gmail.com>\n"
 "Language-Team: Malay <ms@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -148,11 +148,11 @@ msgstr "Sila masukkan nama untuk cakera padat"
 msgid "Please insert a disc in the drive:"
 msgstr "Sila masukkan cakera padat kedalam pemacu"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Pakej rosak"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -161,20 +161,20 @@ msgstr ""
 "menggunakan sofwer ini. Sila baiki dahulu menggunakan synaptic atau apt-get "
 "sebelum meneruskan."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Tidak dapat menaikkan taraf pakej-meta yang diperlukan"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Satu pakej yang perlu terpaksa dikeluarkan"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Tidak dapat menjangka penaikkan taraf"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -183,26 +183,29 @@ msgid ""
 "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. "
+"penaikkan. Sila laporkan ini sebagai ralat pepijat."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Ralat mengesahkan sesetengah pakej"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Tidak dapat memasang '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -211,11 +214,11 @@ msgstr ""
 "pepijat. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Pakej meta tidak dapat diduga."
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -246,13 +249,13 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
-msgstr ""
+msgstr "Membaca cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -260,11 +263,12 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
+#, fuzzy
 msgid "No valid mirror found"
-msgstr ""
+msgstr "Tiada mirror yang sah dijumpai"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -275,36 +279,51 @@ msgid ""
 "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."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:267
+#, fuzzy, python-format
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Maklumat repositori tidak sah"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Sumber ketiga tidak diaktifkan."
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, fuzzy
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
@@ -316,11 +335,11 @@ msgstr ""
 "selepas penaikkan taraf  menggunakan alatan 'software-properties' ataupun "
 "'synaptic'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Ralat semasa pengemaskinian."
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -329,11 +348,11 @@ msgstr ""
 "yang berkaitan dengan masaalah rangkaian, sila periksa dan cuba lagi "
 "sambungan rangkaian anda."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Muatak cakera keras tidak mencukupi."
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -345,15 +364,15 @@ msgstr ""
 "pemasangan sebelum ini menggunakan 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Anda mahu mulakan penaikkan taraf?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Tidak dapat memasang pakej-pakej penaikkan taraf."
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
@@ -365,11 +384,11 @@ msgstr ""
 "Penaikkan taraf tidak dapat diteruskan. Sistem anda mungkin tidak stabil. "
 "Sistem 'recovery' telah dijalankan (dpkg --configure -a)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Pakej-pakej penaikan taraf tidak dapat dicapai."
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -377,11 +396,11 @@ msgstr ""
 "Penaikkan taraf tidak dapat diteruskan. Sila semak sambungan 'internet' atau "
 "media pemasangan anda dan cuba lagi. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -393,56 +412,70 @@ 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. "
+"untuk dikeluarkan di peringkat selanjutnya."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Keluarkan pakej-pakej yang sudah luput?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
-msgstr ""
+msgstr "_Abaikan langkah ini"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -452,27 +485,27 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
-msgstr ""
+msgstr "Mengemaskini"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Mencari perisian yang lapuk"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Naiktaraf sistem sempurna."
 
 #. print "mediaChange %s %s" % (medium, drive)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Sila masukkan '%s' kedalam pemacu '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
 msgid "Fetching is complete"
@@ -522,8 +555,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -581,11 +614,11 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
-msgstr ""
+msgstr "Untuk mengelakkan kehilangan data tutup kesemua aplikasi dan dokumen."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr ""
 
@@ -598,17 +631,17 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
 msgid "<b>Remove %s</b>"
-msgstr ""
+msgstr "<b>Buang %s</b>"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:537
 #, python-format
 msgid "Install %s"
-msgstr ""
+msgstr "Pasang %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:539
 #, python-format
 msgid "Upgrade %s"
-msgstr ""
+msgstr "Naiktaraf %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
 #, python-format
@@ -635,8 +668,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -655,7 +688,7 @@ msgstr ""
 #: ../DistUpgrade/DistUpgrade.glade.h:1
 #: ../data/glade/SoftwareProperties.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -711,25 +744,37 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
+msgid "_Continue"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
+msgid "_Replace"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -820,128 +865,130 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
 msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, python-format
 msgid "Version %s"
 msgstr ""
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1332,7 +1379,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1362,7 +1409,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
diff --git a/po/nb.po b/po/nb.po
index 7741c9c1..9d1ae679 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-29 13:06+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:40+0000\n"
 "Last-Translator: Hans Petter Birkeland <hanspb@bluezone.no>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -70,23 +70,26 @@ msgid "%s (%s)"
 msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
+#, fuzzy
 msgid "Main server"
-msgstr ""
+msgstr "Hovedtjener"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
-#, python-format
+#, fuzzy, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Tjener for %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
+#, fuzzy
 msgid "Nearest server"
-msgstr ""
+msgstr "Nermeste tjener"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
+#, fuzzy
 msgid "Custom servers"
-msgstr ""
+msgstr "Egendefinerte tjenere"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
@@ -96,8 +99,9 @@ msgstr "Programvareoppdateringer"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
+#, fuzzy
 msgid "Active"
-msgstr ""
+msgstr "I bruk"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 #, fuzzy
@@ -149,11 +153,11 @@ msgstr "Vennligst oppgi et navn for platen"
 msgid "Please insert a disc in the drive:"
 msgstr "Vennligst sett inn en plate i CD-spilleren:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Skadede pakker"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -162,20 +166,20 @@ msgstr ""
 "av dette programmet. Vennligst rett opp i dette ved å bruke Synaptic eller "
 "apt-get før du fortsetter."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Kan ikke oppgradere nødvendige meta-pakker"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "En nødvendig pakke må fjernes"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Kunne ikke forberede oppgraderingen"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -184,14 +188,14 @@ msgid ""
 "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. "
+"rapporter dette som en feil."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Kunne ikke autentisere noen pakker"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -201,12 +205,12 @@ msgstr ""
 "nettverksproblem, så du bør prøve igjen senere. Se under for listen over "
 "pakker som ikke kunne autentiseres."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Kan ikke installere '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -214,11 +218,11 @@ msgstr ""
 "Kunne ikke installere en nødvendig pakke. Vennligst rapporter denne feilen. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Kan ikke gjette på meta-pakke"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -252,11 +256,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Leser mellomlager"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -264,11 +268,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Fant ikke noe gyldig speil"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -288,11 +292,11 @@ msgstr ""
 "Hvis du velger \"Nei\" vil oppgraderingen avbrytes."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Vil du opprette standardkilder?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -306,11 +310,11 @@ msgstr ""
 "Skal standard linjer for '%s' legges til? Hvis du velger 'Nei' vil "
 "oppdateringen avbrytes."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Ugyldig informasjon om arkiv"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -318,11 +322,11 @@ msgstr ""
 "Oppgradering av kanalinformasjon resulterte i en ugyldig fil. Vennligst "
 "rapporter dette som en feil."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Tredjepartskilder er deaktivert"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, fuzzy
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
@@ -333,11 +337,11 @@ msgstr ""
 "aktivere dem etter oppgraderingen ved hjelp av verktøyet 'Egenskaper for "
 "programvare' eller med Synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Feil under oppdatering"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -346,11 +350,11 @@ msgstr ""
 "problem med nettverkstilkoblingen. Vennligst sjekk nettverkstilkoblingen din "
 "og prøv igjen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Ikke nok ledig diskplass"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -362,15 +366,15 @@ msgstr ""
 "bruke 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Ønsker du å starte oppgraderingen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Kunne ikke installere oppgraderingene"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
@@ -382,11 +386,11 @@ msgstr ""
 "Oppgraderingen avbrytes nå. Systemet ditt kan være ubrukelig. En reperasjon "
 "ble forsøkt kjørt (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Kunne ikke laste ned alle oppgraderingene."
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -394,11 +398,11 @@ msgstr ""
 "Oppgraderingen avbrytes nå. Vennligst sjekk internet-tilkoblingen eller "
 "installasjonsmediet og prøv på nytt. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -411,25 +415,25 @@ msgstr ""
 "støttet av miljøet 'universe'.\n"
 "\n"
 "Hvis du ikke har 'universe' aktivert vil disse pakkene bli foreslått fjernet "
-"i neste steg. "
+"i neste steg."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Ønsker du å fjerne utdaterte pakker?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Hopp over dette punktet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Feil ved commit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -438,31 +442,46 @@ msgstr ""
 "informasjon. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Gjenoppretter systemets originale tilstand"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Sjekker pakkehåndterer"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Forbereder oppgraderingen"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Oppdaterer informasjon om arkivet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Ugyldig pakkeinformasjon"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -475,19 +494,19 @@ msgstr ""
 "pakken '%s'.\n"
 "Dette indikerer en alvorlig feil, vennligst rapportér denne feilen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Spør om bekreftelse"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Oppgraderer"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Søker etter utdatert programvare"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Systemoppgraderingen er fullført"
 
@@ -548,8 +567,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -601,7 +620,10 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Du må laste ned totalt %s."
+msgstr ""
+"\n"
+"\n"
+"Du må laste ned totalt %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy
@@ -619,7 +641,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Systemet ditt er oppdatert!"
 
@@ -669,8 +691,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -752,25 +774,39 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_Gjenoppta oppgradering"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Ta vare på"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Erstatt"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Rapportér en feil"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Omstart nå"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Gjenoppta oppgradering"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_Gjenoppta oppgradering"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Kunne ikke finne utgivelsesnotatene"
@@ -872,121 +908,127 @@ msgstr "Laster ned filen %li av %li med %s/s"
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Laster ned filen %li av %li med %s/s"
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, 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."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"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."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
+#, fuzzy
 msgid "Recommended updates"
-msgstr ""
+msgstr "Anbefalte oppdateringer"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Installerer oppdateringer"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 Backports"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "_Gjenoppta oppgradering"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "Installerer oppdateringer"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versjon %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Laster ned listen med endringer..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "Sjekk"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Nedlastingsstørrelse: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 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"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Vennligst vent, dette kan ta litt tid."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Oppdateringen er fullført"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "Sjekker for tilgjengelige oppdateringer"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Ny versjon: %s (Størrelse: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "Versjon %s: \n"
+msgstr "Versjon %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Din distribusjon er ikke lenger støttet"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -996,17 +1038,17 @@ msgstr ""
 "oppdateringer. Oppgradér til en nyere utgivelse av Ubuntu. Se http://www."
 "ubuntu.com for mer informasjon om oppgradering."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Ny versjon \"%s\" er tilgjengelig</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "Programvareoversikten er ødelagt."
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1019,12 +1061,12 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Ingen"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
@@ -1036,7 +1078,7 @@ msgstr ""
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 #, fuzzy
@@ -1234,15 +1276,16 @@ msgstr "Kilde"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Statistikk"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:22
+#, fuzzy
 msgid "Third Party"
-msgstr ""
+msgstr "Tredjepart"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
@@ -1445,8 +1488,9 @@ msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1479,9 +1523,8 @@ msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "US eksport begrenset programvare"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
@@ -1650,6 +1693,10 @@ msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter"
 msgid "Non-DFSG-compatible Software"
 msgstr "Ikke-DFSG-kompatibel programvare"
 
+#, 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"
 
@@ -1768,9 +1815,10 @@ msgstr "Ikke-DFSG-kompatibel programvare"
 #~ msgid "Edit Channel"
 #~ msgstr "Endre kanal"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "Legg til k_anal"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "Legg til k_anal"
+#~ msgstr[1] "Legg til k_analer"
 
 #~ msgid "_Custom"
 #~ msgstr "_Tilpasset"
diff --git a/po/ne.po b/po/ne.po
index 7b136f19..57911ef0 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager.HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:43+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:40+0000\n"
 "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
 "MIME-Version: 1.0\n"
@@ -147,56 +147,56 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, 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 "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस "
+msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -204,11 +204,11 @@ msgid ""
 msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -235,11 +235,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -247,11 +247,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -264,11 +264,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -277,43 +277,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 #, fuzzy
 msgid "Error during update"
 msgstr "कुञ्जि हटाउँदा त्रुटि"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -322,15 +322,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -339,21 +339,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -362,55 +362,68 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 #, fuzzy
 msgid "Checking package manager"
 msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "परिवर्तनहरु डाउनलोड गर्दै"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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 "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -420,20 +433,20 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 #, fuzzy
 msgid "Upgrading"
 msgstr "स्तरवृद्धि समाप्त"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr ""
 
@@ -492,8 +505,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -555,7 +568,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "तपाइं को प्रणालि अप-टु-डेट छ!"
@@ -606,8 +619,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -682,26 +695,38 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 #, fuzzy
 msgid "_Replace"
 msgstr "फेरि लोड गर्नुहोस"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -795,137 +820,141 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!"
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 #, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "संस्करण %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "परिवर्तनहरु डाउनलोड गर्दै"
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, fuzzy, python-format
 msgid "Download size: %s"
 msgstr "परिवर्तनहरु डाउनलोड गर्दै"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "स्तरवृद्धिहरु स्थापना गर्दै"
 msgstr[1] "स्तरवृद्धिहरु स्थापना गर्दै"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "संस्करण %s: \n"
+msgstr "संस्करण %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "तपाईंको वितरण समर्थित छैन"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1339,8 +1368,9 @@ msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1373,9 +1403,8 @@ msgstr "नन-फ्री (बहुभर्स)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "युएस निषेधित सफ्टवेयर"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
@@ -1552,6 +1581,10 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, fuzzy
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "युएस निषेधित सफ्टवेयर"
+
+#, fuzzy
 #~ msgid "Normal updates"
 #~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
 
diff --git a/po/nl.po b/po/nl.po
index 4ebdacdf..056cadef 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-24 01:32+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:40+0000\n"
 "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
 "Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Na %s dagen"
 #: ../SoftwareProperties/SoftwareProperties.py:252
 #, fuzzy, python-format
 msgid "%s updates"
-msgstr "Up_dates installeren"
+msgstr "%s updates"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -66,26 +66,27 @@ msgstr "Up_dates installeren"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Hoofdserver"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Server voor %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "dichtsbijzijnde server"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
+#, fuzzy
 msgid "Custom servers"
-msgstr ""
+msgstr "Andere servers"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
@@ -95,16 +96,17 @@ msgstr "Software-updates"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
+#, fuzzy
 msgid "Active"
-msgstr ""
+msgstr "actief"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(broncode)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "Broncode"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -112,7 +114,7 @@ msgstr "Sleutel importeren"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
-msgstr "Fout bij het importeren van het geselecteerde bestand."
+msgstr "Fout bij het importeren van het geselecteerde bestand"
 
 #: ../SoftwareProperties/SoftwareProperties.py:980
 msgid "The selected file may not be a GPG key file or it might be corrupt."
@@ -149,11 +151,11 @@ msgstr "Geef het cd-schijfje een naam"
 msgid "Please insert a disc in the drive:"
 msgstr "Plaats een schijf in de speler:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Niet-werkende pakketten"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -162,20 +164,20 @@ msgstr ""
 "met deze software. Repareer deze eerst met synaptic of apt-get voordat u "
 "verder gaat."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
-msgstr "Kan de vereiste meta-pakketten niet upgraden."
+msgstr "Kan de vereiste meta-pakketten niet upgraden"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Een essentieel pakket zou verwijderd worden"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Kan de vereisten voor de upgrade niet berekenen"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -184,14 +186,14 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Tijdens het berekenen van de upgrade ontstond er een onoplosbaar probleem. "
-"Gelieve dit als fout te rapporteren. "
+"Gelieve dit als fout te rapporteren."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Fout bij het bepalen van de echtheid van sommige pakketten"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -202,12 +204,12 @@ msgstr ""
 "proberen. Hieronder vindt u een lijst met pakketten waarvan de echtheid niet "
 "vastgesteld is."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Kan '%s' niet installeren"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -216,11 +218,11 @@ msgstr ""
 "fout te rapporteren. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Kan het meta-pakket niet raden"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -242,7 +244,7 @@ msgid "Failed to add the CD"
 msgstr "Ophalen is mislukt"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
-#, python-format
+#, fuzzy, python-format
 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"
@@ -250,16 +252,21 @@ msgid ""
 "The error message was:\n"
 "'%s'"
 msgstr ""
+"De upgrade is gestopt omdat de cd niet toegevoegd kon worden. Meld dit als "
+"een bug als dit een goede Ubuntu-cd is.\n"
+"\n"
+"De foutmelding was:\n"
+"'%s'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Tijdelijke opslag inlezen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Bestanden van het netwerk ophalen voor de upgrade?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -267,11 +274,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Geen geldige mirror-server gevonden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -292,11 +299,11 @@ msgstr ""
 "Wanneer u 'Nee' kiest, zal de update worden geannuleerd."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "De standaard bronnenlijst genereren?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -310,11 +317,11 @@ msgstr ""
 "Moeten de standaardregels voor '%s' worden toegevoegd? Wanneer u 'Nee' "
 "kiest, zal de update worden geannuleerd."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "De informatie over de pakketbronnen is ongeldig"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -322,11 +329,11 @@ msgstr ""
 "Het upgraden van de informatie over de pakketbronnen heeft het bestand "
 "ongeldig gemaakt. Rapporteer dit als een fout."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Pakketbronnen van derden uitgeschakeld"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, fuzzy
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
@@ -337,11 +344,11 @@ msgstr ""
 "kunt ze na de upgrade weer inschakelen via het menu Systeem -> Beheer -> "
 "Software-eigenschappen of met het programma Synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Fout tijdens het updaten"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -349,11 +356,11 @@ msgstr ""
 "Tijdens het updaten is er iets misgegaan. Dit komt meestal door "
 "netwerkproblemen. Controleer uw netwerkverbinding en probeer opnieuw."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Niet genoeg vrije schijfruimte"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -365,15 +372,15 @@ msgstr ""
 "vorige installaties via 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Wilt u beginnen met de upgrade?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Kon de upgrades niet installeren"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
@@ -386,11 +393,11 @@ msgstr ""
 "onbruikbare toestand. Er is een hersteloperatie uitgevoerd (dpkg --configure "
 "-a)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Kon de upgrades niet downloaden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -398,11 +405,11 @@ msgstr ""
 "De upgrade wordt nu afgebroken. Controleer uw internetverbinding of het "
 "installatiemedium en probeer opnieuw. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -415,25 +422,25 @@ msgstr ""
 "worden door de gemeenschap beheerd ('universe').\n"
 "\n"
 "Indien 'universe' niet geactiveerd is zal bij de volgende stap gevraagd "
-"worden om deze pakketten te verwijderen. "
+"worden om deze pakketten te verwijderen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Overbodige pakketten verwijderen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Deze stap overslaan"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Fout bij het toepassen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -442,31 +449,46 @@ msgstr ""
 "voor meer informatie. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "De oorspronkelijke toestand wordt hersteld"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Pakkettenbeheer controleren"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Upgrade voorbereiden"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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 ""
+"Tijdens het berekenen van de upgrade ontstond er een onoplosbaar probleem. "
+"Gelieve dit als fout te rapporteren."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Updaten van de informatie over de pakketbronnen"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Ongeldige pakketinformatie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -479,19 +501,19 @@ msgstr ""
 "meer gevonden worden.\n"
 "Dit is een ernstige fout, die gerapporteerd moet worden."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Vragen om bevestiging"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Bezig met upgraden"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Zoeken naar overbodige software"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Systeemupgrade is voltooid."
 
@@ -552,8 +574,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -607,7 +629,10 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "U moet in totaal %s downloaden."
+msgstr ""
+"\n"
+"\n"
+"U moet in totaal %s downloaden. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy
@@ -626,7 +651,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Uw systeem is up-to-date"
 
@@ -676,8 +701,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -757,25 +782,39 @@ msgid "Terminal"
 msgstr "Terminalvenster"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_Upgrade hervatten"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Behouden"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Vervangen"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Fout rapporteren"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Nu herstarten"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Upgrade hervatten"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_Upgrade hervatten"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Kon de versie-informatie niet vinden"
@@ -876,125 +915,131 @@ msgstr "Downloaden van bestand %li uit %li met %s/s"
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Downloaden van bestand %li uit %li met %s/s"
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr ""
 "Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. "
 "Probeer het later nog eens."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 "Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. "
 "Probeer het later nog eens."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "Kon de lijst met wijzigingen niet downloaden. Controleer uw "
 "internetverbinding."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 veiligheidsupdates"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Aanbevolen updates"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Up_dates installeren"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 backports"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "_Upgrade hervatten"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "Up_dates installeren"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versie %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Het overzicht van de wijzigingen wordt gedownload..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
+#, fuzzy
 msgid "_Uncheck All"
-msgstr ""
+msgstr "Alles deselecteren"
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "_Controleren"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Downloadgrootte: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 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"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Een ogenblik geduld, dit kan even duren."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "De update is voltooid"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "Up_dates installeren"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Nieuwe versie: %s (Grootte: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "Versie %s: \n"
+msgstr "Versie %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
-#, python-format
+#: ../UpdateManager/UpdateManager.py:832
+#, fuzzy, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Grootte: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Uw distributie wordt niet langer ondersteund"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -1004,17 +1049,17 @@ msgstr ""
 "upgrade uit naar een nieuwere versie van Ubuntu Linux. Zie http://www.ubuntu."
 "com voor meer informatie over upgraden."
 
-#: ../UpdateManager/UpdateManager.py:845
-#, python-format
+#: ../UpdateManager/UpdateManager.py:863
+#, fuzzy, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>De nieuwe Ubuntu-versie '%s' is beschikbaar</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "Software-index is beschadigd"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1032,19 +1077,19 @@ msgstr ""
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 #, fuzzy
@@ -1081,8 +1126,9 @@ msgid "Changes"
 msgstr "Wijzigingen"
 
 #: ../data/glade/UpdateManager.glade.h:8
+#, fuzzy
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Veranderingen en beschrijving van de update"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1341,8 +1387,9 @@ msgid "Scanning CD-ROM"
 msgstr "De cd-rom wordt geanalyseerd"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
+#, fuzzy
 msgid "_Add Source"
-msgstr ""
+msgstr "Bron toevoegen"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1429,8 +1476,9 @@ msgstr "Door de gemeenschap beheerd (Universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
+#, fuzzy
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Proprietaire drivers voor apparaten"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
@@ -1441,7 +1489,7 @@ msgstr "Niet-vrij (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Cd-rom met Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
@@ -1451,8 +1499,9 @@ msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Door de gemeenschap beheerd (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1474,8 +1523,9 @@ msgstr "Niet-vrij (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
+#, fuzzy
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Proprietaire drivers voor apparaten "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
@@ -1485,7 +1535,7 @@ msgstr "Niet-vrij (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
@@ -1533,8 +1583,9 @@ msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
+#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Cd-rom met Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1577,8 +1628,9 @@ msgstr "Niet-vrij (Multiverse)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
+#, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Cd-rom met Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
@@ -1774,9 +1826,10 @@ msgstr "Software niet compatibel met DFSG"
 #~ msgid "Edit Channel"
 #~ msgstr "Kanaal bewerken"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Kanaal toevoegen"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Kanaal toevoegen"
+#~ msgstr[1] "_Kanalen toevoegen"
 
 #~ msgid "_Custom"
 #~ msgstr "_Aangepast"
diff --git a/po/nn.po b/po/nn.po
new file mode 100644
index 00000000..b9646447
--- /dev/null
+++ b/po/nn.po
@@ -0,0 +1,1524 @@
+# Norwegian Nynorsk translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-06-19 15:52+0000\n"
+"Last-Translator: Willy André Bergstrøm <root@willyandre.net>\n"
+"Language-Team: Norwegian Nynorsk <nn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "Daily"
+msgstr "Kvar dag"
+
+#: ../SoftwareProperties/SoftwareProperties.py:137
+msgid "Every two days"
+msgstr "Annankvar dag"
+
+#: ../SoftwareProperties/SoftwareProperties.py:138
+msgid "Weekly"
+msgstr "Kvar veke"
+
+#: ../SoftwareProperties/SoftwareProperties.py:139
+msgid "Every two weeks"
+msgstr "Annankvar veke"
+
+#: ../SoftwareProperties/SoftwareProperties.py:144
+#, python-format
+msgid "Every %s days"
+msgstr "Kvar %s dag"
+
+#: ../SoftwareProperties/SoftwareProperties.py:167
+msgid "After one week"
+msgstr "Etter ei veke"
+
+#: ../SoftwareProperties/SoftwareProperties.py:168
+msgid "After two weeks"
+msgstr "Etter to veker"
+
+#: ../SoftwareProperties/SoftwareProperties.py:169
+msgid "After one month"
+msgstr "Etter ein månad"
+
+#: ../SoftwareProperties/SoftwareProperties.py:174
+#, python-format
+msgid "After %s days"
+msgstr "Etter %s dagar"
+
+#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
+#: ../SoftwareProperties/SoftwareProperties.py:252
+#, python-format
+msgid "%s updates"
+msgstr ""
+
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
+msgid "Main server"
+msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:324
+msgid "Nearest server"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:345
+msgid "Custom servers"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
+msgid "Software Channel"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
+msgid "Active"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:714
+msgid "(Source Code)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:720
+msgid "Source Code"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:969
+#, fuzzy
+msgid "Import key"
+msgstr "Importer nykel"
+
+#: ../SoftwareProperties/SoftwareProperties.py:979
+#, fuzzy
+msgid "Error importing selected file"
+msgstr "Feil under importering av vald fil"
+
+#: ../SoftwareProperties/SoftwareProperties.py:980
+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."
+
+#: ../SoftwareProperties/SoftwareProperties.py:992
+msgid "Error removing the key"
+msgstr "Kunne ikkje fjerne nykjelen"
+
+#: ../SoftwareProperties/SoftwareProperties.py:993
+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."
+
+#: ../SoftwareProperties/SoftwareProperties.py:1039
+#, python-format
+msgid ""
+"<big><b>Error scanning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1096
+msgid "Please enter a name for the disc"
+msgstr "Oppgi eit namn for plata"
+
+#: ../SoftwareProperties/SoftwareProperties.py:1112
+msgid "Please insert a disc in the drive:"
+msgstr "Sett inn ei plate i stasjonen:"
+
+#: ../DistUpgrade/DistUpgradeCache.py:91
+msgid "Broken packages"
+msgstr "Øydelagde pakkar"
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+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."
+
+#: ../DistUpgrade/DistUpgradeCache.py:207
+msgid "Can't upgrade required meta-packages"
+msgstr "Kan ikkje oppgradere naudsynte meta-pakkar"
+
+#: ../DistUpgrade/DistUpgradeCache.py:217
+msgid "A essential package would have to be removed"
+msgstr "Ein naudsynt pakke vil måtte fjernast"
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:220
+msgid "Could not calculate the upgrade"
+msgstr "Kunne ikkje forberede oppgraderinga"
+
+#: ../DistUpgrade/DistUpgradeCache.py:221
+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 ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:246
+msgid "Error authenticating some packages"
+msgstr "Kunne ikkje autentisere somme pakkar"
+
+#: ../DistUpgrade/DistUpgradeCache.py:247
+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."
+
+#: ../DistUpgrade/DistUpgradeCache.py:312
+#, python-format
+msgid "Can't install '%s'"
+msgstr "Kan ikkje installere '%s'"
+
+#: ../DistUpgrade/DistUpgradeCache.py:313
+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. "
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:320
+msgid "Can't guess meta-package"
+msgstr "Kan ikkje gjette på meta-pakke"
+
+#: ../DistUpgrade/DistUpgradeCache.py:321
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:75
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "Reading cache"
+msgstr "Les mellomlager"
+
+#: ../DistUpgrade/DistUpgradeControler.py:155
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:156
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:248
+msgid "No valid mirror found"
+msgstr "Fann ikkje noko gyldig spegl"
+
+#: ../DistUpgrade/DistUpgradeControler.py:249
+#, python-format
+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."
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:266
+msgid "Generate default sources?"
+msgstr "Vil du opprette standardkjelder?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:267
+#, python-format
+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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:301
+msgid "Repository information invalid"
+msgstr "Ugyldig arkivinformasjon"
+
+#: ../DistUpgrade/DistUpgradeControler.py:302
+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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:308
+msgid "Third party sources disabled"
+msgstr "Tredjepartskjelder er deaktivert"
+
+#: ../DistUpgrade/DistUpgradeControler.py:309
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:358
+msgid "Error during update"
+msgstr "Feil under oppdatering"
+
+#: ../DistUpgrade/DistUpgradeControler.py:359
+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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:368
+msgid "Not enough free disk space"
+msgstr "Ikkje nok ledig diskplass"
+
+#: ../DistUpgrade/DistUpgradeControler.py:369
+#, python-format
+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 ""
+
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeControler.py:440
+msgid "Do you want to start the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:460
+msgid "Could not install the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:461
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:479
+msgid "Could not download the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:480
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:516
+msgid "Support for some applications ended"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:517
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:552
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:563
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:564
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. generate a new cache
+#: ../DistUpgrade/DistUpgradeControler.py:576
+msgid "Restoring original system state"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:632
+#, python-format
+msgid "Fetching backport of '%s'"
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
+msgid "Checking package manager"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
+msgid "Invalid package information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:733
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:737
+msgid "Upgrading"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:744
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:749
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:249
+#, python-format
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, python-format
+msgid "Fetching file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+msgid "Applying changes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
+#, python-format
+msgid "Could not install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+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 ""
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#, python-format
+msgid ""
+"Replace the customized configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:203
+msgid ""
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
+msgid "The 'diff' command was not found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:356
+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 ""
+
+#. FIXME: make those two seperate lines to make it clear
+#. that the "%" applies to the result of ngettext
+#: ../DistUpgrade/DistUpgradeViewGtk.py:487
+#, python-format
+msgid "%d package is going to be removed."
+msgid_plural "%d packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
+#, python-format
+msgid "%d new package is going to be installed."
+msgid_plural "%d new packages are going to be installed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:498
+#, python-format
+msgid "%d package is going to be upgraded."
+msgid_plural "%d packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:503
+#, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
+msgid ""
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:512
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:518
+#: ../UpdateManager/UpdateManager.py:622
+msgid "Your system is up-to-date"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:519
+msgid ""
+"There are no upgrades available for your system. The upgrade will now be "
+"canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:535
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:537
+#, python-format
+msgid "Install %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:539
+#, python-format
+msgid "Upgrade %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:31
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:32
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:38
+#, python-format
+msgid ""
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:109
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:110
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/glade/SoftwareProperties.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+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 ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Fetching and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr ""
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:149
+msgid "Could not run the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:150
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:171
+msgid "Downloading the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:180
+msgid "Upgrade tool signature"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:183
+msgid "Upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:209
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid "Failed to extract"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:215
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid "Verfication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:222
+msgid ""
+"Verifying the upgrade failed.  There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid "Authentication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:229
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:108
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:113
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:206
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:217
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
+msgid "Important security updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
+msgid "Recommended updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
+msgid "Proposed updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:241
+msgid "Backports"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:242
+msgid "Distribution updates"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
+msgid "Other updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:478
+#, python-format
+msgid "Version %s: \n"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:539
+msgid "Downloading list of changes..."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:566
+msgid "_Uncheck All"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:572
+msgid "_Check All"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid "Please wait, this can take some time."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:668
+msgid "Update is complete"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:719
+msgid "Checking for updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
+msgid "From version %(old_version)s to %(new_version)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:832
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:843
+msgid "Your distribution is not supported anymore"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:844
+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 ""
+
+#: ../UpdateManager/UpdateManager.py:863
+#, python-format
+msgid "<b>New distribution release '%s' is available</b>"
+msgstr ""
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:898
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:899
+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 ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:1
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:4
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:5
+msgid "<big><b>Not all updates can be installed</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:6
+msgid "<big><b>Starting update manager</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:7
+msgid "Changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:8
+msgid "Changes and description of the update"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:9
+msgid "Chec_k"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:10
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:11
+msgid "Description"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:13
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:16
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:17
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:18
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:19
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:20
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:21
+msgid "_Check"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:22
+msgid "_Distribution Upgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:23
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:24
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:25
+msgid "changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:26
+msgid "updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:2
+msgid "<b>Automatic updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:3
+msgid "<b>CDROM/DVD</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:4
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:5
+msgid "<b>Internet</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:6
+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 ""
+
+#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+msgid "Authentication"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
+msgid "Download from:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:13
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:16
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:17
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Sources"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:19
+msgid "Source code"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:20
+msgid "Statistics"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:21
+msgid "Submit statistical information"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:22
+msgid "Third Party"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:23
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:24
+msgid "_Download updates automatically, but do not install them"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:25
+msgid "_Import Key File"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:26
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Components:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
+msgid "APT line:"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Reload"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+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 ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changes and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:8
+msgid "Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:13
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:17
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:19
+msgid "Restricted software"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:25
+msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:59
+msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:62
+msgid "Canonical supported Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:64
+msgid "Community maintained (universe)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:65
+msgid "Community maintained Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:67
+msgid "Non-free drivers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:68
+msgid "Proprietary drivers for devices "
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:70
+msgid "Restricted software (Multiverse)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:71
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:76
+msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:103
+msgid "Backported updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:110
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:123
+msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:135
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:140
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:145
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:152
+msgid "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:165
+msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:177
+msgid "Ubuntu 5.04 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:182
+msgid "Ubuntu 5.04 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:187
+msgid "Ubuntu 5.04 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:193
+msgid "Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:199
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:201
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:206
+msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:209
+msgid "No longer officially supported"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:211
+msgid "Restricted copyright"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:218
+msgid "Ubuntu 4.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:223
+msgid "Ubuntu 4.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:228
+msgid "Ubuntu 4.10 Backports"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
diff --git a/po/no.po b/po/no.po
index 3b153941..78f578db 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
+"POT-Creation-Date: 2006-10-06 23:18+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"
@@ -147,30 +147,30 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -181,23 +181,23 @@ msgstr ""
 "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -206,11 +206,11 @@ msgstr ""
 "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -237,11 +237,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -249,11 +249,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -266,11 +266,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -279,43 +279,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 #, fuzzy
 msgid "Error during update"
 msgstr "Feil under fjerning av nøkkel"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -324,15 +324,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -341,21 +341,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -364,55 +364,69 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 #, fuzzy
 msgid "Checking package manager"
 msgstr "En annen pakkehåndterer kjører"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Laster ned endringer"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -422,21 +436,21 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 #, fuzzy
 msgid "Asking for confirmation"
 msgstr "Undersøker systemkonfigurasjon"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 #, fuzzy
 msgid "Upgrading"
 msgstr "Oppgradering fullført"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr ""
 
@@ -495,8 +509,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -558,7 +572,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Systemet er helt oppdatert!"
@@ -609,8 +623,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -685,26 +699,38 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 #, fuzzy
 msgid "_Replace"
 msgstr "Oppdater"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -800,137 +826,140 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Det er en ny versjon av Ubuntu tilgjengelig!"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr "Det er en ny versjon av Ubuntu tilgjengelig!"
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 #, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr "Feil under nedlasting av endringer. Sjekk tilkoblingen til internett."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 Security Updates"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Installerer oppdateringer..."
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "Installerer oppdateringer..."
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "Installerer oppdateringer..."
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versjon %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Laster ned endringer"
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, fuzzy, python-format
 msgid "Download size: %s"
 msgstr "Laster ned endringer"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Installerer oppdateringer..."
 msgstr[1] "Installerer oppdateringer..."
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "Installerer oppdateringer..."
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
 msgstr "Versjon %s: \n"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Din distribusjon er ikke lenger støttet"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1344,8 +1373,9 @@ msgstr "Ubuntu 5.04 Updates"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Vedlikeholdt av miljøet (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1378,9 +1408,8 @@ msgstr "Non-free (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "US eksport begrenset programvare"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
@@ -1556,6 +1585,10 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, fuzzy
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "US eksport begrenset programvare"
+
+#, fuzzy
 #~ msgid "Normal updates"
 #~ msgstr "Installerer oppdateringer..."
 
diff --git a/po/oc.po b/po/oc.po
index 0313725c..19b234ac 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-29 08:11+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-09-30 00:43+0000\n"
 "Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannick.marchegay@lokanova."
 "com>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
@@ -41,26 +41,26 @@ msgstr "Cada %s jorns"
 
 #: ../SoftwareProperties/SoftwareProperties.py:167
 msgid "After one week"
-msgstr "Après una setmana"
+msgstr "Una setmana aprèp"
 
 #: ../SoftwareProperties/SoftwareProperties.py:168
 msgid "After two weeks"
-msgstr "Après dos setmanas"
+msgstr "Doas setmanas aprèp"
 
 #: ../SoftwareProperties/SoftwareProperties.py:169
 msgid "After one month"
-msgstr "Après un mes"
+msgstr "Un mes aprèp"
 
 #: ../SoftwareProperties/SoftwareProperties.py:174
 #, python-format
 msgid "After %s days"
-msgstr "Après %s jorns"
+msgstr "%s jorns aprèp"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
 #, python-format
 msgid "%s updates"
-msgstr ""
+msgstr "%s mesas a jorn"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -68,18 +68,18 @@ msgstr ""
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Servidor principal"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Servidor per %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
@@ -87,7 +87,7 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Servidors personalizats"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
@@ -97,7 +97,7 @@ msgstr ""
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Actiu"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
@@ -149,30 +149,30 @@ msgstr "Picatz un nom pel disc"
 msgid "Please insert a disc in the drive:"
 msgstr "Metètz un disc dins lo legidor :"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Paquetatges corromputs"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Impossible calcular la mesa a jorn"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -181,34 +181,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
-msgstr "Impossible installar '%s'"
+msgstr "Impossible d'installar '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -219,7 +219,7 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
 msgid "Failed to add the CD"
-msgstr ""
+msgstr "Impossible d'apondre lo CD"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -235,11 +235,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -247,11 +247,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -264,11 +264,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -277,42 +277,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Error al moment de metre a jorn"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Pas pro d'espaci liure"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -321,15 +321,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Volètz començar la mesa a jorn ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Impossible installar las mesas a jorn"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -338,21 +338,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Impossible descargar las mesas a jorn"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -361,54 +361,65 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "Suprimir los paquetatges obsolets ?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Suprimir"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -418,19 +429,19 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Demanda de confirmacion"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Mesa a jorn"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Recèrca de logicials obsolets"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "La mesa a jorn del sistèma es acabada."
 
@@ -438,7 +449,7 @@ msgstr "La mesa a jorn del sistèma es acabada."
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Inserissètz lo disc '%s' dins lo legidor '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
 msgid "Fetching is complete"
@@ -453,7 +464,7 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
 #, python-format
 msgid "About %s remaining"
-msgstr ""
+msgstr "Environ %s restantas"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
@@ -465,12 +476,12 @@ msgstr ""
 #. -> longer term, move this code into python-apt
 #: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
-msgstr ""
+msgstr "Aplicacion dels cambis"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "Impossible d'installar '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:188
 msgid ""
@@ -488,13 +499,13 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "Impossible de trobar la comanda 'diff'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
@@ -537,7 +548,10 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Debètz telecargar un total de %s."
+msgstr ""
+"\n"
+"\n"
+"Debètz telecargar un total de %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 msgid ""
@@ -551,7 +565,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr ""
 
@@ -579,7 +593,7 @@ msgstr "Metre a jorn %s"
 #: ../DistUpgrade/DistUpgradeView.py:27
 #, python-format
 msgid "%li days %li hours %li minutes"
-msgstr ""
+msgstr "%li jorns %li oras %li minutas"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
 #, python-format
@@ -594,20 +608,20 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li segondas"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
-msgstr ""
+msgstr "Debètz tornar aviar l'ordenador"
 
 #: ../DistUpgrade/DistUpgradeView.py:110
 msgid ""
@@ -645,7 +659,7 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Netejatge"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 msgid "Details"
@@ -653,7 +667,7 @@ msgstr "Detalhs"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "Diferéncia entre los fichièrs"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 #, fuzzy
@@ -666,7 +680,7 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Preparacion de la mesa a jorn"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
@@ -677,28 +691,40 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr "_Conservar"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Remplaçar"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Tornar aviar ara"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
+msgstr "_Contunhar la mesa a jorn"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
 msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
-msgstr ""
+msgstr "Impossible de trobar las informacions de version"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
@@ -706,16 +732,16 @@ msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
 msgid "Could not download the release notes"
-msgstr ""
+msgstr "Impossible de telecargar las informacions de version"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Verificatz vòstra connexion internet."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
-msgstr ""
+msgstr "Impossible aviar l'esplech de mesa a jorn"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
@@ -724,7 +750,7 @@ msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
-msgstr ""
+msgstr "Telecarga del esplech de mesa a jorn"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
@@ -732,7 +758,7 @@ msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Signatura del esplech de mesa a jorn"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
@@ -758,7 +784,7 @@ msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
-msgstr ""
+msgstr "La verificacion a pas capitat"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
@@ -786,132 +812,135 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr ""
+msgstr "La tièra de las modificacioons es pas disponibla"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "<b>Mesas a jorn per internet</b>"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "<b>Mesas a jorn per internet</b>"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s : \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "_Verificar"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Talha de la descarga : %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 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"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr ""
+msgstr "La mesa a jorn es terminada"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "<b>Mesas a jorn per internet</b>"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "Version %s : \n"
+msgstr "Version %s :"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Talha : %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -938,7 +967,7 @@ msgstr ""
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f Mo"
 
 #: ../data/glade/UpdateManager.glade.h:1
 msgid ""
@@ -1002,11 +1031,11 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Mostrar la progression de cada fichièr"
 
 #: ../data/glade/UpdateManager.glade.h:17
 msgid "Software Updates"
-msgstr ""
+msgstr "Mesa a jorn dels logicials"
 
 #: ../data/glade/UpdateManager.glade.h:18
 msgid ""
@@ -1016,7 +1045,7 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
-msgstr ""
+msgstr "_Metre a jorn"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
@@ -1024,7 +1053,7 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:21
 msgid "_Check"
-msgstr ""
+msgstr "_Verificar"
 
 #: ../data/glade/UpdateManager.glade.h:22
 msgid "_Distribution Upgrade"
@@ -1036,7 +1065,7 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:24
 msgid "_Install Updates"
-msgstr ""
+msgstr "_Installar las mesas a jorn"
 
 #: ../data/glade/UpdateManager.glade.h:25
 #, fuzzy
@@ -1045,7 +1074,7 @@ msgstr "Cambis"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "mesas a jorn"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
 #, fuzzy
@@ -1054,7 +1083,7 @@ msgstr "<b>Mesas a jorn per internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CD-ROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
@@ -1100,7 +1129,7 @@ msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:14
 msgid "Internet Updates"
-msgstr ""
+msgstr "Mesas a jorn per internet"
 
 #: ../data/glade/SoftwareProperties.glade.h:15
 msgid ""
@@ -1127,7 +1156,7 @@ msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Estadisticas"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
@@ -1169,7 +1198,7 @@ msgstr "<b>Comentari :</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
 msgid "<b>Components:</b>"
-msgstr ""
+msgstr "<b>Components :</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Distribution:</b>"
@@ -1216,15 +1245,15 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
-msgstr ""
+msgstr "_Tornar cargar"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Mostrar e installar las mesas a jorn disponiblas"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
-msgstr ""
+msgstr "Gestionari de mesas a jorn"
 
 #: ../data/update-manager.schemas.in.h:1
 msgid ""
@@ -1249,7 +1278,7 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr ""
+msgstr "Mostrar los detalhs d'una mesa a jorn"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
@@ -1300,7 +1329,7 @@ msgstr "Pas liure (multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "CD-ROM que conten Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
@@ -1310,7 +1339,7 @@ msgstr "Mesas a jorn per Ubuntu 6.06 LTS"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1342,13 +1371,13 @@ msgstr "Pas liure (multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
+msgstr "CD-ROM que conten Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
@@ -1393,7 +1422,7 @@ msgstr "Ubuntu 5.10 'Breezy Badger'"
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "CD-ROM que conten Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
diff --git a/po/pa.po b/po/pa.po
index cf757aba..7b3574df 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-04-28 23:31+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:43+0000\n"
 "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
 "Language-Team: Punjabi <fedora-transa-pa@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -144,30 +144,30 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -176,34 +176,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -230,11 +230,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -242,11 +242,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -259,11 +259,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -272,42 +272,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -316,15 +316,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -333,21 +333,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -356,54 +356,65 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -413,20 +424,20 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 #, fuzzy
 msgid "Upgrading"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr ""
 
@@ -484,8 +495,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -547,7 +558,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr ""
 
@@ -597,8 +608,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -673,26 +684,40 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -785,133 +810,135 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 msgstr[1] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, python-format
 msgid "Version %s"
 msgstr ""
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1310,7 +1337,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1340,7 +1367,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
diff --git a/po/pl.po b/po/pl.po
index 90cf55e8..cbd79878 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager cvs\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:59+0000\n"
-"Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-09-02 19:44+0000\n"
+"Last-Translator: White Eagle <piotrgaliszewski@gmail.com>\n"
 "Language-Team: Polish <translators@gnomepl.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:136
 msgid "Daily"
@@ -57,9 +57,9 @@ msgstr "Po %s dniach"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Instalowanie pakietów"
+msgstr "%s aktualizacji"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -67,47 +67,44 @@ msgstr "Instalowanie pakietów"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Serwer główny"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Serwer dla kraju %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Najbliższy serwer"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Inne serwery"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Aktualizacje oprogramowania"
+msgstr "Kanał oprogramowania"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Aktywna"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr "Źródłowy"
+msgstr "(kod źródłowy)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
-msgstr "Źródłowy"
+msgstr "Kod źródłowy"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -115,7 +112,7 @@ msgstr "Zaimportuj klucz"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
-msgstr "Błąd podczas importowania wybranego pliku"
+msgstr "Błąd podczas importu wybranego pliku"
 
 #: ../SoftwareProperties/SoftwareProperties.py:980
 msgid "The selected file may not be a GPG key file or it might be corrupt."
@@ -130,13 +127,13 @@ 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."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
-"<big><b>Błąd podczas przeszukiwania płyty CD</b></big>\n"
+"<big><b>Wystąpił błąd podczas skanowania płyty CD</b></big>\n"
 "\n"
 "%s"
 
@@ -148,11 +145,11 @@ 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:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Uszkodzone pakiety"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -161,36 +158,37 @@ msgstr ""
 "kontynuowaniem należy je naprawić używając Synaptic Menedżer Pakietów lub "
 "apt-get."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Nie można zaktualizować wymaganych meta-pakietów"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Niezbędny pakiet musiałby zostać usunięty"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Nie można przetworzyć aktualizacji"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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. Proszę "
-"zgłosić to jako błąd. "
+"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/ ."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Błąd podczas uwierzytelniania niektórych pakietów"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -200,24 +198,23 @@ msgstr ""
 "sieci. Można spróbować ponownie później. Poniżej znajduje się lista "
 "nieuwierzytelnionych pakietów."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Nie można zainstalować \"%s\""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 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. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Nie można odnaleźć żadnego z wymaganych meta-pakietów"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -225,14 +222,14 @@ msgid ""
 " 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."
+"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."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Pobranie nie powiodło się"
+msgstr "Nie można dodać płyty CD"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -243,28 +240,38 @@ msgid ""
 "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'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Odczytywanie bufora podręcznego"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Pobrać dane z sieci dla aktualizacji?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Nie odnaleziono poprawnego serwera lustrzanego"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -284,11 +291,11 @@ msgstr ""
 "Jeśli wybierzesz \"Nie\" aktualizacja zostanie anulowana."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Wygenerować domyślne źródła?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -302,11 +309,11 @@ msgstr ""
 "Czy mam dodać domyślne wpisy dla \"%s\"? Jeśli wybierzesz \"Nie\" "
 "aktualizacja zostanie anulowana."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Błędne informacje o repozytoriach"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -314,26 +321,25 @@ msgstr ""
 "W wyniku aktualizacji informacji o repozytoriach powstał błędny plik. Proszę "
 "zgłosić ten błąd."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Źródła stron niezależnych zostały wyłączone"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ź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."
+"Niektóre kanały osób trzecich 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Błąd podczas aktualizacji"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -341,11 +347,11 @@ msgstr ""
 "Wystąpił problem podczas aktualizacji. Zazwyczaj wynika on z problemów z "
 "siecią, proszę sprawdzić połączenie sieciowe i spróbować ponownie."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Zbyt mało miejsca na dysku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -357,16 +363,15 @@ msgstr ""
 "\"sudo apt-get clean\"."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Czy chcesz rozpocząć aktualizację?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Instalacja aktualizacji zakończyła się niepowodzeniem."
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -374,15 +379,17 @@ msgid ""
 "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. System może znajdować się w stanie "
-"nienadającym się do użytku. Uruchamianie naprawiania systemu (dpkg --"
-"configure -a)."
+"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/ ."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Pobranie aktualizacji było niemożliwe"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -390,12 +397,11 @@ msgstr ""
 "Aktualizacja została przerwana. Proszę sprawdzić połączenie sieciowe oraz "
 "dysk instalacyjny i spróbować ponownie. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Wsparcie dla niektórych aplikacji zostało zakończone"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -403,29 +409,24 @@ msgid ""
 "If you have not enabled community maintained software (universe), 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. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Usunąć niepotrzebne pakiety?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Pomiń ten krok"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Błąd podczas zatwierdzania"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -434,32 +435,43 @@ msgstr ""
 "poniższych wiadomościach. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Przywracanie pierwotnego stanu systemu"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Sprawdzanie menedżera pakietów"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Aktualizowanie informacji o repozytoriach"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Błędne informacje o pakietach"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -467,23 +479,24 @@ msgid ""
 "manager' package and include the files in /var/log/dist-upgrade/ in the "
 "bugreport."
 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."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Pytanie o potwierdzenie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Aktualizacja w toku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Wyszukiwanie zdezaktualizowanego oprogramowania"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Aktualizacja systemu zakończona powodzeniem."
 
@@ -494,23 +507,22 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "Proszę włożyć \"%s\" do napędu \"%s\""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "Aktualizacja została ukończona."
+msgstr "Pobieranie zakończone"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
 msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Około %li minut pozostało"
+msgstr "Pozostało około %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
 msgstr "Pobieranie pliku %li z %li"
 
@@ -531,21 +543,23 @@ 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/."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"Zastąpić plik konfiguracyjny\n"
+"Zastąpić własny plik konfiguracji\n"
 "\"%s\"?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -557,59 +571,62 @@ msgid "A fatal error occured"
 msgstr "Wystąpił błąd krytyczny"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 ""
-"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"
+"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."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d 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."
+msgstr[0] "%d pakiet zostanie usunięty."
+msgstr[1] "%d pakiety zostaną usunięte."
+msgstr[2] "%d pakietów zostanie usuniętych."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d 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."
+msgstr[0] "%d nowy pakiet zostanie zainstalowany."
+msgstr[1] "%d nowe pakiety zostaną zainstalowane."
+msgstr[2] "%d nowych pakietów zostanie zainstalowanych."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d 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."
+msgstr[0] "%d pakiet zostanie zaktualizowany."
+msgstr[1] "%d pakiety zostaną zaktualizowane."
+msgstr[2] "%d pakietów zostanie zaktualizowanych."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Konieczne pobranie ogółem %s."
+msgstr ""
+"\n"
+"\n"
+"Musisz pobrać w sumie %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing 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."
+"Pobieranie i instalacja aktualizacji może potrwać kilka godzin i nie może "
+"zostać przerwana."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -619,7 +636,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Twój system jest w pełni zaktualizowany"
 
@@ -627,7 +644,7 @@ 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 ""
+msgstr "Brak dostępnych aktualizacji. Aktualizacja zostanie anulowana."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -645,32 +662,32 @@ msgid "Upgrade %s"
 msgstr "Aktualizuj %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Około %li dni %li godzin %li minut pozostało"
+msgstr "%li dni %li godzin %li minut"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Około %li godzin %li minut pozostało"
+msgstr "%li godzin %li minut"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minut"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li sekund"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -716,7 +733,7 @@ msgstr "<b><big>Rozpocząć aktualizację?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Aktualizacja Ubuntu do wersji 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -731,7 +748,6 @@ msgid "Difference between the files"
 msgstr "Różnice pomiędzy plikami"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
 msgstr "Pobieranie i instalowanie aktualizacji"
 
@@ -752,25 +768,37 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Zachowaj"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "Zas_tąp"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "Zgłoś _błąd"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Uruchom ponownie"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Wznów aktualizację"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Nie można było odnaleźć informacji o wydaniu"
@@ -840,13 +868,10 @@ msgid "Verfication failed"
 msgstr "Weryfikacja nie powiodła się"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 msgid ""
 "Verifying 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. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
@@ -861,90 +886,83 @@ msgstr ""
 "lub z serwerem. "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
+msgstr ""
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Pobieranie pliku %li z %li z prędkością %s/s"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później."
+msgstr "Lista zmian nie jest dostępna."
 
-#: ../UpdateManager/UpdateManager.py:210
-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."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
-"Nie udało się pobrać informacji o zmianach. Proszę sprawdzić połączenie z "
-"Internetem."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
+msgstr "Ważne aktualizacje bezpieczeństwa"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Aktualizacje polecane"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "Instalowanie pakietów"
+msgstr "Aktualizacje proponowane"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Backporty"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "_Wznów aktualizację"
+msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Instalowanie pakietów"
+msgstr "Inne aktualizacje"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Wersja %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr "Pobieranie informacji o zmianach..."
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "Odznacz wszystkie"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "Sp_rawdź"
+msgstr "Zaznacz wszystkie"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Rozmiar do pobrania: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -952,40 +970,39 @@ msgstr[0] "Ilość dostępnych aktualizacji: %s"
 msgstr[1] "Ilość dostępnych aktualizacji: %s"
 msgstr[2] "Ilość dostępnych aktualizacji: %s"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Proszę czekać, to może chwilę potrwać."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Aktualizacja została ukończona."
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "Sprawdź dostępne aktualizacje"
+msgstr "Sprawdzanie dostępności aktualizacji"
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "Nowa wersja: %s (Rozmiar: %s)"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Wersja %s: \n"
+msgstr "Wersja %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Rozmiar: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Twoja dystrybucja nie jest już wspierana"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -995,17 +1012,17 @@ msgstr ""
 "krytycznych aktualizacji. Zaktualizuj do nowszej wersji Ubuntu Linux. "
 "Odwiedź http://www.ubuntu.com po więcej informacji."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>Nowe wydanie dystrybucji \"%s\" jest dostępne</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "Spis oprogramowania jest uszkodzony"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1018,55 +1035,44 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Brak"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, 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>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"
-"\"."
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>Utrzymuj system w pełni zaktualizowany</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
-"<big><b>Błąd podczas przeszukiwania płyty CD</b></big>\n"
-"\n"
-"%s"
+msgstr "<big><b>Nie wszystkie aktualizacje mogą zostać zainstalowane</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Rozpocząć aktualizację?</big></b>"
+msgstr "<big><b>Uruchamianie menedżera aktualizacji</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1074,7 +1080,7 @@ msgstr "Zmiany"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Zmiany i opis aktualizacji"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1099,10 +1105,15 @@ msgid ""
 "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."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
-msgstr "Pokaż postęp pobierania poszczególnych plików"
+msgstr "Wyświetl postęp pobierania poszczególnych plików"
 
 #: ../data/glade/UpdateManager.glade.h:17
 msgid "Software Updates"
@@ -1129,9 +1140,8 @@ msgid "_Check"
 msgstr "Sp_rawdź"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "_Wznów aktualizację"
+msgstr "Aktualizacja _dystrybucji"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1142,31 +1152,28 @@ msgid "_Install Updates"
 msgstr "_Instaluj aktualizacje"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Zmiany"
+msgstr "zmiany"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "aktualizacje"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Aktualizacje internetowe</b>"
+msgstr "<b>Aktualizacje automatyczne</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Aktualizacje internetowe</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Aktualizacje internetowe</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1178,11 +1185,17 @@ msgid ""
 "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."
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "Dodaj płytę _CD"
+msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
@@ -1193,9 +1206,8 @@ msgid "D_elete downloaded software files:"
 msgstr "_Usuń pobrane pliki oprogramowania:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "Pobieranie zostało zakończone."
+msgstr "Pobieranie z:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1223,35 +1235,32 @@ msgstr "Przywróć domyślne klucze dystrybucji"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Oprogramowanie"
+msgstr "Źródła oprogramowania"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
-msgstr "Źródłowy"
+msgstr "Kod źródłowy"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Statystyki"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Wysyłanie informacji statystycznych"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Kanały osób trzecich"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "_Sprawdzaj dostępność aktualizacji automatycznie:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "_Pobieraj aktualizacje w tle, ale ich nie instaluj"
+msgstr "_Pobieraj aktualizacje automatycznie, ale ich nie instaluj"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1262,7 +1271,6 @@ msgid "_Install security updates without confirmation"
 msgstr "_Instaluj aktualizacje bezpieczeństwa bez potwierdzania"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1271,12 +1279,12 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>Informacje o kanałach są nieaktualne</big></b>\n"
+"<b><big>Informacje o dostępnym oprogramowaniu 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"
+"Aby zainstalować oprogramowanie i aktualizacje z nowych lub zmienionych "
+"źródeł należy ponownie wczytać informacje o oprogramowaniu.\n"
 "\n"
-"Aby kontynuować potrzebne jest działające połączenie internetowe."
+"Aby kontynuować konieczne jest połączenie internetowe."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
@@ -1299,7 +1307,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1307,10 +1314,11 @@ msgid ""
 "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>Wpisz pełny wiersz APT opisujący kanał który chcesz dodać</b></big>\n"
+"<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 zawartość kanału. Dla przykładu <i>"
-"\"deb http://ftp.debian.org sarge main\"</i>."
+"Wiersz APT zawiera typ, lokalizację i komponenty repozytorium, przykładowo "
+"<i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
@@ -1325,18 +1333,16 @@ msgstr ""
 "Źródłowe"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr "Źródłowy"
+msgstr "Modyfikuj źródło"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
 msgstr "Przeszukiwanie CD-ROMu"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr "Źródłowy"
+msgstr "Dod_aj źródło"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1344,7 +1350,7 @@ msgstr "_Wczytaj ponownie"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr "Pokaż i zainstaluj dostępne aktualizacje"
+msgstr "Wyświetl i zainstaluj dostępne aktualizacje"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -1363,15 +1369,14 @@ msgid "Check for new distribution releases"
 msgstr "Sprawdzaj nowe wydania dystrybucji"
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 ""
-"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."
+"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."
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
@@ -1379,28 +1384,25 @@ msgstr "Przypomnij o wczytaniu listy kanałów"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr "Pokaż szczegóły poszczególnych aktualizacji"
+msgstr "Wyświetl szczegóły poszczególnych aktualizacji"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
 msgstr "Zapamiętuje rozmiar okna Menedżera aktualizacji"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changes and the "
 "description"
 msgstr ""
-"Zapamiętuje stan obszaru z listą zmian i opisem poszczególnych aktualizacji"
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
 msgstr "Rozmiar okna"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Sprawdź kanały oprogramowania w poszukiwaniu nowych aktualizacji"
+msgstr "Konfiguruj źródła pakietów oprogramowania i aktualizacji"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1410,88 +1412,78 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Aktualizacje dla Ubuntu 5.10"
+msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Utrzymywane przez społeczność (Universe)"
+msgstr "Pod opieką społeczeństwa"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Własnościowe sterowniki dla urządzeń"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Inne oprogramowanie (Contributed)"
+msgstr "Ograniczone oprogramowanie"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "CD-ROM z Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 \"Dapper Drake\""
+msgstr "Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Utrzymywane przez społeczność (Universe)"
+msgstr "Obsługiwane przez społeczność (Universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Utrzymywane przez społeczność (Universe)"
+msgstr "Oprogramowanie Open Source pod opieką społeczeństwa"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Nie-wolnodostępne (Multiverse)"
+msgstr "Sterowniki nie-wolnodostępne"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Własnościowe sterowniki dla urządzeń "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Nie-wolnodostępne (Multiverse)"
+msgstr "Oprogramowanie nie-wolnodostępne (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Oprogramowanie objęte restrykcjami eksportowymi USA"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 \"Dapper Drake\""
+msgstr "CD-ROM z Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Aktualizacje backportowane"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1500,9 +1492,8 @@ msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "CD-ROM z Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1521,15 +1512,13 @@ msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
+msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
+msgstr "CD-ROM z Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1538,27 +1527,23 @@ msgstr "Wspierane oficjalnie"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
+msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Aktualizacje dla Ubuntu 5.10"
+msgstr "Aktualizacje dla Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)"
+msgstr "Aktualizacje dla Ubuntu 5.04 (backporty)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu·4.10·\"Warty·Warthog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1573,13 +1558,12 @@ msgstr "Nie-wolnodostępne (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "CD-ROM z Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Niektóre programy nie są już oficjalnie wspierane"
+msgstr "Już nieobsługiwane"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1593,15 +1577,13 @@ msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Aktualizacje dla Ubuntu 5.10"
+msgstr "Aktualizacje dla Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)"
+msgstr "Aktualizacje dla Ubuntu 4.10 (backporty)"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1649,44 +1631,243 @@ msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free"
 msgid "Non-DFSG-compatible Software"
 msgstr "Oprogramowanie niekompatybilne z DFSG."
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Pobieranie pliku %li z %li z nieznaną prędkością"
+#~ 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"
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "Instalowanie pakietów"
+#~ 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 "Cancel _Download"
-#~ msgstr "_Przerwij pobieranie"
+#~ 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."
 
-#, fuzzy
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Aktualizacja do Ubuntu 6.06 LTS</"
-#~ "span>"
+#~ "<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."
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10"
+#~ 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"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Zaktualizuj do najnowszej wersji 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 "
@@ -1697,33 +1878,72 @@ msgstr "Oprogramowanie niekompatybilne z DFSG."
 #~ "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe "
 #~ "punkty bezpieczeństwa i dostarczyć nowe funkcje."
 
-#~ msgid "Oficially supported"
-#~ msgstr "Wspierane oficjalnie"
+#~ msgid "Cancel _Download"
+#~ msgstr "_Przerwij pobieranie"
 
 #~ 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."
+#~ "<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 ""
-#~ "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."
+#~ "<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 "The following updates will be skipped:"
-#~ msgstr "Następujące pakiety zostaną pominięte:"
+#~ 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 "About %li seconds remaining"
-#~ msgstr "Około %li sekund pozostało"
+#~ 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 "Download is complete"
-#~ msgstr "Pobieranie zostało zakończone."
+#~ 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 "The upgrade aborts now. Please report this bug."
-#~ msgstr "Aktualizacja została przerwana. Proszę zgłosić ten błąd."
+#~ msgid ""
+#~ "OpenSource software that is officially supported by Canonical Ltd. (main)"
+#~ msgstr ""
+#~ "Otwarte oprogramowanie oficjalnie obsługiwane przez Canonical Ltd. (main)"
 
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Aktualizacja Ubuntu"
+#~ 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) "
+
+#~ 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"
@@ -1748,6 +1968,9 @@ msgstr "Oprogramowanie niekompatybilne z DFSG."
 #~ msgid "<b>Keys</b>"
 #~ msgstr "<b>Klucze</b>"
 
+#~ msgid "Add _Cdrom"
+#~ msgstr "Dodaj płytę _CD"
+
 #~ msgid "Installation Media"
 #~ msgstr "Nośnik instalacji"
 
@@ -1769,12 +1992,14 @@ msgstr "Oprogramowanie niekompatybilne z DFSG."
 #~ msgid "Edit Channel"
 #~ msgstr "Edytuj kanał"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "Dod_aj kanał"
+#~ 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"
+#~ msgstr "_Zaawansowane"
 
 #~ msgid "Ubuntu 6.06 LTS"
 #~ msgstr "Ubuntu 6.06 LTS"
@@ -1808,6 +2033,9 @@ msgstr "Oprogramowanie niekompatybilne z DFSG."
 #~ 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>"
 
@@ -2027,9 +2255,15 @@ msgstr "Oprogramowanie niekompatybilne z DFSG."
 #~ msgid "CD"
 #~ msgstr "CD"
 
+#~ msgid "Contributed software"
+#~ msgstr "Inne oprogramowanie (Contributed)"
+
 #~ msgid "Non-free software"
 #~ msgstr "Oprogramowanie nie-wolnodostępne"
 
+#~ msgid "US export restricted software"
+#~ msgstr "Oprogramowanie objęte restrykcjami eksportowymi USA"
+
 #~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
 #~ msgstr "Klucz automatycznego podpisu archiwum Ubuntu <ftpmaster@ubuntu.com>"
 
diff --git a/po/pt.po b/po/pt.po
index 3767421c..227583eb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-24 10:17+0000\n"
-"Last-Translator: Joao Carvalhinho <latrine@gmail.com>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-06 18:27+0000\n"
+"Last-Translator: Susana <susana.pereira@gmail.com>\n"
 "Language-Team: Ubuntu Portuguese Team <ubuntu-pt.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,9 +55,9 @@ msgstr "Depois de %s dias"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "A instalar actualizações"
+msgstr "actualizações do %s"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -65,45 +65,44 @@ msgstr "A instalar actualizações"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Servidor principal"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Servidor para %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Servidor mais próximo"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Servidores personalizados"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Actualizações de Software"
+msgstr "Canal de Software"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(Código Fonte)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "Código Fonte"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -129,13 +128,13 @@ msgstr ""
 "A chave que seleccionou não pôde ser removida. Por favor reporte este erro."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
-"<big><b>Erro ao ler o CD</b></big>\n"
+"<big><b>Erro ao examinar o CD</b></big>\n"
 "\n"
 "%s"
 
@@ -147,11 +146,11 @@ 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:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Pacotes Quebrados"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -160,36 +159,37 @@ msgstr ""
 "este software. Por favor corrija-os usando o synaptic ou apt-get antes de "
 "continuar."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Não foi possível actualizar os meta-pacotes necessários"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Um pacote essencial teria que ser removido"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Impossível de calcular a actualização"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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. Por favor "
-"reporte este erro. "
+"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."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Erro ao autenticar alguns pacotes"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -199,12 +199,12 @@ msgstr ""
 "rede transitório. Pode tentar novamente mais tarde. Verifique abaixo uma "
 "lista de pacotes não autenticados."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Impossível de instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -212,12 +212,11 @@ msgstr ""
 "Foi impossível instalar um pacote essencial. Por favor reporte este erro. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Impossível de descobrir meta-pacote"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -232,9 +231,8 @@ msgstr ""
 "get antes de continuar."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Falha a obter"
+msgstr "Falha ao adicionar o CD"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -245,28 +243,37 @@ msgid ""
 "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'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "A ler a cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Obter dados para a actualização a partir da rede?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Nenhum repositório válido encontrada"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -287,11 +294,11 @@ msgstr ""
 "Se escolher \"não\" a actualização irá ser cancelada."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Gerar as fontes padrão?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -305,11 +312,11 @@ msgstr ""
 "Deverão ser adicionadas entradas para '%s'? Se seleccionar 'Não' a "
 "actualização será cancelada."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Informação de repositório inválida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -317,12 +324,11 @@ msgstr ""
 "A actualização da informação de repositório resultou num ficheiro inválido. "
 "Por favor reporte este erro."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Fontes de terceiros desactivadas"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 "
@@ -332,11 +338,11 @@ msgstr ""
 "reactivá-las depois da actualização com a ferramenta 'propriedades-software' "
 "ou com o synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Erro durante a actualização"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -345,11 +351,11 @@ msgstr ""
 "tipo de problema na rede, por favor verifique a sua ligação à rede e volte a "
 "tentar."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Não existe espaço livre em disco suficiente"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -361,16 +367,15 @@ msgstr ""
 "usando 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Deseja iniciar a actualização?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Impossível de instalar as actualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -379,13 +384,16 @@ msgid ""
 "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)."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Impossível de descarregar as actualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -393,11 +401,11 @@ msgstr ""
 "A actualização abortará agora. Por favor verifique a sua ligação à internet "
 "ou media de instalação e volte a tentar. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "O suporte para algumas aplicações já terminou."
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -410,25 +418,25 @@ msgstr ""
 "apenas suportados pela comunidade ('universe').\n"
 "\n"
 "Se não tem o repositório 'universe' activo será sugerida a remoção destes "
-"pacotes no próximo passo. "
+"pacotes no próximo passo."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Remover Pacotes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Saltar Este Passo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Erro ao submeter"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -437,33 +445,46 @@ msgstr ""
 "abaixo para mais informação. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "A restaurar o estado original do sistema"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "A obter backport de '%s'"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "A verificar gestor de pacotes"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr "A preparação da actualização falhou"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "A Actualizar informação de repositórios"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Informação de pacotes inválida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -473,21 +494,23 @@ msgid ""
 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 reporte este problema."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "A pedir confirmação"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "A actualizar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "À procura de software obsoleto"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "A actualização do sistema está completa."
 
@@ -498,25 +521,24 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "Por favor insira '%s' no leitor '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "A actualização está completa"
+msgstr "A transferência está completa"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr "A descarregar ficheiro %li de %li a %s/s"
+msgstr "A obter o ficheiro %li de %li a %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Cerca de %li minutos restantes"
+msgstr "Cerca de %s restantes"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
-msgstr "A descarregar ficheiro %li de %li"
+msgstr "A obter o ficheiro %li de %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
@@ -535,22 +557,27 @@ 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."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"Substituir ficheiro de configuração\n"
+"Substituir ficheiro de configuração personalizado\n"
 "'%s'?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
@@ -561,40 +588,40 @@ msgid "A fatal error occured"
 msgstr "Ocorreu um erro fatal"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 ""
-"Por favor reporte este erro e inclua os ficheiros ~/dist-upgrade.log e ~/"
-"dist-upgrade-apt.log no seu relatório. A actualização abortará agora. O "
-"ficheiro original sources.list foi guardado em /etc/apt/sources.list."
+"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."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s pacote será removido."
-msgstr[1] "%s pacotes serão removidos."
+msgstr[0] "o pacote %d será removido."
+msgstr[1] "os pacotes %d serão removidos."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] "%s novo pacote será instalado."
-msgstr[1] "%s novos pacotes serão instalados."
+msgstr[0] "%d novo pacote será instalado."
+msgstr[1] "%d novos pacotes serão instalados."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "%s pacote será actualizado."
-msgstr[1] "%s pacotes serão actualizados."
+msgstr[0] "%d pacote será actualizado."
+msgstr[1] "%d pacotes serão actualizados."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
 #, fuzzy, python-format
@@ -602,16 +629,18 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Tem de efectuar o download de um total de %s."
+msgstr ""
+"\n"
+"\n"
+"Tem de efectuar o download de um total de %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
 msgstr ""
-"A actualização poderá demorar várias horas e não poderá ser cancelada a "
-"qualquer instante posteriormente."
+"A obtenção e instalação da actualização poderá demorar várias horas e não "
+"poderá ser cancelada a qualquer instante posteriormente."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -621,7 +650,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "O seu sistema está actualizado"
 
@@ -630,6 +659,8 @@ 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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -647,33 +678,35 @@ msgid "Upgrade %s"
 msgstr "Actualizar %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Cerca de %li dias %li horas %li minutos restantes"
+msgstr "%li dias %li horas %li minutos"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Cerca de %li horas %li minutos restantes"
+msgstr "%li horas %li minutos"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minutos"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li segundos"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"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"
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
@@ -716,7 +749,7 @@ msgstr "<b><big>Iniciar a actualização?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>A actualizar o Ubuntu para a versão 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -731,9 +764,8 @@ msgid "Difference between the files"
 msgstr "Diferença entre os ficheiros"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
-msgstr "A descarregar e a instalar actualizações"
+msgstr "A obter e instalar actualizações"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -752,25 +784,37 @@ msgid "Terminal"
 msgstr "Consola"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr "_Cancelar a Actualização"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr "_Continuar"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Manter"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Reportar um erro"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Reiniciar agora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Retomar Actualização?"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr "_Iniciar a Actualização"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Impossível de encontrar notas de lançamento"
@@ -840,13 +884,12 @@ msgid "Verfication failed"
 msgstr "Falhou a verificação"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
 msgstr ""
-"Verificação da actualização falhou. Poderá existir um problema com a rede ou "
-"com o servidor. "
+"A verificação da actualização falhou. Poderá existir um problema com a rede "
+"ou com o servidor. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
@@ -861,132 +904,126 @@ msgstr ""
 "ou com o servidor. "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "A descarregar ficheiro %li de %li a %s/s"
+msgstr "A descarregar ficheiro %(current)li de %(total)li a %(speed)s/s"
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "A descarregar ficheiro %li de %li a %s/s"
+msgstr "A descarregar ficheiro %(current)li de %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr ""
-"A lista de alterações ainda não está disponível. Por favor tente mais tarde."
+msgstr "A lista de alterações não está disponível."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+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."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
-"Falha a descarregar a lista de alterações. Por favor verifique a sua ligação "
-"à internet."
+"Falha a descarregar a lista de alterações. \n"
+"Por favor verifique a sua ligação à internet."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 Actualizações de Segurança"
+msgstr "Actualizações de segurança importantes"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Actualizações recomendadas"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "A instalar actualizações"
+msgstr "Actualizações propostas"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Backports"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "_Retomar Actualização?"
+msgstr "_Actualizações de Distribuição"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "A instalar actualizações"
+msgstr "Outras actualizações"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versão %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr "A descarregar lista de alterações..."
+msgstr "A descarregar a lista de alterações..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "_Desmarcar Todos"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "_Verificar"
+msgstr "_Verificar Todos"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Tamanho do download: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 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"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Por favor aguarde, isto pode levar algum tempo."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "A actualização está completa"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
 msgstr "Verificar por actualizações disponíveis"
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "Nova versão: %s (Tamanho: %s)"
+msgstr "Da versão: %(old_version)s para %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Versão %s: \n"
+msgstr "Versão %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Tamanho: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "A sua distribuição já não é suportada"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -996,17 +1033,17 @@ msgstr ""
 "versão mais recente do Ubuntu Linux. Veja http://www.ubuntu.com para mais "
 "informação em como actualizar."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>Está disponível a nova versão '%s' da distribuição</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "O índice de software está quebrado"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1019,24 +1056,24 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Nenhum"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 #, fuzzy
@@ -1057,17 +1094,15 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>Mantenha o seu sistema actualizado</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
 msgstr ""
-"<big><b>Erro ao ler o CD</b></big>\n"
-"\n"
+"<big><b>Não é possível instalar todas as actualizações</b></big>\r\n"
+"\r\n"
 "%s"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Iniciar a actualização?</big></b>"
+msgstr "<big><b>A iniciar o gestor de actualizações</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1075,7 +1110,7 @@ msgstr "Alterações"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Alterações e descrição da actualização"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1100,6 +1135,11 @@ msgid ""
 "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."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
@@ -1130,9 +1170,8 @@ msgid "_Check"
 msgstr "_Verificar"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "_Retomar Actualização?"
+msgstr "Actualização de _Distribuição"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1143,31 +1182,28 @@ msgid "_Install Updates"
 msgstr "_Instalar Actualizações"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Alterações"
+msgstr "alterações"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "actualizações"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Actualizações Internet</b>"
+msgstr "<b>Actualizações automáticas</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Actualizações Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Actualizações Internet</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1179,11 +1215,17 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "Adicionar _CD"
+msgstr "Adicionar Cdrom"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
@@ -1194,9 +1236,8 @@ msgid "D_elete downloaded software files:"
 msgstr "A_pagar ficheiros descarregados:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "O Download está completo"
+msgstr "Transferir de:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1226,32 +1267,31 @@ msgstr "Restaurar as chaves padrão da sua distribuição"
 #: ../data/software-properties.desktop.in.h:2
 #, fuzzy
 msgid "Software Sources"
-msgstr "Preferências de Software"
+msgstr "Fontes de Software"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
 msgid "Source code"
-msgstr ""
+msgstr "Código fonte"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Estatísticas"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Submeter informação estatística"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Terceira Pessoa"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "_Procurar por actualizações automaticamente:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "_Descarregar actualizações silenciosamente, sem as instalar"
+msgstr "_Transferir actualizações automaticamente mas não as instalar"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1300,7 +1340,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1328,7 +1367,7 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
-msgstr ""
+msgstr "Editar o Código Fonte"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
@@ -1336,7 +1375,7 @@ msgstr "A pesquisar o CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
-msgstr ""
+msgstr "_Adicionar Fonte"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1398,9 +1437,8 @@ msgid "The window size"
 msgstr "Tamanho da Janela"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Configurar os repositórios de software e actualizações pela internet"
+msgstr "Configurar os repositórios de software e actualizações instaláveis"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1410,65 +1448,58 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 Actualizações"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Mantido pela comunidade (Universe)"
+msgstr "Mantido pela comunidade"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Drivers proprietários para dispositivos"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Não-livre (Multiverse)"
+msgstr "Software Restrito"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Cdrom com o Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+msgid "Canonical supported Open Source software"
+msgstr "Software de Código Aberto suportado pela Canonical"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Mantido pela comunidade (Universe)"
+msgstr "Mantido pela comunidade (universal)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Mantido pela comunidade (Universe)"
+msgstr "Software de Código Fonte Aberto mantido pela comunidade"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Não-livre (Multiverse)"
+msgstr "Controladores não-livres"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Drivers proprietários para dispositivos "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
@@ -1478,19 +1509,19 @@ msgstr "Não-livre (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
-msgstr ""
+msgid "Software restricted by copyright or legal issues"
+msgstr "Software restringido por copyright ou questões legais"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Cdrom com o Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
+#, fuzzy
 msgid "Backported updates"
-msgstr ""
+msgstr "Actualizações dos repositórios \"backport\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1499,9 +1530,8 @@ msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Cdrom com o Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1520,15 +1550,13 @@ msgstr "Ubuntu 5.10 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Cdrom com o Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1537,27 +1565,23 @@ msgstr "Suportado Oficialmente"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 Actualizações de Segurança"
+msgstr "Actualizações de Segurança do Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 Actualizações"
+msgstr "Actualizações do Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Backports do Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1572,13 +1596,12 @@ msgstr "Não-livre (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Algum software já não é suportado oficialmente"
+msgstr "Sem mais suporte oficial"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1587,21 +1610,18 @@ msgstr "Direitos de autor restritos"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 5.10 Actualizações de Segurança"
+msgstr "Actualizações de Segurança do Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 5.10 Actualizações"
+msgstr "Actualizações do Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Backports do Ubuntu 4.10"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1668,20 +1688,17 @@ msgstr "Software compatível-DFSG"
 #~ msgid "Your system has already been upgraded."
 #~ msgstr "O seu sistema já foi actualizado."
 
-#, fuzzy
 #~ 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.06 LTS</"
+#~ "<span weight=\"bold\" size=\"x-large\">A actualizar para Ubuntu 6.10</"
 #~ "span>"
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 Actualizações de Segurança"
+#~ msgstr "Actualizações de segurança importantes do Ubuntu"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Actualize para a última versão do Ubuntu"
+#~ msgstr "Actualizações do Ubuntu"
 
 #~ msgid "Cannot install all available updates"
 #~ msgstr "Impossível de instalar todas as actualizações disponíveis"
@@ -1768,9 +1785,10 @@ msgstr "Software compatível-DFSG"
 #~ msgid "Edit Channel"
 #~ msgstr "Editar Repositório"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Adicionar Repositório"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Adicionar Repositório"
+#~ msgstr[1] "_Adicionar Repositórios"
 
 #~ msgid "_Custom"
 #~ msgstr "_Personalizado"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fe604df0..def6479d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,9 +5,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-26 22:31+0000\n"
-"Last-Translator: KurtKraut <ubuntu@kurtkraut.net>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-02 11:49+0000\n"
+"Last-Translator: Andre Noel <drenoel@gmail.com>\n"
 "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:136
 msgid "Daily"
-msgstr "Diário"
+msgstr "Diariamente"
 
 #: ../SoftwareProperties/SoftwareProperties.py:137
 msgid "Every two days"
@@ -56,9 +56,9 @@ msgstr "Após %s dias"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Instalando Atualizações"
+msgstr "Atualizações do %s"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -66,51 +66,48 @@ msgstr "Instalando Atualizações"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Servidor principal"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Servidor no(a) %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Servidor mais próximo"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Servidores personalizados"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Modificando os canais de programas"
+msgstr "Canais de Programas"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Ativo"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr "Source"
+msgstr "(Código Fonte)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
-msgstr "Source"
+msgstr "Código Fonte"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
-msgstr "Importar Chave"
+msgstr "Importar chave"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
@@ -119,7 +116,7 @@ msgstr "Erro importando o arquivo selecionado"
 #: ../SoftwareProperties/SoftwareProperties.py:980
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
-"O arquivo selecionado pode não ser um arquivo de chave GPG ou pode estar "
+"O arquivo selecionado parece não ser um arquivo de chave GPG ou pode estar "
 "corrompido."
 
 #: ../SoftwareProperties/SoftwareProperties.py:992
@@ -129,17 +126,17 @@ msgstr "Erro removendo a chave"
 #: ../SoftwareProperties/SoftwareProperties.py:993
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
-"A chave que você selecionou não pôde se removida. Por favor reporte isto "
-"como um erro."
+"A chave selecionada não pode ser removida. Por favor reporte isto como um "
+"bug."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
-"<big><b>Erro analisando o CD</b></big>\n"
+"<big><b>Erro procurando no CD</b></big>\n"
 "\n"
 "%s"
 
@@ -151,78 +148,79 @@ 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:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Pacotes quebrados"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
+"O seu sistema possui pacotes quebrados que não puderam ser corrigidos com "
+"este programa. Por favor, corrija-os primeiro utilizando o Synaptic ou apt-"
+"get antes de continuar."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Não foi possível atualizar os meta-pacotes requeridos"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Um pacote essencial teria que ser removido"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
-msgstr "Não foi possível calcular a atualização"
+msgstr "Não foi possível processar a atualização"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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 sem resolução ocorreu enquanto calculando a atualização. Por "
-"favor reporte isto como um erro. "
+"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."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Erro autenticando alguns pacotes"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 poder devido a um problema "
-"de rede. Você pode tentar de novo depois. Veja abaixo uma lista dos pacotes "
-"não-autenticados."
+"Não foi possível autenticar alguns pacotes. Isso pode ser devido a um "
+"problema momentâneo na rede. Você pode tentar de novo depois. Veja abaixo "
+"uma lista dos pacotes não-autenticados."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Não foi possível instalar '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 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. "
+"Não foi possível instalar um pacote requerido. Por favor relate isto como um "
+"erro. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
-msgstr "Não foi possível adivinhar o meta-pacote"
+msgstr "Não foi possível determinar o meta-pacote"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -230,16 +228,15 @@ msgid ""
 " 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."
+"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 seguir adiante."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Falha ao obter"
+msgstr "Falha ao adicionar o CD"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -250,28 +247,37 @@ msgid ""
 "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'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Lendo cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Buscar dados da rede para a atualização?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Nenhum repositório válido encontrado"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -282,7 +288,7 @@ msgid ""
 "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 "
+"Durante a busca de 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"
@@ -291,11 +297,11 @@ msgstr ""
 "Se você selecionar 'não' a atualização será cancelada."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
-msgstr "Gerar sources padrão?"
+msgstr "Gerar fontes padrão?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -306,41 +312,41 @@ 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 "
+"Entradas padrão para '%s' devem ser adicionadas? Se você escolher 'Não' a "
 "atualização será cancelada."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Informação de repositório inválida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 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."
+"A atualização das informações de repositórios resultou em um arquivo "
+"inválido. Por favor relate isso como um erro."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Fontes de terceiros desabilitadas"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, 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 ""
-"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."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Erro durante a atualização"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -349,32 +355,31 @@ msgstr ""
 "problemas de rede, por favor verifique a sua conexão de rede e tente "
 "novamente."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Não há espaço suficiente no disco"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 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 "
+"A atualização será abortada agora. Por favor libere pelo menos %s de espaço "
+"de disco no %s. Esvazie sua lixeira e remova pacotes temporários de "
 "instalações anteriores usando 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Você quer iniciar a atualização?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Não foi possível instalar as atualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -382,14 +387,17 @@ msgid ""
 "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 estar em um estado "
-"instável. Uma recuperação é executada (dpkg --configure -a)."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Não foi possível obter as atualizações"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -397,12 +405,11 @@ msgstr ""
 "A atualização será abortada agora. Por favor verifique sua conexão à "
 "Internet ou mídia de instalação e tente de novo. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "O suporte para algumas aplicações foi descontinuado"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -410,64 +417,69 @@ msgid ""
 "If you have not enabled community maintained software (universe), 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. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
-msgstr "Remover Pacotes obsoletos?"
+msgstr "Remover pacotes obsoletos?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Pular Este Passo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Erro ao aplicar as mudanças"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 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 "
+"Alguns problemas ocorreram durante a limpeza. Por favor veja a mensagem "
 "abaixo para maiores informações. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
-msgstr "Reiniciando o estado original do sistema"
+msgstr "Restaurando o estado original do sistema"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
-msgstr "Verificando o Gerenciador de Pacotes"
+msgstr "Verificando o gerenciador de pacotes"
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Atualizando informação do repositório"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Informação do pacote inválida"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -475,25 +487,27 @@ msgid ""
 "manager' package and include the files in /var/log/dist-upgrade/ in the "
 "bugreport."
 msgstr ""
-"Depois que a informação do seu pacote foi atualizada o pacote essencial '%s' "
-"não pôde mais ser encontrado.\n"
-"Isto indica um sério erro, por favor reporte isso como um erro."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
-msgstr "Pedindi por confirmação"
+msgstr "Pedindo confirmação"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Atualizando"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Buscando programas obsoletos"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
-msgstr "A Atualização do Sistema está completa."
+msgstr "A atualização do sistema está completa."
 
 #. print "mediaChange %s %s" % (medium, drive)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
@@ -504,21 +518,21 @@ msgstr "Por favor insira '%s' no drive '%s'"
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
 #, fuzzy
 msgid "Fetching is complete"
-msgstr "Atualização completa"
+msgstr "A extração foi completada"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
 msgstr "Obtendo arquivo %li de %li a %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Aproximadamente %li minutos restando"
+msgstr "Restam %s aproximadamente"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
 msgstr "Obtendo arquivo %li de %li"
 
@@ -527,7 +541,7 @@ msgstr "Obtendo arquivo %li de %li"
 #. -> longer term, move this code into python-apt
 #: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
-msgstr "..."
+msgstr "Aplicando mudanças"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
@@ -539,21 +553,24 @@ 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."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"Substituir arquivo de configuração\n"
-"'%s' ?"
+"Substituir o arquivo de configurações customizadas\n"
+"'%s'?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -565,56 +582,58 @@ msgid "A fatal error occured"
 msgstr "Ocorreu um erro fatal"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 ""
-"Por favor reporte isto como um bug e inclua os arquivos /var/log/dist-"
-"upgrade.log e /var/log/dist-upgrade-apt.log em seu relatório. O upgrade "
-"abortará agora.\n"
+"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."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s pacote será removido."
-msgstr[1] "%s pacotes serão removidos."
+msgstr[0] "%d pacote será removido."
+msgstr[1] "%d pacotes serão removidos."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] "%s novo pacote será instalado."
-msgstr[1] "%s novos pacotes serão instalados."
+msgstr[0] "%d novo pacote será instalado."
+msgstr[1] "%d novos pacotes serão instalados."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "%s pacote será atualizado."
-msgstr[1] "%s pacotes serão atualizados."
+msgstr[0] "%d pacote será atualizado."
+msgstr[1] "%d pacotes serão atualizados."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Você precisa obter um total de %s."
+msgstr ""
+"\n"
+"\n"
+"Você tem que baixar um total de %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
 msgstr ""
-"A atualização pode levar diversas horas e não poderá ser cancelada depois."
+"A obtenção e instalação da atualização pode levar muitas horas e não poderá "
+"ser cancelada depois."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -622,7 +641,7 @@ msgstr "Para evitar perda de dados, feche todas as aplicações e documentos."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Seu sistema está atualizado"
 
@@ -631,6 +650,8 @@ 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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -648,32 +669,32 @@ msgid "Upgrade %s"
 msgstr "Atualizar %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Aproximadamente %li dias %li horas %li minutos restando"
+msgstr "%li dias %li horas %li minutos"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Aproximadamente %li horas %li minutos restando"
+msgstr "%li horas %li minutos"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minutos"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li segundos"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -714,11 +735,11 @@ msgstr "<b><big>Reinicie o seu sistema para finalizar a atualização</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr "<b><big>Iniciar a Atualização?</big></b>"
+msgstr "<b><big>Iniciar a atualização?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Atualizando o Ubuntu para a versão 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -733,7 +754,6 @@ msgid "Difference between the files"
 msgstr "Diferenças entre os arquivos"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
 msgstr "Obtendo e instalando as atualizações"
 
@@ -743,7 +763,7 @@ msgstr "Modificando os canais de software"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr "Preparando a Atualização"
+msgstr "Preparando a atualização"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
@@ -754,25 +774,37 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Manter"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
-msgstr "_Subtituir"
+msgstr "_Substituir"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
-msgstr "Reportar _Erro"
+msgstr "Relatar _Erro"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Reiniciar Agora"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "Continua_r Atualização"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Não foi possível encontrar as notas de lançamento"
@@ -807,7 +839,7 @@ msgstr "Obtendo a ferramenta de atualização"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr "A ferramenta de atualização irá guia-lo pelo processo."
+msgstr "A ferramenta de atualização irá guiá-lo durante o processo."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
@@ -843,13 +875,12 @@ msgid "Verfication failed"
 msgstr "Falha na verificação"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 msgid ""
 "Verifying 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. "
+"Falha ao verificar atualização. Talvez devido a um problema com a rede ou "
+"com o servidor. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
@@ -864,134 +895,122 @@ msgstr ""
 "com o servidor. "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Obtendo arquivo %li de %li a %s/s"
+msgstr ""
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Obtendo arquivo %li de %li a %s/s"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr ""
-"A lista de alterações não está disponível ainda. Por favor, tente novamente "
-"mais tarde."
+msgstr "A lista de alterações não está disponível"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
-"A lista de alterações não está disponível ainda. Por favor, tente novamente "
-"mais tarde."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"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."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Atualizações de Segurança do Ubuntu 5.10"
+msgstr "Principais Atualizações de Segurança"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Atualizações recomendadas"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "Instalando Atualizações"
+msgstr "Atualizações sugeridas"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Backports"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "Continua_r Atualização"
+msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Instalando Atualizações"
+msgstr "Outras atualizações"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
-msgstr "Version %s: \n"
+msgstr "Versão %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr "Obtendo a lista de alterações"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "_Desmarcar Todos"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "_Verificar"
+msgstr "_Marcar Todos"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Tamanho do download: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 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"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
-msgstr "Por favor, espere, isto pode levar algum tempo."
+msgstr "Aguarde por favor, isso pode levar algum tempo."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr "Atualização completa"
+msgstr "A atualização está completa"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "Procurar updates disponíveis"
+msgstr "Verificando por atualizações"
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "New version: %s (Tamanho: %s)"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Version %s: \n"
+msgstr "Versão %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Tamanho: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Sua distribuição não é mais suportada"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -999,19 +1018,19 @@ msgid ""
 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"
+"Veja http://www.ubuntu-br.org para mais informações."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>Uma nova versão da distribuição '%s' está disponível</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
-msgstr "A índex de software está quebrado"
+msgstr "O index do software está quebrado"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1024,55 +1043,44 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Nenhum"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, 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>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\"."
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr "<big><b>Manter o Sistema Atualizado</b></big>"
+msgstr "<big><b>Manter o sistema atualizado</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
-"<big><b>Erro analisando o CD</b></big>\n"
-"\n"
-"%s"
+msgstr "<big><b>Nem todas as atualizações podem ser instaladas</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Iniciar a Atualização?</big></b>"
+msgstr "<big><b>Iniciando o gerenciador de atualizações</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1080,7 +1088,7 @@ msgstr "Mudanças"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Mudanças e descrição da atualização"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1105,6 +1113,11 @@ msgid ""
 "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."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
@@ -1112,15 +1125,15 @@ msgstr "Exibir progresso de arquivos únicos"
 
 #: ../data/glade/UpdateManager.glade.h:17
 msgid "Software Updates"
-msgstr "Atualizações de Programas"
+msgstr "Atualizações de Software"
 
 #: ../data/glade/UpdateManager.glade.h:18
 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ê."
+"Atualizações de programas podem corrigir erros, eliminar vulnerabilidades de "
+"segurança e prover novas funcionalidades."
 
 #: ../data/glade/UpdateManager.glade.h:19
 #, fuzzy
@@ -1136,9 +1149,8 @@ msgid "_Check"
 msgstr "_Verificar"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "Continua_r Atualização"
+msgstr "Atualização da _Distribuição"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1149,31 +1161,28 @@ msgid "_Install Updates"
 msgstr "_Instalar Atualizações"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Mudanças"
+msgstr "mudanças"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "atualizações"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Atualizações via Internet</b>"
+msgstr "<b>Atualizações automáticas</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Atualizações via Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Atualizações via Internet</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1185,11 +1194,17 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "Adicionar _Cdrom"
+msgstr "Adicionar CD-ROM"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
@@ -1200,9 +1215,8 @@ msgid "D_elete downloaded software files:"
 msgstr "Apagar arquivos d_e programas obtidos:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "O Download está completo"
+msgstr "Baixar de:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1218,10 +1232,9 @@ msgid ""
 "automatically"
 msgstr ""
 "Somente atualizações de segurança do servidor oficial do Ubuntu serão "
-"instaladas automaticamente."
+"instaladas automaticamente"
 
 #: ../data/glade/SoftwareProperties.glade.h:16
-#, fuzzy
 msgid "Restore _Defaults"
 msgstr "Restaurar Pa_drões"
 
@@ -1231,35 +1244,32 @@ msgstr "Restaurar as chaves padrão da sua distribuição"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Software Properties"
+msgstr "Canais de Software"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
-msgstr "Source"
+msgstr "Código fonte"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Estatísticas"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Enviar informações estatísticas"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Outros Pacotes"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "Verifi_car por atualizações automaticamente:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "_Obter atualizações em segundo plano, mas não instalá-las"
+msgstr "_Obter atualizações automaticamente, mas não instalá-las"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1270,7 +1280,6 @@ msgid "_Install security updates without confirmation"
 msgstr "_Instalar novas atualizações de segurança sem confirmação"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1279,16 +1288,18 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>O canal informação está desatualizado</big></b>\n"
+"<b><big>A informação sobre programas disponíveis está desatualizada</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"
+"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ê necessita uma conexão de internet para continuar."
+"Você precisa de uma conexão com a Internet funcionando para continuar."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
-msgstr "<b>Comment:</b>"
+msgstr "<b>Comentário:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
 msgid "<b>Components:</b>"
@@ -1296,18 +1307,17 @@ msgstr "<b>Componentes:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Distribution:</b>"
-msgstr "<b>Distribution:</b>"
+msgstr "<b>Distribuição:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Type:</b>"
-msgstr "<b>Type:</b>"
+msgstr "<b>Tipo:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1315,37 +1325,35 @@ msgid ""
 "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>Insira a linha completa do APT do canal que você quer adicionar</b></"
-"big>\n"
+"<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 contém o tipo, a localização e as seções do canal, por "
-"exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>."
+"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>."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
-msgstr "APT line:"
+msgstr "Linha do APT:"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
-"Binary\n"
-"Source"
+"Binário\n"
+"Fonte"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr "Source"
+msgstr "Editar Canal"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
 msgstr "Procurando no CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr "Source"
+msgstr "_Adicionar Canal"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1372,15 +1380,14 @@ msgid "Check for new distribution releases"
 msgstr "Checar por novas versões da distribuição"
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 ""
-"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."
+"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."
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
@@ -1392,22 +1399,20 @@ msgstr "Exibir detalhes de uma atualização"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr "Armazena o tamanho do diálogo do update-manager"
+msgstr "Armazena o tamanho da caixa de diálogo do gerenciador de atualizações"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changes and the "
 "description"
 msgstr ""
-"Armazena o estado do expansor que contém a lista de mudanças e a descrição"
+"Armazena o status do expansor que contém a lista de mudanças e a descrição"
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
 msgstr "O tamanho da janela"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
 msgstr "Configurar os canais de software e atualizações via internet"
 
@@ -1419,88 +1424,78 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Atualizações do Ubuntu 5.10"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Mantido pela Comunidade (Universe)"
+msgstr "Mantido pela comunidade"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Controladores proprietários para dispositivos"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Contributed software"
+msgstr "Software restrito"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Cdrom com Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
 msgstr "Mantido pela Comunidade (Universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Mantido pela Comunidade (Universe)"
+msgstr "Programa de Código Aberto mantido pela Comunidade"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Não-livre (Multiverse)"
+msgstr "Drivers Não-livres"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Controladores proprietários para dispositivos "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Não-livre (Multiverse)"
+msgstr "Programas restritos (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "US export restricted software"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Cdrom com o Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Atualizações \"Backport\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1509,9 +1504,8 @@ msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Cdrom com o Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1530,44 +1524,38 @@ msgstr "Backports do Ubuntu 5.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr "Cdrom com o Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
 msgid "Officially supported"
-msgstr "Suporte oficial"
+msgstr "Suportado oficialmente"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Atualizações de Segurança do Ubuntu 5.10"
+msgstr "Atualizações de Segurança do Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Atualizações do Ubuntu 5.10"
+msgstr "Atualizações do Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Backports do Ubuntu 5.10"
+msgstr "Backports do Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1577,40 +1565,37 @@ msgstr "Mantido pela Comunidade (Universe)"
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:201
 msgid "Non-free (Multiverse)"
-msgstr "Não-livre (Multiverse)"
+msgstr "Não-livres (Multiverse)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Cdrom com Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Alguns softwares não são mais oficialmente suportado."
+msgstr "Não é mais suportado oficialmente"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
 msgid "Restricted copyright"
-msgstr "Restrito por copyright"
+msgstr "Copyright restrito"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 4.10 Security Updates"
+msgstr "Atualizações de Segurança do Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Atualizações do Ubuntu 5.10"
+msgstr "Atualizações do Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Backports do Ubuntu 5.10"
+msgstr "Backports do Ubuntu 4.10"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1636,7 +1621,7 @@ msgstr "Atualizações de Segurança do Debian 3.1 \"Sarge\""
 #. Description
 #: ../data/channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr "Debian \"Etch\" (testing)"
+msgstr "Debian \"Etch\" (testando)"
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:47
@@ -1646,55 +1631,184 @@ msgstr "http://http.us.debian.org/debian/"
 #. Description
 #: ../data/channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
+msgstr "Debian \"Sid\" (instável)"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr "Programa compatível com a DFSG mas com dependências não-livres"
+msgstr "Programa compatível com a DFSG mas com Dependências Não-Livres"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
 msgstr "Programas não compatíveis com a DFSG"
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida"
+#~ msgid ""
+#~ "<big><b>Error scaning the CD</b></big>\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<big><b>Erro durante a análise do CD</b></big>\n"
+#~ "\n"
+#~ "%s"
 
 #, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "Instalando Atualizações"
+#~ 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 "Cancel _Download"
-#~ msgstr "Cancelar _Download"
+#~ 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."
 
-#, fuzzy
+#~ 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.06 "
-#~ "LTS</span>"
+#~ "<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 haver 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."
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Atualizações de Segurança do Ubuntu 5.10"
+#~ 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"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Atualizar para a última versão do 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 por 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"
@@ -1706,9 +1820,65 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ "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 "
@@ -1756,11 +1926,14 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ 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 Programas"
+#~ msgstr "Preferências de software"
 
 #~ msgid "     "
 #~ msgstr "     "
@@ -1769,7 +1942,7 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ msgstr "<b>Canal</b>"
 
 #~ msgid "<b>Components</b>"
-#~ msgstr "<b>Componentes:</b>"
+#~ msgstr "<b>Componentes</b>"
 
 #~ msgid "Add Channel"
 #~ msgstr "Adicionar Canal"
@@ -1777,9 +1950,10 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ msgid "Edit Channel"
 #~ msgstr "Editar Canal"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Adicionar Canal"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Adicionar Canal"
+#~ msgstr[1] "_Adicionar Canais"
 
 #, fuzzy
 #~ msgid "_Custom"
@@ -1817,6 +1991,9 @@ msgstr "Programas não compatíveis com a DFSG"
 #~ 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>Sections:</b>"
 
diff --git a/po/qu.po b/po/qu.po
new file mode 100644
index 00000000..d8a39c96
--- /dev/null
+++ b/po/qu.po
@@ -0,0 +1,1497 @@
+# Quechua translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Quechua <qu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "Daily"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:137
+msgid "Every two days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:138
+msgid "Weekly"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:139
+msgid "Every two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:144
+#, python-format
+msgid "Every %s days"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:167
+msgid "After one week"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:168
+msgid "After two weeks"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:169
+msgid "After one month"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:174
+#, python-format
+msgid "After %s days"
+msgstr ""
+
+#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
+#: ../SoftwareProperties/SoftwareProperties.py:252
+#, python-format
+msgid "%s updates"
+msgstr ""
+
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
+msgid "Main server"
+msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:324
+msgid "Nearest server"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:345
+msgid "Custom servers"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
+msgid "Software Channel"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
+msgid "Active"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:714
+msgid "(Source Code)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:720
+msgid "Source Code"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:969
+msgid "Import key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:979
+msgid "Error importing selected file"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:980
+msgid "The selected file may not be a GPG key file or it might be corrupt."
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:992
+msgid "Error removing the key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:993
+msgid "The key you selected could not be removed. Please report this as a bug."
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1039
+#, python-format
+msgid ""
+"<big><b>Error scanning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1096
+msgid "Please enter a name for the disc"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1112
+msgid "Please insert a disc in the drive:"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:91
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+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 ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:207
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:217
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:220
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:221
+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 ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:246
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:247
+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 ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:312
+#, python-format
+msgid "Can't install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:313
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:320
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:321
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:75
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "Reading cache"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:155
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:156
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:248
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:249
+#, python-format
+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 ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:266
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:267
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:301
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:302
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:308
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:309
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:358
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:359
+msgid ""
+"A problem occured during the update. This is usually some sort of network "
+"problem, please check your network connection and retry."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:368
+msgid "Not enough free disk space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:369
+#, python-format
+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 ""
+
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeControler.py:440
+msgid "Do you want to start the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:460
+msgid "Could not install the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:461
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:479
+msgid "Could not download the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:480
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:516
+msgid "Support for some applications ended"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:517
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:552
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:563
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:564
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. generate a new cache
+#: ../DistUpgrade/DistUpgradeControler.py:576
+msgid "Restoring original system state"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:632
+#, python-format
+msgid "Fetching backport of '%s'"
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
+msgid "Checking package manager"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
+msgid "Invalid package information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:733
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:737
+msgid "Upgrading"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:744
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:749
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:249
+#, python-format
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, python-format
+msgid "Fetching file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+msgid "Applying changes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
+#, python-format
+msgid "Could not install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+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 ""
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#, python-format
+msgid ""
+"Replace the customized configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:203
+msgid ""
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
+msgid "The 'diff' command was not found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:356
+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 ""
+
+#. FIXME: make those two seperate lines to make it clear
+#. that the "%" applies to the result of ngettext
+#: ../DistUpgrade/DistUpgradeViewGtk.py:487
+#, python-format
+msgid "%d package is going to be removed."
+msgid_plural "%d packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
+#, python-format
+msgid "%d new package is going to be installed."
+msgid_plural "%d new packages are going to be installed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:498
+#, python-format
+msgid "%d package is going to be upgraded."
+msgid_plural "%d packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:503
+#, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
+msgid ""
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:512
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:518
+#: ../UpdateManager/UpdateManager.py:622
+msgid "Your system is up-to-date"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:519
+msgid ""
+"There are no upgrades available for your system. The upgrade will now be "
+"canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:535
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:537
+#, python-format
+msgid "Install %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:539
+#, python-format
+msgid "Upgrade %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:31
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:32
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:38
+#, python-format
+msgid ""
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:109
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:110
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/glade/SoftwareProperties.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+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 ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Fetching and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr ""
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:149
+msgid "Could not run the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:150
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:171
+msgid "Downloading the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:180
+msgid "Upgrade tool signature"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:183
+msgid "Upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:209
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid "Failed to extract"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:215
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid "Verfication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:222
+msgid ""
+"Verifying the upgrade failed.  There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid "Authentication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:229
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:108
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:113
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:206
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:217
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
+msgid "Important security updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
+msgid "Recommended updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
+msgid "Proposed updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:241
+msgid "Backports"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:242
+msgid "Distribution updates"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
+msgid "Other updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:478
+#, python-format
+msgid "Version %s: \n"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:539
+msgid "Downloading list of changes..."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:566
+msgid "_Uncheck All"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:572
+msgid "_Check All"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid "Please wait, this can take some time."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:668
+msgid "Update is complete"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:719
+msgid "Checking for updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
+msgid "From version %(old_version)s to %(new_version)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:832
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:843
+msgid "Your distribution is not supported anymore"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:844
+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 ""
+
+#: ../UpdateManager/UpdateManager.py:863
+#, python-format
+msgid "<b>New distribution release '%s' is available</b>"
+msgstr ""
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:898
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:899
+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 ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:1
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:4
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:5
+msgid "<big><b>Not all updates can be installed</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:6
+msgid "<big><b>Starting update manager</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:7
+msgid "Changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:8
+msgid "Changes and description of the update"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:9
+msgid "Chec_k"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:10
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:11
+msgid "Description"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:13
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:16
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:17
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:18
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:19
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:20
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:21
+msgid "_Check"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:22
+msgid "_Distribution Upgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:23
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:24
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:25
+msgid "changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:26
+msgid "updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:2
+msgid "<b>Automatic updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:3
+msgid "<b>CDROM/DVD</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:4
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:5
+msgid "<b>Internet</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:6
+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 ""
+
+#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+msgid "Authentication"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
+msgid "Download from:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:13
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:16
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:17
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Sources"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:19
+msgid "Source code"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:20
+msgid "Statistics"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:21
+msgid "Submit statistical information"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:22
+msgid "Third Party"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:23
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:24
+msgid "_Download updates automatically, but do not install them"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:25
+msgid "_Import Key File"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:26
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Components:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
+msgid "APT line:"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Reload"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+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 ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changes and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:8
+msgid "Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:13
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:17
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:19
+msgid "Restricted software"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:25
+msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:59
+msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:62
+msgid "Canonical supported Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:64
+msgid "Community maintained (universe)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:65
+msgid "Community maintained Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:67
+msgid "Non-free drivers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:68
+msgid "Proprietary drivers for devices "
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:70
+msgid "Restricted software (Multiverse)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:71
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:76
+msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:103
+msgid "Backported updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:110
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:123
+msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:135
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:140
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:145
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:152
+msgid "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:165
+msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:177
+msgid "Ubuntu 5.04 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:182
+msgid "Ubuntu 5.04 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:187
+msgid "Ubuntu 5.04 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:193
+msgid "Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:199
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:201
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:206
+msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:209
+msgid "No longer officially supported"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:211
+msgid "Restricted copyright"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:218
+msgid "Ubuntu 4.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:223
+msgid "Ubuntu 4.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:228
+msgid "Ubuntu 4.10 Backports"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 6329559e..e11b90cb 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,14 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-24 17:39+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:40+0000\n"
 "Last-Translator: Sami POTIRCA <spotirca@gmail.com>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n %\n"
+"Plural-Forms: nplurals=3;plural=(n==1?0:(n==0||((n%100)>0&&(n%100)<20))?"
+"1:2)\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:136
 msgid "Daily"
@@ -57,9 +58,9 @@ msgstr "După %s zile"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "_Instalează actualizarile"
+msgstr "%s actualizări"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -71,47 +72,40 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Server principal"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Server pentru %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Cel mai apropiat server"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Servere preferenţiale"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Actualizări software"
+msgstr "Canal software"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Activ"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr ""
-"Binar\n"
-"Sursă"
+msgstr "(Cod sursă)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
-msgstr ""
-"Binar\n"
-"Sursă"
+msgstr "Cod sursă"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 #, fuzzy
@@ -153,35 +147,34 @@ msgstr "Introduceţi un nume pentru disc"
 msgid "Please insert a disc in the drive:"
 msgstr "Introduceţi un disc în unitate:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 #, fuzzy
 msgid "Broken packages"
 msgstr "Pachete deteriorate"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 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."
+"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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Este imposibilă actualizarea meta-pachetelor cerute"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Un pachet esenţial ar trebui şters"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Imposibil de calculat actualizarea"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -190,38 +183,40 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 #, fuzzy
 msgid "Error authenticating some packages"
 msgstr "Eroare la autentificarea unor pachete."
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Nu pot instala '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
-"Nu am reuşit să instalez pachetul cerut. Puteţi raporta acest lucru ca bug "
-"(eroare). "
+"Nu am reuşit să instalez pachetul cerut. Vă rugăm raportaţi acest lucru ca "
+"bug (eroare). "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Imposibl de ghicit meta-pachet"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -235,9 +230,8 @@ msgstr ""
 "sau apt-get."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Nu s-a putut extrage"
+msgstr "Adăugarea CD-ului a eşuat"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -248,28 +242,37 @@ msgid ""
 "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'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Citire cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Descarc date de la reţea pentru actualizare?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
-msgstr ""
+msgstr "Nicio oglindă validă găsită"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -280,13 +283,19 @@ msgid ""
 "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'."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
-msgstr ""
+msgstr "Generez surse implicite?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -294,60 +303,72 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Informaţii despre depozit nevalide"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
-msgstr ""
+msgstr "Sursele terţe ar trebui dezactivate"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Eroare în timpul actualizării"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Spaţiu liber insuficient"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 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'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Vrei sa începi upgrade-ul?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Nu s-au putut instalat upgrade-urile"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -355,22 +376,29 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Nu pot descărca actualizările"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 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. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -379,55 +407,69 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "Şterg pachetele vechi?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
-msgstr ""
+msgstr "_Sari peste acest pas"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "Şter_ge"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
-msgstr ""
+msgstr "Eroare în timpul salvării"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 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. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 #, fuzzy
 msgid "Restoring original system state"
 msgstr "Se reface starea iniţială a sistemului"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Se verifică managerul de pachete"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Se pregăteşte actualizarea"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
-msgid "Updating repository information"
+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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr "Actualizez informaţii depozit"
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
-msgstr ""
+msgstr "Informaţii pachet nevalide"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -436,20 +478,24 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Se aşteaptă confirmarea"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Se actualizează"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Caut software învechit"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Actualizarea sistemului este completă"
 
@@ -457,27 +503,27 @@ msgstr "Actualizarea sistemului este completă"
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Vă rugăm introduceţi '%s' în unitatea '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
 msgid "Fetching is complete"
-msgstr ""
+msgstr "Descărcare completă"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr ""
+msgstr "Descarc fişierul %li din %li la %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
 #, python-format
 msgid "About %s remaining"
-msgstr ""
+msgstr "Mai rămâne aproximativ %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
 msgid "Fetching file %li of %li"
-msgstr ""
+msgstr "Se descarcă fişierul %li din %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
@@ -489,13 +535,15 @@ msgstr "Se aplică modificările"
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "'%s' nu s-a putut instala"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:188
 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."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
@@ -507,17 +555,17 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "Comanda 'diff' nu a putut fi localizată"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
-msgstr ""
+msgstr "S-a produs o eroare fatală"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
 msgid ""
@@ -526,6 +574,11 @@ msgid ""
 "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."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
@@ -535,6 +588,7 @@ msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
 #, python-format
@@ -542,6 +596,7 @@ msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
 #, python-format
@@ -549,6 +604,7 @@ msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
 #, python-format
@@ -557,20 +613,27 @@ msgid ""
 "\n"
 "You have to download a total of %s. "
 msgstr ""
+"\n"
+"\n"
+"Trebuie să descărcaţi un total de %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"Pentru a preveni pierderea datelor închideţi toate aplicaţiile şi "
+"documentele."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Sistemul dumneavoastră este actualizat la zi!"
 
@@ -583,55 +646,57 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
 msgid "<b>Remove %s</b>"
-msgstr ""
+msgstr "<b>Şterge %s</b>"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:537
 #, python-format
 msgid "Install %s"
-msgstr ""
+msgstr "Instalează %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:539
 #, python-format
 msgid "Upgrade %s"
-msgstr ""
+msgstr "Actualizează %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
 #, python-format
 msgid "%li days %li hours %li minutes"
-msgstr ""
+msgstr "%li zile %li ore %li minute"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
 #, python-format
 msgid "%li hours %li minutes"
-msgstr ""
+msgstr "%li ore %li minute"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minute"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li secunde"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
-msgstr ""
+msgstr "Este necesară repornirea"
 
 #: ../DistUpgrade/DistUpgradeView.py:110
 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?"
 
 #. testcode to see if the bullets look nice in the dialog
 #. for i in range(4):
@@ -649,14 +714,18 @@ msgid ""
 "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."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-msgstr ""
+msgstr "<b><big>Reporniţi sistemul pentru a încheia actualizarea</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr ""
+msgstr "<b><big>Îcepeţi actualizarea?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
@@ -664,7 +733,7 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Curăţ"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 msgid "Details"
@@ -672,16 +741,15 @@ msgstr "Detalii"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "Diferenţa dintre fişiere"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
-msgstr "Nu s-au putut instalat upgrade-urile"
+msgstr "Descarc şi instalez actualizări"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Modificând depozitele software"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
@@ -696,36 +764,50 @@ msgid "Terminal"
 msgstr "Terminal"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
-msgstr ""
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_Continuă Actualizarea"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
+msgid "_Continue"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
-msgstr ""
+msgid "_Keep"
+msgstr "_Păstrează"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
-msgstr ""
+msgid "_Replace"
+msgstr "_Înlocuieşte"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr "_Raportaţi eroare"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr "_Reporneşte acum"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Continuă Actualizarea"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_Continuă Actualizarea"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
-msgstr ""
+msgstr "Nu găsesc notiţele de lansare"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Serverul ar putea fi supraîncărcat. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
 msgid "Could not download the release notes"
-msgstr ""
+msgstr "Nu pot descărca notiţele de lansare"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
@@ -734,38 +816,38 @@ msgstr "Verificaţi conexiunea internet"
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
-msgstr ""
+msgstr "Nu pot rula utilitarul de actualizare"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:150
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Acest lucru este cel mai probabil o eroare. Raportaţi acest lucru ca eroare."
+"Aceasta este cel mai probabil o eroare. Raportaţi acest lucru ca eroare."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
-msgstr ""
+msgstr "Descarc utiliatul de actualizare"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "Utilitarul de actualizare vă va ghida în procesul de actualizare."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Actualizează semnătura utilitarului"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
-msgstr ""
+msgstr "Actualizează utilitar"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Descărcare eşuata"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 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. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
@@ -776,10 +858,12 @@ 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. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
-msgstr ""
+msgstr "Verificare eşuată"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
@@ -796,6 +880,8 @@ 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. "
 
 #: ../UpdateManager/GtkProgress.py:108
 #, python-format
@@ -807,167 +893,172 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "Nu există nici un pachet de actualizat."
+msgstr "Lista schimbărilor nu este disponibilă"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr "Nu există nici un pachet de actualizat."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 #, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"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ă."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Actualizări de Securitate Ubuntu 5.10"
+msgstr "Actualizări importante de securitate"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Actualizări recomandate"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "_Instalează actualizarile"
+msgstr "Pachete propuse"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Actualizări de securitate Ubuntu 5.04"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "_Continuă Actualizarea"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "_Instalează actualizarile"
+msgstr "Alte actualizări"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Versiunea %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Se descarcă listă schimbărilor..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Dimensiune descărcare: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Puteţi instala actualizarea %s"
+msgstr[1] "Puteţi instala actualizarea %s"
+msgstr[2] "Puteţi instala actualizarea %s"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Vă rugăm aşteptaţi, ar putea dura."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr ""
+msgstr "Actualizare completă."
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "_Instalează actualizarile"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Versiunea nouă: %s (Mărime: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Versiunea %s: \n"
+msgstr "Versiunea %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Dimensiune: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
-msgstr "Distribuţia dvs. nu mai este suportată"
+msgstr "Distribuţia dvs. nu mai este asistată"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>Noua versiune '%s' este disponibilă</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
-msgstr ""
+msgstr "Indexul software este deteriorat"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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ă."
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Nimic"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 msgid ""
@@ -979,7 +1070,7 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Menţineţi sistemul la zi</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
 #, fuzzy
@@ -1003,15 +1094,15 @@ msgstr "Modificări"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Modificări şi descrierea actualizării"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
-msgstr ""
+msgstr "Verific_ă"
 
 #: ../data/glade/UpdateManager.glade.h:10
 msgid "Check the software channels for new updates"
-msgstr ""
+msgstr "Verifică depozitele software pentru actualizări noi"
 
 #: ../data/glade/UpdateManager.glade.h:11
 msgid "Description"
@@ -1019,7 +1110,7 @@ msgstr "Descriere"
 
 #: ../data/glade/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Notiţe de lansare"
 
 #: ../data/glade/UpdateManager.glade.h:13
 msgid ""
@@ -1031,7 +1122,7 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Afişează progresul pentru fiecare fişier în parte"
 
 #: ../data/glade/UpdateManager.glade.h:17
 msgid "Software Updates"
@@ -1042,19 +1133,20 @@ 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."
 
 #: ../data/glade/UpdateManager.glade.h:19
-#, fuzzy
 msgid "U_pgrade"
-msgstr "_Actualizează"
+msgstr "A_ctualizează"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Instalaţi ultima versiune Ubuntu"
 
 #: ../data/glade/UpdateManager.glade.h:21
 msgid "_Check"
-msgstr ""
+msgstr "_Verifică"
 
 #: ../data/glade/UpdateManager.glade.h:22
 #, fuzzy
@@ -1063,39 +1155,35 @@ msgstr "_Continuă Actualizarea"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Nu mai afişa această informaţie pe viitor"
 
 #: ../data/glade/UpdateManager.glade.h:24
-#, fuzzy
 msgid "_Install Updates"
-msgstr "_Instalează actualizarile"
+msgstr "_Instalează actualizări"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Modificări"
+msgstr "modificări"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "actualizări"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Actualizări de pe Internet</b>"
+msgstr "<b>Actualizări automate</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Actualizări de pe Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Actualizări de pe Internet</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1107,6 +1195,13 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
 msgid "Add Cdrom"
@@ -1118,16 +1213,15 @@ msgstr "Autentificare"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "Ş_terge fişierele software descărcate:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
 msgid "Download from:"
-msgstr ""
+msgstr "Descarcă din:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
-#, fuzzy
 msgid "Import the public key from a trusted software provider"
-msgstr "Elimină cheia selectată din keyring-ul de încredere."
+msgstr "Importă cheia publică de la un furnizor software de încredere"
 
 #: ../data/glade/SoftwareProperties.glade.h:14
 msgid "Internet Updates"
@@ -1138,57 +1232,53 @@ 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"
 
 #: ../data/glade/SoftwareProperties.glade.h:16
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "Restaurează cheile implicite."
+msgstr "Restaurează _Setări"
 
 #: ../data/glade/SoftwareProperties.glade.h:17
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "Restaurează cheile iniţiale pentru distribuţia mea"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Preferinţe software"
+msgstr "Surse software"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
-msgstr ""
-"Binar\n"
-"Sursă"
+msgstr "Cod sursă"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Statistici"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Trimite informaţii statistice"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Terţ"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "_Verifică pentru actualizări automat:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
 msgid "_Download updates automatically, but do not install them"
-msgstr ""
+msgstr "_Descarcă actualizări automat, dar nu le instala"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
-#, fuzzy
 msgid "_Import Key File"
-msgstr "Importă cheie"
+msgstr "_Importă fişier cheie"
 
 #: ../data/glade/SoftwareProperties.glade.h:26
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Instalează actualizări de securitate fără confirmare"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
 msgid ""
@@ -1249,45 +1339,40 @@ msgstr ""
 "Sursă"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr ""
-"Binar\n"
-"Sursă"
+msgstr "Editează sursa"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Scanez CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr ""
-"Binar\n"
-"Sursă"
+msgstr "_Adaugă sursă"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
-msgstr ""
+msgstr "_Reîncarcă"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Afişează şi instalează actualizările disponibile"
 
 #: ../data/update-manager.desktop.in.h:2
-#, fuzzy
 msgid "Update Manager"
-msgstr "Actualizări Ubuntu 4.10"
+msgstr "Manager actualizări"
 
 #: ../data/update-manager.schemas.in.h:1
 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)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "Verifică pentru lansări noi de distribuţie"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1298,15 +1383,15 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Aminteşte-mi să reîncarc lista canalelor"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr ""
+msgstr "Arată detaliile unei actualizări"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Salvează dimensiunea ferestrei update-manager"
 
 #: ../data/update-manager.schemas.in.h:7
 msgid ""
@@ -1316,23 +1401,22 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
-msgstr ""
+msgstr "Dimensiunea ferestrei"
 
 #: ../data/software-properties.desktop.in.h:1
 msgid "Configure the sources for installable software and updates"
-msgstr ""
+msgstr "Configurează sursele pentru software instalabil şi actualizări"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Actualizări Ubuntu 5.10"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
@@ -1354,18 +1438,18 @@ msgstr "Software în contribuţie"
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Cdrom cu Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Actualizări de securitate Ubuntu 5.04"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Pachete întreţinute de comunitate (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1381,9 +1465,8 @@ msgstr "Pachete întreţinute de comunitate (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Pachete non-libere (Multiverse)"
+msgstr "Pachete non-libere"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
@@ -1392,26 +1475,23 @@ msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Pachete non-libere (Multiverse)"
+msgstr "Software restricţionat (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Software cu restricţii de export din SUA"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Actualizări de securitate Ubuntu 5.04"
+msgstr "Cdrom cu Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Actualizări portate înapoi"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1420,9 +1500,8 @@ msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Cdrom cu Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1436,21 +1515,18 @@ msgstr "Actualizări Ubuntu 5.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:145
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Actualizări de securitate Ubuntu 5.04"
+msgstr "Ubuntu 5.10 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Actualizări de securitate Ubuntu 5.04"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Actualizări de securitate Ubuntu 5.04"
+msgstr "Cdrom cu Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1459,27 +1535,23 @@ msgstr "Pachete suportate oficial"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Actualizări de Securitate Ubuntu 5.10"
+msgstr "Actualizări de Securitate Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Actualizări Ubuntu 5.10"
+msgstr "Actualizări Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Actualizări de securitate Ubuntu 5.04"
+msgstr "Ubuntu 5.04 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1494,7 +1566,7 @@ msgstr "Pachete non-libere (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Cdrom cu Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
@@ -1514,31 +1586,29 @@ msgstr "Actualizări de securitate Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Actualizări Ubuntu 5.10"
+msgstr "Actualizări Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Actualizări de securitate Ubuntu 5.04"
+msgstr "Ubuntu 4.10 Backports"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\""
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
 #. Description
 #: ../data/channels/Debian.info.in:20
@@ -1548,27 +1618,31 @@ msgstr "Actualizări de securitate Debian 3.1 \"Sarge\""
 #. Description
 #: ../data/channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr ""
+msgstr "Debian \"Etch\" (testing)"
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
 #. Description
 #: ../data/channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr ""
+msgstr "Debian \"Sid\" (unstable)"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "Software compatibil DFSG cu dependenţe negratuite"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "Software incompatibil DFSG"
+
+#, fuzzy
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "Software cu restricţii de export din SUA"
 
 #, fuzzy
 #~ msgid "Normal updates"
@@ -1580,13 +1654,11 @@ msgstr ""
 #~ msgid "Your system has already been upgraded."
 #~ msgstr "Sistemul dumneavoastră este actualizat la zi!"
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Actualizări de Securitate Ubuntu 5.10"
+#~ msgstr "Actualizări importante de securitate pentru Ubuntu"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Se actualizează Ubuntu"
+#~ msgstr "Actualizări pentru Ubuntu"
 
 #, fuzzy
 #~ msgid "Oficially supported"
diff --git a/po/ru.po b/po/ru.po
index f9e9eced..8274052c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,15 +1,15 @@
 # Russian translation for update-manager
 # Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
 # This file is distributed under the same license as the update-manager package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+# Igor Zubarev <igor4u@gmail.com>, 2006.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-25 19:23+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-03 02:07+0000\n"
 "Last-Translator: Igor Zubarev <igor4u@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -58,9 +58,9 @@ msgstr "Через %s дней"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Установить обновления"
+msgstr "%s обновлений"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -68,45 +68,44 @@ msgstr "Установить обновления"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Основной сервер"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Сервер %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Ближайший сервер"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Свои сервера"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Обновления программ"
+msgstr "Источник программ"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Активен"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(Исходный код)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "Исходный код"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -130,7 +129,7 @@ msgstr ""
 "Выбранный вами ключ нельзя удалить. Пожалуйста, отправьте отчет об ошибке."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
@@ -148,11 +147,11 @@ msgstr "Введите название для диска"
 msgid "Please insert a disc in the drive:"
 msgstr "Пожалуйста, вставьте диск в привод:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Поврежденные пакеты"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -161,36 +160,37 @@ msgstr ""
 "данной программой. Пожалуйста, исправьте их, используя synaptic или apt-get, "
 "прежде чем продолжить."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Невозможно обновить требуемые мета-пакеты"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Будет удален необходимый пакет"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Невозможно подготовить обновление системы"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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/ к отчету."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Ошибка при проверке подлинности некоторых пакетов"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -200,12 +200,12 @@ msgstr ""
 "кратковременная проблема с сетью и стоит попробовать позже. Ниже приведен "
 "список пакетов, не прошедших проверку."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Невозможно установить '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
@@ -214,12 +214,11 @@ msgstr ""
 "ошибке. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Невозможно подобрать мета-пакет"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -229,13 +228,12 @@ msgid ""
 msgstr ""
 "Ваша система не содержит пакетов ubuntu-desktop, kubuntu-desktop или "
 "edubuntu-desktop, поэтому невозможно определить используемую версию Ubuntu.\n"
-" Для продолжения сначала установите один из приведенных выше пакетов с "
-"помощью synaptic или apt-get."
+" Пожалуйста установите один из приведенных выше пакетов с помощью synaptic "
+"или apt-get."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Не удалось получить"
+msgstr "Не удалось добавить CD"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -246,28 +244,37 @@ msgid ""
 "The error message was:\n"
 "'%s'"
 msgstr ""
+"При добавлении CD произошла ошибка, обновление будет прервано. Пожалуйста "
+"сообщите об ошибке, если это был годный Ubuntu CD\n"
+"\n"
+"Сообщение об ошибке:\n"
+"'%s'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Чтение кэша"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Получить из сети данные для обновления?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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"
+"Если у вас быстрое и недорогое подключение к сети, то ответь 'Да'. Если "
+"подключение дорогое для вас, ответьте 'Нет'."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Не найдено действующее зеркало"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -287,11 +294,11 @@ msgstr ""
 "Ответ 'Нет' отменит обновление."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Сгенерировать источники по умолчанию?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -304,11 +311,11 @@ msgstr ""
 "\n"
 "Добавить записи по умолчанию для '%s'? Ответ 'Нет' прервет обновление."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Информация о репозитории неверна"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -316,26 +323,25 @@ msgstr ""
 "В результате обновления информации о репозиториях образовался неверный файл. "
 "Пожалуйста отправьте отчет об ошибке."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Источники третьих сторон отключены"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 были отключены. После "
+"Некоторые источники третьих сторон в sources.list были отключены. После "
 "обновления вы можете снова включить их с помощью утилиты 'software-"
 "properties' или synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Ошибка при обновлении"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -343,11 +349,11 @@ msgstr ""
 "При обновлении возникла проблема. Обычно это бывает вызвано проблемами в "
 "сети, проверьте сетевые подключения и повторите попытку."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Недостаточно свободного места на диске"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -359,16 +365,15 @@ msgstr ""
 "предыдущих установок с помощью команды 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Вы хотите начать обновление системы?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Невозможно установить обновления"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -377,13 +382,16 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Обновление прервано. Система, возможно, находится в неработоспособном "
-"состоянии. Запущено восстановление системы (dpkg --configure -a)."
+"состоянии. Запущено восстановление системы (dpkg --configure -a).\n"
+"\n"
+"Пожалуйста, отправьте отчет об ошибке программы 'update-manager' и добавьте "
+"файлы в /var/log/dist-upgrade/ к отчету."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Невозможно загрузить обновления"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -391,12 +399,11 @@ msgstr ""
 "Обновление прервано. Проверьте соединение с Интернет или установочный диск и "
 "попробуйте снова. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Некоторые программы больше не поддерживаются"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -404,29 +411,29 @@ msgid ""
 "If you have not enabled community maintained software (universe), these "
 "packages will be suggested for removal in the next step."
 msgstr ""
-"Эти установленные пакеты больше не поддерживаются официально. Теперь их "
-"поддержкой занимается только сообщество ('universe').\n"
+"Эти пакеты больше не поддерживаются Canonical Ltd. Теперь их поддержкой "
+"занимается сообщество.\n"
 "\n"
-"Если у вас не подключен репозиторий 'universe', на следующем шаге вам "
-"предложат удалить эти пакеты. "
+"Если у вас не подключен репозиторий сообщества (universe), на следующем шаге "
+"вам предложат удалить эти пакеты."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Удалить устаревшие пакеты?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
-msgstr "_Пропустить этот шаг"
+msgstr "Пропустить этот шаг"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
-msgstr "_Удалить"
+msgstr "Удалить"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Ошибка при фиксировании"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -435,32 +442,43 @@ msgstr ""
 "ниже. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Восстановление первоначального состояния системы"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "Загрузка '%s' из репозитария backports"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Проверка менеджера пакетов"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Обновление информации о репозитории"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Неверная информация о пакете"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -468,23 +486,23 @@ msgid ""
 "manager' package and include the files in /var/log/dist-upgrade/ in the "
 "bugreport."
 msgstr ""
-"После обновления информации о пакетах, важный пакет '%s' не может быть "
-"найден.\n"
-"Это говорит о серьезной проблеме, пожалуйста отправьте отчет об ошибке."
+"После обновления информации о пакетах не найден важный пакет '%s'.\n"
+"Это серьёзная проблема, пожалуйста, сообщите об ошибке пакета 'update-"
+"manager', включив в отчёт об ошибке файлы, лежащие в /var/log/dist-upgrade/."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Запрос подтверждения"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Обновление"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Поиск устаревших программ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Обновление системы завершено."
 
@@ -495,23 +513,22 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "Пожалуйста, вставьте '%s' в устройство '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "Обновление завершено"
+msgstr "Загрузка завершена"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
 msgstr "Загрузка файла %li из %li со скоростью %s/с"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Осталось приблизительно %li минут"
+msgstr "Осталось приблизительно %s минут"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
 msgstr "Загрузка файла %li из %li"
 
@@ -532,21 +549,23 @@ 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/ в сообщение об ошибке"
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"Заменить конфигурационный файл\n"
+"Заменить изменённый конфигурационный файл\n"
 "'%s'?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -558,59 +577,61 @@ msgid "A fatal error occured"
 msgstr "Произошла неисправимая ошибка"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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-"
+"Пожалуйста, отправьте отчет об ошибке и включите в него файлы /var/log/dist-"
 "upgrade.log и /var/log/dist-upgrade-apt.log. Обновление прервано.\n"
-"Оригинальный sources.list был сохранен как /etc/apt/sources.list.distUpgrade."
+"Оригинальный файл sources.list был сохранен как /etc/apt/sources.list."
+"distUpgrade."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s пакет будет удален."
-msgstr[1] "%s пакета будут удалены."
-msgstr[2] "%s пакетов будут удалены."
+msgstr[0] "%d пакет будет удален."
+msgstr[1] "%d пакета будут удалены."
+msgstr[2] "%d пакетов будут удалены."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 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 новых пакета будут установлены."
-msgstr[2] "%s новых пакетов будут установлены."
+msgstr[0] "%d новый пакет будет установлен."
+msgstr[1] "%d новых пакета будут установлены."
+msgstr[2] "%d новых пакетов будут установлены."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "%s пакет будет обновлен."
-msgstr[1] "%s пакета будут обновлены."
-msgstr[2] "%s пакетов будут обновлены."
+msgstr[0] "%d пакет будет обновлен."
+msgstr[1] "%d пакета будут обновлены."
+msgstr[2] "%d пакетов будут обновлены."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Всего требуется загрузить %s."
+msgstr ""
+"\n"
+"\n"
+"Всего требуется загрузить %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
 msgstr ""
-"Обновление может занять несколько часов и не может быть прервано в любой "
-"момент."
+"Загрузка и установка обновлений может занять несколько часов и не может быть "
+"прервано в любой момент."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -619,7 +640,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Ваша система не требует обновления"
 
@@ -628,6 +649,7 @@ msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
 msgstr ""
+"Для вашей системы не доступно ни одно обновление. Обновление будет отменено."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -645,32 +667,32 @@ msgid "Upgrade %s"
 msgstr "Обновить %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Осталось приблизительно %li дней %li часов %li минут"
+msgstr "%li дней %li часов %li минут"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Осталось приблизительно %li часов %li минут"
+msgstr "%li часов %li минут"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li минут"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li секунд"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -713,7 +735,7 @@ msgstr "<b><big>Начать обновление?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Обновление Ubuntu до версии 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -728,13 +750,12 @@ msgid "Difference between the files"
 msgstr "Различие между файлами"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
 msgstr "Загрузка и установка обновлений"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr "Изменение каналов приложений"
+msgstr "Изменение источников приложений"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
@@ -749,24 +770,36 @@ msgid "Terminal"
 msgstr "Терминал"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
-msgstr "_Оставить"
+msgid "_Cancel Upgrade"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
-msgstr "_Заменить"
+msgid "_Continue"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
-msgstr "_Отправить сообщение об ошибке"
+msgid "_Keep"
+msgstr "Оставить"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
-msgstr "Перезапустить _сейчас"
+msgid "_Replace"
+msgstr "Заменить"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr "Отправить сообщение об ошибке"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr "Перезапустить сейчас"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
-msgstr "_Продолжить обновление"
+msgstr "Продолжить обновление"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
@@ -837,7 +870,6 @@ msgid "Verfication failed"
 msgstr "Проверка не удалась"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
@@ -858,92 +890,83 @@ msgstr ""
 "сети или на сервере. "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Загрузка файла %li из %li со скоростью %s/с"
+msgstr "Загрузка файла %(current)li из %(total)li со скоростью %(speed)s/с"
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Загрузка файла %li из %li со скоростью %s/с"
+msgstr "Загрузка файла %(current)li из %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr ""
-"На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее."
+msgstr "Список изменений недоступен или отсутствует."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
-"На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
-"Не удалось загрузить список изменений. Пожалуйста, проверьте соединение с "
-"интернет."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Обновления безопасности Ubuntu 5.10"
+msgstr "Важные обновления безопасности"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Рекомендованые обновления"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "Установить обновления"
+msgstr "Предлагаемые обновления"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Бэкпорты"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "_Продолжить обновление"
+msgstr "Обновления дистрибутива"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Установить обновления"
+msgstr "Прочие обновления"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Версия %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr "Загрузка списка изменений..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "Сбросить все"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "Проверить"
+msgstr "Проверить все"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Размер загружаемых данных: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -951,40 +974,39 @@ msgstr[0] "Вы можете установить %s обновление"
 msgstr[1] "Вы можете установить %s обновления"
 msgstr[2] "Вы можете установить %s обновлений"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Пожалуйста подождите, это может занять некоторое время."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Обновление завершено"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "Установить обновления"
+msgstr "Проверка наличия обновлений"
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "Новая версия: %s (Размер: %s)"
+msgstr "С версии %(old_version)s на %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Версия %s: \n"
+msgstr "Версия %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Размер: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Ваша версия Ubuntu больше не поддерживается"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -994,17 +1016,17 @@ msgstr ""
 "обновления. Обновите систему до более поздней версии Ubuntu Linux. Для "
 "получения информации об обновлении посетите http://www.ubuntu.com"
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>Доступен новый релиз дистрибутива '%s'</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "Индекс программ поврежден"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1017,54 +1039,49 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Нет"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 Кб"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f Кб"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f Мб"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, 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"
+"<b><big>Вы должны проверить наличие обновлений вручную</big></b>\n"
 "\n"
-"Ваша система не проверяет обновления автоматически. Это настраивается в "
-"\"Система\" -> \"Администрирование\" -> \"Параметры приложений\"."
+"Ваша система не проверяет наличие обновлений автоматически. Это "
+"настраивается в <i>Источники приложений</i> на вкладке <i>Обновления в "
+"Интернет</i>."
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>Не забывайте обновлять систему</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
-"<big><b>Ошибка при сканировании CD</b></big>\n"
-"\n"
-"%s"
+msgstr "<big><b>Не удается установить все обновления</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Начать обновление?</big></b>"
+msgstr "<b><big>Запуск менеджера обновлений</big></b>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1072,15 +1089,15 @@ msgstr "Изменения"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Изменения и описание обновления"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
-msgstr "_Проверить"
+msgstr "Проверить"
 
 #: ../data/glade/UpdateManager.glade.h:10
 msgid "Check the software channels for new updates"
-msgstr "Проверить каналы приложений на наличие обновлений"
+msgstr "Проверить источники приложений на наличие обновлений"
 
 #: ../data/glade/UpdateManager.glade.h:11
 msgid "Description"
@@ -1097,6 +1114,11 @@ msgid ""
 "This can be caused by an uncompleted upgrade, unofficial software packages "
 "or by running a development version."
 msgstr ""
+"Для установки максимального числа обновлений, запустите обновление "
+"дистрибутива.\n"
+"\n"
+"Это может быть вызвано незавершенным обновлением, нестандартными программами "
+"или использованием бета-версии."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
@@ -1127,9 +1149,8 @@ msgid "_Check"
 msgstr "Проверить"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "_Продолжить обновление"
+msgstr "Обновление дистрибутива"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1140,31 +1161,28 @@ msgid "_Install Updates"
 msgstr "Установить обновления"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Изменения"
+msgstr "изменения"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "обновления"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Обновления в Интернет</b>"
+msgstr "<b>Автоматические обновления</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Обновления в Интернет</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Обновления в Интернет</b>"
+msgstr "<b>Интернет</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1176,11 +1194,17 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "Добавить _Cdrom"
+msgstr "Добавить Cdrom"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
@@ -1191,9 +1215,8 @@ msgid "D_elete downloaded software files:"
 msgstr "Удалить загруженные файлы программ:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "Загрузка завершена"
+msgstr "Загрузить с:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1221,34 +1244,32 @@ msgstr "Восстановить исходные ключи вашего дис
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Параметры приложений"
+msgstr "Источники приложений"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
 msgid "Source code"
-msgstr ""
+msgstr "Исходный код"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "Статистика"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "Отправлять статистику"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Сторонние производители"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "Автоматически проверять наличие обновлений:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "Загружать обновления в фоне, но не устанавливать их"
+msgstr "Автоматически загружать обновления, но не устанавливать их"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1259,7 +1280,6 @@ msgid "_Install security updates without confirmation"
 msgstr "Устанавливать обновления безопасности без запроса"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1268,10 +1288,10 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>Информация о каналах устарела</big></b>\n"
+"<b><big>Информация о программном обеспечении устарела</big></b>\n"
 "\n"
-"Вам следует загрузить информацию о каналах для установки программ и "
-"обновлений из добавленных или измененных каналов.\n"
+"Для установки программ и обновлений из новых или изменённых источников нужно "
+"скачать информацию о доступном программном обеспечении.\n"
 "\n"
 "Для продолжения требуется действующее подключение к Интернет."
 
@@ -1296,7 +1316,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1304,11 +1323,11 @@ msgid ""
 "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"
+"<big><b>Введите полную APT-строку репозитория, который вы хотите добавить "
+"как источник</b></big>\n"
 "\n"
-"Строка APT состоит из типа, расположения и компонентов канала, например <i>"
-"\"deb http://ftp.debian.org sarge main\"</i>."
+"APT-строка состоит из типа, расположения и компонентов репозитория, например "
+"<i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
@@ -1324,7 +1343,7 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
-msgstr ""
+msgstr "Редактировать источник"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
@@ -1332,7 +1351,7 @@ msgstr "Просмотр CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
-msgstr ""
+msgstr "Добавить источник"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1359,19 +1378,18 @@ msgid "Check for new distribution releases"
 msgstr "Проверить на наличие новых релизов дистрибутива"
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 ""
 "Если автоматическая проверка обновлений отключена, вам придется обновлять "
-"список каналов вручную. Этот параметр позволяет скрыть показываемое в данном "
-"случае напоминание."
+"список источников вручную. Этот параметр позволяет скрыть показываемое в "
+"данном случае напоминание."
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
-msgstr "Напоминать обновить список каналов"
+msgstr "Напоминать обновить список источников"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
@@ -1382,20 +1400,18 @@ msgid "Stores the size of the update-manager dialog"
 msgstr "Хранит размер окна менеджера обновлений"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changes and the "
 "description"
-msgstr "Хранит состояние экспандера, содержащего список изменений и описание"
+msgstr "Хранит состояние экспандера, содержащего описание и список изменений"
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
-msgstr "Размен окна"
+msgstr "Размер окна"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Настроить каналы программ и обновления из интернет"
+msgstr "Настроить источники установки программ и обновлений"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1405,87 +1421,78 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Обновления Ubuntu 5.10"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Поддерживается сообществом (Universe)"
+msgstr "Поддерживается сообществом"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Проприетарные драйвера устройств"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Несвободное (Multiverse)"
+msgstr "Несвободное ПО"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "CDROM с Ubuntu 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Поддерживается сообществом (Universe)"
+msgstr "Поддерживается сообществом (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Поддерживается сообществом (Universe)"
+msgstr "Поддерживаемое сообществом свободное ПО"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Несвободное (Multiverse)"
+msgstr "Несвободные драйвера"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Проприетарные драйвера устройств "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Несвободное (Multiverse)"
+msgstr "Несвободное обеспечение (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 'Dapper Drake'"
+msgstr "CD с Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Обновления в бэкпортах"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1494,9 +1501,8 @@ msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD с Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1511,18 +1517,17 @@ msgstr "Обновления Ubuntu 5.10"
 #. Description
 #: ../data/channels/Ubuntu.info.in:145
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 5.10 бэкпорты"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "CD с Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1531,27 +1536,23 @@ msgstr "Официально поддерживается"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Обновления безопасности Ubuntu 5.10"
+msgstr "Обновления безопасности Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Обновления Ubuntu 5.10"
+msgstr "Обновления Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 5.04 бэкпорты"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1566,13 +1567,12 @@ msgstr "Несвободное (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "CD с Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Некоторые программы больше не поддерживаются официально"
+msgstr "Официально больше не поддерживается"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1581,21 +1581,18 @@ msgstr "Ограниченные авторские права"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Обновления безопасности Ubuntu 5.10"
+msgstr "Обновления безопасности Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Обновления Ubuntu 5.10"
+msgstr "Обновления Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 Backports"
+msgstr "Ubuntu 4.10 бэкпорты"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1643,6 +1640,40 @@ msgstr "DFSG-совместимое ПО с зависимостями от не
 msgid "Non-DFSG-compatible Software"
 msgstr "Не-DFSG-совместимое ПО"
 
+#~ 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 с неизвестной скоростью"
 
@@ -1662,20 +1693,16 @@ msgstr "Не-DFSG-совместимое ПО"
 #~ 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>"
+#~ "<span weight=\"bold\" size=\"x-large\">Обновление до Ubuntu 6.10</span>"
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Обновления безопасности Ubuntu 5.10"
+#~ msgstr "Важные обновления безопасности для Ubuntu"
 
-#, fuzzy
 #~ msgid "Updates of Ubuntu"
-#~ msgstr "Обновить систему до последней версии Ubuntu"
+#~ msgstr "Обновления для Ubuntu"
 
 #~ msgid "Cannot install all available updates"
 #~ msgstr "Невозможно установить все доступные обновления"
@@ -1764,9 +1791,11 @@ msgstr "Не-DFSG-совместимое ПО"
 #~ msgid "Edit Channel"
 #~ msgstr "Изменить канал"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "Добавить канал"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "Добавить канал"
+#~ msgstr[1] "Добавить каналы"
+#~ msgstr[2] "Добавить каналы"
 
 #~ msgid "_Custom"
 #~ msgstr "_Выбрать"
diff --git a/po/rw.po b/po/rw.po
index 292d629b..4d7d8978 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:44+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:43+0000\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -155,56 +155,56 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, 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 "
+msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. Please report this as a "
@@ -212,11 +212,11 @@ msgid ""
 msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -243,11 +243,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -255,11 +255,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -272,11 +272,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -285,43 +285,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 #, fuzzy
 msgid "Error during update"
 msgstr "i Urufunguzo"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -330,15 +330,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -347,21 +347,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -370,55 +370,67 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Muyobozi ni"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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"
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -428,20 +440,20 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 #, fuzzy
 msgid "Upgrading"
 msgstr "Byarangiye"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr ""
 
@@ -500,8 +512,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -560,7 +572,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Sisitemu ni Hejuru Kuri Itariki"
@@ -611,8 +623,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -687,27 +699,41 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "Byarangiye"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 #, fuzzy
 msgid "_Replace"
 msgstr "Kongera Gutangiza"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 #, fuzzy
 msgid "_Resume Upgrade"
 msgstr "Byarangiye"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "Byarangiye"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -800,137 +826,141 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "ni a Gishya Bya Bihari"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr "ni a Gishya Bya Bihari"
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 #, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "Kuri Gufungura Amahinduka Kugenzura... NIBA ni Gikora Interineti Ukwihuza"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "5"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Kwinjiza porogaramu"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "5"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "Byarangiye"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "Kwinjiza porogaramu"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, fuzzy, python-format
 msgid "Version %s: \n"
 msgstr "Verisiyo \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Iyimura... i"
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, fuzzy, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Sisitemu ni Hejuru Kuri Itariki"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "Kwinjiza porogaramu"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "Verisiyo \n"
+msgstr "Verisiyo"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "Ikwirakwiza... ni Oya"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1339,7 +1369,7 @@ msgstr "5"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1371,9 +1401,8 @@ msgstr "Kigenga"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Kohereza Nta gukoresha bisesuye"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
@@ -1550,6 +1579,10 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, fuzzy
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "Kohereza Nta gukoresha bisesuye"
+
+#, fuzzy
 #~ msgid "Normal updates"
 #~ msgstr "Kwinjiza porogaramu"
 
diff --git a/po/sk.po b/po/sk.po
index 9cf1a5b6..34c34f09 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-24 17:32+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:43+0000\n"
 "Last-Translator: Peter Chabada <ubuntu@chabada.sk>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "Každý druhý deň"
 
 #: ../SoftwareProperties/SoftwareProperties.py:138
 msgid "Weekly"
-msgstr "Raz týždenne"
+msgstr "Raz za týždeň"
 
 #: ../SoftwareProperties/SoftwareProperties.py:139
 msgid "Every two weeks"
@@ -65,9 +65,9 @@ msgstr "Nainštalovať _aktualizácie"
 #. first %s is the description of the component
 #. second %s is the code name of the comp, eg main, universe
 #: ../SoftwareProperties/SoftwareProperties.py:264
-#, python-format
+#, fuzzy, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
@@ -78,11 +78,11 @@ msgstr ""
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "Server pre %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Najbližší server"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
@@ -148,11 +148,11 @@ msgstr "Prosím, zadajte názov disku"
 msgid "Please insert a disc in the drive:"
 msgstr "Prosím, vložte disk do mechaniky:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Poškodené balíky"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -160,20 +160,20 @@ 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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Nemôžem aktualizovať požadované meta-balíky"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Musel by byť odstránený dôležitý balík"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Nemôžem vypočítať aktualizáciu"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, fuzzy
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
@@ -182,14 +182,14 @@ msgid ""
 "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. "
+"ako chybu."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Chyba pri overovaní niektorých balíkov"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -199,23 +199,23 @@ msgstr ""
 "problémom v sieti. Môžete to opäť skúsiť neskôr. Nižšie je uvedený zoznam "
 "neoverených balíčkov."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Nemôžem inštalovať '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 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. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Nemôžem odhadnúť meta balík."
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -248,11 +248,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Čítam vyrovnávaciu pamäť cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -260,11 +260,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Nebol nájdený vhodný server"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -284,11 +284,11 @@ msgstr ""
 "Pokiaľ zvolíte 'Nie', súbor nebude zmenený."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "Vytvoriť štandardný zoznam zdrojov softvéru?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -302,11 +302,11 @@ msgstr ""
 "Majú byť pridané štandardné záznamy pre '%s'? Pokiaľ zvolíte 'Nie', súbor "
 "nebude zmenený."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Neplatná informácia o zdrojoch softvéru"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
@@ -314,11 +314,11 @@ msgstr ""
 "Aktualizácia informácií o zdrojoch softvéru skončila neplatným súborom. "
 "Nahláste to ako chybu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Zdroje tretích strán sú zakázané"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 #, fuzzy
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
@@ -329,11 +329,11 @@ msgstr ""
 "Môžete ich povoliť po upgrade pomocou nástroja 'vlastnosti-softwaru' alebo "
 "pomocou synapticu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Chyba počas aktualizácie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -341,11 +341,11 @@ 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Nedostatok voľného miesta na disku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -357,15 +357,15 @@ msgstr ""
 "súborov z predchádzajúcich inštalácií pomocou príkazu 'sudo apt-get clean'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Chcete začať s aktualizáciou?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Nebolo možné nainštalovať aktualizácie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 #, fuzzy
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
@@ -377,11 +377,11 @@ 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)."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Nebolo možné stiahnuť požadované balíky"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -389,11 +389,11 @@ msgstr ""
 "Aktualizácia bola neočakávane prerušená. Skontrolujte svoje internetové "
 "pripojenie alebo inštalačné médiá a skúste znova. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -406,25 +406,25 @@ msgstr ""
 "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. "
+"tieto balíky v ďalšom kroku navrhnuté na odstránenie."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Odstrániť zastarané balíky?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Preskočiť tento krok"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "Chyba počas potvrdzovania"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -433,31 +433,46 @@ msgstr ""
 "uvedené správy. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "Obnovuje sa pôvodný stav systému"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Kontrola správcu balíkov"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Prebieha príprava aktualizácie"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Aktualizácia informácií o zdrojoch softvéru"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Neplatná informácia o balíku"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, fuzzy, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -470,19 +485,19 @@ msgstr ""
 "s'.\n"
 "To znamená závažný problém. Nahláste to ako chybu."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Požaduje sa potvrdenie"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Prebieha aktualizácia"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Vyhľadávanie zastaraného softvéru"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Aktualizácia systému je dokončená."
 
@@ -543,8 +558,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -601,7 +616,10 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Musíte stiahnuť celkom %s."
+msgstr ""
+"\n"
+"\n"
+"Musíte stiahnuť celkom %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 #, fuzzy
@@ -617,7 +635,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Váš systém je aktuálny"
 
@@ -667,8 +685,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -749,25 +767,39 @@ msgid "Terminal"
 msgstr "Terminál"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_Pokračovať v aktualizácii"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Ponechať"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_Oznámiť chybu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Reštartovať teraz"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Pokračovať v aktualizácii"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_Pokračovať v aktualizácii"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "Nebolo možné nájsť poznámky k vydaniu"
@@ -867,81 +899,86 @@ msgstr "Sťahovanie súboru %li z %li pri %s/s"
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Sťahovanie súboru %li z %li pri %s/s"
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, 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."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "Zlyhalo získavanie zoznamu zmien. Skontrolujte si svoje internetové "
 "pripojenie."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Nainštalovať _aktualizácie"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Ubuntu 5.10 - backporty"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "_Pokračovať v aktualizácii"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "Nainštalovať _aktualizácie"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Verzia %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Získava sa zoznam zmien..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 #, fuzzy
 msgid "_Check All"
 msgstr "_Skontrolovať"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "Veľkosť na stiahnutie: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -949,40 +986,40 @@ 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í"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "Čakajte prosím, toto môže chvíľu trvať."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Aktualizácia je dokončená"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "Kontrolujem aktualizácie..."
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Nová verzia: %s   (veľkosť: %s)"
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "Verzia %s: \n"
+msgstr "Verzia %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Vaša distribúcia už nie je podporovaná"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -993,17 +1030,17 @@ msgstr ""
 "Pre viac informácií o prechode na novšiu verziu si pozrite http://www.ubuntu."
 "com.\""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>K dispozícii je nové vydanie distribúcie '%s'</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "Index softvéru je poškodený"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1015,25 +1052,26 @@ msgstr ""
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
+#, fuzzy
 msgid "None"
-msgstr ""
+msgstr "Žiadna"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 #, fuzzy
@@ -1445,8 +1483,9 @@ msgstr "Ubuntu 6.06 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Udržiavané komunitou (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1479,9 +1518,8 @@ msgstr "Neslobodné (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Softvér s obmedzených exportom pre USA"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
@@ -1650,6 +1688,10 @@ msgstr "Softvér kompatibilný s DFSG bez závislostí na neslobodnom softvére"
 msgid "Non-DFSG-compatible Software"
 msgstr "Softvér nekompatibilný s DFSG"
 
+#, fuzzy
+#~ msgid "By copyright or legal issues restricted software"
+#~ msgstr "Softvér s obmedzených exportom pre USA"
+
 #~ msgid "Downloading file %li of %li with unknown speed"
 #~ msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti"
 
@@ -1768,9 +1810,11 @@ msgstr "Softvér nekompatibilný s DFSG"
 #~ msgid "Edit Channel"
 #~ msgstr "Upraviť zdroje"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Pridať zdroj"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_Pridať zdroj"
+#~ msgstr[1] "_Pridať zdroje"
+#~ msgstr[2] "_Pridať zdroje"
 
 #~ msgid "_Custom"
 #~ msgstr "_Vlastný"
diff --git a/po/sl.po b/po/sl.po
new file mode 100644
index 00000000..a5582fbc
--- /dev/null
+++ b/po/sl.po
@@ -0,0 +1,1539 @@
+# Slovenian translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-08-01 13:08+0000\n"
+"Last-Translator: Tadej <tadej.888@gmail.com>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%"
+"100==4 ? 2 : 3\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "Daily"
+msgstr "Dnevno"
+
+#: ../SoftwareProperties/SoftwareProperties.py:137
+msgid "Every two days"
+msgstr "Vsaka dva dneva"
+
+#: ../SoftwareProperties/SoftwareProperties.py:138
+msgid "Weekly"
+msgstr "Tedensko"
+
+#: ../SoftwareProperties/SoftwareProperties.py:139
+msgid "Every two weeks"
+msgstr "Vsaka dva tedna"
+
+#: ../SoftwareProperties/SoftwareProperties.py:144
+#, python-format
+msgid "Every %s days"
+msgstr "Vsakih %s dni"
+
+#: ../SoftwareProperties/SoftwareProperties.py:167
+msgid "After one week"
+msgstr "Po enem tednu"
+
+#: ../SoftwareProperties/SoftwareProperties.py:168
+msgid "After two weeks"
+msgstr "Po dveh tednih"
+
+#: ../SoftwareProperties/SoftwareProperties.py:169
+msgid "After one month"
+msgstr "Po enem mesecu"
+
+#: ../SoftwareProperties/SoftwareProperties.py:174
+#, python-format
+msgid "After %s days"
+msgstr "Po %s dnevih"
+
+#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
+#: ../SoftwareProperties/SoftwareProperties.py:252
+#, python-format
+msgid "%s updates"
+msgstr ""
+
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
+msgid "Main server"
+msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:324
+msgid "Nearest server"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:345
+msgid "Custom servers"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
+msgid "Software Channel"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
+msgid "Active"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:714
+msgid "(Source Code)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:720
+msgid "Source Code"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:969
+msgid "Import key"
+msgstr "Uvozi ključ"
+
+#: ../SoftwareProperties/SoftwareProperties.py:979
+msgid "Error importing selected file"
+msgstr "Napaka pri uvozu izbrane datoteke"
+
+#: ../SoftwareProperties/SoftwareProperties.py:980
+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"
+
+#: ../SoftwareProperties/SoftwareProperties.py:992
+msgid "Error removing the key"
+msgstr "Napaka pri odstranitvi kluča"
+
+#: ../SoftwareProperties/SoftwareProperties.py:993
+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."
+
+#: ../SoftwareProperties/SoftwareProperties.py:1039
+#, python-format
+msgid ""
+"<big><b>Error scanning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1096
+msgid "Please enter a name for the disc"
+msgstr "Prosim, vnesite ime za ta disk"
+
+#: ../SoftwareProperties/SoftwareProperties.py:1112
+msgid "Please insert a disc in the drive:"
+msgstr "Prosim, vstavite disk v pogon"
+
+#: ../DistUpgrade/DistUpgradeCache.py:91
+msgid "Broken packages"
+msgstr "Pokvarjeni paketi"
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+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."
+
+#: ../DistUpgrade/DistUpgradeCache.py:207
+msgid "Can't upgrade required meta-packages"
+msgstr "Ne morem nadgraditi zahtevanih meta-paketov"
+
+#: ../DistUpgrade/DistUpgradeCache.py:217
+msgid "A essential package would have to be removed"
+msgstr "Bistven paket se bo moral odstraniti"
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:220
+msgid "Could not calculate the upgrade"
+msgstr "Ne morem izračunati nadgradnje"
+
+#: ../DistUpgrade/DistUpgradeCache.py:221
+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 ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:246
+msgid "Error authenticating some packages"
+msgstr "Napaka pristnosti nekaterih paketov"
+
+#: ../DistUpgrade/DistUpgradeCache.py:247
+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."
+
+#: ../DistUpgrade/DistUpgradeCache.py:312
+#, fuzzy, python-format
+msgid "Can't install '%s'"
+msgstr "Ne morem namestiti '%s'"
+
+#: ../DistUpgrade/DistUpgradeCache.py:313
+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. "
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:320
+msgid "Can't guess meta-package"
+msgstr "Ne morem ugibati meta-paketa"
+
+#: ../DistUpgrade/DistUpgradeCache.py:321
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:75
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "Reading cache"
+msgstr "Berem zalogo"
+
+#: ../DistUpgrade/DistUpgradeControler.py:155
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:156
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:248
+msgid "No valid mirror found"
+msgstr "Najdena neveljavna zrcalnost"
+
+#: ../DistUpgrade/DistUpgradeControler.py:249
+#, python-format
+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."
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:266
+msgid "Generate default sources?"
+msgstr "Proizvedem pomanjkljive izvore?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:267
+#, python-format
+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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:301
+msgid "Repository information invalid"
+msgstr "Neveljavna shranjena informacija"
+
+#: ../DistUpgrade/DistUpgradeControler.py:302
+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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:308
+msgid "Third party sources disabled"
+msgstr "Izvor tretje skupine izključen"
+
+#: ../DistUpgrade/DistUpgradeControler.py:309
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:358
+msgid "Error during update"
+msgstr "Napaka med posodobitvijo"
+
+#: ../DistUpgrade/DistUpgradeControler.py:359
+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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:368
+msgid "Not enough free disk space"
+msgstr "Premalo prostora na disku"
+
+#: ../DistUpgrade/DistUpgradeControler.py:369
+#, python-format
+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'."
+
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeControler.py:440
+msgid "Do you want to start the upgrade?"
+msgstr "Želite pričeti z nadgradnjo?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:460
+msgid "Could not install the upgrades"
+msgstr "Ne morem namestiti nadgradenj."
+
+#: ../DistUpgrade/DistUpgradeControler.py:461
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:479
+msgid "Could not download the upgrades"
+msgstr "Ne morem sneti nadgradenj"
+
+#: ../DistUpgrade/DistUpgradeControler.py:480
+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. "
+
+#: ../DistUpgrade/DistUpgradeControler.py:516
+msgid "Support for some applications ended"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:517
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:552
+msgid "Remove obsolete packages?"
+msgstr "Odstranim neuporabne pakete?"
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Skip This Step"
+msgstr "_Preskoči ta korak"
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Remove"
+msgstr "_Odstrani"
+
+#: ../DistUpgrade/DistUpgradeControler.py:563
+msgid "Error during commit"
+msgstr "Napaka med izvedbo"
+
+#: ../DistUpgrade/DistUpgradeControler.py:564
+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. "
+
+#. generate a new cache
+#: ../DistUpgrade/DistUpgradeControler.py:576
+msgid "Restoring original system state"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:632
+#, python-format
+msgid "Fetching backport of '%s'"
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
+msgid "Checking package manager"
+msgstr "Preverjam paketni upravitelj"
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr "Posodabljam shranjeno informacijo"
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
+msgid "Invalid package information"
+msgstr "Neveljavna paketna informacija"
+
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:733
+msgid "Asking for confirmation"
+msgstr "Sprašujem za potrditev"
+
+#: ../DistUpgrade/DistUpgradeControler.py:737
+msgid "Upgrading"
+msgstr "Nadgrajevanje"
+
+#: ../DistUpgrade/DistUpgradeControler.py:744
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:749
+msgid "System upgrade is complete."
+msgstr "Nadgrajevanje sistema je dokončano"
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:249
+#, python-format
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, python-format
+msgid "Fetching file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+msgid "Applying changes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
+#, python-format
+msgid "Could not install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+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 ""
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#, python-format
+msgid ""
+"Replace the customized configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:203
+msgid ""
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
+msgid "The 'diff' command was not found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:356
+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 ""
+
+#. FIXME: make those two seperate lines to make it clear
+#. that the "%" applies to the result of ngettext
+#: ../DistUpgrade/DistUpgradeViewGtk.py:487
+#, python-format
+msgid "%d package is going to be removed."
+msgid_plural "%d packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
+#, python-format
+msgid "%d new package is going to be installed."
+msgid_plural "%d new packages are going to be installed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:498
+#, python-format
+msgid "%d package is going to be upgraded."
+msgid_plural "%d packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:503
+#, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
+msgid ""
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:512
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:518
+#: ../UpdateManager/UpdateManager.py:622
+msgid "Your system is up-to-date"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:519
+msgid ""
+"There are no upgrades available for your system. The upgrade will now be "
+"canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:535
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr "<b>Odstrani %s</b>"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:537
+#, python-format
+msgid "Install %s"
+msgstr "Namesti %s"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:539
+#, python-format
+msgid "Upgrade %s"
+msgstr "Nadgradi %s"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:31
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:32
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:38
+#, python-format
+msgid ""
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:109
+msgid "Reboot required"
+msgstr "Potreben je ponoven zagon"
+
+#: ../DistUpgrade/DistUpgradeView.py:110
+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"
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/glade/SoftwareProperties.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+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 ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+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>"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Fetching and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr "Pripravljam nadgradnjo"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr "Ponovno zaganjam sistem"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr "Terminal"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr "_Obdrži"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Replace"
+msgstr "_Zamenjaj"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr "_Poročaj hrošča"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr "_Ponovno zaženi zdaj"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
+msgid "_Resume Upgrade"
+msgstr "_Nadaljuj nadgradnjo"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr "Ni bilo mogoče najti zapiskov ob izdaji"
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr ""
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:149
+msgid "Could not run the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:150
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:171
+msgid "Downloading the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:180
+msgid "Upgrade tool signature"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:183
+msgid "Upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:209
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid "Failed to extract"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:215
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid "Verfication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:222
+msgid ""
+"Verifying the upgrade failed.  There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid "Authentication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:229
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:108
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:113
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:206
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:217
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
+msgid "Important security updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
+msgid "Recommended updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
+msgid "Proposed updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:241
+msgid "Backports"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:242
+msgid "Distribution updates"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
+msgid "Other updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:478
+#, python-format
+msgid "Version %s: \n"
+msgstr "Različica %s: \n"
+
+#: ../UpdateManager/UpdateManager.py:539
+msgid "Downloading list of changes..."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:566
+msgid "_Uncheck All"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:572
+msgid "_Check All"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
+#, python-format
+msgid "Download size: %s"
+msgstr "Velikost prenosa: %s"
+
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid "Please wait, this can take some time."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:668
+msgid "Update is complete"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:719
+msgid "Checking for updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
+msgid "From version %(old_version)s to %(new_version)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:832
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:843
+msgid "Your distribution is not supported anymore"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:844
+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 ""
+
+#: ../UpdateManager/UpdateManager.py:863
+#, python-format
+msgid "<b>New distribution release '%s' is available</b>"
+msgstr ""
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:898
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:899
+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 ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:1
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:4
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:5
+msgid "<big><b>Not all updates can be installed</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:6
+msgid "<big><b>Starting update manager</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:7
+msgid "Changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:8
+msgid "Changes and description of the update"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:9
+msgid "Chec_k"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:10
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:11
+msgid "Description"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:13
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:16
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:17
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:18
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:19
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:20
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:21
+msgid "_Check"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:22
+msgid "_Distribution Upgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:23
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:24
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:25
+msgid "changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:26
+msgid "updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:2
+msgid "<b>Automatic updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:3
+msgid "<b>CDROM/DVD</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:4
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:5
+msgid "<b>Internet</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:6
+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 ""
+
+#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+msgid "Authentication"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
+msgid "Download from:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:13
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:16
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:17
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Sources"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:19
+msgid "Source code"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:20
+msgid "Statistics"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:21
+msgid "Submit statistical information"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:22
+msgid "Third Party"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:23
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:24
+msgid "_Download updates automatically, but do not install them"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:25
+msgid "_Import Key File"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:26
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Components:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
+msgid "APT line:"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Reload"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+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 ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changes and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:8
+msgid "Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:13
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:17
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:19
+msgid "Restricted software"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:25
+msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:59
+msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:62
+msgid "Canonical supported Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:64
+msgid "Community maintained (universe)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:65
+msgid "Community maintained Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:67
+msgid "Non-free drivers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:68
+msgid "Proprietary drivers for devices "
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:70
+msgid "Restricted software (Multiverse)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:71
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:76
+msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:103
+msgid "Backported updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:110
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:123
+msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:135
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:140
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:145
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:152
+msgid "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:165
+msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:177
+msgid "Ubuntu 5.04 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:182
+msgid "Ubuntu 5.04 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:187
+msgid "Ubuntu 5.04 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:193
+msgid "Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:199
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:201
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:206
+msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:209
+msgid "No longer officially supported"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:211
+msgid "Restricted copyright"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:218
+msgid "Ubuntu 4.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:223
+msgid "Ubuntu 4.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:228
+msgid "Ubuntu 4.10 Backports"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
diff --git a/po/sq.po b/po/sq.po
new file mode 100644
index 00000000..10e0f7bb
--- /dev/null
+++ b/po/sq.po
@@ -0,0 +1,1519 @@
+# Albanian translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-09-30 21:20+0000\n"
+"Last-Translator: Alejdin Tirolli <a.tirolli@hotmail.com>\n"
+"Language-Team: Albanian <sq@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "Daily"
+msgstr "Përditë"
+
+#: ../SoftwareProperties/SoftwareProperties.py:137
+msgid "Every two days"
+msgstr "Çdo dy ditë"
+
+#: ../SoftwareProperties/SoftwareProperties.py:138
+msgid "Weekly"
+msgstr "Përjavë"
+
+#: ../SoftwareProperties/SoftwareProperties.py:139
+msgid "Every two weeks"
+msgstr "Çdo dy javë"
+
+#: ../SoftwareProperties/SoftwareProperties.py:144
+#, python-format
+msgid "Every %s days"
+msgstr "Çdo %s ditësh"
+
+#: ../SoftwareProperties/SoftwareProperties.py:167
+msgid "After one week"
+msgstr "Pas një jave"
+
+#: ../SoftwareProperties/SoftwareProperties.py:168
+msgid "After two weeks"
+msgstr "Pas dy javësh"
+
+#: ../SoftwareProperties/SoftwareProperties.py:169
+msgid "After one month"
+msgstr "Pas një muaji"
+
+#: ../SoftwareProperties/SoftwareProperties.py:174
+#, python-format
+msgid "After %s days"
+msgstr "Pas %s ditësh"
+
+#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
+#: ../SoftwareProperties/SoftwareProperties.py:252
+#, python-format
+msgid "%s updates"
+msgstr "%s përmirësimet"
+
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
+msgid "Main server"
+msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
+#, python-format
+msgid "Server for %s"
+msgstr "Serveri për %s"
+
+#: ../SoftwareProperties/SoftwareProperties.py:324
+msgid "Nearest server"
+msgstr "Serveri më i afërt"
+
+#: ../SoftwareProperties/SoftwareProperties.py:345
+msgid "Custom servers"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
+msgid "Software Channel"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
+msgid "Active"
+msgstr "Aktiv"
+
+#: ../SoftwareProperties/SoftwareProperties.py:714
+msgid "(Source Code)"
+msgstr "(Kodi i hapur)"
+
+#: ../SoftwareProperties/SoftwareProperties.py:720
+msgid "Source Code"
+msgstr "Kodi i hapur"
+
+#: ../SoftwareProperties/SoftwareProperties.py:969
+msgid "Import key"
+msgstr "Importo çelës"
+
+#: ../SoftwareProperties/SoftwareProperties.py:979
+msgid "Error importing selected file"
+msgstr "Gabim gjatë importimit të të dhënës së zgjedhur"
+
+#: ../SoftwareProperties/SoftwareProperties.py:980
+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."
+
+#: ../SoftwareProperties/SoftwareProperties.py:992
+msgid "Error removing the key"
+msgstr "Gabim gjatë largimit të çelësit"
+
+#: ../SoftwareProperties/SoftwareProperties.py:993
+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."
+
+#: ../SoftwareProperties/SoftwareProperties.py:1039
+#, python-format
+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"
+
+#: ../SoftwareProperties/SoftwareProperties.py:1096
+msgid "Please enter a name for the disc"
+msgstr "Jepni një emër për Mediumin."
+
+#: ../SoftwareProperties/SoftwareProperties.py:1112
+msgid "Please insert a disc in the drive:"
+msgstr "Ju lutemi futni një Medium në drive:"
+
+#: ../DistUpgrade/DistUpgradeCache.py:91
+msgid "Broken packages"
+msgstr "Paketat e dëmtuara"
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+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."
+
+#: ../DistUpgrade/DistUpgradeCache.py:207
+msgid "Can't upgrade required meta-packages"
+msgstr "Metapaketat e nevojshme nuk mund të aktualizohen."
+
+#: ../DistUpgrade/DistUpgradeCache.py:217
+msgid "A essential package would have to be removed"
+msgstr "Një paketë themelore u deshtë të largohej"
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:220
+msgid "Could not calculate the upgrade"
+msgstr "Aktualizimi nuk mund të llogaritej"
+
+#: ../DistUpgrade/DistUpgradeCache.py:221
+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."
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:246
+msgid "Error authenticating some packages"
+msgstr "Gabim gjatë vërtetimit të origjinalitetit të disa paketave."
+
+#: ../DistUpgrade/DistUpgradeCache.py:247
+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."
+
+#: ../DistUpgrade/DistUpgradeCache.py:312
+#, python-format
+msgid "Can't install '%s'"
+msgstr "'%s' nuk mund të instalohet"
+
+#: ../DistUpgrade/DistUpgradeCache.py:313
+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. "
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:320
+msgid "Can't guess meta-package"
+msgstr "Can't guess meta-package"
+
+#: ../DistUpgrade/DistUpgradeCache.py:321
+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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+msgid "Failed to add the CD"
+msgstr "Futja e CD dështoi"
+
+#: ../DistUpgrade/DistUpgradeControler.py:75
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "Reading cache"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:155
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:156
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:248
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:249
+#, python-format
+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 ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:266
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:267
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:301
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:302
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:308
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:309
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:358
+msgid "Error during update"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:359
+msgid ""
+"A problem occured during the update. This is usually some sort of network "
+"problem, please check your network connection and retry."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:368
+msgid "Not enough free disk space"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:369
+#, python-format
+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 ""
+
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeControler.py:440
+msgid "Do you want to start the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:460
+msgid "Could not install the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:461
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:479
+msgid "Could not download the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:480
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:516
+msgid "Support for some applications ended"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:517
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:552
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:563
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:564
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. generate a new cache
+#: ../DistUpgrade/DistUpgradeControler.py:576
+msgid "Restoring original system state"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:632
+#, python-format
+msgid "Fetching backport of '%s'"
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
+msgid "Checking package manager"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
+msgid "Invalid package information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:733
+msgid "Asking for confirmation"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:737
+msgid "Upgrading"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:744
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:749
+msgid "System upgrade is complete."
+msgstr ""
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:249
+#, python-format
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, python-format
+msgid "Fetching file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+msgid "Applying changes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
+#, python-format
+msgid "Could not install '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+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 ""
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#, python-format
+msgid ""
+"Replace the customized configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:203
+msgid ""
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
+msgid "The 'diff' command was not found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:356
+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 ""
+
+#. FIXME: make those two seperate lines to make it clear
+#. that the "%" applies to the result of ngettext
+#: ../DistUpgrade/DistUpgradeViewGtk.py:487
+#, python-format
+msgid "%d package is going to be removed."
+msgid_plural "%d packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
+#, python-format
+msgid "%d new package is going to be installed."
+msgid_plural "%d new packages are going to be installed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:498
+#, python-format
+msgid "%d package is going to be upgraded."
+msgid_plural "%d packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:503
+#, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
+msgid ""
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:512
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:518
+#: ../UpdateManager/UpdateManager.py:622
+msgid "Your system is up-to-date"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:519
+msgid ""
+"There are no upgrades available for your system. The upgrade will now be "
+"canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:535
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:537
+#, python-format
+msgid "Install %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:539
+#, python-format
+msgid "Upgrade %s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:31
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:32
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:38
+#, python-format
+msgid ""
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:109
+msgid "Reboot required"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:110
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/glade/SoftwareProperties.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+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 ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Fetching and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr ""
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:149
+msgid "Could not run the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:150
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:171
+msgid "Downloading the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:180
+msgid "Upgrade tool signature"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:183
+msgid "Upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:209
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid "Failed to extract"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:215
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid "Verfication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:222
+msgid ""
+"Verifying the upgrade failed.  There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid "Authentication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:229
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:108
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:113
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:206
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:217
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
+msgid "Important security updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
+msgid "Recommended updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
+msgid "Proposed updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:241
+msgid "Backports"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:242
+msgid "Distribution updates"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
+msgid "Other updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:478
+#, python-format
+msgid "Version %s: \n"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:539
+msgid "Downloading list of changes..."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:566
+msgid "_Uncheck All"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:572
+msgid "_Check All"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid "Please wait, this can take some time."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:668
+msgid "Update is complete"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:719
+msgid "Checking for updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
+msgid "From version %(old_version)s to %(new_version)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:832
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:843
+msgid "Your distribution is not supported anymore"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:844
+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 ""
+
+#: ../UpdateManager/UpdateManager.py:863
+#, python-format
+msgid "<b>New distribution release '%s' is available</b>"
+msgstr ""
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:898
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:899
+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 ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:1
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:4
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:5
+msgid "<big><b>Not all updates can be installed</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:6
+msgid "<big><b>Starting update manager</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:7
+msgid "Changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:8
+msgid "Changes and description of the update"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:9
+msgid "Chec_k"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:10
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:11
+msgid "Description"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:13
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:16
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:17
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:18
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:19
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:20
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:21
+msgid "_Check"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:22
+msgid "_Distribution Upgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:23
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:24
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:25
+msgid "changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:26
+msgid "updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:2
+msgid "<b>Automatic updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:3
+msgid "<b>CDROM/DVD</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:4
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:5
+msgid "<b>Internet</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:6
+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 ""
+
+#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+msgid "Authentication"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
+msgid "Download from:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:13
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:16
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:17
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Sources"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:19
+msgid "Source code"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:20
+msgid "Statistics"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:21
+msgid "Submit statistical information"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:22
+msgid "Third Party"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:23
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:24
+msgid "_Download updates automatically, but do not install them"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:25
+msgid "_Import Key File"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:26
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Components:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
+msgid "APT line:"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Reload"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+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 ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changes and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:8
+msgid "Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:13
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:17
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:19
+msgid "Restricted software"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:25
+msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:59
+msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:62
+msgid "Canonical supported Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:64
+msgid "Community maintained (universe)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:65
+msgid "Community maintained Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:67
+msgid "Non-free drivers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:68
+msgid "Proprietary drivers for devices "
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:70
+msgid "Restricted software (Multiverse)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:71
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:76
+msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:103
+msgid "Backported updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:110
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:123
+msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:135
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:140
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:145
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:152
+msgid "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:165
+msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:177
+msgid "Ubuntu 5.04 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:182
+msgid "Ubuntu 5.04 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:187
+msgid "Ubuntu 5.04 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:193
+msgid "Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:199
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:201
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:206
+msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:209
+msgid "No longer officially supported"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:211
+msgid "Restricted copyright"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:218
+msgid "Ubuntu 4.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:223
+msgid "Ubuntu 4.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:228
+msgid "Ubuntu 4.10 Backports"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
diff --git a/po/sr.po b/po/sr.po
index b8d0b45e..d433222d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-27 12:27+0000\n"
-"Last-Translator: Dejan Milosavljevic <dejan@wavebone.net>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-06-01 10:04+0000\n"
+"Last-Translator: Vladimir Samardzic <vladosam@hotmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -112,20 +112,25 @@ msgid "Import key"
 msgstr "Importiranje kljuca"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
+#, fuzzy
 msgid "Error importing selected file"
-msgstr ""
+msgstr "Грешка у учитавању изабранe datoteke"
 
 #: ../SoftwareProperties/SoftwareProperties.py:980
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:992
+#, fuzzy
 msgid "Error removing the key"
-msgstr ""
+msgstr "Грешка у уклањању кључа"
 
 #: ../SoftwareProperties/SoftwareProperties.py:993
+#, fuzzy
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
+"Кључ који сте изабрали није могуће уклонити. Молим вас пријавите ово као "
+"грешку."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
 #, python-format
@@ -136,37 +141,44 @@ msgid ""
 msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:1096
+#, fuzzy
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Молим вас унесите име диска"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1112
+#, fuzzy
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Молим вас убаците диск у јединицу диска:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
+#, fuzzy
 msgid "Broken packages"
-msgstr ""
+msgstr "Оштећени пакети"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
+#, 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 прије "
+"него што наставите."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -175,34 +187,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -229,11 +241,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -241,11 +253,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -258,11 +270,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -271,59 +283,63 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
+#, fuzzy
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "Нема довољно места на диску"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
-#, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:369
+#, fuzzy, python-format
 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'."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -332,21 +348,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -355,54 +371,65 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
-msgstr ""
+msgstr "_Прескочи овај корак"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
-msgstr ""
+msgstr "_Уклони"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -412,21 +439,22 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
+#, fuzzy
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "Унапређење система је завршено"
 
 #. print "mediaChange %s %s" % (medium, drive)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
@@ -482,13 +510,14 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
+#, fuzzy
 msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "Команда 'diff' није нађена"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
@@ -543,12 +572,14 @@ msgid ""
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
+#, fuzzy
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
+"Да би спречили губитак података затворите све активне програме и документа."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr ""
 
@@ -566,12 +597,12 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeViewGtk.py:537
 #, python-format
 msgid "Install %s"
-msgstr ""
+msgstr "Инсталирај %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:539
 #, python-format
 msgid "Upgrade %s"
-msgstr ""
+msgstr "Унапреди %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
 #, python-format
@@ -598,13 +629,14 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
+#, fuzzy
 msgid "Reboot required"
-msgstr ""
+msgstr "Потребно је поново покретање система"
 
 #: ../DistUpgrade/DistUpgradeView.py:110
 msgid ""
@@ -618,7 +650,7 @@ msgstr ""
 #: ../DistUpgrade/DistUpgrade.glade.h:1
 #: ../data/glade/SoftwareProperties.glade.h:1
 msgid "    "
-msgstr ""
+msgstr "    "
 
 #: ../DistUpgrade/DistUpgrade.glade.h:2
 msgid ""
@@ -646,11 +678,12 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 msgid "Details"
-msgstr ""
+msgstr "Детаљи"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
+#, fuzzy
 msgid "Difference between the files"
-msgstr ""
+msgstr "Разлике између датотека"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Fetching and installing the upgrades"
@@ -670,28 +703,40 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
-msgstr ""
+msgstr "Терминал"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
+msgid "_Continue"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
+msgid "_Replace"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -782,72 +827,74 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
 msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
@@ -855,56 +902,56 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, python-format
 msgid "Version %s"
 msgstr ""
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1287,7 +1334,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1317,7 +1364,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
diff --git a/po/sv.po b/po/sv.po
index 56dd66ab..61bc47ff 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,5 +1,6 @@
 # Swedish messages for update-manager.
 # Copyright (C) 2005 Free Software Foundation, Inc.
+# Daniel Nylander <po@danielnylander.se>, 2006.
 # Christian Rose <menthos@menthos.com>, 2005.
 #
 # $Id: sv.po,v 1.5 2005/04/04 08:49:52 mvogt Exp $
@@ -8,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:18+0000\n"
-"Last-Translator: Robin Sonefors <ozamosi@blinkenlights.se>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-06 03:32+0000\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,56 +58,52 @@ msgstr "Efter %s dagar"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "%d uppdateringar"
+msgstr "Uppdateringar för %s"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
 #. second %s is the code name of the comp, eg main, universe
 #: ../SoftwareProperties/SoftwareProperties.py:264
-#, fuzzy, python-format
+#, python-format
 msgid "%s (%s)"
-msgstr "%s - %s/s"
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Huvudserver"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
-#, fuzzy, python-format
+#, python-format
 msgid "Server for %s"
-msgstr "Server"
+msgstr "Server för %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "Närmaste server"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Anpassade servrar"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Programvaruuppdateringar"
+msgstr "Programvarukanal"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
-#, fuzzy
 msgid "Active"
-msgstr "Aktivera"
+msgstr "Aktiv"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr "Källkod"
+msgstr "(Källkod)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
 msgstr "Källkod"
 
@@ -129,33 +126,32 @@ msgstr "Fel vid borttagning av nyckeln"
 
 #: ../SoftwareProperties/SoftwareProperties.py:993
 msgid "The key you selected could not be removed. Please report this as a bug."
-msgstr ""
-"Nyckeln du valde kan inte tas bort. Var vänlig anmäl detta som en bugg."
+msgstr "Nyckeln du valde kan inte tas bort. Rapportera detta som ett fel."
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
-"<big><b>Fel vid genomsökning av CD</b></big>\n"
+"<big><b>Fel vid avsökning av cd-skiva</b></big>\n"
 "\n"
 "%s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1096
 msgid "Please enter a name for the disc"
-msgstr "Skriv in ett namn på skivan"
+msgstr "Ange ett namn för skivan"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1112
 msgid "Please insert a disc in the drive:"
-msgstr "Sätt in en skiva i enheten:"
+msgstr "Mata in en skiva i enheten:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Trasiga paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -164,36 +160,37 @@ msgstr ""
 "programmet. Reparera dem först med synaptic eller apt-get innan du "
 "fortsätter."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
-msgstr "Kan inte uppdatera obligatoriska meta-paket"
+msgstr "Kan inte uppdatera de obligatoriska meta-paketen"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "Ett grundläggande paket skulle behöva tas bort"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
-msgstr "Kunde inte beräkna uppdateringen"
+msgstr "Kunde inte beräkna uppgraderingen"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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 som inte gick att lösa uppstod när uppdateringen beräknades. Var "
-"vänlig rapportera detta som en bugg. "
+"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."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Det gick inte att autentisiera vissa paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -201,28 +198,27 @@ msgid ""
 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."
+"med icke-autentisierade paket."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Kan inte installera \"%s\""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 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. Var vänlig "
-"rapportera detta som en bugg. "
+"Det var inte möjligt att installera ett nödvändigt paket. Rapportera detta "
+"som ett fel. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Kan inte gissa meta-paket"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -230,16 +226,15 @@ msgid ""
 " 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 upptäcka vilken version av ubuntu du "
-"använder.\n"
-" Installera ett av dessa paket med synaptic eller apt-get innan du "
+"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."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "Misslyckades med att hämta"
+msgstr "Misslyckades med att lägga till cd-skivan"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -250,28 +245,39 @@ msgid ""
 "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\""
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Läser cache"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Hämta uppgraderingsdata från nätverket?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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\"."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Hittade ingen giltig serverspegel"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -288,14 +294,14 @@ msgstr ""
 "\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."
+"Om du väljer \"Nej\" kommer uppdateringen avbrytas."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
-msgstr "Lägg till standardförråd?"
+msgstr "Generera standardkällor?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -308,38 +314,37 @@ msgstr ""
 "Ska standardposter för \"%s\" läggas till? Om du väljer \"Nej\" kommer "
 "uppdateringen avbrytas."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
-msgstr "Information om förråd ogiltig"
+msgstr "Förrådsinformationen är ogiltig"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 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. Var vänlig "
-"rapportera detta som en bugg."
+"Uppdatering av förrådsinformationen orsakade en ogiltig fil. Rapportera "
+"detta som ett fel."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Tredjepartskällor inaktiverade"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
-"Somliga tredjeparskällor i din sources.list var avstängda. Du kan åter-"
-"aktivera dem efter uppgraderingen med verktyget \"software-properties\" "
-"eller med synaptic."
+"Vissa tredjepartsposter i din sources.list blev inaktiverade. Du kan "
+"återaktivera dem efter uppgraderingen med verktyget \"software-properties\" "
+"eller med Synaptic."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Fel vid uppdatering"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -348,11 +353,11 @@ msgstr ""
 "av nätverksproblem, var god kontrollera din nätverksanslutning och försök "
 "igen."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Inte tillräckligt med ledigt diskutrymme"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -360,20 +365,19 @@ msgid ""
 "apt-get clean'."
 msgstr ""
 "Uppgraderingen avbryts nu. Frigör åtminstone %s diskutrymme på %s. Töm din "
-"papperskorg och ta bort temporära paket av tidigare installationer genom att "
-"använda 'sudo apt-get clean'."
+"papperskorg och ta bort temporära paket från tidigare installationer genom "
+"att använda \"sudo apt-get clean\"."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
-msgstr "Vill du starta uppdateringen?"
+msgstr "Vill du starta uppgraderingen?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Det gick inte att installera uppgraderingarna"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -382,26 +386,28 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "Uppgraderingen avbryts nu. Ditt system kan vara i ett oanvändbart tillstånd. "
-"En återställning kördes (dpkg --configure -a)."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
-msgstr "Det gick inte ladda ner uppgraderingarna"
+msgstr "Det gick inte att hämta uppgraderingarna"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
-"Uppdateringen avbryts nu. Var god kontrollera din internetanslutning eller "
-"ditt installationsmedia och försök igen. "
+"Uppgraderingen avbryts nu. Var god kontrollera din Internetanslutning eller "
+"ditt installationsmedia, och försök igen. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Stöd för vissa program har upphört"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -409,27 +415,29 @@ msgid ""
 "If you have not enabled community maintained software (universe), 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. "
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "Ta bort föråldrade paket?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_Hoppa över det här steget"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
-msgstr "Fel inträffade vid utförandet"
+msgstr "Fel inträffade vid verkställandet"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -438,32 +446,46 @@ msgstr ""
 "information. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
-msgstr "Återställer systemstatus"
+msgstr "Återställer ursprungligt systemtillstånd"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "Hämtar bakåtportering av \"%s\""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Kontrollerar pakethanterare"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr "Förberedelse av uppgradering misslyckades"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Uppdaterar förrådsinformation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Ogiltig paketinformation"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -471,23 +493,25 @@ msgid ""
 "manager' package and include the files in /var/log/dist-upgrade/ in the "
 "bugreport."
 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 alvarligt fel, var god och rapportera detto som en bugg."
+"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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Ber om bekräftelse"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Uppgraderar"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
-msgstr "Söker efter föråldrad mjukvara"
+msgstr "Söker efter föråldrad programvara"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Systemuppdateringen är klar."
 
@@ -498,32 +522,31 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "Mata in \"%s\" i enheten \"%s\""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "Uppdateringen är färdig"
+msgstr "Hämtning är klar"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr "Hämtar hem fil %li av %li i %s/s"
+msgstr "Hämtar fil %li av %li i %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "Omkring %li minuter återstår"
+msgstr "Ungefär %s återstående"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
-msgstr "Laddar ner fil %li av %li"
+msgstr "Hämtar fil %li av %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
 #: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
-msgstr "Verställer ändringar"
+msgstr "Verkställer ändringar"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
@@ -535,22 +558,26 @@ 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."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"Ersätt konfigurationsfil\n"
+"Ersätt den anpassade konfigurationsfilen\n"
 "\"%s\"?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
@@ -558,78 +585,79 @@ msgstr "Kommandot \"diff\" hittades inte"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
-msgstr "Ett kritiskt fel uppstod"
+msgstr "Ett ödesdigert fel uppstod"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 god och rapportera detta som en bugg 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."
+"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."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s paket kommer att tas bort."
-msgstr[1] "%s paket kommer att tas bort."
+msgstr[0] "%d paket kommer att tas bort."
+msgstr[1] "%d paket kommer att tas bort."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] "%s nytt paket kommer att installeras."
-msgstr[1] "%s nya paket kommer att installeras."
+msgstr[0] "%d nytt paket kommer att installeras."
+msgstr[1] "%d nya paket kommer att installeras."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "%s paket kommer att uppgraderas."
-msgstr[1] "%s paket kommer att uppgraderas."
+msgstr[0] "%d paket kommer att uppgraderas."
+msgstr[1] "%d paket kommer att uppgraderas."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Du behöver ladda ner totalt %s."
+msgstr ""
+"\n"
+"\n"
+"Du måste hämta totalt %s. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
 msgstr ""
-"Uppdateringen kan ta flera timmar och kan inte avbrytas någon gång senare."
+"Hämtning och installation av uppgraderingen kan ta flera timmar och kan inte "
+"avbrytas."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
-msgstr "Stäng alla öppna program och dokument för att undvika dataförlust."
+msgstr "Stäng alla öppna program och dokument för att förhindra dataförlust."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "Ditt system är uppdaterat"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:519
-#, fuzzy
 msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
 msgstr ""
-"Det finns <b>%s uppdateringar</b> tillgängliga för ditt system, som kräver "
-"att <b>%s</b> data hämtas."
+"Det finns inga tillgängliga uppgraderingar för ditt system. Uppgraderingen "
+"kommer nu att avbrytas."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -647,33 +675,35 @@ msgid "Upgrade %s"
 msgstr "Uppgradera %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "Omkring %li dagar, %li timmar och %li minuter återstår"
+msgstr "%li dagar %li timmar %li minuter"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "Omkring %li timmar och %li minuter återstår"
+msgstr "%li timmar %li minuter"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li minuter"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
-#, fuzzy, python-format
+#, python-format
 msgid "%li seconds"
-msgstr "sekunder"
+msgstr "%li sekunder"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"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"
 
 #: ../DistUpgrade/DistUpgradeView.py:109
 msgid "Reboot required"
@@ -701,10 +731,10 @@ msgid ""
 "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 uppdatering?</big></b>\n"
+"<b><big>Avbryt pågående uppgradering?</big></b>\n"
 "\n"
-"Systemet kan hamna i ett oanvändbart läge om du avbryter uppgraderingen. Du "
-"är starkt rekommderad att fortsätta uppgraderingen."
+"Systemet kan hamna i ett oanvändbart tillstånd om du avbryter "
+"uppgraderingen. Det rekommenderas starkt att du fortsätter uppgraderingen."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
@@ -717,7 +747,7 @@ msgstr "<b><big>Starta uppgraderingen?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Uppgraderar Ubuntu till version 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -732,13 +762,12 @@ msgid "Difference between the files"
 msgstr "Skillnad mellan filerna"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
 msgstr "Hämtar och installerar uppgraderingarna"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr "Ändrar källorna för program"
+msgstr "Ändrar programvarukanalerna"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
@@ -753,28 +782,40 @@ msgid "Terminal"
 msgstr "Terminalfönster"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr "_Avbryt uppgradering"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr "_Fortsätt"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_Behåll"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
-msgstr "_Rapportera bugg"
+msgstr "_Rapportera fel"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "_Starta om nu"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_Återuppta uppgraderingen"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr "_Starta uppgradering"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
-msgstr "Det gick inte att hitta versionsinformation"
+msgstr "Det gick inte att hitta versionsfaktan"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
@@ -782,40 +823,39 @@ msgstr "Servern kan vara överbelastad. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
 msgid "Could not download the release notes"
-msgstr "Det gick inte att ladda ner versionsinformation"
+msgstr "Det gick inte att hämta versionsfaktan"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr "Kontrollera din internetanslutning"
+msgstr "Kontrollera din Internetanslutning."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
-msgstr "Det gick inte att köra uppdateringsverktyget"
+msgstr "Det gick inte att köra uppgraderingsverktyget"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:150
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
 msgstr ""
-"Det är troligen en bugg i uppdateringsverktyget. Var god rapportera det som "
-"en bugg."
+"Det är troligen ett fel i uppgraderingsverktyget. Rapportera det som ett fel."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
-msgstr "Hämtar uppdateringsverktyget"
+msgstr "Hämtar uppgraderingsverktyget"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
 msgstr ""
-"Uppdateringsverktyget kommer att guida dig genom uppdateringsprocessen."
+"Uppgraderingsverktyget kommer att guida dig genom uppgraderingsprocessen."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
-msgstr "Uppdateringsverktygets signatur"
+msgstr "Uppgraderingsverktygets signatur"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
-msgstr "Uppdateringsverktyg"
+msgstr "Uppgraderingsverktyg"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
@@ -824,33 +864,32 @@ msgstr "Misslyckades med att hämta"
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
-"Hämtningen av uppdateringen misslyckades. Det kan vara ett problem med "
+"Hämtningen av uppgraderingen misslyckades. Det kan vara ett problem med "
 "nätverket. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
-msgstr "Misslyckades med att packa upp"
+msgstr "Misslyckades med att extrahera"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
 msgstr ""
-"Uppackningen av uppdateringen misslyckades. Det kan vara ett problem med "
-"nätverket eller servern. "
+"Extraheringen av uppgraderingen misslyckades. Det kan vara ett problem med "
+"nätverket eller med servern. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
-msgstr "Kontrollen misslyckades"
+msgstr "Verifieringen misslyckades"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
 msgstr ""
-"Kontrollen av uppdateringen misslyckades. Det kan vara ett problem med "
-"nätverket eller servern. "
+"Validering av uppgraderingen misslyckades. Det kan finnas ett problem i "
+"nätverket eller med servern. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
@@ -861,220 +900,205 @@ msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
 msgstr ""
-"Autentisering av uppdateringen misslyckades. Det kan vara ett problem med "
-"nätverket eller servern. "
+"Autentisering av uppgraderingen misslyckades. Det kan vara ett problem med "
+"nätverket eller med servern. "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Hämtar hem fil %li av %li i %s/s"
+msgstr "Hämtar fil %(current)li av %(total)li med %(speed)s/s"
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Hämtar hem fil %li av %li i %s/s"
+msgstr "Hämtar fil %(current)li av %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare"
+msgstr "Listan över ändringar finns inte tillgänglig"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
-msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare"
+#: ../UpdateManager/UpdateManager.py:212
+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."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
-"Misslyckades med att hämta listan med ändringar. Kontrollera din "
-"internetanslutning."
+"Misslyckades med att hämta listan över ändringar. \n"
+"Kontrollera din Internetanslutning."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
+msgstr "Viktiga säkerhetsuppdateringar"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr "%d uppdateringar"
+msgstr "Rekommenderade uppdateringar"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "%d uppdateringar"
+msgstr "Föreslagna uppdateringar"
 
-#: ../UpdateManager/UpdateManager.py:239
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr "%d uppdateringar"
+msgstr "Bakåtporteringar"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "Distribution:"
+msgstr "Uppdateringar för utgåva"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Uppdateringar"
+msgstr "Övriga uppdateringar"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Version %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr "Hämtar lista med ändringar..."
+msgstr "Hämtar lista över ändringar..."
 
-#: ../UpdateManager/UpdateManager.py:548
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr "_Uppdatera alla"
+msgstr "_Avmarkera allt"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "_Kontrollera"
+msgstr "_Kontrollera alla"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
-msgstr "Nerladdningsstorlek: %s"
+msgstr "Hämtningsstorlek: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 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"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
-msgstr "Var god vänta, det här kan ta lite tid"
+msgstr "Var god vänta, det här kan ta lite tid."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "Uppdateringen är färdig"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "Kontrollera efter tillgängliga uppdateringar"
+msgstr "Letar efter uppdateringar"
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "Ny version: %s (Storlek: %s)"
+msgstr "Från version %(old_version)s till %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Version %s:"
+msgstr "Version %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:832
+#, python-format
 msgid "(Size: %s)"
-msgstr "Storlek:"
+msgstr "(Storlek: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "Din distribution stöds inte längre"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 få säkerhets- eller kritiska uppdateringar. Uppgradera "
-"till en senare version av Ubuntu Linux. Se http://www.ubuntu.com för mer "
-"information om att uppgradera."
+"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."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>Ny distributionsutgåva \"%s\" finns tillgänglig</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
-msgstr "Indexet för program är trasigt"
+msgstr "Programindexet är trasigt"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
-"packethanteraren \"Synaptic\" eller kör \"sudo apt-get install -f\" i en "
+"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."
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
-#, fuzzy
 msgid "None"
-msgstr "en"
+msgstr "Ingen"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
-#, fuzzy
 msgid "1 KB"
-msgstr "%d kB"
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
-#, fuzzy, python-format
+#, python-format
 msgid "%.0f KB"
-msgstr "%.2f MB"
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
-#, fuzzy, python-format
+#, python-format
 msgid "%.1f MB"
-msgstr "%.2f MB"
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, 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åste titta efter uppdateringar manuellt</big></b>\n"
+"<b><big>Du måste manuellt leta efter uppdateringar</big></b>\n"
 "\n"
-"Ditt system tittar inte efter uppdateringar automatiskt. Du kan konfiguera "
-"detta beteende i \"System\" -> \"Administration\" -> "
-"\"Programvaruinställningar\""
+"Ditt system letar inte automatiskt efter uppdateringar. Du kan konfiguera "
+"det här beteendet i <i>Programvarukällor</i> under fliken "
+"<i>Internetuppdateringar</i>."
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>Håll ditt system uppdaterat</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
-"<big><b>Fel vid genomsökning av CD</b></big>\n"
-"\n"
-"%s"
+msgstr "<big><b>Inte alla uppdateringar kan installeras</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Starta uppgraderingen?</big></b>"
+msgstr "<big><b>Startar Uppdateringshanterare</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1082,7 +1106,7 @@ msgstr "Ändringar"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Ändringar och beskrivning av uppdateringen"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1090,7 +1114,7 @@ msgstr "_Kontrollera"
 
 #: ../data/glade/UpdateManager.glade.h:10
 msgid "Check the software channels for new updates"
-msgstr "Kontrollera programvarukanalerna efter nya uppdateringar"
+msgstr "Leta efter nya uppdateringar i programvarukanalerna"
 
 #: ../data/glade/UpdateManager.glade.h:11
 msgid "Description"
@@ -1098,7 +1122,7 @@ msgstr "Beskrivning"
 
 #: ../data/glade/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr "Versionsinformation"
+msgstr "Versionsfakta"
 
 #: ../data/glade/UpdateManager.glade.h:13
 msgid ""
@@ -1107,6 +1131,11 @@ msgid ""
 "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."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
@@ -1121,25 +1150,24 @@ msgid ""
 "Software updates correct errors, eliminate security vulnerabilities and "
 "provide new features."
 msgstr ""
-"Mjukvaruuppdateringar fixar fel, eliminerar säkerhetsproblem och ger dig nya "
-"funktioner."
+"Programvaruuppdateringar rättar till fel, eliminerar säkerhetsproblem och "
+"ger dig nya funktioner."
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
-msgstr "_Uppdateringar"
+msgstr "U_ppgradera"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr "Uppdatera till senaste versionen av Ubuntu"
+msgstr "Uppgradera till senaste versionen av Ubuntu"
 
 #: ../data/glade/UpdateManager.glade.h:21
 msgid "_Check"
 msgstr "_Kontrollera"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "Distribution:"
+msgstr "_Uppgradering av utgåva"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1150,32 +1178,28 @@ msgid "_Install Updates"
 msgstr "_Installera uppdateringar"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Ändringar"
+msgstr "ändrar"
 
 #: ../data/glade/UpdateManager.glade.h:26
-#, fuzzy
 msgid "updates"
-msgstr "Uppdateringar"
+msgstr "uppdaterar"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Internetuppdateringar</b>"
+msgstr "<b>Automatiska uppdateringar</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>Cd-rom/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Internetuppdateringar</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Internetuppdateringar</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1187,11 +1211,17 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "Lägg till _CD"
+msgstr "Lägg till cd-rom"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
@@ -1199,16 +1229,15 @@ msgstr "Autentisering"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
-msgstr "_Ta bort nerladdade programfiler:"
+msgstr "_Ta bort hämtade programvarufiler:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "Hämtningslogg"
+msgstr "Hämta från:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
-msgstr "Importera den publika nyckeln från en betrodd mjukvaruutgivare"
+msgstr "Importera den publika nyckeln från en betrodd programvaruleverantör"
 
 #: ../data/glade/SoftwareProperties.glade.h:14
 msgid "Internet Updates"
@@ -1219,12 +1248,12 @@ msgid ""
 "Only security updates from the official Ubuntu servers will be installed "
 "automatically"
 msgstr ""
-"Bara säkerhetsuppdateringar från de officiella Ubuntuservrarna kommer "
+"Endast säkerhetsuppdateringar från de officiella Ubuntuservrarna kommer "
 "installeras automatiskt"
 
 #: ../data/glade/SoftwareProperties.glade.h:16
 msgid "Restore _Defaults"
-msgstr "_Återställ standardalternativ"
+msgstr "_Återställ standardvärden"
 
 #: ../data/glade/SoftwareProperties.glade.h:17
 msgid "Restore the default keys of your distribution"
@@ -1236,43 +1265,38 @@ msgid "Software Sources"
 msgstr "Programvarukällor"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
 msgstr "Källkod"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
-#, fuzzy
 msgid "Statistics"
-msgstr "Status"
+msgstr "Statistik"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
-#, fuzzy
 msgid "Submit statistical information"
-msgstr "Hämta användningsinformation"
+msgstr "Skicka in statistik"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Tredjepart"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
-msgstr "Kolla efter uppdateringar _automatiskt:"
+msgstr "Leta efter uppdateringar _automatiskt:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "_Hämta uppdateringar i bakgrunden, men installera dem inte"
+msgstr "_Hämta automatiskt uppdateringar, men installera dem inte"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
-msgstr ""
+msgstr "_Importera nyckelfil"
 
 #: ../data/glade/SoftwareProperties.glade.h:26
 msgid "_Install security updates without confirmation"
 msgstr "_Installera säkerhetsuppdateringar utan bekräftelse"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1281,12 +1305,12 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>Kanalinformationen är gammal</big></b>\n"
+"<b><big>Informationen om tillgänglig programvara är utdaterad</big></b>\n"
 "\n"
-"Du behöver uppdatera kanalinformationen för att installera program och "
-"uppdateringar från nya eller ändrade kanaler. \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 kunna fortsätta."
+"Du behöver en fungerande Internetanslutning för att fortsätta."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
@@ -1309,7 +1333,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1317,10 +1340,11 @@ msgid ""
 "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 in hela APT-raden till kanalen du vill lägga till</b></big>\n"
+"<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 innehåller typ, plats och komponenter för en kanal, till exempel "
-"<i>\"deb http://ftp.debian.org sarge main\"</i>."
+"APT-raden inkluderar typen, platsen och komponenterna för ett förråd, till "
+"exempel <i>\"deb http://ftp.debian.org sarge main\"</i>."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
@@ -1335,18 +1359,16 @@ msgstr ""
 "Källkod"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr "Redigera tjänster"
+msgstr "Redigera källa"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
-msgstr "Söker igenom CD-skivan"
+msgstr "Söker igenom cd-skivan"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr "Lägg till tjänst"
+msgstr "_Lägg till källa"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1365,23 +1387,22 @@ msgid ""
 "Check automatically if a new version of the current distribution is "
 "available and offer to upgrade (if possible)."
 msgstr ""
-"Kontrollera automatiskt om en nyare version av nuvarande distribution finns "
-"tillgänglig och fråga om du vill uppdatera (om möjligt)."
+"Kontrollera automatiskt om en snare version för nuvarande distribution finns "
+"tillgänglig och fråga om du vill uppgradera (om möjligt)."
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr "Sök efter ny utgåva av distributionen"
+msgstr "Sök efter nya utgåvor av distributionen"
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 ""
-"Om automatisk kontroll av uppdateringar är inaktiverad behöver du ladda om "
-"kanallistan manuellt. Det här alternativet möjliggör att dölja påminnelser "
-"som visas i det här läget."
+"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."
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
@@ -1393,25 +1414,23 @@ msgstr "Visa detaljer för en uppdatering"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr "Sparar storleken på uppdateringshanterarens fönster"
+msgstr "Lagrar storleken för uppdateringshanterarens dialogfönster"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changes and the "
 "description"
 msgstr ""
-"Sparar läget på expanderaren som innehåller listan på ändringar och "
-"beskrivningar"
+"Lagrar tillståndet för expanderaren som innehåller listan av ändringar och "
+"beskrivningen"
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
 msgstr "Fönsterstorleken"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "Konfigurera programkanaler och internetuppdateringar"
+msgstr "Konfigurera källorna för installerbara programvaror och uppdateringar"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1421,89 +1440,78 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 Uppdateringar"
+msgstr "Ubuntu 6.10 \"Edgy Eft\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Gemenskapsunderhållen (Universe)"
+msgstr "Gemenskapsunderhållen"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Properitära drivrutiner för enheter"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Bidragen programvara"
+msgstr "Inskränkt programvara"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Cd-rom med Ubuntu 6.10 \"Edgy Eft\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 \"Dapper Drake\""
+msgstr "Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+msgid "Canonical supported Open Source software"
+msgstr "Öppen källkodsprogramvara som stöds av Canonical"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Gemenskapsunderhållen (Universe)"
+msgstr "Gemenskapsunderhållen (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Gemenskapsunderhållen (Universe)"
+msgstr "Öppen källkodsprogramvara underhållen av gemenskapen"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Ickefri (Multiverse)"
+msgstr "Ickefria drivrutiner"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Properitära drivrutiner för enheter "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Ickefri (Multiverse)"
+msgstr "Inskränkt programvara (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Programvara med USA-exportbegränsningar"
+msgid "Software restricted by copyright or legal issues"
+msgstr "Programvara begränsad av upphovsrätt eller juridiska avtal"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 \"Dapper Drake\""
+msgstr "Cd-rom med Ubuntu 6.06 LTS \"Dapper Drake\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
-#, fuzzy
 msgid "Backported updates"
-msgstr "%d uppdateringar"
+msgstr "Bakåtporterade uppdateringar"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1512,9 +1520,8 @@ msgstr "Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Cd-rom med Ubuntu 5.10 \"Breezy Badger\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1533,14 +1540,13 @@ msgstr "Ubuntu 5.10 Bakåtportar"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Cd-rom med Ubuntu 5.04 \"Hoary Hedgehog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1549,27 +1555,23 @@ msgstr "Stöds officiellt"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
+msgstr "Säkerhetsuppdateringar för Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 Uppdateringar"
+msgstr "Uppdateringar för Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 Bakåtportar"
+msgstr "Bakåtporteringar för Ubuntu 5.04"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
+msgstr "Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1584,13 +1586,12 @@ msgstr "Ickefri (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Cd-rom med Ubuntu 4.10 \"Warty Warthog\""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Viss programvara har inte längre officiellt stöd"
+msgstr "Stöds inte längre officiellt"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1599,21 +1600,18 @@ msgstr "Begränsad upphovsrätt"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
+msgstr "Säkerhetsuppdateringar för Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 5.10 Uppdateringar"
+msgstr "Uppdateringar för Ubuntu 4.10"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 Bakåtportar"
+msgstr "Bakåtporteringar för Ubuntu 4.10"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1659,20 +1657,145 @@ msgstr "DFSG-kompatibel programvara med icke-fria beroenden"
 #. CompDescription
 #: ../data/channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr "Inte DFSG-kompatibel programvara"
+msgstr "Icke-DFSG-kompatibel programvara"
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Hämtar hem fil %li av %li med okänd hastighet"
+#~ 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"
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "%d uppdateringar"
+#~ 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 "Cancel _Download"
-#~ msgstr "Avbryt _nedladdningen"
+#~ 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 har inte längre officiellt stöd"
+#~ 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"
@@ -1680,47 +1803,43 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "Your system has already been upgraded."
 #~ msgstr "Ditt system har redan uppgraderats."
 
-#, fuzzy
 #~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
+#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Uppdaterar till Ubuntu 6.06 LTS</"
+#~ "<span weight=\"bold\" size=\"x-large\">Uppgraderar till Ubuntu 6.06 LTS</"
 #~ "span>"
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 Säkerhetsuppdateringar"
+#~ msgid "Downloading and installing the upgrades"
+#~ msgstr "Hämtar och installerar uppgraderingarna"
 
-#, fuzzy
-#~ msgid "Recommended updates of Ubuntu"
-#~ msgstr "%d uppdateringar"
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Uppgraderar Ubuntu"
 
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Uppdatera till senaste versionen av 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 "Cannot install all available updates"
-#~ msgstr "Det går inte att installera alla tillgängliga uppdateringar"
+#~ msgid "Downloading file %li of %li with %s/s"
+#~ msgstr "Hämtar fil %li av %li i %s/s"
 
-#~ msgid "Select _None"
-#~ msgstr "Markera _inga"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Hämtar fil %li av %li med okänd hastighet"
 
-#~ msgid "Select _All"
-#~ msgstr "Markera _alla"
+#~ 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 ""
-#~ "<big><b>Examining your system</b></big>\n"
-#~ "\n"
-#~ "Software updates correct errors, eliminate security vulnerabilities and "
-#~ "provide new features."
+#~ "Failed to download the list of changes. Please check your Internet "
+#~ "connection."
 #~ msgstr ""
-#~ "<big><b>Undersöker ditt system</b></big>\n"
-#~ "\n"
-#~ "Mjukvaruuppdateringar fixar fel, eliminerar säkerhetsproblem och ger dig "
-#~ "nya funktioner."
+#~ "Misslyckades med att hämta listan med ändringar. Kontrollera din "
+#~ "Internetanslutning."
 
-#~ msgid "Oficially supported"
-#~ msgstr "Stöds officiellt"
+#~ 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 "
@@ -1728,24 +1847,15 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ "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 packethanteraren Synaptic "
+#~ "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 "About %li seconds remaining"
-#~ msgstr "Omkring %li sekunder återstår"
-
-#~ msgid "Download is complete"
-#~ msgstr "Hämtningen är färdig"
+#~ msgstr "Följande uppdateringar kommer att hoppas över:"
 
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "Uppdateringen avbryts nu. Var vänlig rapportera detta som en bugg."
-
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "Uppgraderar Ubuntu"
+#~ msgid "Downloading the list of changes..."
+#~ msgstr "Hämtar listan med ändringar..."
 
 #~ msgid "Hide details"
 #~ msgstr "Dölj detaljer"
@@ -1753,12 +1863,43 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ 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'"
+#~ 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>"
@@ -1766,40 +1907,93 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ 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"
 
-#, fuzzy
 #~ msgid "_Add Channel"
-#~ msgstr "_Lägg till kanal"
+#~ 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"
 
-#, fuzzy
 #~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 Uppdateringar"
+#~ msgstr "Ubuntu 6.06 LTS"
 
 #~ msgid "Ubuntu 6.06 LTS Security Updates"
 #~ msgstr "Ubuntu 6.06 LTS Säkerhetsuppdateringar"
@@ -1808,7 +2002,10 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgstr "Ubuntu 6.06 LTS Uppdateringar"
 
 #~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS Bakåtportar"
+#~ 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 "
@@ -1905,9 +2102,15 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ "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>"
 
@@ -1916,6 +2119,10 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ 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"
 
@@ -2065,12 +2272,21 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ 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"
 
@@ -2099,6 +2315,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "Components"
 #~ msgstr "Komponenter"
 
+#~ msgid "Distribution:"
+#~ msgstr "Distribution:"
+
 #~ msgid "Type:"
 #~ msgstr "Typ:"
 
@@ -2114,6 +2333,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "User Interface"
 #~ msgstr "Användargränssnitt"
 
+#~ msgid "Version %s:"
+#~ msgstr "Version %s:"
+
 #~ msgid "New version:"
 #~ msgstr "Ny version"
 
@@ -2177,6 +2399,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ 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."
 
@@ -2286,9 +2511,15 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ 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"
 
@@ -2600,6 +2831,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ 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> ..."
 
@@ -2675,6 +2909,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "Info"
 #~ msgstr "Info"
 
+#~ msgid "Status"
+#~ msgstr "Status"
+
 #~ msgid "Patches"
 #~ msgstr "Programfixar"
 
@@ -2789,6 +3026,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "All Packages"
 #~ msgstr "Alla paket"
 
+#~ msgid "Updates"
+#~ msgstr "Uppdateringar"
+
 #~ msgid "Uninstalled Packages"
 #~ msgstr "Avinstallerade paket"
 
@@ -2873,6 +3113,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ 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"
 
@@ -2882,6 +3125,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ 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"
 
@@ -2937,6 +3183,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "_Updates"
 #~ msgstr "_Uppdateringar"
 
+#~ msgid "_Update All"
+#~ msgstr "_Uppdatera alla"
+
 #~ msgid "Privilege"
 #~ msgstr "Privilegium"
 
@@ -3022,6 +3271,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ 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:"
 
@@ -3109,6 +3361,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "Username"
 #~ msgstr "Användarnamn"
 
+#~ msgid "%d KB"
+#~ msgstr "%d kB"
+
 #~ msgid "%d kB"
 #~ msgstr "%d kB"
 
@@ -3545,6 +3800,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ 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."
@@ -3597,6 +3855,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "Installed Version:"
 #~ msgstr "Installerad version:"
 
+#~ msgid "Size:"
+#~ msgstr "Storlek:"
+
 #~ msgid "bytes"
 #~ msgstr "byte"
 
@@ -3634,6 +3895,13 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ "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>."
 
@@ -3727,15 +3995,24 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ 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..."
 
@@ -3757,6 +4034,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "zero"
 #~ msgstr "noll"
 
+#~ msgid "one"
+#~ msgstr "en"
+
 #~ msgid "two"
 #~ msgstr "två"
 
@@ -3821,6 +4101,9 @@ msgstr "Inte DFSG-kompatibel programvara"
 #~ msgid "Allowed cache difference:"
 #~ msgstr "Tillåten cacheskillnad:"
 
+#~ msgid "seconds"
+#~ msgstr "sekunder"
+
 #~ msgid "<b>%d</b> %s"
 #~ msgstr "<b>%d</b> %s"
 
diff --git a/po/ta.po b/po/ta.po
new file mode 100644
index 00000000..5766fa79
--- /dev/null
+++ b/po/ta.po
@@ -0,0 +1,1503 @@
+# Tamil translation for update-manager
+# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# This file is distributed under the same license as the update-manager package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: update-manager\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-08-04 02:52+0000\n"
+"Last-Translator: Raghavan <vijay.raghavan08@gmail.com>\n"
+"Language-Team: Tamil <ta@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1\n"
+
+#: ../SoftwareProperties/SoftwareProperties.py:136
+msgid "Daily"
+msgstr "தினமும்"
+
+#: ../SoftwareProperties/SoftwareProperties.py:137
+msgid "Every two days"
+msgstr "ஒவ்வோரு இரு நாட்கள்"
+
+#: ../SoftwareProperties/SoftwareProperties.py:138
+msgid "Weekly"
+msgstr "வாரம் தோறும்"
+
+#: ../SoftwareProperties/SoftwareProperties.py:139
+msgid "Every two weeks"
+msgstr "ஒவ்வோரு இரு வாரங்கள்"
+
+#: ../SoftwareProperties/SoftwareProperties.py:144
+#, python-format
+msgid "Every %s days"
+msgstr "ஒவ்வொரு %s நாட்கள்"
+
+#: ../SoftwareProperties/SoftwareProperties.py:167
+msgid "After one week"
+msgstr "ஒரு வார்த்திற்க்கு பிறகு"
+
+#: ../SoftwareProperties/SoftwareProperties.py:168
+msgid "After two weeks"
+msgstr "இரண்டு வாரத்திற்க்கு பிறகு"
+
+#: ../SoftwareProperties/SoftwareProperties.py:169
+msgid "After one month"
+msgstr "ஒரு மாதத்திற்க்கு பின்"
+
+#: ../SoftwareProperties/SoftwareProperties.py:174
+#, python-format
+msgid "After %s days"
+msgstr "%s நாட்களுக்கு பிறகு"
+
+#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
+#: ../SoftwareProperties/SoftwareProperties.py:252
+#, python-format
+msgid "%s updates"
+msgstr ""
+
+#. TRANSLATORS: Label for the components in the Internet section
+#. first %s is the description of the component
+#. second %s is the code name of the comp, eg main, universe
+#: ../SoftwareProperties/SoftwareProperties.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:316
+msgid "Main server"
+msgstr ""
+
+#. TRANSLATORS: %s is a country
+#: ../SoftwareProperties/SoftwareProperties.py:320
+#: ../SoftwareProperties/SoftwareProperties.py:338
+#, python-format
+msgid "Server for %s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:324
+msgid "Nearest server"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:345
+msgid "Custom servers"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:604
+#: ../SoftwareProperties/SoftwareProperties.py:621
+msgid "Software Channel"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:612
+#: ../SoftwareProperties/SoftwareProperties.py:629
+msgid "Active"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:714
+msgid "(Source Code)"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:720
+msgid "Source Code"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:969
+msgid "Import key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:979
+msgid "Error importing selected file"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:980
+msgid "The selected file may not be a GPG key file or it might be corrupt."
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:992
+msgid "Error removing the key"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:993
+msgid "The key you selected could not be removed. Please report this as a bug."
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1039
+#, python-format
+msgid ""
+"<big><b>Error scanning the CD</b></big>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1096
+msgid "Please enter a name for the disc"
+msgstr ""
+
+#: ../SoftwareProperties/SoftwareProperties.py:1112
+msgid "Please insert a disc in the drive:"
+msgstr "தெயவு செய்து இயக்கியினுள் வட்டை செலுத்தவும்:"
+
+#: ../DistUpgrade/DistUpgradeCache.py:91
+msgid "Broken packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:92
+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 ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:207
+msgid "Can't upgrade required meta-packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:217
+msgid "A essential package would have to be removed"
+msgstr ""
+
+#. FIXME: change the text to something more useful
+#: ../DistUpgrade/DistUpgradeCache.py:220
+msgid "Could not calculate the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:221
+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 ""
+
+#. FIXME: maybe ask a question here? instead of failing?
+#: ../DistUpgrade/DistUpgradeCache.py:246
+msgid "Error authenticating some packages"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:247
+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 ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:312
+#, python-format
+msgid "Can't install '%s'"
+msgstr "'%s' நிறுவமுடியவில்லை"
+
+#: ../DistUpgrade/DistUpgradeCache.py:313
+msgid ""
+"It was impossible to install a required package. Please report this as a "
+"bug. "
+msgstr ""
+
+#. FIXME: provide a list
+#: ../DistUpgrade/DistUpgradeCache.py:320
+msgid "Can't guess meta-package"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeCache.py:321
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:74
+msgid "Failed to add the CD"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:75
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:107
+msgid "Reading cache"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:155
+msgid "Fetch data from the network for the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:156
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:248
+msgid "No valid mirror found"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:249
+#, python-format
+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 ""
+
+#. hm, still nothing useful ...
+#: ../DistUpgrade/DistUpgradeControler.py:266
+msgid "Generate default sources?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:267
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:301
+msgid "Repository information invalid"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:302
+msgid ""
+"Upgrading the repository information resulted in a invalid file. Please "
+"report this as a bug."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:308
+msgid "Third party sources disabled"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:309
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:358
+#, fuzzy
+msgid "Error during update"
+msgstr "புதுப்பிக்கும் பொழுது பிழை ஏற்பட்டுள்ளது"
+
+#: ../DistUpgrade/DistUpgradeControler.py:359
+msgid ""
+"A problem occured during the update. This is usually some sort of network "
+"problem, please check your network connection and retry."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:368
+#, fuzzy
+msgid "Not enough free disk space"
+msgstr "வட்டுவில்் போதுமான காலி இடம் இல்லை"
+
+#: ../DistUpgrade/DistUpgradeControler.py:369
+#, python-format
+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 ""
+
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeControler.py:440
+msgid "Do you want to start the upgrade?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:460
+msgid "Could not install the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:461
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:479
+msgid "Could not download the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:480
+msgid ""
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:516
+msgid "Support for some applications ended"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:517
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:552
+msgid "Remove obsolete packages?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Skip This Step"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:553
+msgid "_Remove"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:563
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:564
+msgid ""
+"Some problem occured during the clean-up. Please see the below message for "
+"more information. "
+msgstr ""
+
+#. generate a new cache
+#: ../DistUpgrade/DistUpgradeControler.py:576
+msgid "Restoring original system state"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:632
+#, python-format
+msgid "Fetching backport of '%s'"
+msgstr ""
+
+#. sanity check (check for ubuntu-desktop, brokenCache etc)
+#. then open the cache (again)
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
+msgid "Checking package manager"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
+msgid "Invalid package information"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:733
+#, fuzzy
+msgid "Asking for confirmation"
+msgstr "உறுதிப்படுத்த கேட்கிறது"
+
+#: ../DistUpgrade/DistUpgradeControler.py:737
+msgid "Upgrading"
+msgstr "மேம்படுத்துகிறது"
+
+#: ../DistUpgrade/DistUpgradeControler.py:744
+msgid "Searching for obsolete software"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:749
+#, fuzzy
+msgid "System upgrade is complete."
+msgstr "கணிணி மேம்பாடு முடிந்தது."
+
+#. print "mediaChange %s %s" % (medium, drive)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:100
+#, python-format
+msgid "Please insert '%s' into the drive '%s'"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:118
+msgid "Fetching is complete"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:129
+#, python-format
+msgid "Fetching file %li of %li at %s/s"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewGtk.py:249
+#, python-format
+msgid "About %s remaining"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:132
+#, python-format
+msgid "Fetching file %li of %li"
+msgstr ""
+
+#. FIXME: add support for the timeout
+#. of the terminal (to display something useful then)
+#. -> longer term, move this code into python-apt
+#: ../DistUpgrade/DistUpgradeViewGtk.py:163
+msgid "Applying changes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:187
+#, python-format
+msgid "Could not install '%s'"
+msgstr "'%s' நிறுவ முடியவில்லை"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:188
+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 ""
+
+#. self.expander.set_expanded(True)
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#, python-format
+msgid ""
+"Replace the customized configuration file\n"
+"'%s'?"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:203
+msgid ""
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
+#, fuzzy
+msgid "The 'diff' command was not found"
+msgstr "'diff' என்ற கட்டளை இல்லை"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+msgid "A fatal error occured"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:356
+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 ""
+
+#. FIXME: make those two seperate lines to make it clear
+#. that the "%" applies to the result of ngettext
+#: ../DistUpgrade/DistUpgradeViewGtk.py:487
+#, python-format
+msgid "%d package is going to be removed."
+msgid_plural "%d packages are going to be removed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
+#, python-format
+msgid "%d new package is going to be installed."
+msgid_plural "%d new packages are going to be installed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:498
+#, python-format
+msgid "%d package is going to be upgraded."
+msgid_plural "%d packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:503
+#, python-format
+msgid ""
+"\n"
+"\n"
+"You have to download a total of %s. "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
+msgid ""
+"Fetching and installing the upgrade can take several hours and cannot be "
+"canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:512
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:518
+#: ../UpdateManager/UpdateManager.py:622
+msgid "Your system is up-to-date"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:519
+msgid ""
+"There are no upgrades available for your system. The upgrade will now be "
+"canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:535
+#, python-format
+msgid "<b>Remove %s</b>"
+msgstr "<b>%s நீக்கு</b>"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:537
+#, python-format
+msgid "Install %s"
+msgstr "%s நிறுவு"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:539
+#, python-format
+msgid "Upgrade %s"
+msgstr "%s மேம்படுத்து"
+
+#: ../DistUpgrade/DistUpgradeView.py:27
+#, python-format
+msgid "%li days %li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:29
+#, python-format
+msgid "%li hours %li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:31
+#, python-format
+msgid "%li minutes"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:32
+#, python-format
+msgid "%li seconds"
+msgstr ""
+
+#. 56 kbit
+#. 1Mbit = 1024 kbit
+#: ../DistUpgrade/DistUpgradeView.py:38
+#, python-format
+msgid ""
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:109
+#, fuzzy
+msgid "Reboot required"
+msgstr "மறு தொடக்கம் தேவைப்படுகிறது"
+
+#: ../DistUpgrade/DistUpgradeView.py:110
+msgid ""
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
+msgstr ""
+
+#. testcode to see if the bullets look nice in the dialog
+#. for i in range(4):
+#. view.setStep(i+1)
+#. app.openCache()
+#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/glade/SoftwareProperties.glade.h:1
+msgid "    "
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:2
+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 ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
+msgid "<b><big>Restart the system to complete the upgrade</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:6
+msgid "<b><big>Start the upgrade?</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:7
+msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:8
+msgid "Cleaning up"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:9
+msgid "Details"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:10
+msgid "Difference between the files"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Fetching and installing the upgrades"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:12
+msgid "Modifying the software channels"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Preparing the upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:15
+msgid "Terminal"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
+msgid "_Replace"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
+msgid "_Resume Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:68
+msgid "Could not find the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:69
+msgid "The server may be overloaded. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:79
+msgid "Could not download the release notes"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:80
+msgid "Please check your internet connection."
+msgstr ""
+
+#. no script file found in extracted tarbal
+#: ../UpdateManager/DistUpgradeFetcher.py:149
+msgid "Could not run the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:150
+msgid ""
+"This is most likely a bug in the upgrade tool. Please report it as a bug"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:171
+msgid "Downloading the upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:173
+msgid "The upgrade tool will guide you through the upgrade process."
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:180
+msgid "Upgrade tool signature"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:183
+msgid "Upgrade tool"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:208
+msgid "Failed to fetch"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:209
+msgid "Fetching the upgrade failed. There may be a network problem. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:214
+msgid "Failed to extract"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:215
+msgid ""
+"Extracting the upgrade failed. There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:221
+msgid "Verfication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:222
+msgid ""
+"Verifying the upgrade failed.  There may be a problem with the network or "
+"with the server. "
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:228
+msgid "Authentication failed"
+msgstr ""
+
+#: ../UpdateManager/DistUpgradeFetcher.py:229
+msgid ""
+"Authenticating the upgrade failed. There may be a problem with the network "
+"or with the server. "
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:108
+#, python-format
+msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
+msgstr ""
+
+#: ../UpdateManager/GtkProgress.py:113
+#, python-format
+msgid "Downloading file %(current)li of %(total)li"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:206
+msgid "The list of changes is not available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:217
+msgid ""
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
+msgid "Important security updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
+msgid "Recommended updates"
+msgstr ""
+
+#. Description
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
+msgid "Proposed updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:241
+msgid "Backports"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:242
+msgid "Distribution updates"
+msgstr ""
+
+#. TRANSLATORS: updates from an 'unknown' origin
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
+msgid "Other updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:478
+#, python-format
+msgid "Version %s: \n"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:539
+msgid "Downloading list of changes..."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:566
+msgid "_Uncheck All"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:572
+msgid "_Check All"
+msgstr ""
+
+#. TRANSLATORS: b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
+#, python-format
+msgid "Download size: %s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
+msgid "You can install %s update"
+msgid_plural "You can install %s updates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../UpdateManager/UpdateManager.py:666
+msgid "Please wait, this can take some time."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:668
+msgid "Update is complete"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:719
+msgid "Checking for updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
+msgid "From version %(old_version)s to %(new_version)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
+msgid "Version %s"
+msgstr ""
+
+#. TRANSLATORS: the b stands for Bytes
+#: ../UpdateManager/UpdateManager.py:832
+#, python-format
+msgid "(Size: %s)"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:843
+msgid "Your distribution is not supported anymore"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:844
+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 ""
+
+#: ../UpdateManager/UpdateManager.py:863
+#, python-format
+msgid "<b>New distribution release '%s' is available</b>"
+msgstr ""
+
+#. we assert a clean cache
+#: ../UpdateManager/UpdateManager.py:898
+msgid "Software index is broken"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:899
+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 ""
+
+#. TRANSLATORS: download size is 0
+#: ../UpdateManager/Common/utils.py:33
+msgid "None"
+msgstr ""
+
+#. TRANSLATORS: download size of very small updates
+#: ../UpdateManager/Common/utils.py:36
+msgid "1 KB"
+msgstr ""
+
+#. TRANSLATORS: download size of small updates, e.g. "250 KB"
+#: ../UpdateManager/Common/utils.py:39
+#, python-format
+msgid "%.0f KB"
+msgstr ""
+
+#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
+#: ../UpdateManager/Common/utils.py:42
+#, python-format
+msgid "%.1f MB"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:1
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:4
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:5
+msgid "<big><b>Not all updates can be installed</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:6
+msgid "<big><b>Starting update manager</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:7
+msgid "Changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:8
+msgid "Changes and description of the update"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:9
+msgid "Chec_k"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:10
+msgid "Check the software channels for new updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:11
+msgid "Description"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:12
+msgid "Release Notes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:13
+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 ""
+
+#: ../data/glade/UpdateManager.glade.h:16
+msgid "Show progress of single files"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:17
+msgid "Software Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:18
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:19
+msgid "U_pgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:20
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:21
+msgid "_Check"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:22
+msgid "_Distribution Upgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:23
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:24
+msgid "_Install Updates"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:25
+msgid "changes"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:26
+msgid "updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:2
+msgid "<b>Automatic updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:3
+msgid "<b>CDROM/DVD</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:4
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:5
+msgid "<b>Internet</b>"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:6
+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 ""
+
+#: ../data/glade/SoftwareProperties.glade.h:9
+msgid "Add Cdrom"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:10
+msgid "Authentication"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:11
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:12
+msgid "Download from:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:13
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:14
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:15
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:16
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:17
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:18
+#: ../data/software-properties.desktop.in.h:2
+msgid "Software Sources"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:19
+msgid "Source code"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:20
+msgid "Statistics"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:21
+msgid "Submit statistical information"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:22
+msgid "Third Party"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:23
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:24
+msgid "_Download updates automatically, but do not install them"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:25
+msgid "_Import Key File"
+msgstr ""
+
+#: ../data/glade/SoftwareProperties.glade.h:26
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Components:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
+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 ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
+msgid "APT line:"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Source"
+msgstr ""
+
+#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Reload"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"Check automatically if a new version of the current distribution is "
+"available and offer to upgrade (if possible)."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Check for new distribution releases"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+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 ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:7
+msgid ""
+"Stores the state of the expander that contains the list of changes and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:8
+msgid "The window size"
+msgstr ""
+
+#: ../data/software-properties.desktop.in.h:1
+msgid "Configure the sources for installable software and updates"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:8
+msgid "Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:13
+msgid "Community maintained"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:17
+msgid "Proprietary drivers for devices"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:19
+msgid "Restricted software"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:25
+msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:59
+msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:62
+msgid "Canonical supported Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:64
+msgid "Community maintained (universe)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:65
+msgid "Community maintained Open Source software"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:67
+msgid "Non-free drivers"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:68
+msgid "Proprietary drivers for devices "
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:70
+msgid "Restricted software (Multiverse)"
+msgstr ""
+
+#. CompDescriptionLong
+#: ../data/channels/Ubuntu.info.in:71
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:76
+msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:103
+msgid "Backported updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:110
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:123
+msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:135
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:140
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:145
+msgid "Ubuntu 5.10 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:152
+msgid "Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:165
+msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
+msgid "Officially supported"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:177
+msgid "Ubuntu 5.04 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:182
+msgid "Ubuntu 5.04 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:187
+msgid "Ubuntu 5.04 Backports"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:193
+msgid "Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:199
+msgid "Community maintained (Universe)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:201
+msgid "Non-free (Multiverse)"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:206
+msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:209
+msgid "No longer officially supported"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Ubuntu.info.in:211
+msgid "Restricted copyright"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:218
+msgid "Ubuntu 4.10 Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:223
+msgid "Ubuntu 4.10 Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Ubuntu.info.in:228
+msgid "Ubuntu 4.10 Backports"
+msgstr ""
+
+#. ChangelogURI
+#: ../data/channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr ""
+
+#. BaseURI
+#: ../data/channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr ""
+
+#. Description
+#: ../data/channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr ""
+
+#. CompDescription
+#: ../data/channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr ""
diff --git a/po/th.po b/po/th.po
index d8db8415..17a80581 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-24 16:44+0000\n"
-"Last-Translator: Roys Hengwatanakul <roysheng@msn.com>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:44+0000\n"
+"Last-Translator: Roys Hengwatanakul <roysheng@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,9 +56,9 @@ msgstr "หลังจาก %s วัน"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "_ติดตั้งปรัยปรุง"
+msgstr "%s ปรับปรุง"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -66,45 +66,44 @@ msgstr "_ติดตั้งปรัยปรุง"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "เซิร์ฟเวอร์หลัก"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "เซิร์ฟเวอร์สำหรับประเทศ %s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "เซิร์ฟเวอร์ที่ใกล้ที่สุด"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "เซิร์ฟเวอร์ที่กำหนดเอาเอง"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "ซอฟต์แวร์ปรับปรุง"
+msgstr "ซอฟต์แวร์แชนเนล"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "เปิดใช้งาน"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(ต้นฉบับโปรแกรม)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "ต้นฉบับโปรแกรม"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -127,13 +126,13 @@ msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "กุญแจที่คุณเลือกไม่สามารถลบออกได้ กรุณารายงานว่าเป็นปัญหา"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
-"<big><b>มีปัญหาตรวจสอบแผ่นซีดี</b></big>\n"
+"<big><b>มีปัญหาในการตรวจสอบแผ่นซีดี</b></big>\n"
 "\n"
 "%s"
 
@@ -145,11 +144,11 @@ msgstr "กรุณาใส่ชื่อสำหรับแผ่นดิ
 msgid "Please insert a disc in the drive:"
 msgstr "กรุณาใส่แผ่นดิสก์เข้าไปในเครื่อง:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "แพกเกจเสียหาย"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -157,34 +156,37 @@ msgstr ""
 "ระบบของคุณมีแพกเกจที่มีปัญหาที่ไม่สามารถซ่อมได้ด้วยโปรแกรมนี้ กรุณาซ่อมโดยใช้โปรแกรม synaptic "
 "หรือ apt-get ก่อนดำเนินการต่อไป"
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "ไม่สามารถปรับปรุง meta แพกเกจที่ต้องการได้"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "แพจเกจที่สำคัญจะถูกลบออก"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "ไม่สามารถคำนวนการปรับปรุงได้"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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 "ไม่สามารถแก้ไขปัญหาที่เกิดขึ้นได้ขณะคำนวนการปรับปรุง กรุณารายงานว่านี่เป็นปัญหา "
+msgstr ""
+"ไม่สามารถแก้ไขปัญหาที่เกิดขึ้นได้ขณะคำนวนการปรับปรุงรุ่น\n"
+"\n"
+"กรุณารายงานปัญหานี้ภายใต้แพ็กเกจ 'update-manager' และแนบไฟล์ใน /var/log/dist-"
+"upgrade/ ในรายงานด้วย"
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "ไม่ปัญหาในการยืนยันว่าเป็บของจริงสำหรับบางแพกเกจ"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -193,24 +195,23 @@ msgstr ""
 "ไม่สามารถที่จะยืนยันความถูกต้องของแพกเกจบางอันได้ นี่อาจจะเกี่ยวกับปัญหาในด้านเครือข่าย "
 "คุณอาจจะลองอีกครั้งภายหลังก็ได้ กรุณาตรวจดูรายการของแพกเกจที่ไม่ผ่านการยืนยัน"
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "ไม่สามารถติดตั้ง  '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "ไม่สามารถที่จะติดตั้งแพกเกจที่ต้องการได้ กรุณารายงานว่าเป็นปัญหา "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "ไม่สามารถเดาเมททาแพกเกจ(meta-package)ได้"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -220,13 +221,12 @@ msgid ""
 msgstr ""
 "ระบบของคุณไม่มีอูบันตูเดสก์ท็อป คูบันตูเดสก์ท็อป หรือ เอ็ดดูบันตูเดกส์ท็อป "
 "แพกเกจและไม่สามารถที่จะตรวจสอบได้ว่าคุณใช้อูบันตูรุ่นไหนอยู่\n"
-"กรุณาติดตั้งแพกเกจข้างบนอย่างใดอย่างหนึ่งก่อนโดยใช้โปรแกรม synaptic หรือโปรแกรม apt-get "
+" กรุณาติดตั้งแพกเกจข้างบนอย่างใดอย่างหนึ่งก่อนโดยใช้โปรแกรม synaptic หรือโปรแกรม apt-get "
 "ก่อนดำเนินการต่อไป"
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "ไม่สามารถเอามาได้"
+msgstr "ไม่สามารถเพิ่มซีดีได้"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -237,28 +237,35 @@ msgid ""
 "The error message was:\n"
 "'%s'"
 msgstr ""
+"มีปัญหาในการเพิ่มซีดีการปรับปรุงรุ่นจะถูกยกเลิก กรุณารายงานปัญหานี้ถ้าเป็นซีดีที่ถูกต้องของอูบันตู\n"
+"\n"
+"ปัญหาคือ : \n"
+"'%s'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "กำลังอ่านจากที่เก็บชั่วคราว"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "ดึงข้อมูลจากเครือข่ายสำหรับปรับปรุงรุ่นหรือไม่?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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"
+"ถ้าคุณติดต่อเครือข่ายได้โดยไม่เสียค่าใช้จ่ายมาก และมีความเร็วสูงคุณควรจะตอบ 'ตกลง' "
+"ถ้าค่าใช้จ่ายในการใช้เครือข่ายแพงสำหรับคุณเลือก 'ไม่'"
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "ไม่เจอเซิรฟ์เวอร์เสริม(mirror)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -277,11 +284,11 @@ msgstr ""
 "ถ้าคุณเลือก  'no' การปรับปรุงจะถูกยกเลิก"
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "สร้าง default sources?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -293,36 +300,35 @@ msgstr ""
 "\n"
 "ควรเพิ่มรายการสำหรับ  '%s' หรือไม่?ถ้าคุณเลือก 'No' การปรับปรุงจะถูกยกเลิก"
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "ข้อมูลเกี่ยวกับแหล่งเก็บข้อมูลใช้ไม่ได้"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr "การปรับปรุงข้อมูลของแหล่งข้อมูลทำให้ไฟล์เสียหาย กรุณารายงานว่าเป็นปัญหา"
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "แหล่งอื่นๆใช้ไม่ได้"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ของคุณใช้ไม่ได้ "
+"บางรายการใน souces.list ของคุณถุกปิดไว้ "
 "คุณสามารถเปลี่ยนให้ใช้ได้หลังการปรับปรุงด้วยเครื่องมือ 'software-properties' "
 "หรือด้วยโปรแกรม synaptic"
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "เกิดข้อผิดพลาดขณะปรับปรุง"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -330,11 +336,11 @@ msgstr ""
 "มีปัญหาเกิดขึ้นขณะทำการปรับปรุง โดยปกติแล้วจะเป็นปัญหาด้านเครือข่าย "
 "กรุณาตรวจสอบการสื่อสารในเครือข่ายของคุณแล้วลองใหม่อีกที"
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "ไม่มีพื้นที่ว่างในดิสก์เพียงพอ"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -345,16 +351,15 @@ msgstr ""
 "เทถังขยะทิ้งและลบแพกเกจชั่วคราวจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo apt-get clean'"
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "คุณต้องการที่จะเริ่มการปรับปรุงหรือไม่?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "ไม่สามารถปรับปรุงได้"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -363,13 +368,16 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "การปรับปรุงถูกยกเลิก ระบบของคุณอาจจะอยู่ในสภาพที่ไม่มั่นคง โปรแกรมกู้ระบบถูกเรียกใช้ (dpkg --"
-"configure -a)"
+"configure -a)\n"
+"\n"
+"กรุณารายงานปัญหานี้ภายใต้แพ็กเกจ 'update-manager' และแนบไฟล์ใน /var/log/dist-"
+"upgrade/ ในรายงานด้วย"
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงรุ่น"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -377,12 +385,11 @@ msgstr ""
 "การปรับปรุงถูกยกเลิก กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณหรือ installation "
 "mediaและลองอีกครั้ง "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "สนับสนุนสำหรับบางแอพพลิเคชันสิ้นสุดลง"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -391,60 +398,72 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 "แพกเกจเหล่านีไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้วและตอนนี้ได้รับสนับสนุนจากชุมชน "
-"('universe') แต่เพียงอย่างเดียว\\n\n"
-"\\n\n"
-"ถ้าคุณไม่ได้เลือกใช้แหล่งข้อมูล 'universe' แพกเกจเหล่านี้จะถูกแนะนำให้ลบออกในขั้นต่อไป "
+"แต่เพียงอย่างเดียว\n"
+"\n"
+"ถ้าคุณไม่ได้เลือกใช ้แพกเกจเหล่านี้จะถูกแนะนำให้ลบออกในขั้นต่อไป"
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "ลบแพจเกจที่ล้าสมัยทิ้งหรือไม่?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "_ข้ามขั้นตอนนี้"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "เ_อาออก"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "เกิดข้อผิดพลาดขณะแก้ไขปรับปรุง"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr "เกิดปัญหาขึ้นขณะทำการเก็บกวาด กรุณาตรวจสอบข้อความข้างล่างสำหรับรายละเอียดเพิ่มเติม "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
-msgstr "เริ่มระบบใหม่อีกครั้ง"
+msgstr "คืนระบบสู่สถานะแรกเริ่ม"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
-msgstr ""
+msgstr "ดึงพอร์ตย้อนหลังของ '%s'"
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "กำลังตรวจสอบโปรแกรมจัดการแพกเกจ"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "กำลังเตรียมปรับปรุงรุ่น"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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 "ไม่สามารถแก้ไขปัญหาที่เกิดขึ้นได้ขณะคำนวนการปรับปรุง กรุณารายงานว่านี่เป็นปัญหา"
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "ปรับปรุงข้อมูลของแหล่งข้อมูล"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "ข้อมูลของแพกเกจไม่ถูกต้อง"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -453,21 +472,22 @@ msgid ""
 "bugreport."
 msgstr ""
 "หลังจากการปรับปรุงข้อมูลของแพจเกจ แพจเกจที่จำเป็น '%s'ได้หายไป\n"
-"นี่แสดงว่าเป็นปัญหาร้ายแรง กรุณารายงานว่าเป็นปัญหา"
+"นี่แสดงว่าเป็นปัญหาร้ายแรง กรุณารายงานปัญหานี้ภายใต้แพ็กเกจ 'update-manager' "
+"และแนบไฟล์ใน /var/log/dist-upgrade/ กับรายงานด้วย"
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "_ถามการยืนยันจากคุณก่อน"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "กำลังปรับปรุง"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "ค้นหาซอฟแวร์ที่ล้าสมัย"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "ปรับปรุงระบบเสร็จแล้ว"
 
@@ -478,25 +498,24 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "กรุณาใส่  '%s' เข้าไปในเครื่องเล่น  '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "ปรับปรุงเสร็จสิ้นแล้ว"
+msgstr "ดึงข้อมูลเสร็จสิ้นแล้ว"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li ที่ %s/s"
+msgstr "กำลังดึงไฟล์ %li จาก %li ที่ %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "เหลือประมาณ %li นาที"
+msgstr "เหลือประมาณ %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
-msgstr "ดาวน์โหลดไฟล์ %li จาก %li"
+msgstr "กำลังดึงไฟล์ %li จาก %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
@@ -515,21 +534,23 @@ 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/ ในรายงานด้วย"
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"เปลี่ยนไฟล์ปรับแต่ง\n"
-"'%s'?"
+"เปลี่ยนไฟล์ปรับแต่งที่แก้ไขเอง\n"
+"'%s' หรือไม่?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -541,36 +562,35 @@ msgid "A fatal error occured"
 msgstr "เกิดข้อผิดพลาดอย่างร้ายแรง"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 and /var/log/dist-"
-"upgrade-apt.log มาในรายงานของคุณ การปรับปรุงถูกยกเลิก\n"
-"ไฟล์เก่า sources.list ของคุณถูกเก็บไว้ที่ /etc/apt/sources.list.distUpgrade"
+"กรุณารายงานปัญหานี้และแนบไฟล์ใน /var/log/dist-upgrade/main.log and  /var/log/dist-"
+"upgrade/apt.log มาในรายงานของคุณด้วย การปรับปรุงถูกยกเลิก\n"
+"ไฟล์ sources.list อันเดิมของคุณถูกเก็บไว้ที่ /etc/apt/sources.list.distUpgrade"
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s แพกเกจจะถูกลบออก"
+msgstr[0] "%d แพกเกจจะถูกลบออก"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] "%s แพกเกจใหม่จะถูกติดตั้ง"
+msgstr[0] "%d แพกเกจใหม่จะถูกติดตั้ง"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "%s แพกเกจจะถูกปรับปรุง"
+msgstr[0] "%d แพกเกจจะถูกปรับปรุงรุ่น"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
 #, fuzzy, python-format
@@ -578,14 +598,16 @@ msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "คุณจะต้องดาวน์โหลดทั้งหมด  %s"
+msgstr ""
+"\n"
+"\n"
+"คุณจะต้องดาวน์โหลดทั้งหมด  %s "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
-msgstr "การปรับปรุงอาจจะใช้เวลานานหลายชั่วโมงและไม่สามารถที่จะยกเลิกได้หลังจากนี้ไป"
+msgstr "ดาวน์โหลดและติดตั้งอาจจะใช้เวลานานหลายชั่วโมง และไม่สามารถที่จะยกเลิกได้หลังจากนี้ไป"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -593,7 +615,7 @@ msgstr "เพื่อป้องกันข้อมูลสูญหาย
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "ระบบของคุณทันสมัยแล้ว"
 
@@ -601,7 +623,7 @@ msgstr "ระบบของคุณทันสมัยแล้ว"
 msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
-msgstr ""
+msgstr "ไม่มีข้อมูลปรับปรุงรุ่นสำหรับระบบของคุณ การปรับปรุงรุ่นจึงถูกยกเลิก"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -619,32 +641,32 @@ msgid "Upgrade %s"
 msgstr "ปรับปรุงรุ่น %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "เหลือประมาณ %li วัน %li ชั่วโมง %li นาที"
+msgstr "%li วัน %li ชั่วโมง %li นาที"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "เหลือประมาณ %li ชั่วโมง %li นาที"
+msgstr "%li ชั่วโมง %li นาที"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li นาที"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li วินาที"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -686,7 +708,7 @@ msgstr "<b><big>เริ่มการปรับปรุงหรือไ�
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>กำลังปรับปรุงอูบันตูขึ้นไปเป็นรุ่น 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -701,9 +723,8 @@ msgid "Difference between the files"
 msgstr "ข้อแตกต่างระหว่างไฟล์"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
-msgstr "กำลังดาวน์โหลดและทำการปรับปรุง"
+msgstr "กำลังดาวน์โหลดและติดตั้งปรับปรุงรุ่น"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -722,25 +743,39 @@ msgid "Terminal"
 msgstr "เทอร์มินัล"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "_คงไว้"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "แ_ทนที่"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "_ส่งรายงานปัญหา"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "เ_ริ่มระบบใหม่เดี๋ยวนี้"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "ไม่สามารถหาบันทึกการปล่อย"
@@ -806,11 +841,10 @@ msgid "Verfication failed"
 msgstr "ไม่สามารถตรวจเช็คความถูกต้องได้"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
-msgstr "ตรวจทานการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ "
+msgstr "ตรวจทานการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิร์ฟเวอร์ "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
@@ -823,128 +857,126 @@ msgid ""
 msgstr "ยืนยันการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li ด้วย %s/s"
+msgstr ""
+"กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li ด้วยความเร็ว %(speed)s/s"
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li ด้วย %s/s"
+msgstr "กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง"
+msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง"
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 "ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "อูบันตู 5.10 Security Updates"
+msgstr "ปรับปรุงด้านความปลอดภัยที่สำคัญ"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "การปรับปรุงที่แนะนำให้ทำ"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "_ติดตั้งปรัยปรุง"
+msgstr "การปรับปรุงที่เสนอให้ทำ"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "พอร์ตย้อนหลัง"
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว"
+msgstr "ปรับปรุงชุดเผยแพร่"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "_ติดตั้งปรัยปรุง"
+msgstr "_ปรับปรุงอื่นๆ"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "รุ่น %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "กำลังดาวน์โหลดรายการของการเปลี่ยนแปลง..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "ไ_ม่เลือกทั้งหมด"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "เ_ลือก"
+msgstr "เ_ลือกทั้งหมด"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "ขนาดดาวน์โหลด: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "คุณสามารถติดตั้ง %s รายการปรับปรุง"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "กรุณารอสักครู่ นี่อาจจะใช้เวลาสักหน่อย"
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "ปรับปรุงเสร็จสิ้นแล้ว"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "_ติดตั้งปรัยปรุง"
+msgstr "กำลังตรวจหาข้อมูลปรับปรุง"
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "รุ่นใหม่: %s   (ขนาด: %s)"
+msgstr "จากรุ่นเก่า: %(old_version)s ไปสู่รุ่นใหม่ %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "รุ่น %s: \n"
+msgstr "รุ่น %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(ขนาด: %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "ชุดเผยแพร่(distribution)ของคุณไม่มีบริการสนับสนุนแล้ว"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -954,17 +986,17 @@ msgstr ""
 "ปรับปรุงขึ้นไปรุ่นถัดไปของอูบันตูลีนุกซ์ กรุณาอ่าน http://www.ubuntu.com "
 "สำหรับรายละเอียดเพิ่มเติมในการปรับปรุงรุ่น"
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "มี<b>ชุดแจกจ่ายใหม่ '%s' </b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "ดัชนีของซอฟแวร์เสียหาย"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -976,27 +1008,26 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "ไม่มี"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>You must check for updates manually</big></b>\n"
 "\n"
@@ -1005,25 +1036,20 @@ msgid ""
 msgstr ""
 "<b><big>คุณต้องตรวจหารายการปรับปรุงด้วยตนเอง</big></b>\n"
 "\n"
-"ระบบของคุณไม่ตรวจหารายการปรับปรุงโดยอัตโนมัตื คุณสามารถปรับแต่งใน\"System\" -> "
-"\"Administration\" -> \"Software Properties\"."
+"ระบบของคุณไม่ตรวจหารายการปรับปรุงโดยอัตโนมัตื คุณสามารถปรับแต่งใน<i>แหล่งข้อมูล</"
+"i>ในแถบ<i>ปรับปรุงทางอินเทอร์เน็ต</i>"
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>รักษาระบบของคุณให้ทันสมัย</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
-"<big><b>มีปัญหาตรวจสอบแผ่นซีดี</b></big>\n"
-"\n"
-"%s"
+msgstr "<big><b>ไม่สามารถทำการติดตั้งปรับปรุงได้ทั้งหมด</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>เริ่มการปรับปรุงหรือไม่?</big></b>"
+msgstr "<b><big>เริ่มโปรแกรมจัดการปรับปรุง</big></b>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1031,7 +1057,7 @@ msgstr "เปลี่ยนแปลง"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "เปลี่ยนแปลงและคำอธิบายของการปรับปรุงรุ่น"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1056,6 +1082,10 @@ msgid ""
 "This can be caused by an uncompleted upgrade, unofficial software packages "
 "or by running a development version."
 msgstr ""
+"ดำเนินการปรับปรุงชุดเผยแพร่ ทำการติดตั้งปรับปรุงมากที่สุดเท่าที่จะทำได้ \n"
+"\n"
+"นี่อาจจะมีเหตุมาจากการปรับปรุงที่ไม่เสร็จสิ้น ซอฟต์แวร์แพ็กเกจที่ไม่สนับสนุนอย่างเป็นทางการ "
+"หรือใช้รุ่นที่ยังพัฒนาไม่เสร็จ"
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
@@ -1084,9 +1114,8 @@ msgid "_Check"
 msgstr "เ_ลือก"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "_ปรับปรุงรุ่นต่อจากคราวที่แล้ว"
+msgstr "_ปรับปรุงชุดเผยแพร่"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1103,25 +1132,23 @@ msgstr "เปลี่ยนแปลง"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "ปรับปรุง"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>ปรับปรุงทางอินเทอร์เน็ต</b>"
+msgstr "<b>ปรับปรุงอัตโนมัติ</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>ซีดีรอม/ดีวีดี</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>ปรับปรุงทางอินเทอร์เน็ต</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>ปรับปรุงทางอินเทอร์เน็ต</b>"
+msgstr "<b>อินเทอร์เน็ต</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1133,11 +1160,16 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "เพิ่ม_ซีดีรอม"
+msgstr "เพิ่ม ซีดีรอม"
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
@@ -1148,9 +1180,8 @@ msgid "D_elete downloaded software files:"
 msgstr "_ลบซอฟแวร์ไฟล์ที่ดาวน์โหลด:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "ดาวน์โหลดเสร็จแล้ว"
+msgstr "ดาวน์โหลดจาก:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1176,34 +1207,32 @@ msgstr "คืนกุญแจเดืมของชุดเผยแพร
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "คุณสมบัติของซอฟแวร์"
+msgstr "แหล่งของซอฟแวร์"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
 msgid "Source code"
-msgstr ""
+msgstr "ต้นฉบับโปรแกรม"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "สถิติ"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "ส่งข้อมูลสถิติ"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "บุคคลที่สาม"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "_ตรวจหารายการปรับปรุงโดยอัตโนมัติ:"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "_ดาวน์โหลดปรับปรุงอยู่เบื้องหลังแต่ยังไม่ต้องติดตั้ง"
+msgstr "_ดาวน์โหลดปรับปรุงโดยอัตโนมัติแต่ยังไม่ต้องติดตั้ง"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1214,7 +1243,6 @@ msgid "_Install security updates without confirmation"
 msgstr "_ติดตั้งการปรับปรุงด้านความปลอดภัยโดยไม่ต้องถามก่อน"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1223,11 +1251,12 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>ข้อมูลของช่องล้าสมัย</big></b>\n"
+"<b><big>ข้อมูลเกี่ยวกับซอฟต์แวร์ที่มีล้าสมัย</big></b>\n"
 "\n"
-"คุณจะต้องดาวน์โหลดข้อมูลใหม่ของช่องเพื่อที่จะติดตั้งซอฟแวร็หรือปรับปรุงจากช่องที่เพิ่มใหม่หรือเปลี่ยนช่องใหม่\n"
+"เพื่อที่จะติดตั้งซอฟต์แวร์และปรับปรุงจากแหล่งที่เพิ่มหรือเปลี่ยนใหม่ "
+"คุณจะต้องโหลดข้อมูลเกี่ยวกับซอฟต์แวร์ใหม่\n"
 "\n"
-"คุณจะต้องมีการสื่อสารทางอินเตอร์เน็ตที่ใช้งานได้ที่เพื่อที่จะดำเนินการต่อไป"
+"คุณจะต้องมี่อินเทอร์เน็ตที่ใช้ได้เพื่อที่จะดำเนินการต่อไป"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
@@ -1250,7 +1279,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1258,10 +1286,10 @@ msgid ""
 "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"
+"<big><b>กรุณาเติมให้ครบบรรทัด APT ของแหล่งข้อมูลที่คุณต้องการจะเพิ่ม</b></big>\n"
 "\n"
-"บรรทัด APT ประกอบด้วย ชนิด,สถานที่,ส่วนประกอบของช่อง เช่น <i>\"deb http://ftp.debian."
-"org sarge main\"</i>"
+"บรรทัด APT ประกอบด้วย ชนิด,สถานที่,ส่วนประกอบของแหล่งข้อมูล เช่น <i>\"deb http://ftp."
+"debian.org sarge main\"</i>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
@@ -1277,7 +1305,7 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
-msgstr ""
+msgstr "แก้ไขต้นฉบับ"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
@@ -1285,7 +1313,7 @@ msgstr "ตรวจสอบแผ่นซีดี"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
-msgstr ""
+msgstr "เ_พิ่มต้นฉบับ"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1311,14 +1339,13 @@ msgid "Check for new distribution releases"
 msgstr "ตรวจหาชุดเผยแพร่ใหม่"
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 ""
 "ถ้าการตรวจสอบสำหรับปรับปรุงโดยอัตโนมัติถูกปิดไว้ คุณจะต้องโหลดช่องรายการใหม่เอง "
-"ตัวเลือกนี้จะซ่อนคำเตือนที่จะแสดงในกรณีนี้"
+"ตัวเลือกนี้ทำให้ซ่อนคำเตือนที่จะแสดงในกรณีนี้ได้"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
@@ -1333,20 +1360,18 @@ msgid "Stores the size of the update-manager dialog"
 msgstr "บึนทึกขนาดของหน้าต่างของโปรแกรมจัดการปรับปรุง"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changes and the "
 "description"
-msgstr "บันทึกสถานะของตัวขยาย(expander)ที่มีรายการของการเปลี่ยนแปลงและคำบรรยาย"
+msgstr "บันทึกสถานะของตัวขยายที่มีรายการของการเปลี่ยนแปลงและคำบรรยาย"
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
 msgstr "ขนาดของหน้าต่าง"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "ปรับแต่งช่องทางซอฟแวร์และปรับปรุงทางอินเตอร์เน็ต"
+msgstr "ปรับแต่งแหล่งสำหรับซอฟต์แวร์และปรับปรุงที่ติดตั้งได้"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1356,42 +1381,39 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "อูบันตู 5.10 Updates"
+msgstr "อูบันตู 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "ชุมชนดูแล (Universe)"
+msgstr "ชุมชนดูแล"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "ไดรเวอร์ที่มีกรรมสิทธิ์สำหรับอุปกรณ์"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "ไม่ฟรี(ลิขสิทธิ์)"
+msgstr "ซอฟต์แวร์จำกัดการใช้งาน"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "ซีดีรอมที่มีอูบันตู 6.10 'Edgy Eft'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "อูบันตู 6.06 'Dapper Drake'"
+msgstr "อูบันตู 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "ชุมชนดูแล (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1401,42 +1423,38 @@ msgstr "ชุมชนดูแล (Universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "ชุมชนดูแล (Universe)"
+msgstr "ชุมชนดูแล ซอฟต์แวร์แบบเปิดเผย"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "ไม่ฟรี(ลิขสิทธิ์)"
+msgstr "ไดรเวอร์ที่ไม่ฟรี"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "ไดรเวอร์ที่มีกรรมสิทธิ์สำหรับอุปกรณ์ "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "ไม่ฟรี(ลิขสิทธิ์)"
+msgstr "ซอฟต์แวร์จำกัดการใช้งาน(Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "อูบันตู 6.06 'Dapper Drake'"
+msgstr "ซีดีรอมที่มีอูบันตู 6.06 LST 'Dapper Drake'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "การปรับปรุงแบบย้อนหลัง"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1445,9 +1463,8 @@ msgstr "อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "อูบันตู 5.10 'Breezy Badger'"
+msgstr "ซีดีรอมที่มี อูบันตู 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1466,14 +1483,13 @@ msgstr "อูบันตู 5.10 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "อูบันตู 5.10 'Breezy Badger'"
+msgstr "อูบันตู 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "ซีดีรอมที่มีอูบันตู 5.04 'Hoary Hedgehog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1482,27 +1498,23 @@ msgstr "สนับสนุนอย่างเป็นทางการ"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "อูบันตู 5.10 Security Updates"
+msgstr "อูบันตู 5.04 ปรับปรุงด้านความปลอดภัย"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "อูบันตู 5.10 Updates"
+msgstr "อูบันตู 5.04 ปรับปรุง"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "อูบันตู 5.10 Backports"
+msgstr "อูบันตู 5.04 พอร์ตย้อนหลัง"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "อูบันตู 5.10 'Breezy Badger'"
+msgstr "อูบันตู 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1517,13 +1529,12 @@ msgstr "ไม่ฟรี(ลิขสิทธิ์)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "ซีดีรอมที่มีอูบันตู 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว"
+msgstr "ไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1532,21 +1543,18 @@ msgstr "จำกัดลิขสิทธิ์"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "อูบันตู 5.10 Security Updates"
+msgstr "อูบันตู 4.10 ปรับปรุงด้านความปลอดภัย"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "อูบันตู 5.10 Updates"
+msgstr "อูบันตู 4.10 ปรับปรุง"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "อูบันตู 5.10 Backports"
+msgstr "อูบันตู 4.10 พอร์ตย้อนหลัง"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1597,9 +1605,8 @@ msgstr "ไม่เข้ากับ DFSG ซอฟแวร์"
 #~ msgid "Downloading file %li of %li with unknown speed"
 #~ msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li โดยไม่ทราบความเร็ว"
 
-#, fuzzy
 #~ msgid "Normal updates"
-#~ msgstr "_ติดตั้งปรัยปรุง"
+#~ msgstr "_ปรับปรุงตามปกติ"
 
 #~ msgid "Cancel _Download"
 #~ msgstr "ยกเลิก_ดาวน์โหลด"
@@ -1709,7 +1716,8 @@ msgstr "ไม่เข้ากับ DFSG ซอฟแวร์"
 #~ msgstr "แก้ไขช่องทาง"
 
 #~ msgid "_Add Channel"
-#~ msgstr "_เพิ่มช่องทาง"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "_เพิ่มช่องทาง"
 
 #~ msgid "_Custom"
 #~ msgstr "_กำหนดเอง"
diff --git a/po/tr.po b/po/tr.po
index eb70d9f4..7eb08d54 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:45+0000\n"
-"Last-Translator: Özgur KIRCALI <okircali@gmail.com>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-09-27 21:59+0000\n"
+"Last-Translator: Kayra Akman <ckakman@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +59,7 @@ msgstr "%s gün sonra"
 #: ../SoftwareProperties/SoftwareProperties.py:252
 #, python-format
 msgid "%s updates"
-msgstr ""
+msgstr "%s güncellemeleri"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -67,45 +67,44 @@ msgstr ""
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "Ana sunucu"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "%s sunucusu"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "En yakın sunucu"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "Özel sunucular"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Kanal Düzenle"
+msgstr "Yazılım Kanalı"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "Etkin"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(Kaynak Kodu)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "Kaynak Kodu"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -146,11 +145,11 @@ 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:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Bozuk paketler"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -158,56 +157,63 @@ 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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Gerekli bilgi-paketleri güncelleştirilemiyor"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Gerekli bir paketin kaldırılması gerekmekte"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Güncelleme hesaplanamadı"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Bazı paketlerin doğrulamasında hata"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "'%s' yüklenemiyor"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 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. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Meta-paket kestirilemedi"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 #, fuzzy
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
@@ -223,7 +229,7 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
 msgid "Failed to add the CD"
-msgstr ""
+msgstr "CD eklemede hata"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -234,28 +240,37 @@ msgid ""
 "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'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "Önbellek okunuyor"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "Yükseltme için veriler ağdan indirilsin mi?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "Geçerli yansı bulunamadı"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -266,13 +281,20 @@ msgid ""
 "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."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
-msgstr ""
+msgstr "Öntanımlı depolar kaydedilsin mi??"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -285,32 +307,37 @@ msgstr ""
 "'%s' için varsayılan girişler eklensin mi? Eğer 'Hayır'ı seçerseniz, "
 "güncelleştirme iptal edilecektir."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
-msgstr ""
+msgstr "Depo bilgisi geçersiz"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "Üçüncü parti kaynaklar devredışı bırakıldı"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "Güncelleştirme sırasında hata"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -318,28 +345,31 @@ 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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Yeterince boş disk alanı yok"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 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."
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "Yükseltmeyi başlatmak istiyor musunuz?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "Yükseltmeler kurulamadı"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -347,12 +377,17 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "Yükseltmeler indirilemedi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
@@ -360,11 +395,11 @@ msgstr ""
 "Yükseltme şimdi iptal edilecek. Lütfen internet bağlantınızı veya kurulum "
 "ortamınızı kontrol edin ve yeniden deneyin. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "Bazı uygulamalar için destek sona erdi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -373,54 +408,67 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "Kullanılmayan paketler kaldırılsın mı?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "Bu Adımı _Atla"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "_Kaldır"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
-msgstr ""
+msgstr "İşlem sırasında hata oluştu"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 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. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
-msgstr ""
+msgstr "Orijinal sistem durumuna geri dönülüyor"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
+msgstr "Paket yöneticisi denetleniyor"
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:672
-msgid "Updating repository information"
+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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr "Depo bilgileri güncelleniyor"
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "Geçersiz paket bilgisi"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -429,20 +477,25 @@ msgid ""
 "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."
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
-msgstr ""
+msgstr "Onay isteniyor"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "Yükseltiliyor"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "Kullanılmayan yazılımlar aranıyor"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "Sistem yükseltmesi tamamlandı."
 
@@ -450,7 +503,7 @@ msgstr "Sistem yükseltmesi tamamlandı."
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "Lütfen '%2s' sürücüsüne '%1s' takın"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
 #, fuzzy
@@ -460,25 +513,25 @@ msgstr "İndirme tamamlandı"
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
 #, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr ""
+msgstr "Dosyalar indiriliyor. İnen: %li  Toplam: %li  Hız: %s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
 #, python-format
 msgid "About %s remaining"
-msgstr ""
+msgstr "Yaklaşık %s kaldı"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
 #, python-format
 msgid "Fetching file %li of %li"
-msgstr ""
+msgstr "Dosyalar inidiriliyor. İnen: %li  Toplam: %li"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
 #: ../DistUpgrade/DistUpgradeViewGtk.py:163
 msgid "Applying changes"
-msgstr ""
+msgstr "Değişiklikler uygulanıyor"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
@@ -490,6 +543,9 @@ 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."
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
@@ -498,11 +554,13 @@ msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
+"Özelleştirilmiş yapılandırma dosyası\n"
+"'%s' değiştirilsin mi?"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -511,7 +569,7 @@ msgstr "'diff' komutu bulunamadı"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
-msgstr ""
+msgstr "Giderilemez bir hata oluştu"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
 msgid ""
@@ -520,6 +578,10 @@ msgid ""
 "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."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
@@ -527,19 +589,19 @@ msgstr ""
 #, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] ""
+msgstr[0] "%d paket kaldırılacak."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
 #, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] ""
+msgstr[0] "%d yeni paket kurulacak."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
 #, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] ""
+msgstr[0] "%d paket yükseltilecek."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
 #, python-format
@@ -548,33 +610,41 @@ msgid ""
 "\n"
 "You have to download a total of %s. "
 msgstr ""
+"\n"
+"\n"
+"Toplam %s indirmeniz gerekmektedir. "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
 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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 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."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
-msgstr ""
+msgstr "Sisteminiz güncel"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:519
 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."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
 msgid "<b>Remove %s</b>"
-msgstr ""
+msgstr "<b>Şunu kaldır: %s</b>"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:537
 #, python-format
@@ -589,30 +659,30 @@ msgstr "%s'i yükselt"
 #: ../DistUpgrade/DistUpgradeView.py:27
 #, python-format
 msgid "%li days %li hours %li minutes"
-msgstr ""
+msgstr "%li gün %li saat %li dakika"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
 #, python-format
 msgid "%li hours %li minutes"
-msgstr ""
+msgstr "%li saat %li dakika"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li dakika"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li saniye"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -642,6 +712,10 @@ msgid ""
 "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."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
@@ -653,140 +727,156 @@ msgstr "<b><big>Yükseltme başlatılsın mı?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>Ubuntu 6.10 sürümüne yükseltiliyor</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "Temizliyor"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 msgid "Details"
-msgstr ""
+msgstr "Ayrıntılar"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "Dosyalar arasındaki farklılık"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
-msgstr "Yükseltmeler kurulamadı"
+msgstr "Yükseltmeler indiriliyor ve kuruluyor"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "Yazılım kanalları değiştiriliyor"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "Yükseltme hazırlanıyor"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr ""
+msgstr "Sistem tekrar başlatılıyor"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
-msgstr ""
+msgstr "Uçbirim"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
+msgid "_Continue"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
-msgstr ""
+msgid "_Keep"
+msgstr "_Koru"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
-msgstr ""
+msgid "_Replace"
+msgstr "_Değiştir"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr "_Hatayı Bildir"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr "Şimdi _Tekrar Başlat"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
+msgstr "Yükseltmeye _Devam Et"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
 msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
+"Suggestions: \t\t\r\n"
+"Yayın notları bulunamadı"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Sunucu aşırı yüklenmiş olabilir. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
 msgid "Could not download the release notes"
-msgstr ""
+msgstr "Yayın notları indirilemedi"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "İnternet bağlantınızı kontrol ediniz."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
-msgstr ""
+msgstr "Yükseltme aracı çalıştırılamadı."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:150
 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."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:171
 msgid "Downloading the upgrade tool"
-msgstr ""
+msgstr "Yükseltme aracı indiriliyor"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "Yükseltme aracı size yükseltme işlemi boyunca rehberlik edecek."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Yükseltme aracı imzası"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
-msgstr ""
+msgstr "Yükseltme aracı"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Getirme başarısız"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "Yükseltmeyi indirme başarısız. Ağ sorunu olabilir "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
-msgstr ""
+msgstr "Çıkarılamadı"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
-msgstr ""
+msgstr "Yükseltme çıkarılamadı. Ağ veya sunucu ile ilgili bir sorun olabilir. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
-msgstr ""
+msgstr "Doğrulama başarısız oldu"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
-msgstr ""
+msgstr "Yükseltmeyi onaylamada hata. Ağ ya da sunucuda bir sorun olabilir. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
-msgstr ""
+msgstr "Kimlik denetimi başarısız oldu"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:229
 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. "
 
 #: ../UpdateManager/GtkProgress.py:108
 #, python-format
@@ -798,155 +888,163 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr ""
+msgstr "Değişiklikler listesi erişilebilir değil"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
+msgstr "Önemli güvenlik güncelleştirmeleri"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "Önerilen güncellemeler"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr ""
+msgstr "Teklif edilmiş güncellemeler"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Backport edilmiş yazılımlar"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
 msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr ""
+msgstr "Diğer güncellemeler"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
-msgstr ""
+msgstr "Sürüm %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "Hiç_birini Seçme"
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr ""
+msgstr "_Hepsini Seç"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "İndirme boyutu: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] ""
+msgstr[0] "%s güncelleme kurabilirsiniz"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Lütfen bekleyin, bu işlem biraz zaman alabilir."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr ""
+msgstr "Güncelleme tamamlandı"
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr ""
+msgstr "Güncellemeler denetleniyor"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, python-format
 msgid "Version %s"
-msgstr ""
+msgstr "Sürüm %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(Büyüklük:%s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
-msgstr ""
+msgstr "Kullandığınız dağıtım artık desteklenmiyor"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
-msgstr ""
+msgstr "<b>Yeni dağıtım yayını '%s' ulaşılabilir</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
-msgstr ""
+msgstr "Yazılım dizini bozulmuş"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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."
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "Hiçbiri"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 msgid ""
@@ -958,44 +1056,43 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr ""
+msgstr "<big><b>Sisteminizi güncel tutun</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
 #, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
 msgstr ""
-"<big><b>CD taramada hata</b></big>\n"
-"\n"
+"<big><b>CD taramada hata</b></big>\r\n"
+"\r\n"
 "%s"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Yükseltme başlatılsın mı?</big></b>"
+msgstr "<b><big>Güncelleştirme yöneticisi başlatılıyor</big></b>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
-msgstr ""
+msgstr "Değişiklikler"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "Değişiklikler ve güncelleme açıklaması"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
-msgstr ""
+msgstr "_Denetle"
 
 #: ../data/glade/UpdateManager.glade.h:10
 msgid "Check the software channels for new updates"
-msgstr ""
+msgstr "Yeni güncellemeler için yazılım kanallarını denetle"
 
 #: ../data/glade/UpdateManager.glade.h:11
 msgid "Description"
-msgstr ""
+msgstr "Tanım"
 
 #: ../data/glade/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "Yayın Notları"
 
 #: ../data/glade/UpdateManager.glade.h:13
 msgid ""
@@ -1004,68 +1101,74 @@ msgid ""
 "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."
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
-msgstr ""
+msgstr "Tekil dosyaların ilerleyişini göster"
 
 #: ../data/glade/UpdateManager.glade.h:17
 msgid "Software Updates"
-msgstr ""
+msgstr "Yazılım Güncellemeleri"
 
 #: ../data/glade/UpdateManager.glade.h:18
 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 katar."
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
-msgstr ""
+msgstr "_Yükselt"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "Ubuntu'nun son sürümüne yükselt"
 
 #: ../data/glade/UpdateManager.glade.h:21
 msgid "_Check"
-msgstr ""
+msgstr "_Denetle"
 
 #: ../data/glade/UpdateManager.glade.h:22
 msgid "_Distribution Upgrade"
-msgstr ""
+msgstr "_Dağıtım Yükseltimi"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
-msgstr ""
+msgstr "_Bu bilgiyi gelecekte sakla"
 
 #: ../data/glade/UpdateManager.glade.h:24
 msgid "_Install Updates"
-msgstr ""
+msgstr "Güncelemeleri _Yükle"
 
 #: ../data/glade/UpdateManager.glade.h:25
 msgid "changes"
-msgstr ""
+msgstr "değişiklikler"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "güncellemeler"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
 msgid "<b>Automatic updates</b>"
-msgstr ""
+msgstr "<b>Otomatik güncelleme</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
-msgstr ""
+msgstr "İnternet güncellemeleri"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
 msgid "<b>Internet</b>"
-msgstr ""
+msgstr "<b>Internet</b"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1077,6 +1180,13 @@ msgid ""
 "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>"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
 msgid "Add Cdrom"
@@ -1084,77 +1194,76 @@ msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
-msgstr ""
+msgstr "Kimlik Sınaması"
 
 #: ../data/glade/SoftwareProperties.glade.h:11
 msgid "D_elete downloaded software files:"
-msgstr ""
+msgstr "İndirilmiş yazılım dosyalarını _sil:"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "İndirme tamamlandı"
+msgstr "İndirme adresi:"
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
-msgstr ""
+msgstr "Güvenilen bir yazılm sağlayıcısından açık anahtarı içe aktar"
 
 #: ../data/glade/SoftwareProperties.glade.h:14
 msgid "Internet Updates"
-msgstr ""
+msgstr "İnternet Güncellemeleri"
 
 #: ../data/glade/SoftwareProperties.glade.h:15
 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"
 
 #: ../data/glade/SoftwareProperties.glade.h:16
 msgid "Restore _Defaults"
-msgstr ""
+msgstr "_Öntanımlılara Dön"
 
 #: ../data/glade/SoftwareProperties.glade.h:17
 msgid "Restore the default keys of your distribution"
-msgstr ""
+msgstr "Dağıtımınızın öntanımlı anahtarlarını geriye döndür"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Yazılım Özellikleri"
+msgstr "Yazılım Kaynakları"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
 msgid "Source code"
-msgstr ""
+msgstr "Kaynak kodu"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "İstatistikler"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "İstatistiki Bilgileri Bildir"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "Üçüncü Taraf"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
-msgstr ""
+msgstr "Güncellemeleri _otomatik olarak denetle"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
 msgid "_Download updates automatically, but do not install them"
-msgstr ""
+msgstr "Güncellemeleri _otomatik olarak indir ancak kurma"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
-#, fuzzy
 msgid "_Import Key File"
-msgstr "Anahtar aktar"
+msgstr "İçe Anahtar Dosyası _Aktar"
 
 #: ../data/glade/SoftwareProperties.glade.h:26
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "_Onaylatmadan güvenlik güncellemelerini kur"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
 msgid ""
@@ -1165,26 +1274,32 @@ msgid ""
 "\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."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
-msgstr ""
+msgstr "<b>Yorum:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
 msgid "<b>Components:</b>"
-msgstr ""
+msgstr "<b>Bileşenler:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Distribution:</b>"
-msgstr ""
+msgstr "<b>Dağıtım:<b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:9
 msgid "<b>Type:</b>"
-msgstr ""
+msgstr "<b>Tür:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
 msgid "<b>URI:</b>"
-msgstr ""
+msgstr "<b>URI:<b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
 msgid ""
@@ -1197,17 +1312,19 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
-msgstr ""
+msgstr "APT satırı"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
 "Binary\n"
 "Source"
 msgstr ""
+"İkili\n"
+"Kaynak"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
-msgstr ""
+msgstr "Kaynak Düzenleme"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
@@ -1215,7 +1332,7 @@ msgstr "CD-ROM taranıyor"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
-msgstr ""
+msgstr "Kaynak _Ekle"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1250,7 +1367,7 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Kanal listesini tekrar yüklemeyi hatırlat."
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
@@ -1258,7 +1375,7 @@ msgstr "Bir güncelleştirmenin detaylarını göster"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "Güncelleme yöneticisi penceresinin boyutunu saklar"
 
 #: ../data/update-manager.schemas.in.h:7
 msgid ""
@@ -1272,102 +1389,98 @@ msgstr "Pencere boyutu"
 
 #: ../data/software-properties.desktop.in.h:1
 msgid "Configure the sources for installable software and updates"
-msgstr ""
+msgstr "Kurulabilir yazılım ve güncellemeler için kaynakları yapılandır"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
 msgid "Community maintained"
-msgstr ""
+msgstr "Topluluk tarafından bakılan"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "Aygıtlar için kapalı kaynak sürücüler"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Sınırlı telif hakkı"
+msgstr "Kısıtlı yazılımlar"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Ubuntu 6.10 'Edgy Eft' Cdrom'u"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
 msgid "Community maintained (universe)"
-msgstr ""
+msgstr "Topluluk tarafından bakılan (universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
 msgid "Community maintained Open Source software"
-msgstr ""
+msgstr "Topluluk tarafından bakılan Açık Kaynak Kodlu yazılımlar"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
 msgid "Non-free drivers"
-msgstr ""
+msgstr "Özgür olmayan sürücüler"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "Aygıtlar için lisanslı sürücüler "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
 msgid "Restricted software (Multiverse)"
-msgstr ""
+msgstr "Kısıtlı yazılımlar (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr ""
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake' Cdrom'u"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Geritaşınmış (backported) güncellemeler"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr ""
+msgstr "Ubuntu 5.10 'Breezy Badger' Cdrom'u"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1377,23 +1490,22 @@ msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
 #. Description
 #: ../data/channels/Ubuntu.info.in:140
 msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
+msgstr "Ubuntu 5.10 Güncelleştirmeleri"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:145
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri"
+msgstr "Ubuntu 5.10 Geritaşınmış Yazılımlar (Backports)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Ubuntu 5.04 'Hoary Hedgehog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Ubuntu 5.04 'Hoary Hedgehog' Cdrom'u"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1402,48 +1514,43 @@ msgstr "Resmi olarak desteklenenler"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
+msgstr "Ubuntu 5.04 Güvenlik Güncelleştirmeleri"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
+msgstr "Ubuntu 5.04 Güncelleştirmeleri"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri"
+msgstr "Ubuntu 5.04 Geritaşınmış Yazılımlar (Backports)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
 msgid "Community maintained (Universe)"
-msgstr ""
+msgstr "Topluluk tarafından bakılan (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:201
 msgid "Non-free (Multiverse)"
-msgstr ""
+msgstr "Özgür olmayan (Multiverse)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Ubuntu 4.10 'Warty Warthog' Cdrom'u"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Resmi olarak desteklenenler"
+msgstr "Artık resmi olarak desteklenmiyor"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1452,81 +1559,75 @@ msgstr "Sınırlı telif hakkı"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
+msgstr "Ubuntu 4.10 Güvenlik Güncelleştirmeleri"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
+msgstr "Ubuntu 4.10 Güncelleştirmeleri"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri"
+msgstr "Ubuntu 4.10 Geritaşınmış Yazılımlar (Backports)"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\""
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
 #. Description
 #: ../data/channels/Debian.info.in:20
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr ""
+msgstr "Debian 3.1 \"Sarge\" Güvenlik Güncelleştirmeleri"
 
 #. Description
 #: ../data/channels/Debian.info.in:34
 msgid "Debian \"Etch\" (testing)"
-msgstr ""
+msgstr "Debian \"Etch\" (test)"
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
 #. Description
 #: ../data/channels/Debian.info.in:48
 msgid "Debian \"Sid\" (unstable)"
-msgstr ""
+msgstr "Debian \"Sid\" (kararsız)"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "Özgür Olmayan Bağımlılığı Bulunan DFSG Uyumlu Yazılım"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
+msgstr "DFSG Uyumlu Olmayan Yazılım"
 
 #~ msgid "Your system has already been upgraded."
 #~ msgstr "Sisteminiz zaten yükseltilmiş."
 
-#, 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'ya yükseltiliyor</"
-#~ "span>"
+#~ "<span weight=\"bold\" size=\"x-large\">Ubuntu 6.10'a yükseltiliyor</span>"
 
-#, fuzzy
 #~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri"
+#~ msgstr "Ubuntu için önemli güvenlik güncellemeleri"
 
 #, fuzzy
 #~ msgid "Oficially supported"
@@ -1539,7 +1640,8 @@ msgstr ""
 #~ msgstr "     "
 
 #~ msgid "_Add Channel"
-#~ msgstr "Kanal _ekle"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "Kanal _ekle"
 
 #~ msgid "_Custom"
 #~ msgstr "_Özel"
diff --git a/po/uk.po b/po/uk.po
index 00cc865e..6c21a38d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,37 +1,38 @@
+# translation of uk(5).po to Ukrainian
+# Maxim Dziumanenko <mvd@mylinux.ua>, 2005.
+# Vadim Abramchuck <Abram@email.ua>, 2006.
 # Ukrainian translation of update-manager.
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# Maxim Dziumanenko <mvd@mylinux.ua>, 2005
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 msgid ""
 msgstr ""
-"Project-Id-Version: update-manager\n"
+"Project-Id-Version: uk(5)\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:45+0000\n"
-"Last-Translator: Serhey Kusyumoff <gpalco@gmail.com>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-08-20 22:36+0000\n"
+"Last-Translator: Vadim Abramchuck <abram@email.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:136
-#, fuzzy
 msgid "Daily"
-msgstr "<b>Подробиці</b>"
+msgstr "Щодня"
 
 #: ../SoftwareProperties/SoftwareProperties.py:137
-#, fuzzy
 msgid "Every two days"
-msgstr "Кожні %s днів"
+msgstr "Кожні два дня"
 
 #: ../SoftwareProperties/SoftwareProperties.py:138
 msgid "Weekly"
-msgstr ""
+msgstr "Щотижня"
 
 #: ../SoftwareProperties/SoftwareProperties.py:139
 msgid "Every two weeks"
-msgstr ""
+msgstr "Кожні два тижня"
 
 #: ../SoftwareProperties/SoftwareProperties.py:144
 #, python-format
@@ -40,15 +41,15 @@ msgstr "Кожні %s днів"
 
 #: ../SoftwareProperties/SoftwareProperties.py:167
 msgid "After one week"
-msgstr ""
+msgstr "Через тиждень"
 
 #: ../SoftwareProperties/SoftwareProperties.py:168
 msgid "After two weeks"
-msgstr ""
+msgstr "Через два тижні"
 
 #: ../SoftwareProperties/SoftwareProperties.py:169
 msgid "After one month"
-msgstr ""
+msgstr "Через місяць"
 
 #: ../SoftwareProperties/SoftwareProperties.py:174
 #, python-format
@@ -57,9 +58,9 @@ msgstr "Через %s днів"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Встановлення оновлень..."
+msgstr ""
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -90,9 +91,8 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "Оновлення програм"
+msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
@@ -100,14 +100,12 @@ msgid "Active"
 msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr "Текст програми"
+msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
-msgstr "Текст програми"
+msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -145,11 +143,11 @@ msgstr "Введіть назву диску"
 msgid "Please insert a disc in the drive:"
 msgstr "Вставте диск в пристрій:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "Пошкоджені пакунки"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -157,59 +155,61 @@ msgstr ""
 "Ваша система містить пошкоджені пакунки, котрі не можуть бути виправлені "
 "цією програмою. Скористайтесь перш програмами synaptic чи apt-get."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "Не можливо поновити необхідні meta-пакунки"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
+#, fuzzy
 msgid "A essential package would have to be removed"
-msgstr "Це призведе довидалення базового пакунку системи"
+msgstr "Це призведе до видалення !essential! пакунку системи"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "Не можливо розрахувати поновлення"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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 "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. "
+msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "Помилка підписів в деяких пакунках"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
+"Не вдалося перевірити деякі пакунки. Це може бути викликано проблемами в "
+"мережі. Можливо, Вам захочеться спробувати пізніше. Список не перевірених "
+"пакунків нижче."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Не можливо встановити '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. "
+msgstr ""
+"Неможливо встановити необхідний пакунок. Сповістіть про це як про помилку. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "Не можливо підібрати meta-пакунок"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -217,8 +217,6 @@ msgid ""
 " Please install one of the packages above first using synaptic or apt-get "
 "before proceeding."
 msgstr ""
-"Ваша система містить пошкоджені пакунки, котрі не можуть бути виправлені "
-"цією програмою. Скористайтесь перш програмами synaptic чи apt-get."
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
 msgid "Failed to add the CD"
@@ -238,11 +236,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr "Зчитування кешу"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -250,12 +248,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
-msgstr "Не знайдено"
+msgstr "Не знайдено правильного зеркала"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -268,11 +265,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
-msgstr ""
+msgstr "Створити джерела за замовчуванням?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -281,43 +278,45 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "Помилка в даних про репозиторій"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
+"Поновлення файлу сховищ призвело до пошкодження. Будь ласка, сповістіть про "
+"це як про помилку."
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 #, fuzzy
 msgid "Error during update"
 msgstr "Помилка підчас поновлення"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "Недостатньо місця на диску"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -326,16 +325,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
-msgstr "Бажаєте почати апгрейд системи?"
+msgstr "Бажаєте почати оновлення системи?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
-msgstr "Неможливо провести апргрейд системи"
+msgstr "Неможливо провести оновлення системи"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -343,27 +341,24 @@ msgid ""
 "Please report this bug against the 'update-manager' package and include the "
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
-"Апргрейд системи щойно зупинено. Система тепер може працювати нестабільно. "
-"Виконайте команду 'sudo apt-get install -f', або скористайдесь програмою "
-"Synaptic для налаштування системи."
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
-msgstr "Неможливо завантажити пакунки для апргрейду системи"
+msgstr "Неможливо завантажити пакунки для оновлення системи"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
-"Апргрейд системи щойно перервано. Будь ласка, перевірте зєднання з "
-"інтернетом чи носії та спробуйте знов. "
+"Оновлення системи щойно перервано. Будь ласка, перевірте з'єднання з "
+"Інтернетом або зовнішній носії та спробуйте знов. "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -372,24 +367,24 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 #, fuzzy
 msgid "Remove obsolete packages?"
 msgstr "Видалити непотрібні пакунки?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
-msgstr ""
+msgstr "Пропустити цей крок"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
-msgstr ""
+msgstr "Видалити"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
@@ -398,32 +393,42 @@ msgstr ""
 "нижче. "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
-msgstr "Перезавантаження системи"
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "Перевірка програми управління пакунками"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "Отримання інформації про репозиторій"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
-msgstr ""
+msgstr "Невірна інформація про пакунок"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -433,38 +438,36 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "Запит підтвердження"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
-msgstr "Оновлення завершено"
+msgstr "Процес оновлення"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "Пошук програм, що не використовуються"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
-msgstr "Апргрейд системи завершено."
+msgstr "Оновлення системи завершено."
 
 #. print "mediaChange %s %s" % (medium, drive)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr "Вставте '%s' в пристрій '%s'"
+msgstr "Вставте '%s' в привід '%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "Завантадення пакунків завершено"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr "Завантажується файл %li of %li at %s/s"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
@@ -473,9 +476,9 @@ msgid "About %s remaining"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
-msgstr "Завантажується файл %li of %li at %s/s"
+msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
@@ -506,79 +509,73 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "Команда 'diff' не знайдена"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
 msgstr "Виникла невиправна помилка"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 ""
-"Будь ласка, повідмте це я помилку, включивши в повідомлення файли ~/dist-"
-"upgrade.log and ~/dist-upgrade-apt.log . Апргрейд щойно перервано."
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s пакунків буде видалено."
+msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] "%s пакунків буде встановлено."
+msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "буде проведено апргрейд %s пакунків."
+msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "Потрібно завантажити всього %s пакунків."
+msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
 msgstr ""
-"Апрейд може продовжуватись декілька годин, і не може бути перервано протягом "
-"всього часу."
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
-msgstr ""
+msgstr "Для запобігання втраті інформації закрийте усі програми та документи."
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Ваша система оновлена!"
@@ -600,9 +597,9 @@ msgid "Install %s"
 msgstr "Встановити %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:539
-#, fuzzy, python-format
+#, python-format
 msgid "Upgrade %s"
-msgstr "Апргрейд %s"
+msgstr "Оновити %s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
 #, python-format
@@ -629,8 +626,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -641,7 +638,7 @@ msgstr "Необхідно перезавантажити систему"
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
-"Виконання апгрейду звершено. Необхідно перезавантажити систему. "
+"Виконання оновлення завершено. Необхідно перезавантажити систему. "
 "Перезавантажити зара?"
 
 #. testcode to see if the bullets look nice in the dialog
@@ -660,16 +657,18 @@ msgid ""
 "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"
-"↵"
+"<b><big>Відмінити оновлення системи?</big></b>\n"
+"\n"
+"Зауважте, що якщо Ви скасуєте оновлення, це може призвести до нестабільного "
+"стану системи. Дуже рекомендується продовжити оновлення."
 
 #: ../DistUpgrade/DistUpgrade.glade.h:5
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
-msgstr "<b><big>Перезавантажте систему для завершення апгрейду</big></b>"
+msgstr "<b><big>Перезавантажте систему для завершення оновлення</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:6
 msgid "<b><big>Start the upgrade?</big></b>"
-msgstr "<b><big>Почати апгрейд системи?</big></b>"
+msgstr "<b><big>Почати оновлення?</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
@@ -681,16 +680,15 @@ msgstr "Очищення"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
 msgid "Details"
-msgstr "<b>Подробиці</b>"
+msgstr "Деталі"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "Різниця між файлами"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
-msgstr "Завантаження та встановлення пакунків для апгрейду"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -709,43 +707,53 @@ msgid "Terminal"
 msgstr "Термінал"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr "Затримати"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 #, fuzzy
 msgid "_Replace"
 msgstr "Перезавантажити"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
-msgstr "П_овідомити про помилку"
+msgstr "Повідомити про помилку"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
-msgstr "_Перезавантажити"
+msgstr "Перезапустити зараз"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
-msgstr "П_родовжити апгрейд системи"
+msgstr "Продовжити оновлення"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
-#, fuzzy
 msgid "Could not find the release notes"
-msgstr "Не знайдено пакунків для апгрейду"
+msgstr "Не вдалося знайти примітки випуску."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "Сервер може бути перенавантажений. "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
-#, fuzzy
 msgid "Could not download the release notes"
-msgstr "Неможливо завантажити пакунки для апргрейду системи"
+msgstr "Не вдалося завантажити примітки випуску."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "Будь ласка, перевірте ваше з'єднання з Інтернетом."
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
@@ -766,20 +774,19 @@ msgstr "Завантаження та встановлення пакунків
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "Інструмент оновлення проведе Вас через процес оновлення."
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
-msgstr ""
+msgstr "Підпис інструменту оновлення"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:183
-#, fuzzy
 msgid "Upgrade tool"
-msgstr "Апргрейд %s"
+msgstr "Інструмент оновлення"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
-msgstr ""
+msgstr "Не вдалося отримати"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
@@ -797,7 +804,7 @@ msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
-msgstr ""
+msgstr "Перевірка зазнала краху"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
@@ -817,149 +824,143 @@ msgid ""
 msgstr ""
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "Завантажується файл %li of %li at %s/s"
+msgstr ""
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "Завантажується файл %li of %li at %s/s"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "Доступний новий випуск Ubuntu!"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
-"не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Оновлення безпеки Ubuntu 5.10"
+msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "Встановлення оновлень..."
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "П_родовжити апгрейд системи"
+msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "Встановлення оновлень..."
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Версія %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr "Завантаження змін"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "Розмір завантаження: %s"
 
-#: ../UpdateManager/UpdateManager.py:615
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:633
+#, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] "Неможливо провести апргрейд системи"
-msgstr[1] "Неможливо провести апргрейд системи"
-msgstr[2] "Неможливо провести апргрейд системи"
+msgstr[0] "Ви можете встановити %s оновлення"
+msgstr[1] "Ви можете встановити %s оновлення"
+msgstr[2] "Ви можете встановити %s оновлень"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
-msgstr ""
+msgstr "Будь ласка, зачекайте, це може зайняти деякий час."
 
-#: ../UpdateManager/UpdateManager.py:650
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr "Завантадення пакунків завершено"
+msgstr "Оновлення завершено"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "Встановлення оновлень..."
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "Версія %s: \n"
+msgstr ""
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
-msgstr "Ваш дистрибутив вже не підтримується"
+msgstr "Ваш дистрибутив більше не підтримується"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 для подальшої інформації про оновлення."
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1005,9 +1006,8 @@ msgid "<big><b>Not all updates can be installed</b></big>"
 msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>Почати апгрейд системи?</big></b>"
+msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1054,10 +1054,12 @@ msgid ""
 "Software updates correct errors, eliminate security vulnerabilities and "
 "provide new features."
 msgstr ""
+"Оновлення програм виправляють помилки, проблеми безпеки та додають нові "
+"можливості."
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
-msgstr ""
+msgstr "Оновити"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
@@ -1068,9 +1070,8 @@ msgid "_Check"
 msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "П_родовжити апгрейд системи"
+msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1082,32 +1083,28 @@ msgid "_Install Updates"
 msgstr "Встановлення оновлень..."
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "Зміни"
+msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Оновлення через Інтернет</b>"
+msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-#, fuzzy
 msgid "<b>Internet updates</b>"
 msgstr "<b>Оновлення через Інтернет</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Оновлення через Інтернет</b>"
+msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1133,9 +1130,8 @@ msgid "D_elete downloaded software files:"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "Завантадення пакунків завершено"
+msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 #, fuzzy
@@ -1165,14 +1161,12 @@ msgstr "Відновити початкові ключі"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "Властивості програм"
+msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
-msgstr "Текст програми"
+msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
@@ -1196,13 +1190,12 @@ msgid "_Download updates automatically, but do not install them"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:25
-#, fuzzy
 msgid "_Import Key File"
-msgstr "Імпортувати ключ"
+msgstr "Імпортувати файл ключа"
 
 #: ../data/glade/SoftwareProperties.glade.h:26
 msgid "_Install security updates without confirmation"
-msgstr ""
+msgstr "Встановлювати оновлення безпеки без підтвердження"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
 msgid ""
@@ -1219,9 +1212,8 @@ msgid "<b>Comment:</b>"
 msgstr "<b>Коментар:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:7
-#, fuzzy
 msgid "<b>Components:</b>"
-msgstr "<b>Компоненти</b>"
+msgstr "<b>Компоненти:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:8
 msgid "<b>Distribution:</b>"
@@ -1236,7 +1228,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1244,16 +1235,10 @@ msgid ""
 "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>. Докладні приклади можна знайти у "
-"документації."
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
-msgstr "Рядок APT"
+msgstr "Рядок APT:"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:15
 msgid ""
@@ -1261,21 +1246,19 @@ msgid ""
 "Source"
 msgstr ""
 "Двійкові\n"
-"вихідні"
+"Вихідні коди"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr "Текст програми"
+msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "Сканування компакт-диску"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr "Текст програми"
+msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 #, fuzzy
@@ -1284,7 +1267,7 @@ msgstr "Перезавантажити"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "Показати та встановити наявні оновлення"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -1309,7 +1292,7 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
-msgstr ""
+msgstr "Нагадувати про поновлення списку каналів"
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
@@ -1327,7 +1310,7 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
-msgstr ""
+msgstr "Розмір вікна"
 
 #: ../data/software-properties.desktop.in.h:1
 msgid "Configure the sources for installable software and updates"
@@ -1337,19 +1320,17 @@ msgstr ""
 #: ../data/channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Оновлення Ubuntu 5.10"
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "Підтримується спільнотою (Universe)"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
@@ -1358,44 +1339,38 @@ msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "Супутнє програмне забезпечення"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\""
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Оновлення Ubuntu 5.04"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "Підтримується спільнотою (Universe)"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "Підтримується спільнотою (Universe)"
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "Не-вільний (Multiverse)"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
@@ -1404,21 +1379,18 @@ msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "Не-вільний (Multiverse)"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "ПЗ під експортними обмеженнями США"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Оновлення Ubuntu 5.04"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
@@ -1427,73 +1399,63 @@ msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\""
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\""
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Оновлення безпеки Ubuntu 5.10"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:140
 msgid "Ubuntu 5.10 Updates"
-msgstr "Оновлення Ubuntu 5.10"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:145
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Оновлення Ubuntu 5.10"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\""
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
-#, fuzzy
 msgid "Officially supported"
-msgstr "Офіціально підтримуються"
+msgstr "Офіційно підтримуються"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Оновлення безпеки Ubuntu 5.10"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Оновлення Ubuntu 5.10"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Оновлення Ubuntu 5.10"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\""
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1507,15 +1469,13 @@ msgstr "Не-вільний (Multiverse)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
-#, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\""
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "Офіціально підтримуються"
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1525,18 +1485,17 @@ msgstr "Обмежені авторські права"
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Оновлення безпеки Ubuntu 4.10"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
 msgid "Ubuntu 4.10 Updates"
-msgstr "Оновлення Ubuntu 4.10"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Оновлення Ubuntu 5.10"
+msgstr ""
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1552,30 +1511,27 @@ msgstr "Debian 3.1 \"Sarge\""
 #. BaseURI
 #: ../data/channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
 #. Description
 #: ../data/channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Оновлення безпеки стабільного Debian"
+msgstr "Оновлення безпеки Debian 3.1 \"Sarge\""
 
 #. Description
 #: ../data/channels/Debian.info.in:34
-#, fuzzy
 msgid "Debian \"Etch\" (testing)"
-msgstr "Тестовий Debian"
+msgstr "Debian \"Etch\" (тестовий)"
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "http://http.us.debian.org/debian/"
 
 #. Description
 #: ../data/channels/Debian.info.in:48
-#, fuzzy
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian поза США (Нестабільний)"
+msgstr "Debian \"Sid\" (нестабільний)"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:54
@@ -1587,339 +1543,227 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#, fuzzy
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "Завантажується файл %li of %li на невизначенії швидкості"
-
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "Встановлення оновлень..."
-
-#~ msgid "Cancel _Download"
-#~ msgstr "Скасувати _Завантаження"
+#~ msgid ""
+#~ "<big><b>Error scaning the CD</b></big>\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<big><b>Помилка сканування КД</b></big>\n"
+#~ "\n"
+#~ "%s"
 
-#~ msgid "Could not find any upgrades"
-#~ msgstr "Не знайдено пакунків для апгрейду"
+#~ msgid ""
+#~ "A unresolvable problem occured while calculating the upgrade. Please "
+#~ "report this as a bug. "
+#~ msgstr ""
+#~ "Під час розрахунку оновлення виникла невиправна помилка. Будь ласка, "
+#~ "повідомте про це як про помилку програми. "
 
-#~ msgid "Your system has already been upgraded."
-#~ 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."
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Оновлення безпеки Ubuntu 5.10"
+#~ 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 для налаштування системи."
 
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "Апгрейд системи Ubuntu"
+#~ msgid "Some software no longer officially supported"
+#~ msgstr "Деяке програмне забезпечення більше офіційно не підтримується"
 
 #, fuzzy
-#~ msgid "Cannot install all available updates"
-#~ msgstr "Пошук пакунків для апгрейду"
+#~ msgid "Restoring originale system state"
+#~ msgstr "Перезавантаження системи"
 
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ msgstr "Офіціально підтримуються"
+#~ msgid "About %li minutes remaining"
+#~ msgstr "Залишилось близько %li хвилин"
 
 #~ msgid "Download is complete"
 #~ msgstr "Завантадення пакунків завершено"
 
+#~ msgid "Downloading file %li of %li at %s/s"
+#~ msgstr "Завантажується файл %li of %li at %s/s"
+
 #, 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 "Оновлення Ubuntu 5.10"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Оновлення безпеки Ubuntu 5.04"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Оновлення Ubuntu 5.10"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Оновлення Ubuntu 5.10"
-
-#, 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"
+#~ "Replace configuration file\n"
+#~ "'%s'?"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Завантаження змін</span>\n"
-#~ "\n"
-#~ "Потрібно отримати зміни з центрального сервера"
-
-#~ msgid "Show available updates and choose which to install"
-#~ msgstr "Показати доступні оновлення та зміни до встановлених пакетів"
+#~ "Замінити файл налаштування\n"
+#~ "'%s'?"
 
 #, 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."
+#~ "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 ""
-#~ "<big><b>Ключі автентифікації</b></big>\n"
-#~ "\n"
-#~ "У цьому діалозі ви можете додавати та видаляти ключі автентифікації. Ключ "
-#~ "дає змогу перевірити цілісність завантаженого програмного забезпечення."
+#~ "Будь ласка, повідмте це я помилку, включивши в повідомлення файли ~/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 ""
-#~ "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. "
+#~ "The upgrade can take several hours and cannot be canceled at any time "
+#~ "later."
 #~ 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 "Could not find any upgrades"
+#~ msgstr "Не знайдено пакунків для оновлення"
 
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Максимальний розмір (Мб):"
+#~ msgid "Your system has already been upgraded."
+#~ msgstr "Оновлення вашої системи вже проведено."
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>"
 #~ msgstr ""
-#~ "Відновити початкові ключі, що постачались з дистрибутивом. Встановлені "
-#~ "користувачем ключі не будуть змінені."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Встановити _максимальний розмір кеша пакетів"
-
-#~ msgid "Settings"
-#~ msgstr "Параметри"
-
-#~ msgid "Show detailed package versions"
-#~ msgstr "Показувати детальні версії пакетів"
+#~ "<span weight=\"bold\" size=\"x-large\">Оновлення до Ubuntu 6.06 LTS</span>"
 
-#~ msgid "Show disabled software sources"
-#~ msgstr "Показувати вимкнені джерела програм"
+#~ msgid "Downloading and installing the upgrades"
+#~ msgstr "Завантаження та встановлення пакунків для апгрейду"
 
-#~ msgid "Update interval in days: "
-#~ msgstr "Інтервал оновлення (днів): "
-
-#~ msgid "_Add Repository"
-#~ msgstr "_Додати репозиторій"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Завантажити оновлювані пакети"
-
-#~ 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 "Cancel downloading the changelog"
-#~ msgstr "Скасувати завантаження записів changelog"
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "Оновлення системи Ubuntu"
 
 #, fuzzy
-#~ msgid "Debian sarge"
-#~ msgstr "Debian 3.1 \"Sarge\""
+#~ msgid "Downloading file %li of %li with %s/s"
+#~ msgstr "Завантажується файл %li of %li at %s/s"
 
 #, fuzzy
-#~ msgid "Debian etch"
-#~ msgstr "Тестовий Debian"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "Завантажується файл %li of %li на невизначенії швидкості"
 
 #, fuzzy
-#~ msgid "Debian sid"
-#~ msgstr "Тестовий Debian"
+#~ msgid ""
+#~ "Failed to download the list of changes. Please check your Internet "
+#~ "connection."
+#~ msgstr ""
+#~ "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет."
 
 #, 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 "Cannot install all available updates"
+#~ msgstr "Пошук пакунків для апгрейду"
 
-#~ msgid "Debian Stable"
-#~ msgstr "Стабільний Debian"
+#, fuzzy
+#~ msgid "Downloading the list of changes..."
+#~ msgstr "Завантаження змін"
 
-#~ msgid "Debian Unstable \"Sid\""
-#~ msgstr "Нестабільний Debian \"Sid\""
+#~ msgid "Hide details"
+#~ msgstr "Сховати деталі"
 
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Debian поза США (Стабільний)"
+#~ msgid "Show details"
+#~ msgstr "Показати деталі"
 
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian поза США (Тестовий)"
+#~ msgid "New version: %s   (Size: %s)"
+#~ msgstr "Нова версія: %s   (Розмір: %s)"
 
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Автоматичний ключ підпису архіву Ubuntu <ftpmaster@ubuntu.com>"
+#~ msgid "Cancel _Download"
+#~ msgstr "Скасувати Завантаження"
 
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "Автоматичний ключ підпису компакт-диску Ubuntu <cdimage@ubuntu.com>"
+#~ msgid "<b>Channels</b>"
+#~ msgstr "<b>Канали</b>"
 
-#~ msgid "Choose a key-file"
-#~ msgstr "Виберіть ключовий файл"
+#~ msgid "<b>Keys</b>"
+#~ msgstr "<b>Ключі</b>"
 
-#~ msgid "There is one package available for updating."
-#~ msgstr "Немає доступних для оновлення пакетів."
+#~ msgid "Add _Cdrom"
+#~ msgstr "Додати компакт-диск"
 
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "Для оновлення доступно %s пакетів."
+#~ msgid "Installation Media"
+#~ msgstr "Носій встановлення"
 
-#~ msgid "There are no updated packages"
-#~ msgstr "Немає оновлених пакетів"
+#~ msgid "Software Preferences"
+#~ 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 "_Download updates in the background, but do not install them"
+#~ msgstr "Завантажувати оновлення у фоні, але не встановлювати їх"
 
-#~ 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 "     "
+#~ 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 пакетів оновлення, загальний розмір %s"
-#~ msgstr[1] "Ви виділили %s з %s пакетів оновлення, загальний розмір %s"
-#~ msgstr[2] "Ви виділили %s з %s пакетів оновлення, загальний розмір %s"
+#~ msgid "<b>Channel</b>"
+#~ msgstr "<b>Канал</b>"
 
-#~ msgid "The updates are being applied."
-#~ msgstr "Застосовуються оновлення."
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>Компоненти</b>"
 
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
+#~ "<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 ""
-#~ "Одночасно можна запускати лише один менеджер пакетів. Спочатку закрийте "
-#~ "іншу програму.close this other application first."
+#~ "<big><b>Введіть повний рядок сховища APT, який ви бажаєте додати</b></"
+#~ "big>\n"
+#~ "\n"
+#~ "Рядок APT містить тип, адресу та вміст сховища, наприклад <i>\"deb http://"
+#~ "ftp.debian.org sarge main\"</i>. Докладні приклади можна знайти у "
+#~ "документації."
 
-#~ msgid "Updating package list..."
-#~ msgstr "Оновлення списку пакетів..."
+#~ msgid "Add Channel"
+#~ msgstr "Додати канал"
 
-#~ msgid "There are no updates available."
-#~ msgstr "Немає доступних оновлень."
+#~ msgid "Edit Channel"
+#~ msgstr "Редагувати канал"
 
-#~ msgid "New version:"
-#~ msgstr "Нова версія:"
+#~ msgid "_Add Channel"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "Додати канал"
+#~ msgstr[1] "Додати канали"
+#~ msgstr[2] "Додати канали"
 
-#~ 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"
+#~ msgid "_Custom"
+#~ 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/"
+#~ msgid "Software Properties"
+#~ msgstr "Властивості програм"
 
-#~ msgid "Never show this message again"
-#~ msgstr "Не показуйте це повідомлення знову"
+#~ msgid "Ubuntu 6.06 LTS"
+#~ msgstr "Ubuntu 6.06 LTS"
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "Зміне не знайдено, можливо сервер досі не оновлено."
+#~ 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"
diff --git a/po/update-manager.pot b/po/update-manager.pot
index 2909b623..1e9dcf1b 100644
--- a/po/update-manager.pot
+++ b/po/update-manager.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -142,30 +142,30 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -174,34 +174,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -228,11 +228,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -240,11 +240,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -257,11 +257,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -270,42 +270,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -314,15 +314,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -331,21 +331,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -354,54 +354,65 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -411,19 +422,19 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr ""
 
@@ -481,8 +492,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -544,7 +555,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr ""
 
@@ -594,8 +605,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -669,25 +680,37 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
+msgid "_Continue"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
+msgid "_Replace"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -778,128 +801,130 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
 msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, python-format
 msgid "Version %s"
 msgstr ""
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1282,7 +1307,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1312,7 +1337,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
diff --git a/po/ur.po b/po/ur.po
index 25649bf5..4d127f41 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: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
+"POT-Creation-Date: 2006-10-06 23:18+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"
@@ -143,30 +143,30 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -175,34 +175,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -229,11 +229,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -241,11 +241,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -258,11 +258,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -271,42 +271,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -315,15 +315,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -332,21 +332,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -355,54 +355,65 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -412,19 +423,19 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr ""
 
@@ -482,8 +493,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -545,7 +556,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr ""
 
@@ -595,8 +606,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -670,25 +681,37 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
+msgid "_Continue"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
+msgid "_Replace"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -779,128 +802,130 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
 msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, python-format
 msgid "Version %s"
 msgstr ""
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1284,7 +1309,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1314,7 +1339,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
diff --git a/po/urd.po b/po/urd.po
index 65f63c08..978beca6 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: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
+"POT-Creation-Date: 2006-10-06 23:18+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"
@@ -143,30 +143,30 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -175,34 +175,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -229,11 +229,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -241,11 +241,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -258,11 +258,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -271,42 +271,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -315,15 +315,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -332,21 +332,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -355,54 +355,65 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -412,19 +423,19 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr ""
 
@@ -482,8 +493,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -545,7 +556,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr ""
 
@@ -595,8 +606,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -670,25 +681,37 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
+msgid "_Continue"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
+msgid "_Replace"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -779,128 +802,130 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
 msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, python-format
 msgid "Version %s"
 msgstr ""
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1284,7 +1309,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1314,7 +1339,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
diff --git a/po/vi.po b/po/vi.po
index e42aa10e..50355c11 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager Gnome HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:45+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:45+0000\n"
 "Last-Translator: Tran The Trung <tttrung@hotmail.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -56,9 +56,9 @@ msgstr "Sau %s ngày"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Đang cài đặt bản cập nhật..."
+msgstr ""
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -110,7 +110,7 @@ msgstr "Nguồn"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
-msgstr ""
+msgstr "Nhập mã khóa"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
@@ -138,74 +138,79 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:1096
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Nhập tên của đĩa"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1112
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Hãy đút đĩa vào trong ổ:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
-msgstr ""
+msgstr "Gói bị lỗi"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
-msgstr ""
+msgstr "Không thể nâng cấp các gói gốc được yêu cầu"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
-msgstr ""
+msgstr "Một gói quan trọng cần phải bị gỡ bỏ"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "Không thể tính được dung lượng cần nâng cấp"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 #, 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. "
+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."
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
-msgstr ""
+msgstr "Gặp lỗi khi đang xác thực một số gói"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
+"đủ."
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "Không thể cài đặt '%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 #, fuzzy
 msgid ""
 "It was impossible to install a required package. 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. "
+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. "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
-msgstr ""
+msgstr "Không thể đoán được gói gốc"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -230,13 +235,13 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
-msgstr ""
+msgstr "Đang đọc bộ nhớ đệm"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -244,11 +249,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -261,11 +266,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -274,43 +279,43 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 #, fuzzy
 msgid "Error during update"
 msgstr "Gặp lỗi khi gỡ bỏ khóa"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -319,15 +324,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -336,21 +341,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -359,55 +364,68 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 #, fuzzy
 msgid "Checking package manager"
 msgstr "Một bộ quản lý gói khác đang chạy"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "Đang tải các thay đổi"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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."
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -417,20 +435,20 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 #, fuzzy
 msgid "Upgrading"
 msgstr "Nâng cấp xong"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr ""
 
@@ -489,8 +507,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -549,7 +567,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 #, fuzzy
 msgid "Your system is up-to-date"
 msgstr "Hệ thống bạn toàn mới nhất."
@@ -600,8 +618,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -676,26 +694,38 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+msgid "_Keep"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 #, fuzzy
 msgid "_Replace"
 msgstr "Tải lại"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -789,138 +819,142 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, 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ố."
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+#: ../UpdateManager/UpdateManager.py:212
+#, 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ố."
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 #, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"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."
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Đang cài đặt bản cập nhật..."
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
+#, fuzzy
 msgid "Backports"
-msgstr ""
+msgstr "Bản cập nhật Ubuntu 5.10"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "Đang cài đặt bản cập nhật..."
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "Đang cài đặt bản cập nhật..."
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "Phiên bản %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "Đang tải các thay đổi"
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "Đang cài đặt bản cập nhật..."
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, fuzzy, python-format
 msgid "Version %s"
-msgstr "Phiên bản %s: \n"
+msgstr "Phiên bản %s:"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 #, 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."
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1332,8 +1366,9 @@ msgstr "Bản cập nhật Ubuntu 5.04"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "Do cộng đồng bảo quản (Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
@@ -1366,9 +1401,8 @@ msgstr "Không tự do (Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "Phần mềm bị giới hạn xuất Mỹ"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
@@ -1544,6 +1578,10 @@ msgid "Non-DFSG-compatible Software"
 msgstr ""
 
 #, 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..."
 
diff --git a/po/xh.po b/po/xh.po
index 6e7a0566..8c711614 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-notifier\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-04-20 19:15+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:45+0000\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
 "MIME-Version: 1.0\n"
@@ -57,9 +57,9 @@ msgstr ""
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "Bonisa izihlaziyo"
+msgstr ""
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -143,30 +143,30 @@ msgstr ""
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
+#: ../DistUpgrade/DistUpgradeCache.py:221
 msgid ""
 "A unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -175,34 +175,34 @@ msgid ""
 msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr ""
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -229,11 +229,11 @@ msgstr ""
 msgid "Reading cache"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -241,11 +241,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -258,11 +258,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -271,42 +271,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -315,15 +315,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -332,21 +332,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -355,54 +355,65 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -412,19 +423,19 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr ""
 
@@ -482,8 +493,8 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -545,7 +556,7 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr ""
 
@@ -595,8 +606,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -670,25 +681,37 @@ msgid "Terminal"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-msgid "_Replace"
+msgid "_Continue"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
+msgid "_Keep"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
+msgid "_Replace"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr ""
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr ""
@@ -779,134 +802,137 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
+#: ../UpdateManager/UpdateManager.py:206
 #, fuzzy
 msgid "The list of changes is not available"
 msgstr "Kukho i-%i yohlaziyo ekhoyo"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
-msgstr ""
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr "Kukho i-%i yohlaziyo ekhoyo"
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 #, fuzzy
 msgid "Important security updates"
 msgstr "Bonisa izihlaziyo"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 #, fuzzy
 msgid "Proposed updates"
 msgstr "Bonisa izihlaziyo"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "Bonisa izihlaziyo"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 #, fuzzy
 msgid "Other updates"
 msgstr "Bonisa izihlaziyo"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:719
 #, fuzzy
 msgid "Checking for updates"
 msgstr "Bonisa izihlaziyo"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
+#: ../UpdateManager/UpdateManager.py:830
 #, python-format
 msgid "Version %s"
 msgstr ""
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -1297,7 +1323,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
@@ -1327,7 +1353,7 @@ msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a9a8830d..26a20108 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-30 14:16+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-10-05 20:36+0000\n"
 "Last-Translator: catinsnow <catinsnow@gmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -56,9 +56,9 @@ msgstr "%s天后"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "安装更新"
+msgstr "%s 更新"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -66,51 +66,44 @@ msgstr "安装更新"
 #: ../SoftwareProperties/SoftwareProperties.py:264
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "主服务器"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "%s 的服务器"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "最近服务器"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "自定义服务器"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "软件更新"
+msgstr "软件频道"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "启用"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr ""
-"二进制\n"
-"源代码"
+msgstr "(源代码)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
-msgstr ""
-"二进制\n"
-"源代码"
+msgstr "源代码"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -133,13 +126,13 @@ msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "你所选择的密钥不能被删除。请汇报这个bug"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
-"<big><b>读取光盘时出错</b></big>\n"
+"<big><b>扫描光盘时出错</b></big>\n"
 "\n"
 "%s"
 
@@ -151,11 +144,11 @@ msgstr "请输入光盘的名称"
 msgid "Please insert a disc in the drive:"
 msgstr "请将光盘插入到光驱里:"
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "破损的软件包"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -163,34 +156,37 @@ msgstr ""
 "你的系统包含有破损的软件包而不能通过此软件修复。 在你继续前请先用新立得或者"
 "apt-get修复它们。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "不能升级要求的元包"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "一个必要的软件包会被删除"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "无法计算升级"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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 "在计算升级时遇到一个无法解决的问题。请汇报这个bug。 "
+msgstr ""
+"在计算升级时遇到一个无法解决的问题。\n"
+"\n"
+"请汇报这个有关 'update-manager' 的错误，并且将 /var/log/dist-upgrade/ 中的文"
+"件包含在错误报告中。"
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "在认证一些软件包时出错"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -199,24 +195,23 @@ msgstr ""
 "无法认证一些软件包。这可能是暂时的网络问题。你可以在稍后再试。以下是未认证软"
 "件包的列表。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "无法安装'%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "无法安装要求的软件包。请汇报这个bug。 "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "无法猜出元包"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -225,13 +220,12 @@ msgid ""
 "before proceeding."
 msgstr ""
 "你的系统没有一个ubuntu-desktop,kubuntu-desktop或eubuntu-desktop软件包所以无法"
-"确定你运行的ubuntu的版本。 请在继续前先用新立得或apt-get安装以上所举软件包中"
-"的一个。"
+"确定你运行的ubuntu的版本。\n"
+" 请先用新立得或apt-get安装以上所举软件包中的一个。"
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "下载失败"
+msgstr "添加CD失败"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -242,28 +236,34 @@ msgid ""
 "The error message was:\n"
 "'%s'"
 msgstr ""
+"添加CD时出错，升级中止。请报告本bug。\n"
+"\n"
+"错误消息是：\n"
+"'%s'"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "正在读取缓存"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
-msgstr ""
+msgstr "要从网络获取升级数据吗？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 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"
+"如果网络带宽足够，请选择'是'。否则选'否'。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "未找到可用的镜像"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -280,11 +280,11 @@ msgstr ""
 "如果选'no'更新将被取消."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "生成默认的源?"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -296,45 +296,44 @@ msgstr ""
 "\n"
 "添加用于'%s'的缺省条目?如果选择'No',升级将被取消."
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "源的信息无效"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr "升级源的信息时产生一个无效文件。请汇报这个bug。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "第三方源被禁用"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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中的一些第三方源被禁用。你可以在升级后用\"软件属性\"工具或新立得"
+"包管理器来重新启用它们."
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "升级时出错"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr "升级时候出错。这通常是一些网络问题，请检查你的网络连接后再试。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "磁盘空间不足"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -345,16 +344,15 @@ msgstr ""
 "get clean'命令来删除之前安装的临时软件包。"
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "你要开始升级么？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "无法安装升级"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -363,23 +361,26 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 "升级现在取消。你的系统可能处于不稳定状态。恢复操作可运行(dpkg --configure -"
-"a)。"
+"a)。\n"
+"\n"
+"请报告本'update-manger'包的bug，并在报告中包含/var/log/disg-upgrade/中的文"
+"件。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "无法下载升级包"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr "升级现在取消。请检查你的网络连接活重新放置安装媒体后再试。 "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
-msgstr ""
+msgstr "一些应用程序支持终止"
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 #, fuzzy
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
@@ -390,57 +391,70 @@ msgid ""
 msgstr ""
 "这些安装的包已不在被官方支持,仅为社区维护('universe').\n"
 "\n"
-"如果你没有启用'社区维护'源,下一步这些包将被建议移除. "
+"如果你没有启用'社区维护'源,下一步这些包将被建议移除."
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "删除陈旧的软件包？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "跳过这个步骤(_S)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "确认时出错"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr "在清理时发生问题。更多信息请查看以下消息。 "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr "正在恢复原始系统状态"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "正在检查软件包管理器"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+#, fuzzy
+msgid "Preparing the upgrade failed"
+msgstr "正在准备升级"
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+#, 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 "在计算升级时遇到一个无法解决的问题。请汇报这个bug。"
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "更新源的信息"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "无效的包信息"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeControler.py:721
+#, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
 "not be found anymore.\n"
@@ -448,22 +462,24 @@ msgid ""
 "manager' package and include the files in /var/log/dist-upgrade/ in the "
 "bugreport."
 msgstr ""
-"包信息被更新后核心包'%s'没有找到.\n"
-"这标志着一个严重的错误,请报告bug."
+"包信息被更新后核心包'%s'没有找到。\n"
+"\n"
+"这表示严重的错误,请报告这个'update-manager'包的bug，并在报告中包含/var/log/"
+"dist-upgrade/中的文件。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "请求确认"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "正在更新"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "寻找陈旧的软件包"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "系统更新完毕"
 
@@ -474,25 +490,24 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "请将'%s'插入光驱'%s'"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "更新完成"
+msgstr "下载完成"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr "正在下载文件%li/%li速度是%s/s"
+msgstr "下载文件 %li/%li 速度是%s/s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
-#, fuzzy, python-format
+#, python-format
 msgid "About %s remaining"
-msgstr "大约还要%li分钟"
+msgstr "大约还要 %s"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
-msgstr "正在下载第 %li 个文件(共 %li 个文件)"
+msgstr "下载第 %li 个文件(共 %li 个文件)"
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
@@ -511,21 +526,23 @@ 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'包的bug,度在报告中包含/var/log/dist-"
+"upgrade/中的文件。"
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"替换配置文件\n"
+"替换定制配置文件\n"
 "“%s”吗？"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -551,37 +568,39 @@ msgstr ""
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s软件包将被删除。"
+msgstr[0] "%d 个软件包将被删除。"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] "%s新的软件包将被安装。"
+msgstr[0] "%d 个新的软件包将被安装。"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "%s软件包将被升级"
+msgstr[0] "%d 个软件包将被升级"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "你下载了总体的%s。"
+msgstr ""
+"\n"
+"\n"
+"你需要下载了总共 %s。 "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
-msgstr "升级会持续几个小时且不能在稍后的任何时候被终止"
+msgstr "下载及升级会持续几个小时，且不可取消。"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -589,7 +608,7 @@ msgstr "关闭所有打开的程序和文档以防止数据丢失。"
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "您的系统已为最新"
 
@@ -597,7 +616,7 @@ msgstr "您的系统已为最新"
 msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
-msgstr ""
+msgstr "你的系统没有可用升级。升级被取消。"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:535
 #, python-format
@@ -615,32 +634,32 @@ msgid "Upgrade %s"
 msgstr "升级%s"
 
 #: ../DistUpgrade/DistUpgradeView.py:27
-#, fuzzy, python-format
+#, python-format
 msgid "%li days %li hours %li minutes"
-msgstr "大约还要%li天%li小时%li分钟"
+msgstr "%li 天 %li 小时 %li 分钟"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
-#, fuzzy, python-format
+#, python-format
 msgid "%li hours %li minutes"
-msgstr "大约还要%li天%li小时"
+msgstr "%li 天 %li 小时"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li 分钟"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li 秒"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -681,7 +700,7 @@ msgstr "<b><big>开始升级？</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:7
 msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
-msgstr ""
+msgstr "<b><big>升级Ubuntu到 6.10</big></b>"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
@@ -717,25 +736,39 @@ msgid "Terminal"
 msgstr "终端"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+#, fuzzy
+msgid "_Cancel Upgrade"
+msgstr "继续升级(_R)"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "维持原状(_K)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "报告Bug(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "现在重启(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "继续升级(_R)"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+#, fuzzy
+msgid "_Start Upgrade"
+msgstr "继续升级(_R)"
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "无法找到发行说明"
@@ -827,118 +860,116 @@ msgstr "正在下载文件 %li/%li 速度是 %s/s"
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "正在下载文件 %li/%li 速度是 %s/s"
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "变动列表尚不可用。请稍后再试。"
+msgstr "变动列表尚不可用。"
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+#, fuzzy
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr "变动列表尚不可用。请稍后再试。"
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
+#, fuzzy
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
 msgstr "无法下载更新列表。请检查您的网络连接。"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 安全更新"
+msgstr "重要安全更新"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "建议更新"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "安装更新"
+msgstr "建议更新"
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
-msgstr ""
+msgstr "Backports"
 
-#: ../UpdateManager/UpdateManager.py:240
+#: ../UpdateManager/UpdateManager.py:242
 #, fuzzy
 msgid "Distribution updates"
 msgstr "继续升级(_R)"
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "安装更新"
+msgstr "其它更新"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "版本 %s： \n"
 
-#: ../UpdateManager/UpdateManager.py:521
+#: ../UpdateManager/UpdateManager.py:539
 #, fuzzy
 msgid "Downloading list of changes..."
 msgstr "正在下载更新列表..."
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
-msgstr ""
+msgstr "取消全部(_U)"
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "检查（_C）"
+msgstr "选中全部(_C)"
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "下载文件大小：%s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "你可以安装 %s 个更新"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "请稍等，这需要花一些时间。"
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "更新完成"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "检查有效的更新"
+msgstr "检查更新"
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, fuzzy, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "新版本：%s(大小：%s)"
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "版本 %s： \n"
+msgstr "版本 %s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(大小:%s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "您的发行版不再被支持"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -948,17 +979,17 @@ msgstr ""
 "\r\n"
 "http://www.ubuntu.com 来获取更多有关升级的信息。"
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>新发行版 '%s' 可用</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "软件索引已被破坏"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -970,24 +1001,24 @@ msgstr ""
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
 msgid "None"
-msgstr ""
+msgstr "无"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
 #, fuzzy
@@ -1007,17 +1038,12 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>保持你的系统更新</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
-msgstr ""
-"<big><b>读取光盘时出错</b></big>\n"
-"\n"
-"%s"
+msgstr "<big><b>没有更新可供安装</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>开始升级？</big></b>"
+msgstr "<b><big>运行升级管理器</big></b>"
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1025,7 +1051,7 @@ msgstr "变更"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "更新的变化及描述"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1050,6 +1076,9 @@ msgid ""
 "This can be caused by an uncompleted upgrade, unofficial software packages "
 "or by running a development version."
 msgstr ""
+"运行发行升级，会安装尽可能多的更新。\n"
+"\n"
+"这是由不完全升级、非官方软件包或者运行开发版本引起的。"
 
 #: ../data/glade/UpdateManager.glade.h:16
 msgid "Show progress of single files"
@@ -1078,9 +1107,8 @@ msgid "_Check"
 msgstr "检查（_C）"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "继续升级(_R)"
+msgstr "发行升级(_U)"
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1091,31 +1119,28 @@ msgid "_Install Updates"
 msgstr "安装更新(_I)"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "变更"
+msgstr "变化"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "更新"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>Internet 更新</b>"
+msgstr "<b>自动更新</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>CDROM/DVD</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>Internet 更新</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>Internet 更新</b>"
+msgstr "<b>Internet</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1127,6 +1152,10 @@ msgid ""
 "The results are used to improve the support for popular applications and to "
 "rank applications in the search results.</i>"
 msgstr ""
+"<i>为了提高Ubuntu的用户体验，请参加流行对比。这样，你安装了哪些软件及使用频度"
+"每周会被匿名发送给Unbuntu。\n"
+"\n"
+"其结果用于流行软件支持及应用软件搜索排名。"
 
 #: ../data/glade/SoftwareProperties.glade.h:9
 #, fuzzy
@@ -1142,9 +1171,8 @@ msgid "D_elete downloaded software files:"
 msgstr "删除下载的软件文件(_e)"
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "下载完成"
+msgstr "下载自："
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1170,37 +1198,32 @@ msgstr "还原为发行版本预设的密钥"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "软件属性"
+msgstr "软件源"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
-msgstr ""
-"二进制\n"
-"源代码"
+msgstr "源代码"
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
-msgstr ""
+msgstr "统计"
 
 #: ../data/glade/SoftwareProperties.glade.h:21
 msgid "Submit statistical information"
-msgstr ""
+msgstr "提交统计信息"
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "第三方"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "自动检查更新(_C)"
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "在后台下载更新，但是不安装(_D)"
+msgstr "自动下载更新，但不安装(_D)"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1211,7 +1234,6 @@ msgid "_Install security updates without confirmation"
 msgstr "不确认就安装安全更新(_I)"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1220,9 +1242,9 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>频道信息已过时</big></b>\n"
+"<b><big>可用软件信息已过时</big></b>\n"
 "\n"
-"你必须从新增加的或更新的频道重载频道信息以安装软件和更新。\n"
+"你必须重载可用软件信息，以安装软件和从新增或者改变的源更新。\n"
 "\n"
 "你需要一个有效的互联网连接才能继续。"
 
@@ -1272,22 +1294,16 @@ msgstr ""
 "源代码"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr ""
-"二进制\n"
-"源代码"
+msgstr "编辑源"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
 msgstr "正在扫描CD-ROM"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr ""
-"二进制\n"
-"源代码"
+msgstr "添加源(_A)"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1345,9 +1361,8 @@ msgid "The window size"
 msgstr "窗口大小"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "设定软件频道和互联网升级"
+msgstr "设定可安装和升级的源"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1357,9 +1372,8 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 更新"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
@@ -1370,75 +1384,68 @@ msgstr "社区维护(Universe)"
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
 msgid "Proprietary drivers for devices"
-msgstr ""
+msgstr "设备的专有驱动"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "贡献的软件"
+msgstr "受限软件"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Ubuntu 6.10 'Edgy Eft' 光盘"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6-06 'Dapper Drake'"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
-msgstr ""
+#, fuzzy
+msgid "Canonical supported Open Source software"
+msgstr "社区维护(Universe)"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "社区维护(Universe)"
+msgstr "社区维护(universe)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "社区维护(Universe)"
+msgstr "社区维护开源软件"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "非自由(Multiverse)"
+msgstr "非自由驱动"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
 msgid "Proprietary drivers for devices "
-msgstr ""
+msgstr "设备的属性驱动 "
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "非自由(Multiverse)"
+msgstr "受限软件(Multiverse)"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "美国限制出口的软件"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6-06 'Dapper Drake'"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake' 光盘"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
 msgid "Backported updates"
-msgstr ""
+msgstr "Backported 更新"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
@@ -1447,9 +1454,8 @@ msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.10 'Breezy Badger' 光盘"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
@@ -1468,15 +1474,13 @@ msgstr "Ubuntu 5.10 移植"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 安全更新"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 安全更新"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'光盘"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1485,9 +1489,8 @@ msgstr "官方支持"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 安全更新"
+msgstr "Ubuntu 5.04 安全更新"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
@@ -1497,36 +1500,33 @@ msgstr "Ubuntu 5.10 更新"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 移植"
+msgstr "Ubuntu 5.04 Backports"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
 msgid "Community maintained (Universe)"
-msgstr "社区维护(Universe)"
+msgstr "社区维护"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:201
 msgid "Non-free (Multiverse)"
-msgstr "非自由(Multiverse)"
+msgstr "非自由"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "Ubuntu 4.10 'Warty Warthog'光盘"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "一些软件已经不在被官方支持."
+msgstr "官方不再支持"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1540,15 +1540,13 @@ msgstr "Ubuntu 4.10 安全更新"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 5.10 更新"
+msgstr "Ubuntu 4.10 更新"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 移植"
+msgstr "Ubuntu 4.10 Backports"
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1596,12 +1594,14 @@ msgstr "带有非自由依赖关系的DFSG兼容软件"
 msgid "Non-DFSG-compatible Software"
 msgstr "非DFSG兼容软件"
 
+#~ 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 "安装更新"
+#~ msgstr "正常更新"
 
 #~ msgid "Cancel _Download"
 #~ msgstr "取消下载(_D)"
@@ -1709,7 +1709,8 @@ msgstr "非DFSG兼容软件"
 #~ msgstr "编辑路径"
 
 #~ msgid "_Add Channel"
-#~ msgstr "添加路径(_A)"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "添加路径(_A)"
 
 #~ msgid "_Custom"
 #~ msgstr "自定义(_C)"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 29847de7..50e902bc 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,64 +1,63 @@
-# traditional Chinese translation of update-manager.
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# Abel Cheung <abel@oaka.org>, 2005.
+# Chinese (Hong Kong) translation of update-manager.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# Abel Cheung <abel@oaka.org>, 2005, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: update-manager 0.41.1\n"
+"Project-Id-Version: update-manager 0.42.2\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-23 19:45+0000\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-06-16 01:18+0000\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
-"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:136
-#, fuzzy
 msgid "Daily"
-msgstr "<b>細節</b>"
+msgstr "每天"
 
 #: ../SoftwareProperties/SoftwareProperties.py:137
 msgid "Every two days"
-msgstr ""
+msgstr "每兩天"
 
 #: ../SoftwareProperties/SoftwareProperties.py:138
 msgid "Weekly"
-msgstr ""
+msgstr "每週"
 
 #: ../SoftwareProperties/SoftwareProperties.py:139
 msgid "Every two weeks"
-msgstr ""
+msgstr "每兩週"
 
 #: ../SoftwareProperties/SoftwareProperties.py:144
 #, python-format
 msgid "Every %s days"
-msgstr ""
+msgstr "每 %s 天"
 
 #: ../SoftwareProperties/SoftwareProperties.py:167
 msgid "After one week"
-msgstr ""
+msgstr "一週後"
 
 #: ../SoftwareProperties/SoftwareProperties.py:168
 msgid "After two weeks"
-msgstr ""
+msgstr "兩週後"
 
 #: ../SoftwareProperties/SoftwareProperties.py:169
 msgid "After one month"
-msgstr ""
+msgstr "一個月後"
 
 #: ../SoftwareProperties/SoftwareProperties.py:174
 #, python-format
 msgid "After %s days"
-msgstr ""
+msgstr "%s 日後"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "正在安裝軟件更新..."
+msgstr ""
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
@@ -89,9 +88,8 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "軟件更新"
+msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
@@ -99,18 +97,16 @@ msgid "Active"
 msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
-#, fuzzy
 msgid "(Source Code)"
-msgstr "源程式碼"
+msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
-#, fuzzy
 msgid "Source Code"
-msgstr "源程式碼"
+msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
-msgstr ""
+msgstr "匯入密碼匙"
 
 #: ../SoftwareProperties/SoftwareProperties.py:979
 msgid "Error importing selected file"
@@ -138,74 +134,76 @@ msgstr ""
 
 #: ../SoftwareProperties/SoftwareProperties.py:1096
 msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "請輸入光碟的名稱"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1112
 msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "請將光碟放入光碟機："
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
-msgstr ""
+msgstr "不完整套件"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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 來修復"
+"套件。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr ""
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
-msgstr ""
+msgstr "無法計算升級過程"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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 "你選定的密碼匙無法移除，請匯報問題。 "
+msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 ""
+"有些套件不能認證，這可能是短暫的網絡問題；你可以稍後再試。以下為沒有認證的套"
+"件。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
-msgstr ""
+msgstr "無法安裝「%s」"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
-msgstr "你選定的密碼匙無法移除，請匯報問題。 "
+msgstr "有必須的套件無法安裝，請匯報問題。 "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -230,13 +228,13 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
-msgstr ""
+msgstr "正在讀取快取資料"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -244,11 +242,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
-msgstr ""
+msgstr "找不到有效的 mirror 網站"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -261,11 +259,11 @@ msgid ""
 msgstr ""
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -274,43 +272,42 @@ msgid ""
 "cancel."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
-msgstr ""
+msgstr "套件庫資料無效"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
-msgstr ""
+msgstr "停用外來的軟件來源"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
-msgstr "移除密碼匙時發生錯誤"
+msgstr "更新時發生錯誤"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
-msgstr ""
+msgstr "磁碟空間不足"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -319,15 +316,15 @@ msgid ""
 msgstr ""
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
-msgstr ""
+msgstr "是否要開始升級？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
-msgstr ""
+msgstr "無法安裝升級"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -336,21 +333,21 @@ msgid ""
 "files in /var/log/dist-upgrade/ in the bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
-msgstr ""
+msgstr "無法下載升級所需的套件"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
-msgstr ""
+msgstr "升級現正中止。請檢查網路連線是否正常，然後再試一次。 "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -359,55 +356,65 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
-msgstr ""
+msgstr "是否移除過時的套件？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
-msgstr ""
+msgstr "略過這步驟(_S)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
-msgstr ""
+msgstr "移除(_R)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr ""
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
-msgstr "另一個套件管理員正在執行中"
+msgstr "正在檢查套件管理程式"
+
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgradeControler.py:672
-msgid "Updating repository information"
+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 ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:695
+msgid "Updating repository information"
+msgstr "正在更新套件庫資料"
+
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
-msgstr ""
+msgstr "套件資料無效"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -417,28 +424,27 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
-msgstr "完成升級"
+msgstr "升級中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
-msgstr ""
+msgstr "正在搜尋過時的軟件"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
-msgstr ""
+msgstr "已完成系統升級。"
 
 #. print "mediaChange %s %s" % (medium, drive)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:100
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
-msgstr ""
+msgstr "請將「%s」放入光碟機「%s」中"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
 msgid "Fetching is complete"
@@ -471,7 +477,7 @@ msgstr "正在下載更改紀錄..."
 #: ../DistUpgrade/DistUpgradeViewGtk.py:187
 #, python-format
 msgid "Could not install '%s'"
-msgstr ""
+msgstr "無法安裝「%s」"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:188
 msgid ""
@@ -489,13 +495,13 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
 msgid "The 'diff' command was not found"
-msgstr ""
+msgstr "找不到「diff」指令"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:355
 msgid "A fatal error occured"
@@ -516,21 +522,18 @@ msgstr ""
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
 #, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
 #, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
 msgstr[0] ""
-msgstr[1] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
 #, python-format
@@ -552,10 +555,9 @@ msgstr ""
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
-msgstr "系統已經在最新狀態！"
+msgstr "系統已經在最新狀態"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:519
 msgid ""
@@ -603,8 +605,8 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -647,16 +649,15 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:8
 msgid "Cleaning up"
-msgstr ""
+msgstr "清理"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
 msgid "Details"
-msgstr "<b>細節</b>"
+msgstr "詳細資料"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:10
 msgid "Difference between the files"
-msgstr ""
+msgstr "檔案間的差別"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
 msgid "Fetching and installing the upgrades"
@@ -664,76 +665,85 @@ msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
-msgstr ""
+msgstr "更改軟件來源"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:13
 msgid "Preparing the upgrade"
-msgstr ""
+msgstr "正準備升級"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:14
 msgid "Restarting the system"
-msgstr ""
+msgstr "重新啟動系統"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:15
 msgid "Terminal"
-msgstr ""
+msgstr "終端機"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
-msgid "_Keep"
+msgid "_Cancel Upgrade"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:17
-#, fuzzy
-msgid "_Replace"
-msgstr "重新載入"
+msgid "_Continue"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:18
-msgid "_Report Bug"
-msgstr ""
+msgid "_Keep"
+msgstr "保留(_K)"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:19
-msgid "_Restart Now"
-msgstr ""
+msgid "_Replace"
+msgstr "取代(_R)"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:20
+msgid "_Report Bug"
+msgstr "報告錯誤(_R)"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:21
+msgid "_Restart Now"
+msgstr "現在重新啟動(_R)"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
+msgstr "繼續升級(_R)"
+
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
 msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
-msgstr ""
+msgstr "找不到發行通告"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:69
 msgid "The server may be overloaded. "
-msgstr ""
+msgstr "伺服器可能負荷過重。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:79
 msgid "Could not download the release notes"
-msgstr ""
+msgstr "無法下載發行通告"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:80
 msgid "Please check your internet connection."
-msgstr ""
+msgstr "請檢查網絡連線是否正常。"
 
 #. no script file found in extracted tarbal
 #: ../UpdateManager/DistUpgradeFetcher.py:149
 msgid "Could not run the upgrade tool"
-msgstr ""
+msgstr "無法執行升級工具"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:150
-#, fuzzy
 msgid ""
 "This is most likely a bug in the upgrade tool. Please report it as a bug"
-msgstr "你選定的密碼匙無法移除，請匯報問題。"
+msgstr "這可能是升級工具的錯誤，請匯報問題"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:171
-#, fuzzy
 msgid "Downloading the upgrade tool"
-msgstr "正在下載更改紀錄"
+msgstr "正在下載升級工具"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:173
 msgid "The upgrade tool will guide you through the upgrade process."
-msgstr ""
+msgstr "升級工具會引導你進行整個升級的過程。"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:180
 msgid "Upgrade tool signature"
@@ -741,29 +751,29 @@ msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:183
 msgid "Upgrade tool"
-msgstr ""
+msgstr "升級工具"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:208
 msgid "Failed to fetch"
-msgstr ""
+msgstr "下載失敗"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:209
 msgid "Fetching the upgrade failed. There may be a network problem. "
-msgstr ""
+msgstr "下載升級工具失敗，可能是網絡上的問題。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:214
 msgid "Failed to extract"
-msgstr ""
+msgstr "解壓失敗"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:215
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
-msgstr ""
+msgstr "升級套件解壓失敗。可能是因為網路或伺服器出現問題。 "
 
 #: ../UpdateManager/DistUpgradeFetcher.py:221
 msgid "Verfication failed"
-msgstr ""
+msgstr "檢驗失敗"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
 msgid ""
@@ -772,15 +782,14 @@ msgid ""
 msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
-#, fuzzy
 msgid "Authentication failed"
-msgstr "認證"
+msgstr "認證失敗"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:229
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
-msgstr ""
+msgstr "認證升級套件失敗。可能是因為網路或伺服器出現問題。 "
 
 #: ../UpdateManager/GtkProgress.py:108
 #, python-format
@@ -792,137 +801,130 @@ msgstr ""
 msgid "Downloading file %(current)li of %(total)li"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "Ubuntu 已推出新版本！"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
-msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。"
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 安全性更新"
+msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
 msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "正在安裝軟件更新..."
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "正在安裝軟件更新..."
+msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "正在安裝軟件更新..."
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "版本 %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr "正在下載更改紀錄"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
 msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
-msgstr ""
+msgstr "下載大小：%s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "你可以安裝 %s 個更新套件"
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
-msgstr ""
+msgstr "完成更新"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "正在安裝軟件更新..."
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:808
+#: ../UpdateManager/UpdateManager.py:826
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "版本 %s: \n"
+msgstr ""
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 #, fuzzy
 msgid "Your distribution is not supported anymore"
 msgstr "已經不再支援你用的發行版本"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 ""
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr ""
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -981,7 +983,7 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
-msgstr ""
+msgstr "檢查(_K)"
 
 #: ../data/glade/UpdateManager.glade.h:10
 msgid "Check the software channels for new updates"
@@ -993,7 +995,7 @@ msgstr "詳細說明"
 
 #: ../data/glade/UpdateManager.glade.h:12
 msgid "Release Notes"
-msgstr ""
+msgstr "發行通告"
 
 #: ../data/glade/UpdateManager.glade.h:13
 msgid ""
@@ -1019,15 +1021,15 @@ msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
-msgstr ""
+msgstr "升級(_P)"
 
 #: ../data/glade/UpdateManager.glade.h:20
 msgid "Upgrade to the latest version of Ubuntu"
-msgstr ""
+msgstr "升級至最新版本的 Ubuntu"
 
 #: ../data/glade/UpdateManager.glade.h:21
 msgid "_Check"
-msgstr ""
+msgstr "檢查(_C)"
 
 #: ../data/glade/UpdateManager.glade.h:22
 msgid "_Distribution Upgrade"
@@ -1038,37 +1040,32 @@ msgid "_Hide this information in the future"
 msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:24
-#, fuzzy
 msgid "_Install Updates"
-msgstr "正在安裝軟件更新..."
+msgstr "安裝軟件更新(_I)"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "更改紀錄"
+msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>線上更新</b>"
+msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:4
-#, fuzzy
 msgid "<b>Internet updates</b>"
-msgstr "<b>線上更新</b>"
+msgstr "<b>網絡更新</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>線上更新</b>"
+msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1103,9 +1100,8 @@ msgid "Import the public key from a trusted software provider"
 msgstr "由你信任的密碼匙圈中移除指定的密碼匙。"
 
 #: ../data/glade/SoftwareProperties.glade.h:14
-#, fuzzy
 msgid "Internet Updates"
-msgstr "<b>線上更新</b>"
+msgstr "網絡更新"
 
 #: ../data/glade/SoftwareProperties.glade.h:15
 msgid ""
@@ -1114,9 +1110,8 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:16
-#, fuzzy
 msgid "Restore _Defaults"
-msgstr "還原為預設值"
+msgstr "還原為預設值(_D)"
 
 #: ../data/glade/SoftwareProperties.glade.h:17
 #, fuzzy
@@ -1125,14 +1120,12 @@ msgstr "還原為預設密碼匙"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "軟件屬性"
+msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:19
-#, fuzzy
 msgid "Source code"
-msgstr "源程式碼"
+msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:20
 msgid "Statistics"
@@ -1147,9 +1140,8 @@ msgid "Third Party"
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:23
-#, fuzzy
 msgid "_Check for updates automatically:"
-msgstr "檢查軟件更新間隔："
+msgstr "檢查軟件更新間隔(_C)："
 
 #: ../data/glade/SoftwareProperties.glade.h:24
 msgid "_Download updates automatically, but do not install them"
@@ -1192,10 +1184,9 @@ msgstr "<b>類型:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:10
 msgid "<b>URI:</b>"
-msgstr "<b>URI:</b>"
+msgstr "<b>網址:</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1203,10 +1194,6 @@ msgid ""
 "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>。你可以在文件中尋找有關該行的格式的詳細描述。"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
@@ -1221,27 +1208,24 @@ msgstr ""
 "源程式碼"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
-#, fuzzy
 msgid "Edit Source"
-msgstr "源程式碼"
+msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
-msgstr ""
+msgstr "正在掃描光碟"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
-#, fuzzy
 msgid "_Add Source"
-msgstr "源程式碼"
+msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
-#, fuzzy
 msgid "_Reload"
-msgstr "重新載入"
+msgstr "重新載入(_R)"
 
 #: ../data/update-manager.desktop.in.h:1
 msgid "Show and install available updates"
-msgstr ""
+msgstr "顯示及安裝現有的更新套件"
 
 #: ../data/update-manager.desktop.in.h:2
 msgid "Update Manager"
@@ -1255,7 +1239,7 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:2
 msgid "Check for new distribution releases"
-msgstr ""
+msgstr "檢查有沒有新的發行版本"
 
 #: ../data/update-manager.schemas.in.h:3
 msgid ""
@@ -1270,11 +1254,11 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:5
 msgid "Show details of an update"
-msgstr ""
+msgstr "顯示更新套件的詳細資料"
 
 #: ../data/update-manager.schemas.in.h:6
 msgid "Stores the size of the update-manager dialog"
-msgstr ""
+msgstr "儲存 update-manager 對話窗的大小"
 
 #: ../data/update-manager.schemas.in.h:7
 msgid ""
@@ -1284,7 +1268,7 @@ msgstr ""
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
-msgstr ""
+msgstr "視窗大小"
 
 #: ../data/software-properties.desktop.in.h:1
 msgid "Configure the sources for installable software and updates"
@@ -1294,19 +1278,17 @@ msgstr ""
 #: ../data/channels/Ubuntu.info.in.h:4
 #, no-c-format
 msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 更新"
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "協力維護軟件 (Universe)"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
@@ -1315,44 +1297,38 @@ msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "協力維護軟件"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 4.10 光碟 “Warty Warthog”"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 5.04 更新"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "協力維護軟件 (Universe)"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "協力維護軟件 (Universe)"
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "非自由軟件 (Multiverse)"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
@@ -1361,21 +1337,18 @@ msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "非自由軟件 (Multiverse)"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-#, fuzzy
-msgid "By copyright or legal issues restricted software"
-msgstr "美國禁止出口軟件"
+msgid "Software restricted by copyright or legal issues"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 5.04 更新"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
@@ -1384,73 +1357,63 @@ msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
-#, fuzzy
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 光碟 “Breezy Badger”"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 光碟 “Breezy Badger”"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 安全性更新"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:140
 msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 更新"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:145
-#, fuzzy
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 更新"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”"
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
-#, fuzzy
 msgid "Officially supported"
-msgstr "官方支援"
+msgstr "正式支援"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 安全性更新"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 更新"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 更新"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 4.10 光碟 “Warty Warthog”"
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1464,15 +1427,13 @@ msgstr "非自由軟件 (Multiverse)"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
-#, fuzzy
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 4.10 光碟 “Warty Warthog”"
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "官方支援"
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1482,358 +1443,264 @@ msgstr "版權受限"
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 4.10 安全性更新"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 4.10 更新"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 更新"
+msgstr ""
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
 #, no-c-format
 msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
+msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Debian.info.in:6
 msgid "Debian 3.1 \"Sarge\""
-msgstr "Debian 3.1 “Sarge”"
+msgstr "Debian 3.1「Sarge」"
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:19
 msgid "http://security.debian.org/"
-msgstr ""
+msgstr "http://security.debian.org/"
 
 #. Description
 #: ../data/channels/Debian.info.in:20
-#, fuzzy
 msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Debian 穩定版安全性更新"
+msgstr "Debian 3.1「Sarge」安全性更新"
 
 #. Description
 #: ../data/channels/Debian.info.in:34
-#, fuzzy
 msgid "Debian \"Etch\" (testing)"
-msgstr "Debian 測試版"
+msgstr "Debian 「Etch」（測試版）"
 
 #. BaseURI
 #: ../data/channels/Debian.info.in:47
 msgid "http://http.us.debian.org/debian/"
-msgstr ""
+msgstr "ftp://ftp.hk.debian.org/debian/"
 
 #. Description
 #: ../data/channels/Debian.info.in:48
-#, fuzzy
 msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian Non-US (不穩定版)"
+msgstr "Debian 「Sid」（不穩定版）"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:54
 msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr ""
+msgstr "符合 DFSG 的軟件，但依賴於非自由軟件"
 
 #. CompDescription
 #: ../data/channels/Debian.info.in:57
 msgid "Non-DFSG-compatible Software"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "正在安裝軟件更新..."
-
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 安全性更新"
-
-#, fuzzy
-#~ msgid "Cannot install all available updates"
-#~ msgstr "正在檢查更新套件..."
-
-#, fuzzy
-#~ msgid "Oficially supported"
-#~ 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 "自選(_C)"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 5.10 更新"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 5.04 安全性更新"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 5.10 更新"
-
-#, fuzzy
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 5.10 更新"
-
-#, fuzzy
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>分類:</b>"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>分類:</b>"
-
-#, fuzzy
-#~ msgid "Reload the latest information about updates"
-#~ msgstr "由伺服器重新載入套件資料。"
+msgstr "和 DFSG 不相容的軟件"
 
 #~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "<big><b>Error scaning the CD</b></big>\n"
 #~ "\n"
-#~ "Need to get the changes from the central server"
+#~ "%s"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">下載更改紀錄</span>\n"
+#~ "<big><b>掃描光碟時發生錯誤</b></big>\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 "修改軟件來源和設定"
-
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>來源</b>"
-
-#~ msgid "day(s)"
-#~ msgstr "日"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>軟件庫</b>"
+#~ "%s"
 
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>暫存檔</b>"
+#~ msgid ""
+#~ "A unresolvable problem occured while calculating the upgrade. Please "
+#~ "report this as a bug. "
+#~ msgstr "計算升級時發生無法解決的問題，請匯報問題。 "
 
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>介面</b>"
+#~ 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 ""
-#~ "<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."
+#~ "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 ""
-#~ "<big><b>認證用密碼匙</b></big>\n"
-#~ "\n"
-#~ "你可以在本對話窗內加減認證用的密碼匙。這些密碼匙可以用來檢查下載的軟件是否"
-#~ "完整。"
+#~ "sources.list 中部份外來的套件來源已經被停用。系統升級後，你可以使用"
+#~ "「software-properties」工具或 synaptic 重新啟用這些來源。"
 
 #~ 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. "
+#~ "The upgrade aborts now. Your system can be in an unusable state. A "
+#~ "recovery was run (dpkg --configure -a)."
 #~ msgstr ""
-#~ "將新的密碼匙檔加入你信任的密碼匙圈之內。請確保該密碼匙是經安全的途徑獲得"
-#~ "的，而且屬於你信任的擁有者。 "
+#~ "升級中止。你的系統現在可能在一個不穩定的狀態。正在進行復原 (dpkg --"
+#~ "configure -a)。"
 
-#~ msgid "Add repository..."
-#~ msgstr "加入軟件庫..."
+#~ msgid "Some software no longer officially supported"
+#~ msgstr "某些軟件不會再有正式支援"
 
-#~ msgid "Automatically check for software _updates."
-#~ msgstr "自動檢查軟件更新(_U)"
+#~ msgid "Restoring originale system state"
+#~ msgstr "恢復原來的系統狀態"
 
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "自動清理暫存檔案(_T)"
+#~ msgid "About %li days %li hours %li minutes remaining"
+#~ msgstr "大約還剩下 %li 天 %li 小時 %li 分鐘"
 
-#~ msgid "Clean interval in days: "
-#~ msgstr "每隔多少天自動清理: "
+#~ msgid "About %li hours %li minutes remaining"
+#~ msgstr "大約還剩下 %li 小時 %li 分鐘"
 
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "刪除套件快取中的舊套件(_O)"
+#~ msgid "About %li minutes remaining"
+#~ msgstr "大約還剩下 %li 分鐘"
 
-#~ msgid "Edit Repository..."
-#~ msgstr "編輯軟件庫..."
+#~ msgid "About %li seconds remaining"
+#~ msgstr "大約還剩下 %li 秒鐘"
 
-#~ msgid "Maximum age in days:"
-#~ msgstr "時間上限 (日):"
+#~ msgid "Download is complete"
+#~ msgstr "下載完成"
 
-#~ msgid "Maximum size in MB:"
-#~ msgstr "大小上限 (MB):"
+#~ msgid "Downloading file %li of %li"
+#~ msgstr "正在下載檔案 %li/%li"
+
+#~ msgid "The upgrade aborts now. Please report this bug."
+#~ msgstr "升級現正中止，請匯報問題。"
 
 #~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
+#~ "Replace configuration file\n"
+#~ "'%s'?"
 #~ msgstr ""
-#~ "將發行版本提供的預設密碼匙還原。這個程序不會更改用戶自行安裝的密碼匙。"
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "指定套件快取的大小上限(_M)"
-
-#~ msgid "Settings"
-#~ msgstr "設定"
-
-#~ msgid "Show detailed package versions"
-#~ msgstr "顯示詳細套件版本資料"
+#~ "取代設定檔\n"
+#~ "「%s」？"
 
-#~ msgid "Show disabled software sources"
-#~ msgstr "顯示被停用的軟件來源"
+#~ msgid "%s package is going to be removed."
+#~ msgid_plural "%s packages are going to be removed."
+#~ msgstr[0] "準備移除 %s 個套件。"
 
-#~ msgid "Update interval in days: "
-#~ msgstr "每隔多少天自動更新: "
+#~ msgid "%s new package is going to be installed."
+#~ msgid_plural "%s new packages are going to be installed."
+#~ msgstr[0] "準備安裝 %s 個新套件。"
 
-#~ msgid "_Add Repository"
-#~ msgstr "加入軟件庫(_A)"
+#~ msgid "%s package is going to be upgraded."
+#~ msgid_plural "%s packages are going to be upgraded."
+#~ msgstr[0] "準備升級 %s 個套件。"
 
-#~ msgid "_Download upgradable packages"
-#~ msgstr "下載所有可以更新的套件(_D)"
+#~ msgid "Downloading and installing the upgrades"
+#~ msgstr "正在下載及安裝升級套件"
 
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>狀態:</b>"
+#~ msgid "Upgrading Ubuntu"
+#~ msgstr "正在升級 Ubuntu"
 
 #~ 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"
-#~ "以下的軟件是可以更新的。你可以按「安裝」按鈕開始更新。"
+#~ "Verfing the upgrade failed.  There may be a problem with the network or "
+#~ "with the server. "
+#~ msgstr "檢驗升級套件失敗。可能是因為網路或伺服器出現問題。 "
 
-#~ msgid "Cancel downloading the changelog"
-#~ msgstr "取消下載更改紀錄"
+#~ msgid "Downloading file %li of %li with %s/s"
+#~ msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒"
 
-#~ msgid "You need to be root to run this program"
-#~ msgstr "你需要 root 的身分方可使用本程式"
+#~ msgid "Downloading file %li of %li with unknown speed"
+#~ msgstr "正在下載檔案 %li/%li，下載速度不明"
 
-#~ msgid "Binary"
-#~ msgstr "可執行檔"
+#~ msgid "The list of changes is not available yet. Please try again later."
+#~ msgstr "修改紀錄不存在，請稍後再試。"
 
-#~ msgid "Non-free software"
-#~ msgstr "非自由軟件"
-
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian 3.0 “Woody”"
+#~ msgid ""
+#~ "Failed to download the list of changes. Please check your Internet "
+#~ "connection."
+#~ msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。"
 
-#~ msgid "Debian Stable"
-#~ msgstr "Debian 穩定版"
+#~ msgid "Cannot install all available updates"
+#~ msgstr "無法安裝所有更新套件"
 
-#~ msgid "Debian Unstable \"Sid\""
-#~ msgstr "Debian 不穩定版 “Sid”"
+#~ 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 "Debian Non-US (Stable)"
-#~ msgstr "Debian Non-US (穩定版)"
+#~ msgid "The following updates will be skipped:"
+#~ msgstr "會略過更新以下套件："
 
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian Non-US (測試版)"
+#~ msgid "Downloading the list of changes..."
+#~ msgstr "正在下載更改紀錄…"
 
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Ubuntu 套件自動簽署用密碼匙 <ftpmaster@ubuntu.com>"
+#, fuzzy
+#~ msgid "Hide details"
+#~ msgstr "<b>細節</b>"
 
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "Ubuntu 光碟自動簽署用密碼匙 <cdimage@ubuntu.com>"
+#~ msgid "Cancel _Download"
+#~ msgstr "取消下載(_D)"
 
-#~ msgid "Choose a key-file"
-#~ msgstr "選擇密碼匙檔"
+#~ msgid "<b>Channels</b>"
+#~ msgstr "<b>套件來源</b>"
 
-#~ msgid "There is one package available for updating."
-#~ msgstr "有 1 個套件可以更新。"
+#~ msgid "<b>Keys</b>"
+#~ msgstr "<b>密碼匙</b>"
 
-#~ msgid "There are %s packages available for updating."
-#~ msgstr "有 %s 個套件可以更新。"
+#~ msgid "Add _Cdrom"
+#~ msgstr "加入光碟機(_C)"
 
-#~ msgid "There are no updated packages"
-#~ msgstr "沒有任何套件需要更新"
+#~ msgid "Installation Media"
+#~ 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 個更新套件中的任何一個"
+#~ msgid "Software Preferences"
+#~ msgstr "軟件偏好設定"
 
-#~ 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 "     "
+#~ msgstr "     "
 
 #, fuzzy
-#~ 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] "你選取了 %2$s 個更新套件中的 %1$s 個，大小為 %3$s"
-#~ msgstr[1] "你選取了 %2$s 個更新套件中的 %1$s 個，大小總共為 %3$s"
+#~ msgid "<b>Channel</b>"
+#~ msgstr "<b>密碼匙</b>"
 
-#~ msgid "The updates are being applied."
-#~ msgstr "現在安裝更新套件。"
+#, fuzzy
+#~ msgid "<b>Components</b>"
+#~ msgstr "<b>元件</b>"
 
+#, fuzzy
 #~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ 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>."
+#~ msgstr ""
+#~ "<big><b>請輸入整行你想加入的 APT 軟件庫位置</b></big>\n"
+#~ "\n"
+#~ "該行的內容包括 APT 軟件庫的類型、位置和內容，例如： <i>\"deb http://ftp."
+#~ "debian.org sarge main\"</i>。你可以在文件中尋找有關該行的格式的詳細描述。"
 
-#~ msgid "Updating package list..."
-#~ msgstr "正在更新套件清單..."
+#~ msgid "Edit Channel"
+#~ msgstr "修改套件來源"
 
-#~ msgid "There are no updates available."
-#~ msgstr "沒有任何軟件可以更新。"
+#~ msgid "_Add Channel"
+#~ msgid_plural "_Add Channels"
+#~ msgstr[0] "加入套件來源(_A)"
 
-#~ msgid "New version:"
-#~ msgstr "新版本:"
+#~ msgid "_Custom"
+#~ msgstr "自選(_C)"
 
-#~ 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 。"
+#~ msgid "Configure software channels and internet updates"
+#~ 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/ 獲取有關"
-#~ "升級的指引。"
+#~ msgid "Software Properties"
+#~ msgstr "軟件屬性"
+
+#~ msgid "Ubuntu 6.06 LTS"
+#~ msgstr "Ubuntu 6.06 LTS"
+
+#~ msgid "Ubuntu 6.06 LTS Security Updates"
+#~ msgstr "Ubuntu 6.06 LTS 安全性更新"
 
-#~ msgid "Never show this message again"
-#~ msgstr "以後不再顯示此訊息"
+#~ msgid "Ubuntu 6.06 LTS Updates"
+#~ msgstr "Ubuntu 6.06 LTS 更新"
 
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr "沒有更改紀錄，可能伺服器資料未更新。"
+#, fuzzy
+#~ msgid "Ubuntu 6.06 LTS Backports"
+#~ msgstr "Ubuntu 5.10 更新"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2c0cd116..203074cd 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,19 +1,15 @@
-# Chinese (Taiwan)translation of update-manager.
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# Abel Cheung <abel@oaka.org>, 2005.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: update-manager 0.41.1\n"
 "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-29 17:00+0200\n"
-"PO-Revision-Date: 2006-05-31 12:00+0000\n"
-"Last-Translator: PCMan <pcman.tw@gmail.com>\n"
+"POT-Creation-Date: 2006-10-06 23:18+0200\n"
+"PO-Revision-Date: 2006-09-14 07:29+0000\n"
+"Last-Translator: SOC Ho <soc.scho@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:136
 msgid "Daily"
@@ -55,55 +51,54 @@ msgstr "%s 天過後"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
 #: ../SoftwareProperties/SoftwareProperties.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%s updates"
-msgstr "安裝更新套件(_I)"
+msgstr "%s 更新"
 
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
 #. second %s is the code name of the comp, eg main, universe
 #: ../SoftwareProperties/SoftwareProperties.py:264
-#, python-format
+#, fuzzy, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:316
 msgid "Main server"
-msgstr ""
+msgstr "主要伺服器"
 
 #. TRANSLATORS: %s is a country
 #: ../SoftwareProperties/SoftwareProperties.py:320
 #: ../SoftwareProperties/SoftwareProperties.py:338
 #, python-format
 msgid "Server for %s"
-msgstr ""
+msgstr "位於%s的伺服器"
 
 #: ../SoftwareProperties/SoftwareProperties.py:324
 msgid "Nearest server"
-msgstr ""
+msgstr "最近的伺服器"
 
 #: ../SoftwareProperties/SoftwareProperties.py:345
 msgid "Custom servers"
-msgstr ""
+msgstr "個人伺服器"
 
 #: ../SoftwareProperties/SoftwareProperties.py:604
 #: ../SoftwareProperties/SoftwareProperties.py:621
-#, fuzzy
 msgid "Software Channel"
-msgstr "軟體更新"
+msgstr "軟體頻道"
 
 #: ../SoftwareProperties/SoftwareProperties.py:612
 #: ../SoftwareProperties/SoftwareProperties.py:629
 msgid "Active"
-msgstr ""
+msgstr "動作中"
 
 #: ../SoftwareProperties/SoftwareProperties.py:714
 msgid "(Source Code)"
-msgstr ""
+msgstr "(原始碼)"
 
 #: ../SoftwareProperties/SoftwareProperties.py:720
 msgid "Source Code"
-msgstr ""
+msgstr "原始碼"
 
 #: ../SoftwareProperties/SoftwareProperties.py:969
 msgid "Import key"
@@ -126,15 +121,12 @@ msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr "您選定的金鑰無法移除，請匯報問題。"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1039
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<big><b>Error scanning the CD</b></big>\n"
 "\n"
 "%s"
 msgstr ""
-"<big><b>掃描光碟時發生錯誤</b></big>\n"
-"\n"
-"%s"
 
 #: ../SoftwareProperties/SoftwareProperties.py:1096
 msgid "Please enter a name for the disc"
@@ -144,11 +136,11 @@ msgstr "請輸入光碟的名稱"
 msgid "Please insert a disc in the drive:"
 msgstr "請將光碟放入光碟機："
 
-#: ../DistUpgrade/DistUpgradeCache.py:92
+#: ../DistUpgrade/DistUpgradeCache.py:91
 msgid "Broken packages"
 msgstr "不完整套件"
 
-#: ../DistUpgrade/DistUpgradeCache.py:93
+#: ../DistUpgrade/DistUpgradeCache.py:92
 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."
@@ -156,34 +148,33 @@ msgstr ""
 "您的系統有安裝不完整的套件，而本程式無法將它們修正。在進行前請先使用 "
 "synaptic 或 apt-get 來修恢它們。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:207
 msgid "Can't upgrade required meta-packages"
 msgstr "無法升級須要的元套件 (meta-package)"
 
-#: ../DistUpgrade/DistUpgradeCache.py:193
+#: ../DistUpgrade/DistUpgradeCache.py:217
 msgid "A essential package would have to be removed"
 msgstr "將會移除的核心套件"
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:196
+#: ../DistUpgrade/DistUpgradeCache.py:220
 msgid "Could not calculate the upgrade"
 msgstr "無法計算升級"
 
-#: ../DistUpgrade/DistUpgradeCache.py:197
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:221
 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 "計算升級時發生無法解決的問題，請匯報問題。 "
+msgstr ""
 
 #. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:222
+#: ../DistUpgrade/DistUpgradeCache.py:246
 msgid "Error authenticating some packages"
 msgstr "認證一些套件時發生錯誤"
 
-#: ../DistUpgrade/DistUpgradeCache.py:223
+#: ../DistUpgrade/DistUpgradeCache.py:247
 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 "
@@ -192,24 +183,23 @@ msgstr ""
 "一些套件不能認證，這可能是由於短暫的網路問題；您可以稍後再試。以下為沒有認證"
 "的套件。"
 
-#: ../DistUpgrade/DistUpgradeCache.py:288
+#: ../DistUpgrade/DistUpgradeCache.py:312
 #, python-format
 msgid "Can't install '%s'"
 msgstr "無法安裝‘%s’"
 
-#: ../DistUpgrade/DistUpgradeCache.py:289
+#: ../DistUpgrade/DistUpgradeCache.py:313
 msgid ""
 "It was impossible to install a required package. Please report this as a "
 "bug. "
 msgstr "無法安裝須要的套件，請匯報問題。 "
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:296
+#: ../DistUpgrade/DistUpgradeCache.py:320
 msgid "Can't guess meta-package"
 msgstr "無法估計元套件 (meta-package)"
 
-#: ../DistUpgrade/DistUpgradeCache.py:297
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeCache.py:321
 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 "
@@ -217,14 +207,10 @@ msgid ""
 " 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安裝上述其中一個套件"
 
 #: ../DistUpgrade/DistUpgradeControler.py:74
-#, fuzzy
 msgid "Failed to add the CD"
-msgstr "下載失敗"
+msgstr "無法加入光碟"
 
 #: ../DistUpgrade/DistUpgradeControler.py:75
 #, python-format
@@ -235,16 +221,21 @@ msgid ""
 "The error message was:\n"
 "'%s'"
 msgstr ""
+"在加入光碟時有錯誤產升，升級將終止。若此光碟為一個有效的ubuntu光碟，請將此舉"
+"報為臭蟲。\n"
+"\n"
+"錯誤訊息為：\n"
+"「%s」"
 
 #: ../DistUpgrade/DistUpgradeControler.py:107
 msgid "Reading cache"
 msgstr "正在讀取快取"
 
-#: ../DistUpgrade/DistUpgradeControler.py:151
+#: ../DistUpgrade/DistUpgradeControler.py:155
 msgid "Fetch data from the network for the upgrade?"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:152
+#: ../DistUpgrade/DistUpgradeControler.py:156
 msgid ""
 "The upgrade can use the network to check the latest updates and to fetch "
 "packages that are not on the current CD.\n"
@@ -252,11 +243,11 @@ msgid ""
 "If networking is expensive for you choose 'No'."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:244
+#: ../DistUpgrade/DistUpgradeControler.py:248
 msgid "No valid mirror found"
 msgstr "找不到有效的 mirror"
 
-#: ../DistUpgrade/DistUpgradeControler.py:245
+#: ../DistUpgrade/DistUpgradeControler.py:249
 #, python-format
 msgid ""
 "While scaning your repository information no mirror entry for the upgrade "
@@ -275,11 +266,11 @@ msgstr ""
 "如果選擇「否」，則更新會被取消。"
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:262
+#: ../DistUpgrade/DistUpgradeControler.py:266
 msgid "Generate default sources?"
 msgstr "產生預設的來源？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:263
+#: ../DistUpgrade/DistUpgradeControler.py:267
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -291,45 +282,42 @@ msgstr ""
 "\n"
 "需要加入預設的 '%s' 項目嗎？如果你選擇「否」，更新將會被取消。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:297
+#: ../DistUpgrade/DistUpgradeControler.py:301
 msgid "Repository information invalid"
 msgstr "無效的套件庫資料"
 
-#: ../DistUpgrade/DistUpgradeControler.py:298
+#: ../DistUpgrade/DistUpgradeControler.py:302
 msgid ""
 "Upgrading the repository information resulted in a invalid file. Please "
 "report this as a bug."
 msgstr "升級套件庫時導致無效的檔案。請匯報問題。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:304
+#: ../DistUpgrade/DistUpgradeControler.py:308
 msgid "Third party sources disabled"
 msgstr "停用第三方來源"
 
-#: ../DistUpgrade/DistUpgradeControler.py:305
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:309
 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升級後，你可以重新啟用它。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:354
+#: ../DistUpgrade/DistUpgradeControler.py:358
 msgid "Error during update"
 msgstr "更新時發生錯誤"
 
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
 msgid ""
 "A problem occured during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
 msgstr "更新時發生錯誤。這可能是某些網路問題，試檢查網路連線及再試。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:364
+#: ../DistUpgrade/DistUpgradeControler.py:368
 msgid "Not enough free disk space"
 msgstr "磁碟空間不足"
 
-#: ../DistUpgrade/DistUpgradeControler.py:365
+#: ../DistUpgrade/DistUpgradeControler.py:369
 #, python-format
 msgid ""
 "The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -340,16 +328,15 @@ msgstr ""
 "clean'來移除先前安裝套件時的暫存檔。"
 
 #. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:424
+#: ../DistUpgrade/DistUpgradeControler.py:440
 msgid "Do you want to start the upgrade?"
 msgstr "是否要開始升級？"
 
-#: ../DistUpgrade/DistUpgradeControler.py:444
+#: ../DistUpgrade/DistUpgradeControler.py:460
 msgid "Could not install the upgrades"
 msgstr "無法安裝升級"
 
-#: ../DistUpgrade/DistUpgradeControler.py:445
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeControler.py:461
 msgid ""
 "The upgrade aborts now. Your system could be in an unusable state. A "
 "recovery was run (dpkg --configure -a).\n"
@@ -357,24 +344,22 @@ msgid ""
 "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)。"
 
-#: ../DistUpgrade/DistUpgradeControler.py:463
+#: ../DistUpgrade/DistUpgradeControler.py:479
 msgid "Could not download the upgrades"
 msgstr "無法下載升級套件"
 
-#: ../DistUpgrade/DistUpgradeControler.py:464
+#: ../DistUpgrade/DistUpgradeControler.py:480
 msgid ""
 "The upgrade aborts now. Please check your internet connection or "
 "installation media and try again. "
 msgstr "升級現正中止。請檢查網路連線是否正常及再試 "
 
-#: ../DistUpgrade/DistUpgradeControler.py:500
+#: ../DistUpgrade/DistUpgradeControler.py:516
 msgid "Support for some applications ended"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:501
+#: ../DistUpgrade/DistUpgradeControler.py:517
 msgid ""
 "Canonical Ltd. no longer provides support for the following software "
 "packages. You can still get support from the community.\n"
@@ -383,54 +368,65 @@ msgid ""
 "packages will be suggested for removal in the next step."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:552
 msgid "Remove obsolete packages?"
 msgstr "移除不再使用的套件"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Skip This Step"
 msgstr "略過這步驟(_S)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:537
+#: ../DistUpgrade/DistUpgradeControler.py:553
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../DistUpgrade/DistUpgradeControler.py:547
+#: ../DistUpgrade/DistUpgradeControler.py:563
 msgid "Error during commit"
 msgstr "提交時發生錯誤"
 
-#: ../DistUpgrade/DistUpgradeControler.py:548
+#: ../DistUpgrade/DistUpgradeControler.py:564
 msgid ""
 "Some problem occured during the clean-up. Please see the below message for "
 "more information. "
 msgstr "在清理時發生一些問題。請參閱以下訊息以取得更多資訊。 "
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:560
+#: ../DistUpgrade/DistUpgradeControler.py:576
 msgid "Restoring original system state"
-msgstr "恢復原先的系統狀態"
+msgstr "回覆原有系統狀態"
 
-#: ../DistUpgrade/DistUpgradeControler.py:616
+#: ../DistUpgrade/DistUpgradeControler.py:632
 #, python-format
 msgid "Fetching backport of '%s'"
 msgstr ""
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:651
-#: ../DistUpgrade/DistUpgradeControler.py:686
+#: ../DistUpgrade/DistUpgradeControler.py:667
+#: ../DistUpgrade/DistUpgradeControler.py:709
 msgid "Checking package manager"
 msgstr "正在檢查套件管理程式"
 
+#: ../DistUpgrade/DistUpgradeControler.py:671
+msgid "Preparing the upgrade failed"
+msgstr ""
+
 #: ../DistUpgrade/DistUpgradeControler.py:672
+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 ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:695
 msgid "Updating repository information"
 msgstr "正在更新套件庫資料"
 
-#: ../DistUpgrade/DistUpgradeControler.py:697
+#: ../DistUpgrade/DistUpgradeControler.py:720
 msgid "Invalid package information"
 msgstr "無效的套件資訊"
 
-#: ../DistUpgrade/DistUpgradeControler.py:698
+#: ../DistUpgrade/DistUpgradeControler.py:721
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
@@ -440,19 +436,19 @@ msgid ""
 "bugreport."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeControler.py:710
+#: ../DistUpgrade/DistUpgradeControler.py:733
 msgid "Asking for confirmation"
 msgstr "詢問以確認"
 
-#: ../DistUpgrade/DistUpgradeControler.py:714
+#: ../DistUpgrade/DistUpgradeControler.py:737
 msgid "Upgrading"
 msgstr "升級中"
 
-#: ../DistUpgrade/DistUpgradeControler.py:721
+#: ../DistUpgrade/DistUpgradeControler.py:744
 msgid "Searching for obsolete software"
 msgstr "尋搜不再使用的套件"
 
-#: ../DistUpgrade/DistUpgradeControler.py:726
+#: ../DistUpgrade/DistUpgradeControler.py:749
 msgid "System upgrade is complete."
 msgstr "系統升級完成。"
 
@@ -463,14 +459,13 @@ msgid "Please insert '%s' into the drive '%s'"
 msgstr "請將‘%s’放入光碟機‘%s’中"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:118
-#, fuzzy
 msgid "Fetching is complete"
-msgstr "更新完成"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:129
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li at %s/s"
-msgstr "正在下載檔案 %li/%li，速度在 %s/秒"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:130
 #: ../DistUpgrade/DistUpgradeViewGtk.py:249
@@ -479,9 +474,9 @@ msgid "About %s remaining"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:132
-#, fuzzy, python-format
+#, python-format
 msgid "Fetching file %li of %li"
-msgstr "正在下載檔案 %li/%li"
+msgstr ""
 
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
@@ -503,18 +498,16 @@ msgstr ""
 
 #. self.expander.set_expanded(True)
 #: ../DistUpgrade/DistUpgradeViewGtk.py:202
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Replace the customized configuration file\n"
 "'%s'?"
 msgstr ""
-"取代設定檔\n"
-"‘%s‘？"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:203
 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."
+"You will lose any changes you have made to this configuration file if you "
+"choose to replace it with a newer version."
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:216
@@ -526,54 +519,49 @@ msgid "A fatal error occured"
 msgstr "發生嚴重錯誤"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:356
-#, 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 ""
-"請將此視為 bug 來回報，並於報告中包含 /var/log/dist-upgrade.log 及 /var/log/"
-"dist-upgrade-apt.log 這兩個檔案。 現在取消更新。\n"
-"您的原始 sources.list 已被存到 /etc/apt/sources.list.distUpgrade。"
 
 #. FIXME: make those two seperate lines to make it clear
 #. that the "%" applies to the result of ngettext
 #: ../DistUpgrade/DistUpgradeViewGtk.py:487
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
-msgstr[0] "%s 個套件將會移除。"
-msgstr[1] ""
+msgstr[0] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:492
-#, fuzzy, python-format
+#, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
-msgstr[0] "%s 個新套件將會安裝。"
-msgstr[1] ""
+msgstr[0] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:498
-#, fuzzy, python-format
+#, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
-msgstr[0] "%s 個套件將會升級。"
-msgstr[1] ""
+msgstr[0] ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:503
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\n"
 "You have to download a total of %s. "
-msgstr "您總共需要下載 %s。"
+msgstr ""
+"\n"
+"\n"
+"你必須下載全部的%s。 "
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:509
-#, fuzzy
 msgid ""
 "Fetching and installing the upgrade can take several hours and cannot be "
 "canceled at any time later."
-msgstr "升級可能需要數小時及無法在稍後任何時間取消。"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:512
 msgid "To prevent data loss close all open applications and documents."
@@ -581,7 +569,7 @@ msgstr "避免遺失請關閉所有已開啟的程式及文件。"
 
 #. FIXME: this should go into DistUpgradeController
 #: ../DistUpgrade/DistUpgradeViewGtk.py:518
-#: ../UpdateManager/UpdateManager.py:604
+#: ../UpdateManager/UpdateManager.py:622
 msgid "Your system is up-to-date"
 msgstr "系統已經在最新狀態"
 
@@ -609,30 +597,30 @@ msgstr "升級 %s"
 #: ../DistUpgrade/DistUpgradeView.py:27
 #, python-format
 msgid "%li days %li hours %li minutes"
-msgstr ""
+msgstr "%li日%li小時%li分鐘"
 
 #: ../DistUpgrade/DistUpgradeView.py:29
 #, python-format
 msgid "%li hours %li minutes"
-msgstr ""
+msgstr "%li小時%li分鐘"
 
 #: ../DistUpgrade/DistUpgradeView.py:31
 #, python-format
 msgid "%li minutes"
-msgstr ""
+msgstr "%li分鐘"
 
 #: ../DistUpgrade/DistUpgradeView.py:32
 #, python-format
 msgid "%li seconds"
-msgstr ""
+msgstr "%li秒"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
 #: ../DistUpgrade/DistUpgradeView.py:38
 #, python-format
 msgid ""
-"This download will take about %s with a 56k modem and about %s with a 1Mbit "
-"DSL connection"
+"This download will take about %s with a 1Mbit DSL connection and about %s "
+"with a 56k modem"
 msgstr ""
 
 #: ../DistUpgrade/DistUpgradeView.py:109
@@ -689,9 +677,8 @@ msgid "Difference between the files"
 msgstr "檔案間的差別"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:11
-#, fuzzy
 msgid "Fetching and installing the upgrades"
-msgstr "正在下載及安裝升級"
+msgstr ""
 
 #: ../DistUpgrade/DistUpgrade.glade.h:12
 msgid "Modifying the software channels"
@@ -710,25 +697,37 @@ msgid "Terminal"
 msgstr "終端"
 
 #: ../DistUpgrade/DistUpgrade.glade.h:16
+msgid "_Cancel Upgrade"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:17
+msgid "_Continue"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:18
 msgid "_Keep"
 msgstr "保留(_K)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:17
+#: ../DistUpgrade/DistUpgrade.glade.h:19
 msgid "_Replace"
 msgstr "取代(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:18
+#: ../DistUpgrade/DistUpgrade.glade.h:20
 msgid "_Report Bug"
 msgstr "報告錯誤(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:19
+#: ../DistUpgrade/DistUpgrade.glade.h:21
 msgid "_Restart Now"
 msgstr "現在重新啟動(_R)"
 
-#: ../DistUpgrade/DistUpgrade.glade.h:20
+#: ../DistUpgrade/DistUpgrade.glade.h:22
 msgid "_Resume Upgrade"
 msgstr "繼續升級(_R)"
 
+#: ../DistUpgrade/DistUpgrade.glade.h:23
+msgid "_Start Upgrade"
+msgstr ""
+
 #: ../UpdateManager/DistUpgradeFetcher.py:68
 msgid "Could not find the release notes"
 msgstr "無法找到發行說明"
@@ -794,11 +793,10 @@ msgid "Verfication failed"
 msgstr "檢驗失敗"
 
 #: ../UpdateManager/DistUpgradeFetcher.py:222
-#, fuzzy
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
-msgstr "檢驗升級套件失敗。可能是因為跟伺服器的網路連接出現問題。 "
+msgstr ""
 
 #: ../UpdateManager/DistUpgradeFetcher.py:228
 msgid "Authentication failed"
@@ -811,128 +809,121 @@ msgid ""
 msgstr "認證升級套件失敗。可能是因為跟伺服器的網路連線出現問題。 "
 
 #: ../UpdateManager/GtkProgress.py:108
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
-msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒"
+msgstr ""
 
 #: ../UpdateManager/GtkProgress.py:113
-#, fuzzy, python-format
+#, python-format
 msgid "Downloading file %(current)li of %(total)li"
-msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:204
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:206
 msgid "The list of changes is not available"
-msgstr "修改紀錄不存在，請稍後再試。"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:210
-msgid "The list of changes is not available yet. Please try again later."
-msgstr "修改紀錄不存在，請稍後再試。"
+#: ../UpdateManager/UpdateManager.py:212
+msgid ""
+"The list of changes is not available yet.\n"
+"Please try again later."
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:215
+#: ../UpdateManager/UpdateManager.py:217
 msgid ""
-"Failed to download the list of changes. Please check your Internet "
-"connection."
-msgstr "無法下載更動列表。請檢查網路連線是否正常。"
+"Failed to download the list of changes. \n"
+"Please check your Internet connection."
+msgstr ""
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:88
 msgid "Important security updates"
-msgstr "Ubuntu 5.10 安全性更新"
+msgstr "重要的安全更新"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+#: ../UpdateManager/UpdateManager.py:239 ../data/channels/Ubuntu.info.in:93
 msgid "Recommended updates"
-msgstr ""
+msgstr "建議的安全更新"
 
 #. Description
-#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:240 ../data/channels/Ubuntu.info.in:98
 msgid "Proposed updates"
-msgstr "安裝更新套件(_I)"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:239
+#: ../UpdateManager/UpdateManager.py:241
 msgid "Backports"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:240
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:242
 msgid "Distribution updates"
-msgstr "繼續升級(_R)"
+msgstr ""
 
 #. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:249 ../UpdateManager/UpdateManager.py:266
 msgid "Other updates"
-msgstr "安裝更新套件(_I)"
+msgstr "其他更新"
 
-#: ../UpdateManager/UpdateManager.py:460
+#: ../UpdateManager/UpdateManager.py:478
 #, python-format
 msgid "Version %s: \n"
 msgstr "版本 %s： \n"
 
-#: ../UpdateManager/UpdateManager.py:521
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:539
 msgid "Downloading list of changes..."
-msgstr "正在下載修改紀錄..."
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:548
+#: ../UpdateManager/UpdateManager.py:566
 msgid "_Uncheck All"
 msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:554
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:572
 msgid "_Check All"
-msgstr "檢查(_C)"
+msgstr ""
 
 #. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:595 ../UpdateManager/UpdateManager.py:619
+#: ../UpdateManager/UpdateManager.py:613 ../UpdateManager/UpdateManager.py:637
 #, python-format
 msgid "Download size: %s"
 msgstr "下載大小：%s"
 
-#: ../UpdateManager/UpdateManager.py:615
+#: ../UpdateManager/UpdateManager.py:633
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "您可以安裝 %s 個更新"
-msgstr[1] ""
 
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:666
 msgid "Please wait, this can take some time."
 msgstr "請稍候，這可能需要一點時間。"
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:668
 msgid "Update is complete"
 msgstr "更新完成"
 
-#: ../UpdateManager/UpdateManager.py:701
-#, fuzzy
+#: ../UpdateManager/UpdateManager.py:719
 msgid "Checking for updates"
-msgstr "安裝更新套件(_I)"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:808
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:826
+#, python-format
 msgid "From version %(old_version)s to %(new_version)s"
-msgstr "新版本：%s   （大小：%s）"
+msgstr ""
 
-#: ../UpdateManager/UpdateManager.py:812
-#, fuzzy, python-format
+#: ../UpdateManager/UpdateManager.py:830
+#, python-format
 msgid "Version %s"
-msgstr "版本 %s： \n"
+msgstr "版本%s"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:814
+#: ../UpdateManager/UpdateManager.py:832
 #, python-format
 msgid "(Size: %s)"
-msgstr ""
+msgstr "(大小： %s)"
 
-#: ../UpdateManager/UpdateManager.py:825
+#: ../UpdateManager/UpdateManager.py:843
 msgid "Your distribution is not supported anymore"
 msgstr "您正使用的發行版本已不再支援"
 
-#: ../UpdateManager/UpdateManager.py:826
+#: ../UpdateManager/UpdateManager.py:844
 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 "
@@ -941,17 +932,17 @@ msgstr ""
 "您不會再取得任何安全或重大更新，請升級到最新版本的 Ubuntu Linux。請參閱 "
 "http://www.ubuntu.com以取得更多升級資訊。"
 
-#: ../UpdateManager/UpdateManager.py:845
+#: ../UpdateManager/UpdateManager.py:863
 #, python-format
 msgid "<b>New distribution release '%s' is available</b>"
 msgstr "<b>有新的 distribution 發行版 '%s'</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:880
+#: ../UpdateManager/UpdateManager.py:898
 msgid "Software index is broken"
 msgstr "軟體索引損壞"
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:899
 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 "
@@ -962,54 +953,46 @@ msgstr ""
 
 #. TRANSLATORS: download size is 0
 #: ../UpdateManager/Common/utils.py:33
+#, fuzzy
 msgid "None"
-msgstr ""
+msgstr "無下載"
 
 #. TRANSLATORS: download size of very small updates
 #: ../UpdateManager/Common/utils.py:36
 msgid "1 KB"
-msgstr ""
+msgstr "1 KB"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 KB"
 #: ../UpdateManager/Common/utils.py:39
 #, python-format
 msgid "%.0f KB"
-msgstr ""
+msgstr "%.0f KB"
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
 #: ../UpdateManager/Common/utils.py:42
 #, python-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
 #: ../data/glade/UpdateManager.glade.h:1
-#, 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"
-"您的系統不會自動檢查更新。您可以在「系統」→「管理的→「軟體偏好設定」中設定。"
 
 #: ../data/glade/UpdateManager.glade.h:4
 msgid "<big><b>Keep your system up-to-date</b></big>"
 msgstr "<big><b>將您的系統維持在最新狀態</b></big>"
 
 #: ../data/glade/UpdateManager.glade.h:5
-#, fuzzy
 msgid "<big><b>Not all updates can be installed</b></big>"
 msgstr ""
-"<big><b>掃描光碟時發生錯誤</b></big>\n"
-"\n"
-"%s"
 
 #: ../data/glade/UpdateManager.glade.h:6
-#, fuzzy
 msgid "<big><b>Starting update manager</b></big>"
-msgstr "<b><big>開始升級？</big></b>"
+msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:7
 msgid "Changes"
@@ -1017,7 +1000,7 @@ msgstr "修改紀錄"
 
 #: ../data/glade/UpdateManager.glade.h:8
 msgid "Changes and description of the update"
-msgstr ""
+msgstr "在更新中的更動及其敘述"
 
 #: ../data/glade/UpdateManager.glade.h:9
 msgid "Chec_k"
@@ -1055,7 +1038,7 @@ msgstr "軟體更新"
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities and "
 "provide new features."
-msgstr "軟體更新會更正錯誤, 排除安全弱點, 並提功新功能."
+msgstr "軟體更新會更正錯誤, 排除安全弱點, 並提供新功能."
 
 #: ../data/glade/UpdateManager.glade.h:19
 msgid "U_pgrade"
@@ -1070,9 +1053,8 @@ msgid "_Check"
 msgstr "檢查(_C)"
 
 #: ../data/glade/UpdateManager.glade.h:22
-#, fuzzy
 msgid "_Distribution Upgrade"
-msgstr "繼續升級(_R)"
+msgstr ""
 
 #: ../data/glade/UpdateManager.glade.h:23
 msgid "_Hide this information in the future"
@@ -1083,31 +1065,28 @@ msgid "_Install Updates"
 msgstr "安裝更新套件(_I)"
 
 #: ../data/glade/UpdateManager.glade.h:25
-#, fuzzy
 msgid "changes"
-msgstr "修改紀錄"
+msgstr "更動"
 
 #: ../data/glade/UpdateManager.glade.h:26
 msgid "updates"
-msgstr ""
+msgstr "更新"
 
 #: ../data/glade/SoftwareProperties.glade.h:2
-#, fuzzy
 msgid "<b>Automatic updates</b>"
-msgstr "<b>線上更新</b>"
+msgstr "<b>自動更新</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:3
 msgid "<b>CDROM/DVD</b>"
-msgstr ""
+msgstr "<b>光碟/DVD光碟</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:4
 msgid "<b>Internet updates</b>"
 msgstr "<b>線上更新</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:5
-#, fuzzy
 msgid "<b>Internet</b>"
-msgstr "<b>線上更新</b>"
+msgstr "<b>網際網路</b>"
 
 #: ../data/glade/SoftwareProperties.glade.h:6
 msgid ""
@@ -1121,9 +1100,8 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:9
-#, fuzzy
 msgid "Add Cdrom"
-msgstr "加入光碟(_C)"
+msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:10
 msgid "Authentication"
@@ -1134,9 +1112,8 @@ msgid "D_elete downloaded software files:"
 msgstr "刪除已下載的軟體檔案(_E)："
 
 #: ../data/glade/SoftwareProperties.glade.h:12
-#, fuzzy
 msgid "Download from:"
-msgstr "下載完成"
+msgstr "下載於："
 
 #: ../data/glade/SoftwareProperties.glade.h:13
 msgid "Import the public key from a trusted software provider"
@@ -1162,9 +1139,8 @@ msgstr "還原為發行版本預設的金鑰"
 
 #: ../data/glade/SoftwareProperties.glade.h:18
 #: ../data/software-properties.desktop.in.h:2
-#, fuzzy
 msgid "Software Sources"
-msgstr "軟體屬性"
+msgstr "軟體原始碼"
 
 #: ../data/glade/SoftwareProperties.glade.h:19
 msgid "Source code"
@@ -1180,16 +1156,15 @@ msgstr ""
 
 #: ../data/glade/SoftwareProperties.glade.h:22
 msgid "Third Party"
-msgstr ""
+msgstr "第三方"
 
 #: ../data/glade/SoftwareProperties.glade.h:23
 msgid "_Check for updates automatically:"
 msgstr "自動檢查更新(_C)："
 
 #: ../data/glade/SoftwareProperties.glade.h:24
-#, fuzzy
 msgid "_Download updates automatically, but do not install them"
-msgstr "在背景下載更新套件，但無須安裝(_D)"
+msgstr "自動下載更新部份但不進行安裝(_D)"
 
 #: ../data/glade/SoftwareProperties.glade.h:25
 msgid "_Import Key File"
@@ -1200,7 +1175,6 @@ msgid "_Install security updates without confirmation"
 msgstr "無須確認便安裝安全性更新(_I)"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
-#, fuzzy
 msgid ""
 "<b><big>The information about available software is out-of-date</big></b>\n"
 "\n"
@@ -1209,12 +1183,6 @@ msgid ""
 "\n"
 "You need a working internet connection to continue."
 msgstr ""
-"<b><big>套件來源的資料已經過期</big></b>\n"
-"\n"
-"您需要重新載入套件來源的資料以安裝軟體，及更新套件來源新加入或修改了的套"
-"件。\n"
-"\n"
-"您須要連線到網際網路繼續。"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:6
 msgid "<b>Comment:</b>"
@@ -1237,7 +1205,6 @@ msgid "<b>URI:</b>"
 msgstr "<b>URI：</b>"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
-#, fuzzy
 msgid ""
 "<big><b>Enter the complete APT line of the repository that you want to add "
 "as source</b></big>\n"
@@ -1245,11 +1212,6 @@ msgid ""
 "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 來源列包括了來源的類型、位置及 components，例如 <i>\"deb http://ftp."
-"debian.org sarge main\"</i>。"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:14
 msgid "APT line:"
@@ -1265,7 +1227,7 @@ msgstr ""
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:17
 msgid "Edit Source"
-msgstr ""
+msgstr "編輯來源"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:18
 msgid "Scanning CD-ROM"
@@ -1273,7 +1235,7 @@ msgstr "正在掃描光碟"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:19
 msgid "_Add Source"
-msgstr ""
+msgstr "增加來源(_A)"
 
 #: ../data/glade/SoftwarePropertiesDialogs.glade.h:20
 msgid "_Reload"
@@ -1298,14 +1260,11 @@ msgid "Check for new distribution releases"
 msgstr "檢查有沒有新的發行版本"
 
 #: ../data/update-manager.schemas.in.h:3
-#, 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 ""
-"如果停用自動更新檢查，您需要自行重新載入套件來源清單。在此情況下本選項允許關"
-"閉更新提示"
 
 #: ../data/update-manager.schemas.in.h:4
 msgid "Remind to reload the channel list"
@@ -1320,20 +1279,18 @@ msgid "Stores the size of the update-manager dialog"
 msgstr "儲存 update-manager 對話視窗的大小"
 
 #: ../data/update-manager.schemas.in.h:7
-#, fuzzy
 msgid ""
 "Stores the state of the expander that contains the list of changes and the "
 "description"
-msgstr "儲存包含修改紀錄及描述的 expander 的狀態"
+msgstr ""
 
 #: ../data/update-manager.schemas.in.h:8
 msgid "The window size"
 msgstr "視窗大小"
 
 #: ../data/software-properties.desktop.in.h:1
-#, fuzzy
 msgid "Configure the sources for installable software and updates"
-msgstr "設定套件來源及網路更新"
+msgstr "設置可安裝的軟體及更新部份之來源。"
 
 #. ChangelogURI
 #: ../data/channels/Ubuntu.info.in.h:4
@@ -1343,15 +1300,13 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:8
-#, fuzzy
 msgid "Ubuntu 6.10 'Edgy Eft'"
-msgstr "Ubuntu 5.10 更新"
+msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:13
-#, fuzzy
 msgid "Community maintained"
-msgstr "協力維護軟體 (Universe)"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:17
@@ -1360,43 +1315,38 @@ msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:19
-#, fuzzy
 msgid "Restricted software"
-msgstr "非自由軟體 (Multiverse)"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:25
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
-msgstr ""
+msgstr "Ubuntu 6.10 'Edgy Eft'的光碟"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:59
-#, fuzzy
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 ‘Dapper Drake‘"
+msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:62
-msgid "By Canonical supported Open Source software"
+msgid "Canonical supported Open Source software"
 msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:64
-#, fuzzy
 msgid "Community maintained (universe)"
-msgstr "協力維護軟體 (Universe)"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:65
-#, fuzzy
 msgid "Community maintained Open Source software"
-msgstr "協力維護軟體 (Universe)"
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:67
-#, fuzzy
 msgid "Non-free drivers"
-msgstr "非自由軟體 (Multiverse)"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:68
@@ -1405,20 +1355,18 @@ msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:70
-#, fuzzy
 msgid "Restricted software (Multiverse)"
-msgstr "非自由軟體 (Multiverse)"
+msgstr ""
 
 #. CompDescriptionLong
 #: ../data/channels/Ubuntu.info.in:71
-msgid "By copyright or legal issues restricted software"
+msgid "Software restricted by copyright or legal issues"
 msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:76
-#, fuzzy
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
-msgstr "Ubuntu 6.06 ‘Dapper Drake‘"
+msgstr "含Ubuntu 6.06 LTS 'Dapper Drake'之光碟"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:103
@@ -1428,39 +1376,37 @@ msgstr ""
 #. Description
 #: ../data/channels/Ubuntu.info.in:110
 msgid "Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 ‘Breezy Badger’"
+msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:123
-#, fuzzy
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
-msgstr "Ubuntu 5.10 ‘Breezy Badger’"
+msgstr "Ubuntu 5.10 'Breezy Badger'的光碟"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:135
 msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 安全性更新"
+msgstr "Ubuntu 5.10安全性更新"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:140
 msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 更新"
+msgstr "Ubuntu 5.10更新"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:145
 msgid "Ubuntu 5.10 Backports"
-msgstr "Ubuntu 5.10 回移套件"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:152
-#, fuzzy
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr "Ubuntu 5.10 ‘Breezy Badger’"
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:165
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
-msgstr ""
+msgstr "Ubuntu 5.04 'Hoary Hedgehog'的光碟"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
@@ -1469,27 +1415,23 @@ msgstr "官方支援"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:177
-#, fuzzy
 msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.10 安全性更新"
+msgstr "Ubuntu 5.04安全性更新"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:182
-#, fuzzy
 msgid "Ubuntu 5.04 Updates"
-msgstr "Ubuntu 5.10 更新"
+msgstr "Ubuntu 5.04更新"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:187
-#, fuzzy
 msgid "Ubuntu 5.04 Backports"
-msgstr "Ubuntu 5.10 回移套件"
+msgstr ""
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:193
-#, fuzzy
 msgid "Ubuntu 4.10 'Warty Warthog'"
-msgstr "Ubuntu 5.10 ‘Breezy Badger’"
+msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:199
@@ -1504,13 +1446,12 @@ msgstr "非自由軟體 (Multiverse)"
 #. Description
 #: ../data/channels/Ubuntu.info.in:206
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
-msgstr ""
+msgstr "含Ubuntu 4.10 'Warty Warthog'之光碟"
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:209
-#, fuzzy
 msgid "No longer officially supported"
-msgstr "有些軟體不再有官方支援"
+msgstr ""
 
 #. CompDescription
 #: ../data/channels/Ubuntu.info.in:211
@@ -1519,21 +1460,18 @@ msgstr "版權受限制"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:218
-#, fuzzy
 msgid "Ubuntu 4.10 Security Updates"
-msgstr "Ubuntu 5.10 安全性更新"
+msgstr "Ubuntu 4.10安全性更新"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:223
-#, fuzzy
 msgid "Ubuntu 4.10 Updates"
-msgstr "Ubuntu 5.10 更新"
+msgstr "Ubuntu 4.10更新"
 
 #. Description
 #: ../data/channels/Ubuntu.info.in:228
-#, fuzzy
 msgid "Ubuntu 4.10 Backports"
-msgstr "Ubuntu 5.10 回移套件"
+msgstr ""
 
 #. ChangelogURI
 #: ../data/channels/Debian.info.in.h:4
@@ -1581,41 +1519,81 @@ msgstr "符合 DFSG 的軟體，但有依賴於非自由軟體"
 msgid "Non-DFSG-compatible Software"
 msgstr "不符合 DFSG 的軟體"
 
-#~ msgid "Downloading file %li of %li with unknown speed"
-#~ msgstr "正在下載檔案 %li/%li，下載速度不明"
+#~ msgid "     "
+#~ msgstr "     "
 
-#, fuzzy
-#~ msgid "Normal updates"
-#~ msgstr "安裝更新套件(_I)"
+#~ msgid "%s new package is going to be installed."
+#~ msgid_plural "%s new packages are going to be installed."
+#~ msgstr[0] "%s 個新套件將會安裝。"
 
-#~ msgid "Cancel _Download"
-#~ msgstr "取消下載(_D)"
+#~ msgid "%s package is going to be removed."
+#~ msgid_plural "%s packages are going to be removed."
+#~ msgstr[0] "%s 個套件將會移除。"
 
-#~ msgid "Some software no longer officially supported"
-#~ msgstr "有些軟體不再有官方支援"
-
-#~ msgid "Could not find any upgrades"
-#~ msgstr "無法找到任何升級"
+#~ msgid "%s package is going to be upgraded."
+#~ msgid_plural "%s packages are going to be upgraded."
+#~ msgstr[0] "%s 個套件將會升級。"
 
-#~ msgid "Your system has already been upgraded."
-#~ 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>套件來源的資料已經過期</big></b>\n"
+#~ "\n"
+#~ "您需要重新載入套件來源的資料以安裝軟體，及更新套件來源新加入或修改了的套"
+#~ "件。\n"
+#~ "\n"
+#~ "您須要連線到網際網路繼續。"
 
-#, fuzzy
 #~ msgid ""
-#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
+#~ "<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 ""
-#~ "<span weight=\"bold\" size=\"x-large\">升級至 Ubuntu  6.06 LTS</span>"
+#~ "<b><big>您必須自行檢查更新</big></b>\n"
+#~ "\n"
+#~ "您的系統不會自動檢查更新。您可以在「系統」→「管理的→「軟體偏好設定」中設"
+#~ "定。"
 
-#, fuzzy
-#~ msgid "Important security updates of Ubuntu"
-#~ msgstr "Ubuntu 5.10 安全性更新"
+#~ msgid "<b>Channel</b>"
+#~ msgstr "<b>套件來源</b>"
 
-#, fuzzy
-#~ msgid "Updates of Ubuntu"
-#~ msgstr "升級到最新版本的 Ubuntu"
+#~ msgid "<b>Channels</b>"
+#~ msgstr "<b>套件來源</b>"
 
-#~ msgid "Cannot install all available updates"
-#~ msgstr "無法安裝所有更新套件"
+#~ 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"
@@ -1625,160 +1603,233 @@ msgstr "不符合 DFSG 的軟體"
 #~ 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."
+#~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>"
 #~ msgstr ""
-#~ "有一些更新須要移除其它套件。使用“Synaptic 套件管理程式”的「標記所有升級」"
-#~ "功能或在終端機中執行“sudo apt-get dist-upgrade”來完整地更新您的系統。"
+#~ "<span weight=\"bold\" size=\"x-large\">升級至 Ubuntu  6.06 LTS</span>"
 
-#~ msgid "The following updates will be skipped:"
-#~ msgstr "會略過更新以下套件："
+#~ msgid ""
+#~ "A unresolvable problem occured while calculating the upgrade. Please "
+#~ "report this as a bug. "
+#~ msgstr "計算升級時發生無法解決的問題，請匯報問題。 "
 
-#~ msgid "Download is complete"
-#~ msgstr "下載完成"
+#~ msgid "About %li days %li hours %li minutes remaining"
+#~ msgstr "大約還剩下 %li 天 %li 小時 %li 分鐘"
 
-#~ msgid "The upgrade aborts now. Please report this bug."
-#~ msgstr "升級現正中止，請匯報問題。"
+#~ msgid "About %li hours %li minutes remaining"
+#~ msgstr "大約還剩下 %li 小時 %li 分鐘"
 
-#~ msgid "Upgrading Ubuntu"
-#~ msgstr "正在升級 Ubuntu"
+#~ msgid "About %li minutes remaining"
+#~ msgstr "大約還剩下 %li 分鐘"
 
-#~ msgid "Hide details"
-#~ msgstr "隱藏詳細資料"
+#~ msgid "About %li seconds remaining"
+#~ msgstr "大約還剩下 %li 秒鐘"
 
-#~ msgid "Show details"
-#~ msgstr "顯示詳細資料"
+#~ msgid "Add Channel"
+#~ msgstr "加入套件來源"
 
-#~ msgid "Only one software management tool is allowed to run at the same time"
-#~ msgstr "同時間只允許執行一個套件管理程式"
+#~ msgid "Add _Cdrom"
+#~ msgstr "加入光碟(_C)"
 
 #~ msgid ""
-#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
-#~ msgstr "請先關閉其它程式，如‘aptitude’ 或‘Synaptic’。"
+#~ "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 "<b>Channels</b>"
-#~ msgstr "<b>套件來源</b>"
+#~ msgid "Cancel _Download"
+#~ msgstr "取消下載(_D)"
 
-#~ msgid "<b>Keys</b>"
-#~ msgstr "<b>金鑰</b>"
+#~ msgid "Cannot install all available updates"
+#~ msgstr "無法安裝所有更新套件"
 
-#~ msgid "Installation Media"
-#~ msgstr "安裝媒體"
+#~ msgid "Configure software channels and internet updates"
+#~ msgstr "設定套件來源及網路更新"
 
-#~ msgid "Software Preferences"
-#~ msgstr "軟體偏好設定"
+#~ msgid "Could not find any upgrades"
+#~ msgstr "無法找到任何升級"
 
-#~ msgid "     "
-#~ msgstr "     "
+#~ msgid "Download is complete"
+#~ msgstr "下載完成"
 
-#~ msgid "<b>Channel</b>"
-#~ msgstr "<b>套件來源</b>"
+#~ msgid "Downloading and installing the upgrades"
+#~ msgstr "正在下載及安裝升級"
 
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>元件</b>"
+#~ msgid "Downloading file %li of %li"
+#~ msgstr "正在下載檔案 %li/%li"
 
-#~ msgid "Add Channel"
-#~ msgstr "加入套件來源"
+#~ 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 "編輯套件來源"
 
-#, fuzzy
-#~ msgid "_Add Channel"
-#~ msgstr "加入套件來源(_A)"
-
-#~ msgid "_Custom"
-#~ msgstr "自訂(_C)"
+#~ msgid ""
+#~ "Failed to download the list of changes. Please check your Internet "
+#~ "connection."
+#~ msgstr "無法下載更動列表。請檢查網路連線是否正常。"
 
-#~ msgid "Ubuntu 6.06 LTS"
-#~ msgstr "Ubuntu 6.06 更新"
+#~ msgid "Hide details"
+#~ msgstr "隱藏詳細資料"
 
-#~ msgid "Ubuntu 6.06 LTS Security Updates"
-#~ msgstr "Ubuntu 6.06 LTS 安全性更新"
+#~ 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 "Ubuntu 6.06 LTS Updates"
-#~ msgstr "Ubuntu 6.06 LTS 更新"
+#~ msgid "Installation Media"
+#~ msgstr "安裝媒體"
 
-#~ msgid "Ubuntu 6.06 LTS Backports"
-#~ msgstr "Ubuntu 6.06 LTS 回移套件"
+#~ msgid "New version: %s   (Size: %s)"
+#~ msgstr "新版本：%s   （大小：%s）"
 
-#~ msgid "No valid entry found"
-#~ msgstr "找不到有效的項目"
+#~ msgid "Only one software management tool is allowed to run at the same time"
+#~ msgstr "同時間只允許執行一個套件管理程式"
 
 #~ msgid ""
-#~ "While scaning your repository information no valid entry for the upgrade "
-#~ "was found.\n"
-#~ msgstr "掃描套件庫資料作升級時找不到有效的項目。\n"
+#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first."
+#~ msgstr "請先關閉其它程式，如‘aptitude’ 或‘Synaptic’。"
 
 #~ msgid ""
-#~ "The upgrade aborts now. Your system can be in an unusable state. A "
-#~ "recovery is now run (dpkg --configure -a)."
+#~ "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 ""
-#~ "升級現正中止。您的系統可以會處於不穩定的狀態。執行 (dpkg --configure -a) "
-#~ "來恢復。"
+#~ "請將此視為 bug 來回報，並於報告中包含 /var/log/dist-upgrade.log 及 /var/"
+#~ "log/dist-upgrade-apt.log 這兩個檔案。 現在取消更新。\n"
+#~ "您的原始 sources.list 已被存到 /etc/apt/sources.list.distUpgrade。"
 
 #~ 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. "
+#~ "Replace configuration file\n"
+#~ "'%s'?"
 #~ msgstr ""
-#~ "請匯報問題及在報告中請包括檔案 ~/dist-upgrade.log 和 ~/dist-upgrade-apt."
-#~ "log。升級現正中止。 "
+#~ "取代設定檔\n"
+#~ "‘%s‘？"
+
+#~ msgid "Restoring originale system state"
+#~ msgstr "恢復原先的系統狀態"
+
+#~ msgid "Show details"
+#~ msgstr "顯示詳細資料"
+
+#~ msgid "Software Preferences"
+#~ msgstr "軟體偏好設定"
 
-#~ msgid "You can install one update"
-#~ msgid_plural "You can install %s updates"
-#~ msgstr[0] "您可以安裝 1 個更新套件"
-#~ msgstr[1] "您可以安裝 %s 個更新套件"
+#~ msgid "Software Properties"
+#~ msgstr "軟體屬性"
 
-#~ msgid "Repositories changed"
-#~ msgstr "套件庫已變更"
+#~ msgid "Some software no longer officially supported"
+#~ msgstr "有些軟體不再有官方支援"
 
 #~ 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 "您需要重新載入在伺服器中的套件清單使變更生效。現在要這樣做？"
+#~ "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 ""
-#~ "<big><b>Analysing your system</b></big>\n"
-#~ "\n"
-#~ "Software updates can correct errors, eliminate security vulnerabilities, "
-#~ "and provide new features to you."
+#~ "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 ""
-#~ "<big><b>正在分析您的系統</b></big>\n"
-#~ "\n"
-#~ "軟體更新能夠修正錯誤、防止安全漏洞及增加新的功能。"
+#~ "有一些更新須要移除其它套件。使用“Synaptic 套件管理程式”的「標記所有升級」"
+#~ "功能或在終端機中執行“sudo apt-get dist-upgrade”來完整地更新您的系統。"
 
 #~ msgid ""
-#~ "Software updates can correct errors, eliminate security vulnerabilities, "
-#~ "and provide new features to you."
-#~ msgstr "軟體更新能夠修正錯誤、防止安全漏洞及增加新的功能。"
+#~ "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 ""
-#~ "Only security updates from the official Ubuntu servers will be installed "
-#~ "automatically. The software package \"unattended-upgrades\" needs to be "
-#~ "installed therefor"
+#~ "The upgrade aborts now. Your system can be in an unusable state. A "
+#~ "recovery was run (dpkg --configure -a)."
 #~ msgstr ""
-#~ "只有來自 ubuntu 官方伺服器的安全性更新會自動安裝。需要安裝軟體套"
-#~ "件“unattended-upgrades”"
+#~ "升級中止。 你的系統現在可能在一個不穩定的狀態。 正在進行復原 (dpkg --"
+#~ "configure -a)。"
 
-#~ msgid "<b>Sections</b>"
-#~ msgstr "<b>組別：</b>"
+#~ msgid ""
+#~ "The upgrade can take several hours and cannot be canceled at any time "
+#~ "later."
+#~ msgstr "升級可能需要數小時及無法在稍後任何時間取消。"
 
 #~ msgid ""
-#~ "<big><b>Enter the complete APT line of the channel that you want to add</"
-#~ "b></big>\n"
+#~ "These installed packages are no longer officially supported, and are now "
+#~ "only community-supported ('universe').\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>."
+#~ "If you don't have 'universe' enabled these packages will be suggested for "
+#~ "removal in the next step. "
 #~ msgstr ""
-#~ "<big><b>請輸入要加入的套件來源的 APT 套件庫位置</b></big>\n"
+#~ "這些已安裝的套件官方不再支援，現在將只會由社群維護 ('universe')\n"
 #~ "\n"
-#~ "APT 套件庫位置 (APT line) 包括套件來源的類型、位置和組別，例如： <i>“deb "
-#~ "http://ftp.debian.org sarge main”</i>。"
+#~ "如果你沒有啟用 '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)"
diff --git a/update-manager b/update-manager
index 21b03702..34128972 100644
--- a/update-manager
+++ b/update-manager
@@ -36,8 +36,6 @@ from gettext import gettext as _
 from optparse import OptionParser
 
 if __name__ == "__main__":
-  _ = gettext.gettext
-
   APP="update-manager"
   DIR="/usr/share/locale"
 
@@ -50,14 +48,14 @@ if __name__ == "__main__":
   parser = OptionParser()
   parser.add_option ("-c", "--check-dist-upgrades", action="store_true",
                      dest="check_dist_upgrades", default=False,
-                     help="Check if a new distribution release is available")
+                     help=_("Check if a new distribution release is available"))
   parser.add_option ("-d", "--devel-release", action="store_true",
                      dest="devel_release", default=False,
-                     help="Check if upgrading to the latest devel release "
-                          "is possible")
+                     help=_("Check if upgrading to the latest devel release "
+                          "is possible"))
   parser.add_option ("--dist-upgrade","--dist-ugprade", action="store_true",
                      dest="dist_upgrade", default=False,
-                     help="Try to run a dist-upgrade")
+                     help=_("Try to run a dist-upgrade"))
 
   (options, args) = parser.parse_args()